From 6d1b2216464d4dad449ac6fcfec476832224a55e Mon Sep 17 00:00:00 2001 From: Raven Szewczyk Date: Fri, 24 May 2024 19:50:35 +0100 Subject: Merge addon sources --- .../java/com/github/technus/tectech/Reference.java | 15 - .../java/com/github/technus/tectech/TecTech.java | 119 - .../openComputers/AvrArchitecture.java | 307 -- .../github/technus/tectech/loader/MainLoader.java | 202 - .../technus/tectech/loader/NetworkDispatcher.java | 25 - .../technus/tectech/loader/TecTechConfig.java | 257 - .../tectech/loader/gui/CreativeTabTecTech.java | 37 - .../technus/tectech/loader/recipe/Assembler.java | 3029 ----------- .../tectech/loader/recipe/AssemblyLine.java | 128 - .../tectech/loader/recipe/BaseRecipeLoader.java | 49 - .../tectech/loader/recipe/CircuitAssembler.java | 46 - .../technus/tectech/loader/recipe/Crafting.java | 57 - .../technus/tectech/loader/recipe/Extractor.java | 57 - .../technus/tectech/loader/recipe/Godforge.java | 563 -- .../loader/recipe/ResearchStationAssemblyLine.java | 3272 ------------ .../technus/tectech/loader/thing/CoverLoader.java | 48 - .../tectech/loader/thing/MachineLoader.java | 2101 -------- .../technus/tectech/loader/thing/MuTeLoader.java | 21 - .../technus/tectech/loader/thing/ThingsLoader.java | 99 - .../mechanics/dataTransport/DataPacket.java | 104 - .../dataTransport/InventoryDataPacket.java | 62 - .../mechanics/dataTransport/QuantumDataPacket.java | 50 - .../enderStorage/EnderFluidContainer.java | 134 - .../mechanics/enderStorage/EnderLinkTag.java | 39 - .../mechanics/enderStorage/EnderLinkTank.java | 47 - .../enderStorage/EnderWorldSavedData.java | 145 - .../tectech/mechanics/pipe/IActivePipe.java | 12 - .../mechanics/pipe/IConnectsToDataPipe.java | 17 - .../mechanics/pipe/IConnectsToEnergyTunnel.java | 11 - .../mechanics/pipe/PipeActivityMessage.java | 136 - .../tectech/mechanics/spark/RendererMessage.java | 149 - .../tectech/mechanics/spark/ThaumSpark.java | 57 - .../tectech/mechanics/tesla/ITeslaConnectable.java | 169 - .../mechanics/tesla/ITeslaConnectableSimple.java | 24 - .../mechanics/tesla/TeslaCoverConnection.java | 81 - .../github/technus/tectech/proxy/ClientProxy.java | 182 - .../github/technus/tectech/proxy/CommonProxy.java | 94 - .../tectech/recipe/EyeOfHarmonyFrontend.java | 206 - .../technus/tectech/recipe/EyeOfHarmonyRecipe.java | 499 -- .../tectech/recipe/EyeOfHarmonyRecipeStorage.java | 184 - .../tectech/recipe/GodforgeExoticFrontend.java | 82 - .../tectech/recipe/GodforgePlasmaFrontend.java | 76 - .../tectech/recipe/ResearchStationFrontend.java | 101 - .../technus/tectech/recipe/TT_recipeAdder.java | 278 - .../technus/tectech/recipe/TecTechRecipeMaps.java | 77 - .../tectech/rendering/EOH/EOH_ItemRenderer.java | 98 - .../tectech/rendering/EOH/EOH_RenderingUtils.java | 270 - .../technus/tectech/rendering/EOH/EOH_TESR.java | 91 - .../technus/tectech/thing/CustomItemList.java | 609 --- .../tectech/thing/block/EOH_RenderBlock.java | 79 - .../tectech/thing/block/ForgeOfGodsBlock.java | 70 - .../tectech/thing/block/GodforgeGlassBlock.java | 107 - .../tectech/thing/block/GodforgeGlassItem.java | 30 - .../tectech/thing/block/GodforgeGlassRender.java | 122 - .../tectech/thing/block/QuantumGlassBlock.java | 111 - .../tectech/thing/block/QuantumGlassItem.java | 33 - .../tectech/thing/block/QuantumGlassRender.java | 129 - .../tectech/thing/block/QuantumStuffBlock.java | 104 - .../tectech/thing/block/QuantumStuffRender.java | 104 - .../tectech/thing/block/ReactorSimBlock.java | 96 - .../tectech/thing/block/ReactorSimItem.java | 36 - .../tectech/thing/block/RenderForgeOfGods.java | 130 - .../tectech/thing/block/TileEyeOfHarmony.java | 200 - .../tectech/thing/block/TileForgeOfGods.java | 77 - .../tectech/thing/casing/GT_Block_CasingsBA0.java | 227 - .../tectech/thing/casing/GT_Block_CasingsNH.java | 64 - .../tectech/thing/casing/GT_Block_CasingsTT.java | 196 - .../tectech/thing/casing/GT_Item_CasingsBA0.java | 111 - .../tectech/thing/casing/GT_Item_CasingsNH.java | 15 - .../tectech/thing/casing/GT_Item_CasingsTT.java | 133 - .../thing/casing/GT_Item_Casings_Godforge.java | 114 - .../thing/casing/GT_Item_Casings_Spacetime.java | 56 - .../casing/GT_Item_Casings_Stabilisation.java | 47 - .../casing/GT_Item_Casings_TimeAcceleration.java | 46 - .../tectech/thing/casing/GodforgeCasings.java | 124 - .../casing/SpacetimeCompressionFieldCasing.java | 120 - .../thing/casing/StabilisationFieldCasing.java | 117 - .../tectech/thing/casing/TT_Container_Casings.java | 28 - .../thing/casing/TimeAccelerationFieldCasing.java | 120 - .../thing/cover/GT_Cover_TM_EnderFluidLink.java | 252 - .../thing/cover/GT_Cover_TM_PowerPassUpgrade.java | 53 - .../tectech/thing/cover/GT_Cover_TM_TeslaCoil.java | 71 - .../cover/GT_Cover_TM_TeslaCoil_Ultimate.java | 44 - .../tectech/thing/gui/TecTechUITextures.java | 184 - .../tectech/thing/item/AstralArrayFabricator.java | 53 - .../tectech/thing/item/EnderFluidLinkCover.java | 56 - .../technus/tectech/thing/item/EuMeterGT.java | 169 - .../tectech/thing/item/ParametrizerMemoryCard.java | 234 - .../tectech/thing/item/PowerPassUpgradeCover.java | 55 - .../tectech/thing/item/RenderForgeOfGodsItem.java | 91 - .../tectech/thing/item/TeslaCoilCapacitor.java | 108 - .../tectech/thing/item/TeslaCoilComponent.java | 72 - .../technus/tectech/thing/item/TeslaCoilCover.java | 87 - .../technus/tectech/thing/item/TeslaStaff.java | 54 - .../tectech/thing/metaTileEntity/Textures.java | 318 -- .../hatch/GT_MetaTileEntity_Hatch_Capacitor.java | 268 - .../GT_MetaTileEntity_Hatch_CreativeData.java | 133 - ...T_MetaTileEntity_Hatch_CreativeMaintenance.java | 96 - ...T_MetaTileEntity_Hatch_CreativeUncertainty.java | 58 - .../GT_MetaTileEntity_Hatch_DataConnector.java | 202 - .../hatch/GT_MetaTileEntity_Hatch_DynamoMulti.java | 128 - .../GT_MetaTileEntity_Hatch_DynamoTunnel.java | 225 - .../hatch/GT_MetaTileEntity_Hatch_EnergyMulti.java | 134 - .../GT_MetaTileEntity_Hatch_EnergyTunnel.java | 152 - .../hatch/GT_MetaTileEntity_Hatch_Holder.java | 181 - .../hatch/GT_MetaTileEntity_Hatch_InputData.java | 102 - .../GT_MetaTileEntity_Hatch_InputDataItems.java | 246 - .../hatch/GT_MetaTileEntity_Hatch_OutputData.java | 116 - .../GT_MetaTileEntity_Hatch_OutputDataItems.java | 141 - .../hatch/GT_MetaTileEntity_Hatch_Param.java | 559 -- .../hatch/GT_MetaTileEntity_Hatch_ParamText.java | 291 -- .../hatch/GT_MetaTileEntity_Hatch_Rack.java | 470 -- .../hatch/GT_MetaTileEntity_Hatch_Uncertainty.java | 474 -- .../GT_MetaTileEntity_Hatch_WirelessMulti.java | 216 - .../multi/ForgeOfGodsRingsStructureString.java | 5101 ------------------ .../multi/ForgeOfGodsStructureString.java | 5429 -------------------- .../multi/GT_MetaTileEntity_EM_EyeOfHarmony.java | 1767 ------- .../multi/GT_MetaTileEntity_EM_ForgeOfGods.java | 2385 --------- .../multi/GT_MetaTileEntity_EM_computer.java | 525 -- .../multi/GT_MetaTileEntity_EM_dataBank.java | 302 -- .../multi/GT_MetaTileEntity_EM_infuser.java | 315 -- .../multi/GT_MetaTileEntity_EM_research.java | 823 --- .../multi/GT_MetaTileEntity_EM_switch.java | 291 -- .../multi/GT_MetaTileEntity_EM_transformer.java | 221 - .../multi/GT_MetaTileEntity_TM_microwave.java | 348 -- .../multi/GT_MetaTileEntity_TM_teslaCoil.java | 1080 ---- .../base/GT_MetaTileEntity_MultiblockBase_EM.java | 2823 ---------- .../metaTileEntity/multi/base/INameFunction.java | 6 - .../metaTileEntity/multi/base/IStatusFunction.java | 6 - .../thing/metaTileEntity/multi/base/LedStatus.java | 64 - .../metaTileEntity/multi/base/Parameters.java | 327 -- .../thing/metaTileEntity/multi/base/SoundLoop.java | 59 - .../render/TT_RenderedExtendedFacingTexture.java | 25 - .../GT_MetaTileEntity_EM_BaseModule.java | 497 -- .../GT_MetaTileEntity_EM_ExoticModule.java | 529 -- .../GT_MetaTileEntity_EM_MoltenModule.java | 227 - .../GT_MetaTileEntity_EM_PlasmaModule.java | 226 - .../GT_MetaTileEntity_EM_SmeltingModule.java | 228 - .../pipe/GT_MetaTileEntity_PipeBlock_Data.java | 52 - .../pipe/GT_MetaTileEntity_PipeBlock_Energy.java | 52 - .../pipe/GT_MetaTileEntity_Pipe_Data.java | 316 -- .../pipe/GT_MetaTileEntity_Pipe_Energy.java | 285 - .../single/GT_MetaTileEntity_BuckConverter.java | 271 - .../single/GT_MetaTileEntity_DebugPollutor.java | 246 - .../GT_MetaTileEntity_DebugPowerGenerator.java | 392 -- .../GT_MetaTileEntity_DebugStructureWriter.java | 300 -- .../single/GT_MetaTileEntity_OwnerDetector.java | 239 - .../single/GT_MetaTileEntity_TT_Transformer.java | 73 - .../single/GT_MetaTileEntity_TeslaCoil.java | 404 -- .../single/GT_MetaTileEntity_WetTransformer.java | 49 - .../tectech/thing/multiTileEntity/GodForge.java | 0 .../thing/tileEntity/ReactorSimTileEntity.java | 143 - .../github/technus/tectech/util/CommonValues.java | 33 - .../com/github/technus/tectech/util/Converter.java | 41 - .../technus/tectech/util/FluidStackLong.java | 29 - .../github/technus/tectech/util/GodforgeMath.java | 308 -- .../github/technus/tectech/util/ItemStackLong.java | 28 - .../github/technus/tectech/util/TT_Utility.java | 192 - 158 files changed, 50612 deletions(-) delete mode 100644 tectech/src/main/java/com/github/technus/tectech/Reference.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/TecTech.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/compatibility/openComputers/AvrArchitecture.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/loader/MainLoader.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/loader/NetworkDispatcher.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/loader/TecTechConfig.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/loader/gui/CreativeTabTecTech.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/loader/recipe/Assembler.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/loader/recipe/AssemblyLine.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/loader/recipe/BaseRecipeLoader.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/loader/recipe/CircuitAssembler.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/loader/recipe/Crafting.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/loader/recipe/Extractor.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/loader/recipe/Godforge.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/loader/recipe/ResearchStationAssemblyLine.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/loader/thing/CoverLoader.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/loader/thing/MuTeLoader.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/loader/thing/ThingsLoader.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/mechanics/dataTransport/DataPacket.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/mechanics/dataTransport/InventoryDataPacket.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/mechanics/dataTransport/QuantumDataPacket.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/mechanics/enderStorage/EnderFluidContainer.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/mechanics/enderStorage/EnderLinkTag.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/mechanics/enderStorage/EnderLinkTank.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/mechanics/enderStorage/EnderWorldSavedData.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/mechanics/pipe/IActivePipe.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/mechanics/pipe/IConnectsToDataPipe.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/mechanics/pipe/IConnectsToEnergyTunnel.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/mechanics/pipe/PipeActivityMessage.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/mechanics/spark/RendererMessage.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/mechanics/spark/ThaumSpark.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/mechanics/tesla/ITeslaConnectable.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/mechanics/tesla/ITeslaConnectableSimple.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/mechanics/tesla/TeslaCoverConnection.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/proxy/ClientProxy.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/proxy/CommonProxy.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/recipe/EyeOfHarmonyFrontend.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/recipe/EyeOfHarmonyRecipe.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/recipe/EyeOfHarmonyRecipeStorage.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/recipe/GodforgeExoticFrontend.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/recipe/GodforgePlasmaFrontend.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/recipe/ResearchStationFrontend.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/recipe/TT_recipeAdder.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/recipe/TecTechRecipeMaps.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/rendering/EOH/EOH_ItemRenderer.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/rendering/EOH/EOH_RenderingUtils.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/rendering/EOH/EOH_TESR.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/CustomItemList.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/block/EOH_RenderBlock.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/block/ForgeOfGodsBlock.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/block/GodforgeGlassBlock.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/block/GodforgeGlassItem.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/block/GodforgeGlassRender.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/block/QuantumGlassBlock.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/block/QuantumGlassItem.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/block/QuantumGlassRender.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/block/QuantumStuffBlock.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/block/QuantumStuffRender.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/block/ReactorSimBlock.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/block/ReactorSimItem.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/block/RenderForgeOfGods.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/block/TileEyeOfHarmony.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/block/TileForgeOfGods.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsBA0.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsNH.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsTT.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_CasingsBA0.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_CasingsNH.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_CasingsTT.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_Casings_Godforge.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_Casings_Spacetime.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_Casings_Stabilisation.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_Casings_TimeAcceleration.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/casing/GodforgeCasings.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/casing/SpacetimeCompressionFieldCasing.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/casing/StabilisationFieldCasing.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/casing/TT_Container_Casings.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/casing/TimeAccelerationFieldCasing.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/cover/GT_Cover_TM_EnderFluidLink.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/cover/GT_Cover_TM_PowerPassUpgrade.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/cover/GT_Cover_TM_TeslaCoil.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/cover/GT_Cover_TM_TeslaCoil_Ultimate.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/gui/TecTechUITextures.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/item/AstralArrayFabricator.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/item/EnderFluidLinkCover.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/item/EuMeterGT.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/item/ParametrizerMemoryCard.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/item/PowerPassUpgradeCover.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/item/RenderForgeOfGodsItem.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCapacitor.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilComponent.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCover.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/item/TeslaStaff.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/metaTileEntity/Textures.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Capacitor.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_CreativeData.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_CreativeMaintenance.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_CreativeUncertainty.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DataConnector.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DynamoMulti.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DynamoTunnel.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyMulti.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyTunnel.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Holder.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_InputData.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_InputDataItems.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OutputData.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OutputDataItems.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Param.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ParamText.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Rack.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Uncertainty.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_WirelessMulti.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/ForgeOfGodsRingsStructureString.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/ForgeOfGodsStructureString.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_ForgeOfGods.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dataBank.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_infuser.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_switch.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_transformer.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/INameFunction.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/IStatusFunction.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/LedStatus.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/Parameters.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/SoundLoop.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/render/TT_RenderedExtendedFacingTexture.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/godforge_modules/GT_MetaTileEntity_EM_BaseModule.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/godforge_modules/GT_MetaTileEntity_EM_ExoticModule.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/godforge_modules/GT_MetaTileEntity_EM_MoltenModule.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/godforge_modules/GT_MetaTileEntity_EM_PlasmaModule.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/godforge_modules/GT_MetaTileEntity_EM_SmeltingModule.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_PipeBlock_Data.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_PipeBlock_Energy.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_Data.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_Energy.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_BuckConverter.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DebugPollutor.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DebugPowerGenerator.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DebugStructureWriter.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_OwnerDetector.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TT_Transformer.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TeslaCoil.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_WetTransformer.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/multiTileEntity/GodForge.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/thing/tileEntity/ReactorSimTileEntity.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/util/CommonValues.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/util/Converter.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/util/FluidStackLong.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/util/GodforgeMath.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/util/ItemStackLong.java delete mode 100644 tectech/src/main/java/com/github/technus/tectech/util/TT_Utility.java (limited to 'tectech/src/main/java/com') diff --git a/tectech/src/main/java/com/github/technus/tectech/Reference.java b/tectech/src/main/java/com/github/technus/tectech/Reference.java deleted file mode 100644 index 928a4a4e0f..0000000000 --- a/tectech/src/main/java/com/github/technus/tectech/Reference.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.github.technus.tectech; - -import gregtech.api.enums.Mods; - -public final class Reference { - - public static final String MODID = Mods.Names.TECTECH; - public static final String NAME = "TecTech - Tec Technology!"; - public static final String VERSION = Tags.VERSION; - public static final String COLLECTIONNAME = "TecTech"; - public static final String CLIENTSIDE = "com.github.technus.tectech.proxy.ClientProxy"; - public static final String SERVERSIDE = "com.github.technus.tectech.proxy.CommonProxy"; - - private Reference() {} -} diff --git a/tectech/src/main/java/com/github/technus/tectech/TecTech.java b/tectech/src/main/java/com/github/technus/tectech/TecTech.java deleted file mode 100644 index 593f5f9627..0000000000 --- a/tectech/src/main/java/com/github/technus/tectech/TecTech.java +++ /dev/null @@ -1,119 +0,0 @@ -package com.github.technus.tectech; - -import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE; -import static gregtech.api.enums.Mods.COFHCore; - -import net.minecraftforge.common.MinecraftForge; - -import com.github.technus.tectech.loader.MainLoader; -import com.github.technus.tectech.loader.TecTechConfig; -import com.github.technus.tectech.loader.gui.CreativeTabTecTech; -import com.github.technus.tectech.loader.thing.MuTeLoader; -import com.github.technus.tectech.mechanics.enderStorage.EnderWorldSavedData; -import com.github.technus.tectech.proxy.CommonProxy; -import com.github.technus.tectech.recipe.EyeOfHarmonyRecipeStorage; -import com.github.technus.tectech.recipe.TecTechRecipeMaps; - -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.Mod; -import cpw.mods.fml.common.SidedProxy; -import cpw.mods.fml.common.event.FMLInitializationEvent; -import cpw.mods.fml.common.event.FMLLoadCompleteEvent; -import cpw.mods.fml.common.event.FMLPostInitializationEvent; -import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import eu.usrv.yamcore.auxiliary.IngameErrorLog; -import eu.usrv.yamcore.auxiliary.LogHelper; -import gregtech.api.objects.XSTR; - -@Mod( - modid = Reference.MODID, - name = Reference.NAME, - version = Reference.VERSION, - dependencies = "required-after:Forge@[10.13.4.1614,);" + "required-after:YAMCore@[0.5.70,);" - + "required-after:structurelib;" - + "after:ComputerCraft;" - + "after:OpenComputers;" - + "required-after:gtneioreplugin;" - + "required-after:gregtech;" - + "after:dreamcraft;" - + "after:appliedenergistics2;" - + "after:CoFHCore;" - + "after:Thaumcraft;") -public class TecTech { - - @SidedProxy(clientSide = Reference.CLIENTSIDE, serverSide = Reference.SERVERSIDE) - public static CommonProxy proxy; - - @Mod.Instance(Reference.MODID) - public static TecTech instance; - - public static final XSTR RANDOM = XSTR.XSTR_INSTANCE; - public static final LogHelper LOGGER = new LogHelper(Reference.MODID); - public static CreativeTabTecTech creativeTabTecTech; - - public static TecTechConfig configTecTech; - - public static EnderWorldSavedData enderWorldSavedData; - - /** - * For Loader.isModLoaded checks during the runtime - */ - public static boolean hasCOFH = false; - - public static final byte tectechTexturePage1 = 8; - - @Mod.EventHandler - @SuppressWarnings("unused") - public void PreLoad(FMLPreInitializationEvent PreEvent) { - LOGGER.setDebugOutput(true); - - configTecTech = new TecTechConfig( - PreEvent.getModConfigurationDirectory(), - Reference.COLLECTIONNAME, - Reference.MODID); - - if (!configTecTech.LoadConfig()) { - LOGGER.error(Reference.MODID + " could not load its config file. Things are going to be weird!"); - } - - if (configTecTech.MOD_ADMIN_ERROR_LOGS) { - LOGGER.setDebugOutput(DEBUG_MODE); - LOGGER.debug("moduleAdminErrorLogs is enabled"); - IngameErrorLog moduleAdminErrorLogs = new IngameErrorLog(); - } - - enderWorldSavedData = new EnderWorldSavedData(); - FMLCommonHandler.instance() - .bus() - .register(enderWorldSavedData); - MinecraftForge.EVENT_BUS.register(enderWorldSavedData); - - TecTechRecipeMaps.init(); - MainLoader.preLoad(); - new MuTeLoader().run(); - } - - @Mod.EventHandler - @SuppressWarnings("unused") - public void Load(FMLInitializationEvent event) { - hasCOFH = COFHCore.isModLoaded(); - - MainLoader.load(); - MainLoader.addAfterGregTechPostLoadRunner(); - } - - @Mod.EventHandler - @SuppressWarnings("unused") - public void PostLoad(FMLPostInitializationEvent PostEvent) { - MainLoader.postLoad(); - } - - @Mod.EventHandler - @SuppressWarnings("unused") - public void onLoadCompleted(FMLLoadCompleteEvent event) { - eyeOfHarmonyRecipeStorage = new EyeOfHarmonyRecipeStorage(); - } - - public static EyeOfHarmonyRecipeStorage eyeOfHarmonyRecipeStorage = null; - -} diff --git a/tectech/src/main/java/com/github/technus/tectech/compatibility/openComputers/AvrArchitecture.java b/tectech/src/main/java/com/github/technus/tectech/compatibility/openComputers/AvrArchitecture.java deleted file mode 100644 index 74e7a26839..0000000000 --- a/tectech/src/main/java/com/github/technus/tectech/compatibility/openComputers/AvrArchitecture.java +++ /dev/null @@ -1,307 +0,0 @@ -package com.github.technus.tectech.compatibility.openComputers; - -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.util.zip.GZIPInputStream; -import java.util.zip.GZIPOutputStream; - -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; - -import org.apache.commons.compress.utils.IOUtils; - -import com.github.technus.avrClone.AvrCore; -import com.github.technus.avrClone.instructions.ExecutionEvent; -import com.github.technus.avrClone.instructions.InstructionRegistry; -import com.github.technus.avrClone.instructions.exceptions.DebugEvent; -import com.github.technus.avrClone.instructions.exceptions.DelayEvent; -import com.github.technus.avrClone.memory.EepromMemory; -import com.github.technus.avrClone.memory.RemovableMemory; -import com.github.technus.avrClone.memory.program.ProgramMemory; -import com.github.technus.tectech.TecTech; -import com.github.technus.tectech.util.Converter; - -import li.cil.oc.Settings; -import li.cil.oc.api.Driver; -import li.cil.oc.api.driver.Item; -import li.cil.oc.api.driver.item.Memory; -import li.cil.oc.api.machine.Architecture; -import li.cil.oc.api.machine.ExecutionResult; -import li.cil.oc.api.machine.Machine; -import li.cil.oc.api.machine.Signal; -import li.cil.oc.common.SaveHandler; - -@Architecture.Name("AVR 32Bit Clone") -@Architecture.NoMemoryRequirements -public class AvrArchitecture implements Architecture { - - private final Machine machine; - private AvrCore core; - private boolean debugRun; - private int delay; - private int[] tempData; - private int memSize; - - public AvrArchitecture(Machine machine) { - this.machine = machine; - } - - @Override - public boolean isInitialized() { - return core != null && core.checkValid(); - } - - @Override - public boolean recomputeMemory(Iterable components) { - computeMemory(components); - return true; - } - - private void computeMemory(Iterable components) { - int memory = 0; - for (ItemStack component : components) { - Item driver = Driver.driverFor(component); - if (driver instanceof Memory memoryDriver) { - memory += memoryDriver.amount(component) * 256; // in integers - } // else if (driver instanceof DriverEEPROM$) { - - // } - } - memory = Math.min( - Math.max(memory, 0), - Settings.get() - .maxTotalRam()); - if (memory != memSize) {} - } - - @Override - public boolean initialize() { - core = new AvrCore(); - - computeMemory( - this.machine.host() - .internalComponents()); - - if (isInitialized()) { - machine.beep("."); - return true; - } - return false; - } - - @Override - public void close() { - core = null; - tempData = null; - delay = 0; - } - - @Override - public void runSynchronized() { - core.cycle(); - } - - @Override - public ExecutionResult runThreaded(boolean isSynchronizedReturn) { - if (core.awoken) { - delay = 0; - for (int load = 0; load < 512;) { - load += core.getInstruction() - .getCost(core); - ExecutionEvent executionEvent = core.cpuCycleForce(); - if (executionEvent != null) { - if (executionEvent.throwable instanceof DelayEvent) { - delay = executionEvent.data[0]; - break; - } else if (executionEvent.throwable instanceof DebugEvent) { - if (debugRun) { - // aBaseMetaTileEntity.setActive(false); - break; - } - } - } - } - } else if (delay > 0) { - delay--; - if (delay == 0) { - core.awoken = true; - } - } - return null; - } - - @Override - public void onSignal() { - Signal signal = machine.popSignal(); - - core.interruptsHandle(); - } - - @Override - public void onConnect() { - // init network components, in case init was called from load logic (pre first tick?) - } - - @Override - public void load(NBTTagCompound avr) { - debugRun = avr.getBoolean("debugRun"); - delay = avr.getInteger("delay"); - core.active = avr.getBoolean("active"); - core.awoken = (avr.getBoolean("awoken")); - core.programCounter = avr.getInteger("programCounter"); - InstructionRegistry registry = InstructionRegistry.REGISTRIES.get(avr.getString("instructionRegistry")); - if (registry != null) { - byte[] instructions = SaveHandler.load( - avr, - this.machine.node() - .address() + "_instructionsMemory"); - byte[] param0 = SaveHandler.load( - avr, - this.machine.node() - .address() + "_param0Memory"); - byte[] param1 = SaveHandler.load( - avr, - this.machine.node() - .address() + "_param1Memory"); - if (instructions != null && param0 != null - && param1 != null - && instructions.length > 0 - && param0.length > 0 - && param1.length > 0) { - int[] instr = null, par0 = null, par1 = null; - try { - GZIPInputStream gzis = new GZIPInputStream(new ByteArrayInputStream(instructions)); - instr = Converter.readInts(IOUtils.toByteArray(gzis)); - IOUtils.closeQuietly(gzis); - } catch (IOException e) { - TecTech.LOGGER.error("Failed to decompress instructions memory from disk."); - e.printStackTrace(); - } - try { - GZIPInputStream gzis = new GZIPInputStream(new ByteArrayInputStream(param0)); - par0 = Converter.readInts(IOUtils.toByteArray(gzis)); - IOUtils.closeQuietly(gzis); - } catch (IOException e) { - TecTech.LOGGER.error("Failed to decompress param0 memory from disk."); - e.printStackTrace(); - } - try { - GZIPInputStream gzis = new GZIPInputStream(new ByteArrayInputStream(param1)); - par1 = Converter.readInts(IOUtils.toByteArray(gzis)); - IOUtils.closeQuietly(gzis); - } catch (IOException e) { - TecTech.LOGGER.error("Failed to decompress param1 memory from disk."); - e.printStackTrace(); - } - if (instr != null && par0 != null - && par1 != null - && instr.length == par0.length - && instr.length == par1.length) { - core.setProgramMemory(new ProgramMemory(registry, avr.getBoolean("immersive"), instr, par0, par1)); - } - } - } - if (avr.hasKey("eepromSize")) { - core.restoreEepromDefinition(EepromMemory.make(avr.getInteger("eepromSize"))); - } - byte[] data = SaveHandler.load( - avr, - this.machine.node() - .address() + "_dataMemory"); - if (data != null && data.length > 0) { - try { - GZIPInputStream gzis = new GZIPInputStream(new ByteArrayInputStream(data)); - tempData = Converter.readInts(IOUtils.toByteArray(gzis)); - IOUtils.closeQuietly(gzis); - } catch (IOException e) { - TecTech.LOGGER.error("Failed to decompress data memory from disk."); - e.printStackTrace(); - } - } - core.checkValid(); - } - - @Override - public void save(NBTTagCompound avr) { - avr.setBoolean("debugRun", debugRun); - avr.setInteger("delay", delay); - avr.setBoolean("active", core.active); - avr.setBoolean("awoken", core.awoken); - avr.setInteger("programCounter", core.programCounter); - ProgramMemory programMemory = core.getProgramMemory(); - if (programMemory != null) { - try { - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - GZIPOutputStream gzos = new GZIPOutputStream(baos); - gzos.write(Converter.writeInts(programMemory.instructions)); - gzos.close(); - SaveHandler.scheduleSave( - machine.host(), - avr, - machine.node() - .address() + "_instructionsMemory", - baos.toByteArray()); - } catch (IOException e) { - TecTech.LOGGER.error("Failed to compress instructions memory to disk"); - e.printStackTrace(); - } - try { - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - GZIPOutputStream gzos = new GZIPOutputStream(baos); - gzos.write(Converter.writeInts(programMemory.param0)); - gzos.close(); - SaveHandler.scheduleSave( - machine.host(), - avr, - machine.node() - .address() + "_param0Memory", - baos.toByteArray()); - } catch (IOException e) { - TecTech.LOGGER.error("Failed to compress param0 memory to disk"); - e.printStackTrace(); - } - try { - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - GZIPOutputStream gzos = new GZIPOutputStream(baos); - gzos.write(Converter.writeInts(programMemory.param1)); - gzos.close(); - SaveHandler.scheduleSave( - machine.host(), - avr, - machine.node() - .address() + "_param1Memory", - baos.toByteArray()); - } catch (IOException e) { - TecTech.LOGGER.error("Failed to compress param1 memory to disk"); - e.printStackTrace(); - } - avr.setBoolean("immersive", programMemory.immersiveOperands); - avr.setString("instructionRegistry", programMemory.registry.toString()); - } - RemovableMemory eeprom = core.getEepromMemory(); - if (eeprom != null) { - avr.setInteger( - "eepromSize", - eeprom.getDefinition() - .getSize()); - } - if (core.dataMemory != null) { - try { - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - GZIPOutputStream gzos = new GZIPOutputStream(baos); - gzos.write(Converter.writeInts(core.dataMemory)); - gzos.close(); - SaveHandler.scheduleSave( - machine.host(), - avr, - machine.node() - .address() + "_dataMemory", - baos.toByteArray()); - } catch (IOException e) { - TecTech.LOGGER.error("Failed to compress data memory to disk"); - e.printStackTrace(); - } - } - } -} diff --git a/tectech/src/main/java/com/github/technus/tectech/loader/MainLoader.java b/tectech/src/main/java/com/github/technus/tectech/loader/MainLoader.java deleted file mode 100644 index 01d63392e5..0000000000 --- a/tectech/src/main/java/com/github/technus/tectech/loader/MainLoader.java +++ /dev/null @@ -1,202 +0,0 @@ -package com.github.technus.tectech.loader; - -import static com.github.technus.tectech.TecTech.LOGGER; -import static com.github.technus.tectech.TecTech.configTecTech; -import static com.github.technus.tectech.TecTech.creativeTabTecTech; -import static com.github.technus.tectech.TecTech.proxy; -import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE; -import static gregtech.api.enums.Mods.NewHorizonsCoreMod; -import static gregtech.api.enums.Mods.TwilightForest; - -import java.util.HashMap; - -import net.minecraft.block.Block; -import net.minecraft.util.DamageSource; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidStack; - -import com.github.technus.tectech.TecTech; -import com.github.technus.tectech.loader.gui.CreativeTabTecTech; -import com.github.technus.tectech.loader.recipe.BaseRecipeLoader; -import com.github.technus.tectech.loader.thing.CoverLoader; -import com.github.technus.tectech.loader.thing.MachineLoader; -import com.github.technus.tectech.loader.thing.ThingsLoader; -import com.github.technus.tectech.thing.casing.TT_Container_Casings; -import com.github.technus.tectech.thing.metaTileEntity.Textures; - -import cpw.mods.fml.common.ProgressManager; -import cpw.mods.fml.common.registry.GameRegistry; -import gregtech.api.GregTech_API; -import gregtech.api.enums.Materials; -import gregtech.api.recipe.RecipeMaps; -import gregtech.api.util.GT_Recipe; - -@SuppressWarnings("deprecation") -public final class MainLoader { - - public static DamageSource microwaving; - - private MainLoader() {} - - public static void preLoad() { - creativeTabTecTech = new CreativeTabTecTech("TecTech"); - - // set expanded texture arrays for tiers - try { - Textures.run(); - } catch (Throwable t) { - LOGGER.error("Loading textures...", t); - } - } - - public static void load() { - ProgressManager.ProgressBar progressBarLoad = ProgressManager.push("TecTech Loader", 6); - - progressBarLoad.step("Regular Things"); - new ThingsLoader().run(); - LOGGER.info("Block/Item Init Done"); - - progressBarLoad.step("Machine Things"); - new MachineLoader().run(); - LOGGER.info("Machine Init Done"); - - progressBarLoad.step("Cover Things"); - new CoverLoader().run(); - LOGGER.info("Cover Init Done"); - - progressBarLoad.step("Add damage types"); - microwaving = new DamageSource("microwaving").setDamageBypassesArmor(); - LOGGER.info("Damage types addition Done"); - - progressBarLoad.step("Register Packet Dispatcher"); - new NetworkDispatcher(); - LOGGER.info("Packet Dispatcher registered"); - - progressBarLoad.step("Register GUI Handler"); - proxy.registerRenderInfo(); - LOGGER.info("GUI Handler registered"); - - ProgressManager.pop(progressBarLoad); - } - - public static void postLoad() { - ProgressManager.ProgressBar progressBarPostLoad = ProgressManager.push("TecTech Post Loader", 4); - - progressBarPostLoad.step("Dreamcraft Compatibility"); - if (NewHorizonsCoreMod.isModLoaded()) { - try { - Class clazz = Class.forName("com.dreammaster.gthandler.casings.GT_Container_CasingsNH"); - TT_Container_Casings.sBlockCasingsNH = (Block) clazz.getField("sBlockCasingsNH") - .get(null); - - if (TT_Container_Casings.sBlockCasingsNH == null) { - throw new NullPointerException("sBlockCasingsNH Is not set at this time"); - } - } catch (Exception e) { - throw new Error("Unable to get NH casings", e); - } - } - - progressBarPostLoad.step("Recipes"); - new BaseRecipeLoader().run(); - TecTech.LOGGER.info("Recipe Init Done"); - - if (!configTecTech.DISABLE_BLOCK_HARDNESS_NERF) { - progressBarPostLoad.step("Nerf blocks blast resistance"); - adjustTwilightBlockResistance(); - TecTech.LOGGER.info("Blocks nerf done"); - } else { - progressBarPostLoad.step("Do not nerf blocks blast resistance"); - TecTech.LOGGER.info("Blocks were not nerfed"); - } - - // ProgressManager.pop(progressBarPostLoad); - } - - public static void addAfterGregTechPostLoadRunner() { - GregTech_API.sAfterGTPostload.add(() -> { - if (TecTech.configTecTech.NERF_FUSION) { - FixBrokenFusionRecipes(); - } - }); - } - - private static void FixBrokenFusionRecipes() { - HashMap binds = new HashMap<>(); - for (Materials material : Materials.values()) { - FluidStack p = material.getPlasma(1); - if (p != null) { - if (DEBUG_MODE) { - LOGGER.info("Found Plasma of " + material.mName); - } - if (material.mElement != null && (material.mElement.mProtons >= Materials.Iron.mElement.mProtons - || -material.mElement.mProtons >= Materials.Iron.mElement.mProtons - || material.mElement.mNeutrons >= Materials.Iron.mElement.mNeutrons - || -material.mElement.mNeutrons >= Materials.Iron.mElement.mNeutrons)) { - if (DEBUG_MODE) { - LOGGER.info("Attempting to bind " + material.mName); - } - if (material.getMolten(1) != null) { - binds.put( - p.getFluid(), - material.getMolten(1) - .getFluid()); - } else if (material.getGas(1) != null) { - binds.put( - p.getFluid(), - material.getGas(1) - .getFluid()); - } else if (material.getFluid(1) != null) { - binds.put( - p.getFluid(), - material.getFluid(1) - .getFluid()); - } else { - binds.put( - p.getFluid(), - Materials.Iron.getMolten(1) - .getFluid()); - } - } - } - } - for (GT_Recipe r : RecipeMaps.fusionRecipes.getAllRecipes()) { - Fluid fluid = binds.get(r.mFluidOutputs[0].getFluid()); - if (fluid != null) { - if (DEBUG_MODE) { - LOGGER.info("Nerfing Recipe " + r.mFluidOutputs[0].getUnlocalizedName()); - } - r.mFluidOutputs[0] = new FluidStack(fluid, r.mFluidOutputs[0].amount); - } - fluid = binds.get(r.mFluidInputs[0].getFluid()); - if (fluid != null) { - if (DEBUG_MODE) { - LOGGER.info("Fixing plasma use in Recipe " + r.mFluidInputs[0].getUnlocalizedName()); - } - r.mFluidInputs[0] = new FluidStack(fluid, r.mFluidInputs[0].amount); - } - fluid = binds.get(r.mFluidInputs[1].getFluid()); - if (fluid != null) { - if (DEBUG_MODE) { - LOGGER.info("Fixing plasma use in Recipe " + r.mFluidInputs[1].getUnlocalizedName()); - } - r.mFluidInputs[1] = new FluidStack(fluid, r.mFluidInputs[1].amount); - } - } - } - - private static void safeSetResistance(Block block, float resistance) { - if (block != null) { - block.setResistance(resistance); - } - } - - private static void adjustTwilightBlockResistance() { - if (TwilightForest.isModLoaded()) { - safeSetResistance(GameRegistry.findBlock("TwilightForest", "tile.TFShield"), 30); - safeSetResistance(GameRegistry.findBlock("TwilightForest", "tile.TFThorns"), 10); - safeSetResistance(GameRegistry.findBlock("TwilightForest", "tile.TFTowerTranslucent"), 30); - safeSetResistance(GameRegistry.findBlock("TwilightForest", "tile.TFDeadrock"), 5); - } - } -} diff --git a/tectech/src/main/java/com/github/technus/tectech/loader/NetworkDispatcher.java b/tectech/src/main/java/com/github/technus/tectech/loader/NetworkDispatcher.java deleted file mode 100644 index c195364d91..0000000000 --- a/tectech/src/main/java/com/github/technus/tectech/loader/NetworkDispatcher.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.github.technus.tectech.loader; - -import static com.github.technus.tectech.Reference.MODID; - -import com.github.technus.tectech.mechanics.pipe.PipeActivityMessage; -import com.github.technus.tectech.mechanics.spark.RendererMessage; - -public class NetworkDispatcher extends eu.usrv.yamcore.network.PacketDispatcher { - - public static NetworkDispatcher INSTANCE; - - public NetworkDispatcher() { - super(MODID); - INSTANCE = this; - registerPackets(); - } - - @Override - public void registerPackets() { - registerMessage(PipeActivityMessage.ServerHandler.class, PipeActivityMessage.PipeActivityQuery.class); - registerMessage(PipeActivityMessage.ClientHandler.class, PipeActivityMessage.PipeActivityData.class); - - registerMessage(RendererMessage.ClientHandler.class, RendererMessage.RendererData.class); - } -} diff --git a/tectech/src/main/java/com/github/technus/tectech/loader/TecTechConfig.java b/tectech/src/main/java/com/github/technus/tectech/loader/TecTechConfig.java deleted file mode 100644 index cb27933eb7..0000000000 --- a/tectech/src/main/java/com/github/technus/tectech/loader/TecTechConfig.java +++ /dev/null @@ -1,257 +0,0 @@ -package com.github.technus.tectech.loader; - -import java.io.File; - -import eu.usrv.yamcore.config.ConfigManager; - -public class TecTechConfig extends ConfigManager { - - public TecTechConfig(File pConfigBaseDirectory, String pModCollectionDirectory, String pModID) { - super(pConfigBaseDirectory, pModCollectionDirectory, pModID); - } - - // final static to allow compiler to remove the debug code when this is false - public static boolean DEBUG_MODE = false; - public static boolean POWERLESS_MODE = false; - public boolean BOOM_ENABLE; - public boolean DISABLE_BLOCK_HARDNESS_NERF; - public boolean EASY_SCAN; - public boolean NERF_FUSION; - public boolean ENABLE_TURRET_EXPLOSIONS; - public float TURRET_DAMAGE_FACTOR; - public float TURRET_EXPLOSION_FACTOR; - - public boolean MOD_ADMIN_ERROR_LOGS; - - public boolean TESLA_MULTI_GAS_OUTPUT; - public float TESLA_MULTI_LOSS_FACTOR_OVERDRIVE; - public int TESLA_MULTI_LOSS_PER_BLOCK_T0; - public int TESLA_MULTI_LOSS_PER_BLOCK_T1; - public int TESLA_MULTI_LOSS_PER_BLOCK_T2; - public int TESLA_MULTI_PLASMA_PER_SECOND_T1_HELIUM; - public int TESLA_MULTI_PLASMA_PER_SECOND_T1_NITROGEN; - public int TESLA_MULTI_PLASMA_PER_SECOND_T2_RADON; - public int TESLA_MULTI_RANGE_COEFFICIENT_PLASMA_T1; - public int TESLA_MULTI_RANGE_COEFFICIENT_PLASMA_T2; - public int TESLA_MULTI_RANGE_COVER; - public int TESLA_MULTI_RANGE_TOWER; - public int TESLA_MULTI_RANGE_TRANSCEIVER; - public float TESLA_SINGLE_LOSS_FACTOR_OVERDRIVE; - public int TESLA_SINGLE_LOSS_PER_BLOCK; - public int TESLA_SINGLE_RANGE; - public boolean TESLA_VISUAL_EFFECT; - - /** - * This loading phases do not correspond to mod loading phases! - */ - @Override - protected void PreInit() { - - BOOM_ENABLE = true; - DISABLE_BLOCK_HARDNESS_NERF = false; - EASY_SCAN = false; - NERF_FUSION = false; - ENABLE_TURRET_EXPLOSIONS = true; - TURRET_DAMAGE_FACTOR = 10; - TURRET_EXPLOSION_FACTOR = 1; - - MOD_ADMIN_ERROR_LOGS = false; - - TESLA_MULTI_GAS_OUTPUT = false; - TESLA_MULTI_LOSS_FACTOR_OVERDRIVE = 0.25F; - TESLA_MULTI_LOSS_PER_BLOCK_T0 = 1; - TESLA_MULTI_LOSS_PER_BLOCK_T1 = 1; - TESLA_MULTI_LOSS_PER_BLOCK_T2 = 1; - TESLA_MULTI_PLASMA_PER_SECOND_T1_HELIUM = 100; - TESLA_MULTI_PLASMA_PER_SECOND_T1_NITROGEN = 50; - TESLA_MULTI_PLASMA_PER_SECOND_T2_RADON = 50; - TESLA_MULTI_RANGE_COEFFICIENT_PLASMA_T1 = 2; - TESLA_MULTI_RANGE_COEFFICIENT_PLASMA_T2 = 4; - TESLA_MULTI_RANGE_COVER = 16; - TESLA_MULTI_RANGE_TOWER = 32; - TESLA_MULTI_RANGE_TRANSCEIVER = 16; - TESLA_SINGLE_LOSS_FACTOR_OVERDRIVE = 0.25F; - TESLA_SINGLE_LOSS_PER_BLOCK = 1; - TESLA_SINGLE_RANGE = 20; - TESLA_VISUAL_EFFECT = true; - } - - /** - * This loading phases do not correspond to mod loading phases! - */ - @Override - protected void Init() { - DEBUG_MODE = _mainConfig - .getBoolean("DebugMode", "debug", DEBUG_MODE, "Enables logging and other purely debug features"); - POWERLESS_MODE = _mainConfig - .getBoolean("PowerlessMode", "debug", POWERLESS_MODE, "Enables 0EU/t multi block machinery"); - - BOOM_ENABLE = _mainConfig.getBoolean( - "BoomEnable", - "features", - BOOM_ENABLE, - "Set to false to disable explosions on everything bad that you can do"); - DISABLE_BLOCK_HARDNESS_NERF = _mainConfig.getBoolean( - "DisableBlockHardnessNerf", - "features", - DISABLE_BLOCK_HARDNESS_NERF, - "Set to true to disable the block hardness nerf"); - EASY_SCAN = _mainConfig.getBoolean( - "EasyScan", - "features", - EASY_SCAN, - "Enables tricorder to scan EM i/o hatches directly, too CHEEKY"); - NERF_FUSION = _mainConfig.getBoolean( - "NerfFusion", - "features", - NERF_FUSION, - "Set to true to enable removal of plasmas heavier than Fe and other weird ones"); - ENABLE_TURRET_EXPLOSIONS = _mainConfig.getBoolean( - "TurretBoomEnable", - "features", - ENABLE_TURRET_EXPLOSIONS, - "Set to false to disable explosions caused by EM turrets"); - TURRET_DAMAGE_FACTOR = _mainConfig.getFloat( - "TurretDamageFactor", - "features", - TURRET_DAMAGE_FACTOR, - 0, - Short.MAX_VALUE, - "Damage is multiplied by this number"); - TURRET_EXPLOSION_FACTOR = _mainConfig.getFloat( - "TurretExplosionFactor", - "features", - TURRET_EXPLOSION_FACTOR, - 0, - Short.MAX_VALUE, - "Explosion strength is multiplied by this number"); - - MOD_ADMIN_ERROR_LOGS = _mainConfig.getBoolean( - "AdminErrorLog", - "modules", - MOD_ADMIN_ERROR_LOGS, - "If set to true, every op/admin will receive all errors occurred during the startup phase as in game message on join"); - - TESLA_MULTI_GAS_OUTPUT = _mainConfig.getBoolean( - "TeslaMultiGasOutput", - "tesla_tweaks", - TESLA_MULTI_GAS_OUTPUT, - "Set to true to enable outputting plasmas as gasses from the tesla tower with a 1:1 ratio"); - TESLA_MULTI_LOSS_FACTOR_OVERDRIVE = _mainConfig.getFloat( - "TeslaMultiLossFactorOverdrive", - "tesla_tweaks", - TESLA_MULTI_LOSS_FACTOR_OVERDRIVE, - 0, - 1, - "Additional Tesla Tower power loss per amp as a factor of the tier voltage"); - TESLA_MULTI_LOSS_PER_BLOCK_T0 = _mainConfig.getInt( - "TeslaMultiLossPerBlockT0", - "tesla_tweaks", - TESLA_MULTI_LOSS_PER_BLOCK_T0, - 0, - Integer.MAX_VALUE, - "Tesla Tower power transmission loss per block per amp using no plasmas"); - TESLA_MULTI_LOSS_PER_BLOCK_T1 = _mainConfig.getInt( - "TeslaMultiLossPerBlockT1", - "tesla_tweaks", - TESLA_MULTI_LOSS_PER_BLOCK_T1, - 0, - Integer.MAX_VALUE, - "Tesla Tower power transmission loss per block per amp using helium or nitrogen plasma"); - TESLA_MULTI_LOSS_PER_BLOCK_T2 = _mainConfig.getInt( - "TeslaMultiLossPerBlockT2", - "tesla_tweaks", - TESLA_MULTI_LOSS_PER_BLOCK_T2, - 0, - Integer.MAX_VALUE, - "Tesla Tower power transmission loss per block per amp using radon plasma"); - TESLA_MULTI_PLASMA_PER_SECOND_T1_HELIUM = _mainConfig.getInt( - "TeslaMultiPlasmaPerSecondT1Helium", - "tesla_tweaks", - TESLA_MULTI_PLASMA_PER_SECOND_T1_HELIUM, - 0, - Integer.MAX_VALUE, - "Tesla Tower helium plasma consumed each second the tesla tower is active"); - TESLA_MULTI_PLASMA_PER_SECOND_T1_NITROGEN = _mainConfig.getInt( - "TeslaMultiPlasmaPerSecondT1Nitrogen", - "tesla_tweaks", - TESLA_MULTI_PLASMA_PER_SECOND_T1_NITROGEN, - 0, - Integer.MAX_VALUE, - "Tesla Tower nitrogen plasma consumed each second the tesla tower is active"); - TESLA_MULTI_PLASMA_PER_SECOND_T2_RADON = _mainConfig.getInt( - "TeslaMultiPlasmaPerSecondT2Radon", - "tesla_tweaks", - TESLA_MULTI_PLASMA_PER_SECOND_T2_RADON, - 0, - Integer.MAX_VALUE, - "Tesla Tower radon plasma consumed each second the tesla tower is active"); - TESLA_MULTI_RANGE_COEFFICIENT_PLASMA_T1 = _mainConfig.getInt( - "TeslaMultiRangeCoefficientPlasmaT1", - "tesla_tweaks", - TESLA_MULTI_RANGE_COEFFICIENT_PLASMA_T1, - 0, - Integer.MAX_VALUE, - "Tesla Tower T1 Plasmas Range Multiplier"); - TESLA_MULTI_RANGE_COEFFICIENT_PLASMA_T2 = _mainConfig.getInt( - "TeslaMultiRangeCoefficientPlasmaT2", - "tesla_tweaks", - TESLA_MULTI_RANGE_COEFFICIENT_PLASMA_T2, - 0, - Integer.MAX_VALUE, - "Tesla Tower T2 Plasmas Range Multiplier"); - TESLA_MULTI_RANGE_COVER = _mainConfig.getInt( - "TeslaMultiRangeCover", - "tesla_tweaks", - TESLA_MULTI_RANGE_COVER, - 0, - Integer.MAX_VALUE, - "Tesla Tower to Tesla Coil Rich Edition Cover max range"); - TESLA_MULTI_RANGE_TOWER = _mainConfig.getInt( - "TeslaMultiRangeTower", - "tesla_tweaks", - TESLA_MULTI_RANGE_TOWER, - 0, - Integer.MAX_VALUE, - "Tesla Tower to Tower max range"); - TESLA_MULTI_RANGE_TRANSCEIVER = _mainConfig.getInt( - "TeslaMultiRangeTransceiver", - "tesla_tweaks", - TESLA_MULTI_RANGE_TRANSCEIVER, - 0, - Integer.MAX_VALUE, - "Tesla Tower to Transceiver max r