From a2fea24d1908d457794a01390a03c3600f728220 Mon Sep 17 00:00:00 2001 From: Connor-Colenso <52056774+Connor-Colenso@users.noreply.github.com> Date: Mon, 4 Sep 2023 02:33:18 +0100 Subject: Cleanup old content and add GT++ patch (#239) * Remove unused EM item * Remove more unused EM stuff * Checkpoint for more EM removal. * Progress! * Update texture * Fix textures and remove unused EM pipe * Remove deprecated datastick reader. * Spotless * Remove wormhole multi, unused. --------- Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> Co-authored-by: Connor Colenso --- .../java/com/github/technus/tectech/TecTech.java | 34 +- .../tectech/compatibility/gtpp/GtppAtomLoader.java | 203 -- .../openmodularturrets/TT_turret_loader.java | 28 - .../blocks/turretbases/TurretBaseEM.java | 50 - .../blocks/turretbases/TurretBaseItemEM.java | 38 - .../blocks/turretheads/TurretHeadEM.java | 71 - .../blocks/turretheads/TurretHeadItemEM.java | 69 - .../blocks/turretheads/TurretHeadItemRenderEM.java | 44 - .../blocks/turretheads/TurretHeadRenderEM.java | 9 - .../entity/projectiles/projectileEM.java | 192 -- .../entity/projectiles/projectileRenderEM.java | 86 - .../tileentity/turret/TileTurretHeadEM.java | 89 - .../tileentity/turretbase/TileTurretBaseEM.java | 76 - .../definitions/EMComplexAspectDefinition.java | 233 -- .../definitions/EMPrimalAspectDefinition.java | 56 - .../transformations/AspectDefinitionCompat.java | 38 - .../AspectDefinitionCompatEnabled.java | 88 - .../thing/metaTileEntity/multi/EssentiaCompat.java | 34 - .../multi/EssentiaCompatEnabled.java | 73 - .../GT_MetaTileEntity_EM_essentiaDequantizer.java | 236 -- .../GT_MetaTileEntity_EM_essentiaQuantizer.java | 196 -- .../technus/tectech/loader/ElementalLoader.java | 40 - .../technus/tectech/loader/EntityLoader.java | 21 - .../github/technus/tectech/loader/MainLoader.java | 49 +- .../technus/tectech/loader/gui/CreativeTabEM.java | 22 - .../tectech/loader/gui/CreativeTabTecTech.java | 4 +- .../technus/tectech/loader/gui/ModGuiHandler.java | 2 +- .../technus/tectech/loader/recipe/Assembler.java | 51 - .../tectech/loader/recipe/BaseRecipeLoader.java | 15 +- .../tectech/loader/recipe/MachineEMBehaviours.java | 79 - .../loader/recipe/ResearchStationAssemblyLine.java | 91 +- .../tectech/loader/thing/MachineLoader.java | 618 +----- .../technus/tectech/loader/thing/ThingsLoader.java | 32 +- .../tectech/mechanics/anomaly/AnomalyHandler.java | 538 ----- .../tectech/mechanics/anomaly/CancerCommand.java | 88 - .../tectech/mechanics/anomaly/ChargeCommand.java | 84 - .../tectech/mechanics/anomaly/MassCommand.java | 83 - .../tectech/mechanics/elementalMatter/README | 47 - .../elementalMatter/core/EMException.java | 25 - .../elementalMatter/core/IEMContainer.java | 13 - .../elementalMatter/core/commands/EMGive.java | 151 -- .../elementalMatter/core/commands/EMList.java | 104 - .../elementalMatter/core/decay/EMDecay.java | 93 - .../elementalMatter/core/decay/EMDecayResult.java | 46 - .../core/definitions/EMComplexTemplate.java | 69 - .../core/definitions/EMPrimitiveTemplate.java | 200 -- .../core/definitions/IEMDefinition.java | 153 -- .../registry/EMDefinitionsRegistry.java | 196 -- .../core/definitions/registry/EMIndirectType.java | 40 - .../core/definitions/registry/EMType.java | 64 - .../core/maps/EMConstantStackMap.java | 56 - .../core/maps/EMDefinitionStackMap.java | 54 - .../core/maps/EMInstanceStackMap.java | 242 -- .../elementalMatter/core/maps/EMStackMap.java | 58 - .../elementalMatter/core/maps/IEMMapRead.java | 304 --- .../elementalMatter/core/maps/IEMMapWrite.java | 118 - .../core/maps/IEMMapWriteExact.java | 167 -- .../elementalMatter/core/recipes/EMRecipe.java | 86 - .../core/stacks/EMDefinitionStack.java | 73 - .../core/stacks/EMInstanceStack.java | 590 ----- .../elementalMatter/core/stacks/IEMStack.java | 59 - .../core/transformations/EMDequantizationInfo.java | 58 - .../transformations/EMFluidQuantizationInfo.java | 43 - .../transformations/EMItemQuantizationInfo.java | 74 - .../transformations/EMOredictQuantizationInfo.java | 58 - .../transformations/EMTransformationRegistry.java | 136 -- .../core/transformations/OreDictionaryStack.java | 20 - .../definitions/complex/EMAtomDefinition.java | 2300 -------------------- .../definitions/complex/EMHadronDefinition.java | 480 ---- .../definitions/complex/EMNuclideIAEA.java | 343 --- .../definitions/primitive/EMBosonDefinition.java | 18 - .../definitions/primitive/EMFermionDefinition.java | 18 - .../primitive/EMGaugeBosonDefinition.java | 125 -- .../definitions/primitive/EMLeptonDefinition.java | 99 - .../primitive/EMNeutrinoDefinition.java | 71 - .../primitive/EMPrimitiveDefinition.java | 113 - .../definitions/primitive/EMQuarkDefinition.java | 186 -- .../primitive/EMScalarBosonDefinition.java | 69 - .../github/technus/tectech/proxy/ClientProxy.java | 13 - .../github/technus/tectech/recipe/TT_recipe.java | 266 +-- .../technus/tectech/recipe/TT_recipeAdder.java | 221 -- .../technus/tectech/thing/CustomItemList.java | 43 - .../tectech/thing/block/EyeOfHarmonyBlock.java | 2 +- .../technus/tectech/thing/item/AvrProgrammer.java | 223 -- .../item/DebugElementalInstanceContainer_EM.java | 171 -- .../item/ElementalDefinitionContainer_EM.java | 132 -- .../item/ElementalDefinitionScanStorage_EM.java | 137 -- .../tectech/thing/item/gui/ScanDisplayScreen.java | 11 +- ...GT_MetaTileEntity_Hatch_ElementalContainer.java | 363 --- .../GT_MetaTileEntity_Hatch_InputElemental.java | 52 - .../GT_MetaTileEntity_Hatch_OutputElemental.java | 94 - .../GT_MetaTileEntity_Hatch_OverflowElemental.java | 307 --- .../multi/GT_MetaTileEntity_EM_annihilation.java | 184 -- .../multi/GT_MetaTileEntity_EM_bhg.java | 1306 ----------- .../multi/GT_MetaTileEntity_EM_crafting.java | 162 -- .../multi/GT_MetaTileEntity_EM_decay.java | 362 --- .../multi/GT_MetaTileEntity_EM_dequantizer.java | 211 -- .../multi/GT_MetaTileEntity_EM_junction.java | 247 --- .../multi/GT_MetaTileEntity_EM_quantizer.java | 296 --- .../multi/GT_MetaTileEntity_EM_research.java | 4 +- .../multi/GT_MetaTileEntity_EM_scanner.java | 620 ------ .../multi/GT_MetaTileEntity_EM_stabilizer.java | 124 -- .../multi/GT_MetaTileEntity_EM_switch.java | 2 - .../multi/GT_MetaTileEntity_EM_wormhole.java | 172 -- .../GT_MetaTileEntity_TM_proccessingStack.java | 76 - .../base/GT_MetaTileEntity_MultiblockBase_EM.java | 429 +--- .../em_collider/GT_MetaTileEntity_EM_collider.java | 864 -------- .../multi/em_collider/IColliderHandler.java | 6 - .../em_collider/IPrimitiveColliderHandler.java | 9 - .../multi/em_machine/Behaviour_Centrifuge.java | 228 -- .../multi/em_machine/Behaviour_Electrolyzer.java | 31 - .../Behaviour_ElectromagneticSeparator.java | 243 --- .../multi/em_machine/Behaviour_PrecisionLaser.java | 31 - .../multi/em_machine/Behaviour_Recycler.java | 41 - .../multi/em_machine/Behaviour_Scanner.java | 31 - .../em_machine/GT_MetaTileEntity_EM_machine.java | 391 ---- .../pipe/GT_MetaTileEntity_PipeBlock_EM.java | 52 - .../pipe/GT_MetaTileEntity_Pipe_EM.java | 284 --- .../pipe/GT_MetaTileEntity_Pipe_Energy.java | 5 +- .../single/GT_MetaTileEntity_DataReader.java | 147 -- .../single/GT_MetaTileEntity_DebugPollutor.java | 56 +- .../GT_MetaTileEntity_DebugPowerGenerator.java | 2 +- .../single/GT_MetaTileEntity_MicroController.java | 198 -- 123 files changed, 58 insertions(+), 19770 deletions(-) delete mode 100644 src/main/java/com/github/technus/tectech/compatibility/gtpp/GtppAtomLoader.java delete mode 100644 src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/TT_turret_loader.java delete mode 100644 src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretbases/TurretBaseEM.java delete mode 100644 src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretbases/TurretBaseItemEM.java delete mode 100644 src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretheads/TurretHeadEM.java delete mode 100644 src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretheads/TurretHeadItemEM.java delete mode 100644 src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretheads/TurretHeadItemRenderEM.java delete mode 100644 src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretheads/TurretHeadRenderEM.java delete mode 100644 src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/entity/projectiles/projectileEM.java delete mode 100644 src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/entity/projectiles/projectileRenderEM.java delete mode 100644 src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/tileentity/turret/TileTurretHeadEM.java delete mode 100644 src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/tileentity/turretbase/TileTurretBaseEM.java delete mode 100644 src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMComplexAspectDefinition.java delete mode 100644 src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMPrimalAspectDefinition.java delete mode 100644 src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/transformations/AspectDefinitionCompat.java delete mode 100644 src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/transformations/AspectDefinitionCompatEnabled.java delete mode 100644 src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/EssentiaCompat.java delete mode 100644 src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/EssentiaCompatEnabled.java delete mode 100644 src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java delete mode 100644 src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java delete mode 100644 src/main/java/com/github/technus/tectech/loader/ElementalLoader.java delete mode 100644 src/main/java/com/github/technus/tectech/loader/EntityLoader.java delete mode 100644 src/main/java/com/github/technus/tectech/loader/gui/CreativeTabEM.java delete mode 100644 src/main/java/com/github/technus/tectech/loader/recipe/MachineEMBehaviours.java delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/anomaly/AnomalyHandler.java delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/anomaly/CancerCommand.java delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/anomaly/ChargeCommand.java delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/anomaly/MassCommand.java delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/README delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/EMException.java delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/IEMContainer.java delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/EMGive.java delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/EMList.java delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/decay/EMDecay.java delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/decay/EMDecayResult.java delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/EMComplexTemplate.java delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/EMPrimitiveTemplate.java delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/IEMDefinition.java delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/registry/EMDefinitionsRegistry.java delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/registry/EMIndirectType.java delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/registry/EMType.java delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMConstantStackMap.java delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMDefinitionStackMap.java delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMInstanceStackMap.java delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMStackMap.java delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapRead.java delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapWrite.java delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapWriteExact.java delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/recipes/EMRecipe.java delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/EMDefinitionStack.java delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/EMInstanceStack.java delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/IEMStack.java delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMDequantizationInfo.java delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMFluidQuantizationInfo.java delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMItemQuantizationInfo.java delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMOredictQuantizationInfo.java delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMTransformationRegistry.java delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/OreDictionaryStack.java delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMAtomDefinition.java delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMHadronDefinition.java delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMNuclideIAEA.java delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMBosonDefinition.java delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMFermionDefinition.java delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMGaugeBosonDefinition.java delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMLeptonDefinition.java delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMNeutrinoDefinition.java delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMPrimitiveDefinition.java delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMQuarkDefinition.java delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMScalarBosonDefinition.java delete mode 100644 src/main/java/com/github/technus/tectech/thing/item/AvrProgrammer.java delete mode 100644 src/main/java/com/github/technus/tectech/thing/item/DebugElementalInstanceContainer_EM.java delete mode 100644 src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionContainer_EM.java delete mode 100644 src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionScanStorage_EM.java delete mode 100644 src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ElementalContainer.java delete mode 100644 src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_InputElemental.java delete mode 100644 src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OutputElemental.java delete mode 100644 src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OverflowElemental.java delete mode 100644 src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_annihilation.java delete mode 100644 src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_bhg.java delete mode 100644 src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_crafting.java delete mode 100644 src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_decay.java delete mode 100644 src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantizer.java delete mode 100644 src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_junction.java delete mode 100644 src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java delete mode 100644 src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java delete mode 100644 src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_stabilizer.java delete mode 100644 src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_wormhole.java delete mode 100644 src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_proccessingStack.java delete mode 100644 src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_collider/GT_MetaTileEntity_EM_collider.java delete mode 100644 src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_collider/IColliderHandler.java delete mode 100644 src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_collider/IPrimitiveColliderHandler.java delete mode 100644 src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_Centrifuge.java delete mode 100644 src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_Electrolyzer.java delete mode 100644 src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_ElectromagneticSeparator.java delete mode 100644 src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_PrecisionLaser.java delete mode 100644 src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_Recycler.java delete mode 100644 src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_Scanner.java delete mode 100644 src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/GT_MetaTileEntity_EM_machine.java delete mode 100644 src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_PipeBlock_EM.java delete mode 100644 src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_EM.java delete mode 100644 src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DataReader.java delete mode 100644 src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_MicroController.java (limited to 'src/main/java/com') diff --git a/src/main/java/com/github/technus/tectech/TecTech.java b/src/main/java/com/github/technus/tectech/TecTech.java index ee68c7123f..03bb454edc 100644 --- a/src/main/java/com/github/technus/tectech/TecTech.java +++ b/src/main/java/com/github/technus/tectech/TecTech.java @@ -12,20 +12,11 @@ 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.CreativeTabEM; import com.github.technus.tectech.loader.gui.CreativeTabTecTech; -import com.github.technus.tectech.mechanics.anomaly.AnomalyHandler; -import com.github.technus.tectech.mechanics.anomaly.CancerCommand; -import com.github.technus.tectech.mechanics.anomaly.ChargeCommand; -import com.github.technus.tectech.mechanics.anomaly.MassCommand; import com.github.technus.tectech.mechanics.commands.ConvertFloat; import com.github.technus.tectech.mechanics.commands.ConvertInteger; import com.github.technus.tectech.mechanics.data.ChunkDataHandler; import com.github.technus.tectech.mechanics.data.PlayerPersistence; -import com.github.technus.tectech.mechanics.elementalMatter.core.commands.EMGive; -import com.github.technus.tectech.mechanics.elementalMatter.core.commands.EMList; -import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMDefinitionsRegistry; -import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry; import com.github.technus.tectech.mechanics.enderStorage.EnderWorldSavedData; import com.github.technus.tectech.nei.IMCForNEI; import com.github.technus.tectech.proxy.CommonProxy; @@ -35,12 +26,7 @@ import com.github.technus.tectech.util.XSTR; 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 cpw.mods.fml.common.event.FMLServerAboutToStartEvent; -import cpw.mods.fml.common.event.FMLServerStartingEvent; +import cpw.mods.fml.common.event.*; import eu.usrv.yamcore.auxiliary.IngameErrorLog; import eu.usrv.yamcore.auxiliary.LogHelper; import gregtech.GT_Mod; @@ -71,19 +57,14 @@ public class TecTech { public static final XSTR RANDOM = XSTR.XSTR_INSTANCE; public static final LogHelper LOGGER = new LogHelper(Reference.MODID); public static CreativeTabTecTech creativeTabTecTech; - public static CreativeTabEM creativeTabEM; private static IngameErrorLog moduleAdminErrorLogs; public static TecTechConfig configTecTech; public static EnderWorldSavedData enderWorldSavedData; public static ChunkDataHandler chunkDataHandler; - public static AnomalyHandler anomalyHandler; public static PlayerPersistence playerPersistence; - public static final EMDefinitionsRegistry definitionsRegistry = new EMDefinitionsRegistry(); - public static final EMTransformationRegistry transformationInfo = new EMTransformationRegistry(); - /** * For Loader.isModLoaded checks during the runtime */ @@ -228,29 +209,20 @@ public class TecTech { } } - MainLoader.load(definitionsRegistry); + MainLoader.load(); MainLoader.addAfterGregTechPostLoadRunner(); IMCForNEI.IMCSender(); } @Mod.EventHandler public void PostLoad(FMLPostInitializationEvent PostEvent) { - MainLoader.postLoad(definitionsRegistry, transformationInfo); - - chunkDataHandler.registerChunkMetaDataHandler(anomalyHandler = new AnomalyHandler()); + MainLoader.postLoad(); } @Mod.EventHandler public void serverLoad(FMLServerStartingEvent pEvent) { pEvent.registerServerCommand(new ConvertInteger()); pEvent.registerServerCommand(new ConvertFloat()); - pEvent.registerServerCommand(new EMList()); - if (DEBUG_MODE) { - pEvent.registerServerCommand(new EMGive()); - pEvent.registerServerCommand(new CancerCommand()); - pEvent.registerServerCommand(new ChargeCommand()); - pEvent.registerServerCommand(new MassCommand()); - } } @Mod.EventHandler diff --git a/src/main/java/com/github/technus/tectech/compatibility/gtpp/GtppAtomLoader.java b/src/main/java/com/github/technus/tectech/compatibility/gtpp/GtppAtomLoader.java deleted file mode 100644 index c7f7574d21..0000000000 --- a/src/main/java/com/github/technus/tectech/compatibility/gtpp/GtppAtomLoader.java +++ /dev/null @@ -1,203 +0,0 @@ -package com.github.technus.tectech.compatibility.gtpp; - -import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry.EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED; -import static com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMAtomDefinition.getBestUnstableIsotope; -import static com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMAtomDefinition.getFirstStableIsotope; - -import java.lang.reflect.Method; - -import net.minecraftforge.fluids.FluidStack; - -import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack; -import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry; - -import gregtech.api.enums.OrePrefixes; - -public class GtppAtomLoader { - - // region reflect a bit - private Class ELEMENT; - private Object ELEMENT_INSTANCE; - private Method getUnlocalizedName, getFluid, generate; - - private String getUnlocalizedName(String elementName) { - try { - return (String) getUnlocalizedName.invoke(ELEMENT.getField(elementName).get(ELEMENT_INSTANCE)); - } catch (Exception e) { - throw new Error(e); - } - } - - private FluidStack getFluid(String elementName, int fluidAmount) { - try { - return (FluidStack) getFluid.invoke(ELEMENT.getField(elementName).get(ELEMENT_INSTANCE), fluidAmount); - } catch (Exception e) { - throw new Error(e); - } - } - - private void generate(String elementName, boolean generateAll, boolean generateBlastRecipes) { - try { - generate.invoke( - null, - ELEMENT.getField(elementName).get(ELEMENT_INSTANCE), - generateAll, - generateBlastRecipes); - } catch (Exception e) { - throw new Error(e); - } - } - // endregion - - public void setTransformations(EMTransformationRegistry transformationInfo) { - // region reflect a bit - try { - ELEMENT = Class.forName("gtPlusPlus.core.material.ELEMENT"); - ELEMENT_INSTANCE = ELEMENT.getMethod("getInstance").invoke(null); - - Class clazz = Class.forName("gtPlusPlus.core.material.Material"); - getUnlocalizedName = clazz.getMethod("getUnlocalizedName"); - try { - getFluid = clazz.getMethod("getFluidStack", int.class); - } catch (Exception e) { - getFluid = clazz.getMethod("getFluid", int.class); - } - - clazz = Class.forName("gtPlusPlus.core.material.MaterialGenerator"); - generate = clazz.getMethod( - "generate", - Class.forName("gtPlusPlus.core.material.Material"), - boolean.class, - boolean.class); - } catch (Exception e) { - throw new Error(e); - } - // endregion - - transformationInfo.addFluid( - new EMDefinitionStack(getFirstStableIsotope(10), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), - getFluid("NEON", 144)); - generate("GERMANIUM", true, true); - transformationInfo.addOredict( - new EMDefinitionStack(getFirstStableIsotope(32), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), - OrePrefixes.dust, - getUnlocalizedName("GERMANIUM"), - 1); - transformationInfo.addOredict( - new EMDefinitionStack(getFirstStableIsotope(34), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), - OrePrefixes.dust, - getUnlocalizedName("SELENIUM"), - 1); - transformationInfo.addFluid( - new EMDefinitionStack(getFirstStableIsotope(35), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), - getFluid("BROMINE", 144)); - transformationInfo.addFluid( - new EMDefinitionStack(getFirstStableIsotope(36), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), - getFluid("KRYPTON", 144)); - transformationInfo.addOredict( - new EMDefinitionStack(getFirstStableIsotope(40), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), - OrePrefixes.dust, - getUnlocalizedName("ZIRCONIUM"), - 1); - transformationInfo.addOredict( - new EMDefinitionStack(getFirstStableIsotope(43), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), - OrePrefixes.dust, - getUnlocalizedName("TECHNETIUM"), - 1); - transformationInfo.addOredict( - new EMDefinitionStack(getFirstStableIsotope(44), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), - OrePrefixes.dust, - getUnlocalizedName("RUTHENIUM"), - 1); - transformationInfo.addOredict( - new EMDefinitionStack(getFirstStableIsotope(45), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), - OrePrefixes.dust, - getUnlocalizedName("RHODIUM"), - 1); - transformationInfo.addOredict( - new EMDefinitionStack(getFirstStableIsotope(53), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), - OrePrefixes.dust, - getUnlocalizedName("IODINE"), - 1); - transformationInfo.addFluid( - new EMDefinitionStack(getFirstStableIsotope(54), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), - getFluid("XENON", 144)); - transformationInfo.addOredict( - new EMDefinitionStack(getFirstStableIsotope(72), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), - OrePrefixes.dust, - getUnlocalizedName("HAFNIUM"), - 1); - transformationInfo.addOredict( - new EMDefinitionStack(getFirstStableIsotope(75), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), - OrePrefixes.dust, - getUnlocalizedName("RHENIUM"), - 1); - transformationInfo.addOredict( - new EMDefinitionStack(getFirstStableIsotope(81), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), - OrePrefixes.dust, - getUnlocalizedName("THALLIUM"), - 1); - - transformationInfo.addOredict( - new EMDefinitionStack(getBestUnstableIsotope(84), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), - OrePrefixes.dust, - getUnlocalizedName("POLONIUM"), - 1); - transformationInfo.addOredict( - new EMDefinitionStack(getBestUnstableIsotope(85), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), - OrePrefixes.dust, - getUnlocalizedName("ASTATINE"), - 1); - transformationInfo.addOredict( - new EMDefinitionStack(getBestUnstableIsotope(87), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), - OrePrefixes.dust, - getUnlocalizedName("FRANCIUM"), - 1); - transformationInfo.addOredict( - new EMDefinitionStack(getBestUnstableIsotope(88), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), - OrePrefixes.dust, - getUnlocalizedName("RADIUM"), - 1); - transformationInfo.addOredict( - new EMDefinitionStack(getBestUnstableIsotope(89), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), - OrePrefixes.dust, - getUnlocalizedName("ACTINIUM"), - 1); - transformationInfo.addOredict( - new EMDefinitionStack(getBestUnstableIsotope(91), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), - OrePrefixes.dust, - getUnlocalizedName("PROTACTINIUM"), - 1); - transformationInfo.addOredict( - new EMDefinitionStack(getBestUnstableIsotope(93), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), - OrePrefixes.dust, - getUnlocalizedName("NEPTUNIUM"), - 1); - - transformationInfo.addOredict( - new EMDefinitionStack(getBestUnstableIsotope(96), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), - OrePrefixes.dust, - getUnlocalizedName("CURIUM"), - 1); - transformationInfo.addOredict( - new EMDefinitionStack(getBestUnstableIsotope(97), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), - OrePrefixes.dust, - getUnlocalizedName("BERKELIUM"), - 1); - transformationInfo.addOredict( - new EMDefinitionStack(getBestUnstableIsotope(98), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), - OrePrefixes.dust, - getUnlocalizedName("CALIFORNIUM"), - 1); - transformationInfo.addOredict( - new EMDefinitionStack(getBestUnstableIsotope(99), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), - OrePrefixes.dust, - getUnlocalizedName("EINSTEINIUM"), - 1); - transformationInfo.addOredict( - new EMDefinitionStack(getBestUnstableIsotope(100), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), - OrePrefixes.dust, - getUnlocalizedName("FERMIUM"), - 1); - } -} diff --git a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/TT_turret_loader.java b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/TT_turret_loader.java deleted file mode 100644 index 4323c3bbae..0000000000 --- a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/TT_turret_loader.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.github.technus.tectech.compatibility.openmodularturrets; - -import net.minecraft.item.Item; -import net.minecraftforge.client.MinecraftForgeClient; - -import com.github.technus.tectech.compatibility.openmodularturrets.blocks.turretheads.TurretHeadEM; -import com.github.technus.tectech.compatibility.openmodularturrets.blocks.turretheads.TurretHeadItemRenderEM; -import com.github.technus.tectech.compatibility.openmodularturrets.blocks.turretheads.TurretHeadRenderEM; -import com.github.technus.tectech.compatibility.openmodularturrets.entity.projectiles.projectileEM; -import com.github.technus.tectech.compatibility.openmodularturrets.entity.projectiles.projectileRenderEM; -import com.github.technus.tectech.compatibility.openmodularturrets.tileentity.turret.TileTurretHeadEM; - -import cpw.mods.fml.client.registry.ClientRegistry; -import cpw.mods.fml.client.registry.RenderingRegistry; - -public class TT_turret_loader implements Runnable { - - @Override - public void run() { - TurretHeadRenderEM turretHeadRenderEM = new TurretHeadRenderEM(); - ClientRegistry.bindTileEntitySpecialRenderer(TileTurretHeadEM.class, turretHeadRenderEM); - MinecraftForgeClient.registerItemRenderer( - Item.getItemFromBlock(TurretHeadEM.INSTANCE), - new TurretHeadItemRenderEM(turretHeadRenderEM, new TileTurretHeadEM())); - - RenderingRegistry.registerEntityRenderingHandler(projectileEM.class, new projectileRenderEM()); - } -} diff --git a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretbases/TurretBaseEM.java b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretbases/TurretBaseEM.java deleted file mode 100644 index 6da5055e08..0000000000 --- a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretbases/TurretBaseEM.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.github.technus.tectech.compatibility.openmodularturrets.blocks.turretbases; - -import static com.github.technus.tectech.TecTech.creativeTabTecTech; - -import net.minecraft.block.Block; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; - -import com.github.technus.tectech.Reference; -import com.github.technus.tectech.compatibility.openmodularturrets.tileentity.turretbase.TileTurretBaseEM; - -import cpw.mods.fml.common.registry.GameRegistry; -import openmodularturrets.blocks.turretbases.BlockAbstractTurretBase; -import openmodularturrets.handler.ConfigHandler; - -/** - * Created by Tec on 27/07/2017. - */ -public class TurretBaseEM extends BlockAbstractTurretBase { - - private final int MaxCharge = ConfigHandler.getBaseTierFiveMaxCharge(); - private final int MaxIO = ConfigHandler.getBaseTierFiveMaxIo(); - public static TurretBaseEM INSTANCE; - - public TurretBaseEM() { - setCreativeTab(creativeTabTecTech); - setResistance(16); - setBlockName("turretBaseEM"); - setStepSound(Block.soundTypeMetal); - setBlockTextureName(Reference.MODID + ":turretBaseEM"); - } - - @Override - public TileEntity createNewTileEntity(World worldIn, int meta) { - return new TileTurretBaseEM(MaxCharge, MaxIO); - } - - @Override - public void registerBlockIcons(IIconRegister reg) { - super.registerBlockIcons(reg); - blockIcon = reg.registerIcon(Reference.MODID + ":turretBaseEM"); - } - - public static void run() { - INSTANCE = new TurretBaseEM(); - GameRegistry.registerBlock(INSTANCE, TurretBaseItemEM.class, INSTANCE.getUnlocalizedName()); - GameRegistry.registerTileEntity(TileTurretBaseEM.class, "TileTurretBaseEM"); - } -} diff --git a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretbases/TurretBaseItemEM.java b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretbases/TurretBaseItemEM.java deleted file mode 100644 index 4a1a350196..0000000000 --- a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretbases/TurretBaseItemEM.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.github.technus.tectech.compatibility.openmodularturrets.blocks.turretbases; - -import static net.minecraft.util.StatCollector.translateToLocal; - -import java.util.List; - -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; - -import com.github.technus.tectech.util.CommonValues; - -/** - * Created by Tec on 28/07/2017. - */ -public class TurretBaseItemEM extends ItemBlock { - - public TurretBaseItemEM(Block block) { - super(block); - } - - @Override - public void addInformation(ItemStack p_77624_1_, EntityPlayer p_77624_2_, List list, boolean p_77624_4_) { - list.add(CommonValues.TEC_MARK_EM); - list.add(""); - list.add(EnumChatFormatting.AQUA + "--" + translateToLocal("tooptip.energy.label") + "--"); - list.add(translateToLocal("tooltip.rf.max") + ": " + EnumChatFormatting.WHITE + 1000000000); - list.add(translateToLocal("tooltip.rf.io") + ": " + EnumChatFormatting.WHITE + 50000); - list.add(""); - list.add(EnumChatFormatting.GREEN + "--" + translateToLocal("tooltip.extras.label") + "--"); - list.add(translateToLocal("tooltip.extras.addons.2")); - list.add(translateToLocal("tooltip.extras.upgrade.2")); - list.add(""); - list.add(EnumChatFormatting.DARK_GRAY + translateToLocal("flavour.base.0")); - } -} diff --git a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretheads/TurretHeadEM.java b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretheads/TurretHeadEM.java deleted file mode 100644 index b410f483c1..0000000000 --- a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretheads/TurretHeadEM.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.github.technus.tectech.compatibility.openmodularturrets.blocks.turretheads; - -import static com.github.technus.tectech.TecTech.creativeTabTecTech; - -import net.minecraft.block.Block; -import net.minecraft.block.ITileEntityProvider; -import net.minecraft.block.material.Material; -import net.minecraft.entity.EnumCreatureType; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; - -import com.github.technus.tectech.compatibility.openmodularturrets.tileentity.turret.TileTurretHeadEM; - -import cpw.mods.fml.common.registry.GameRegistry; -import openmodularturrets.tileentity.turretbase.TurretBase; - -/** - * Created by Tec on 27/07/2017. - */ -public class TurretHeadEM extends Block implements ITileEntityProvider { - - public static TurretHeadEM INSTANCE; - - public TurretHeadEM() { - super(Material.glass); - setCreativeTab(creativeTabTecTech); - setBlockUnbreakable(); - setResistance(6000000.0F); - setStepSound(Block.soundTypeMetal); - setBlockBounds(0.2F, 0.0F, 0.2F, 0.8F, 1F, 0.8F); - setBlockName("turretHeadEM"); - // this.setBlockTextureName(Reference.MODID+":turretHeadEM"); - } - - @Override - public int getRenderType() { - return -1; - } - - @Override - public boolean isOpaqueCube() { - return false; - } - - @Override - public boolean canPlaceBlockAt(World worldIn, int x, int y, int z) { - return worldIn.getTileEntity(x + 1, y, z) instanceof TurretBase - || worldIn.getTileEntity(x - 1, y, z) instanceof TurretBase - || worldIn.getTileEntity(x, y + 1, z) instanceof TurretBase - || worldIn.getTileEntity(x, y - 1, z) instanceof TurretBase - || worldIn.getTileEntity(x, y, z + 1) instanceof TurretBase - || worldIn.getTileEntity(x, y, z - 1) instanceof TurretBase; - } - - @Override - public boolean canCreatureSpawn(EnumCreatureType type, IBlockAccess world, int x, int y, int z) { - return false; - } - - @Override - public TileEntity createNewTileEntity(World worldIn, int meta) { - return new TileTurretHeadEM(); - } - - public static void run() { - INSTANCE = new TurretHeadEM(); - GameRegistry.registerBlock(INSTANCE, TurretHeadItemEM.class, INSTANCE.getUnlocalizedName()); - GameRegistry.registerTileEntity(TileTurretHeadEM.class, "TileTurretHeadEM"); - } -} diff --git a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretheads/TurretHeadItemEM.java b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretheads/TurretHeadItemEM.java deleted file mode 100644 index f32029460b..0000000000 --- a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretheads/TurretHeadItemEM.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.github.technus.tectech.compatibility.openmodularturrets.blocks.turretheads; - -import static com.github.technus.tectech.util.CommonValues.TEC_MARK_EM; -import static net.minecraft.util.StatCollector.translateToLocal; - -import java.text.DecimalFormat; -import java.util.List; - -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; - -import openmodularturrets.handler.ConfigHandler; - -/** - * Created by Tec on 28/07/2017. - */ -public class TurretHeadItemEM extends ItemBlock { - - private static final DecimalFormat df = new DecimalFormat("0.0"); - - public TurretHeadItemEM(Block block) { - super(block); - } - - @Override - public void addInformation(ItemStack p_77624_1_, EntityPlayer p_77624_2_, List list, boolean p_77624_4_) { - list.add(TEC_MARK_EM); - list.add(""); - list.add(EnumChatFormatting.GOLD + "--" + translateToLocal("tooltip.info") + "--"); - list.add(translateToLocal("tooltip.tier") + ": " + EnumChatFormatting.WHITE + '5'); - list.add( - translateToLocal("tooltip.range") + ": " - + EnumChatFormatting.WHITE - + ConfigHandler.getLaserTurretSettings().getRange()); - list.add( - translateToLocal("tooltip.accuracy") + ": " - + EnumChatFormatting.WHITE - + translateToLocal("turret.accuracy.high")); - list.add( - translateToLocal("tooltip.ammo") + ": " + EnumChatFormatting.WHITE + translateToLocal("turret.ammo.4")); - list.add( - translateToLocal("tooltip.tierRequired") + ": " - + EnumChatFormatting.WHITE - + translateToLocal("base.tier.5")); - list.add(""); - list.add(EnumChatFormatting.DARK_PURPLE + "--" + translateToLocal("tooltip.damage.label") + "--"); - list.add( - translateToLocal("tooltip.damage.stat") + ": " - + EnumChatFormatting.WHITE - + (float) ConfigHandler.getLaserTurretSettings().getDamage() / 2.0F - + ' ' - + translateToLocal("tooltip.health")); - list.add(translateToLocal("tooltip.aoe") + ": " + EnumChatFormatting.WHITE + '0'); - list.add( - translateToLocal("tooltip.firerate") + ": " - + EnumChatFormatting.WHITE - + df.format(20.0F / (float) ConfigHandler.getLaserTurretSettings().getFireRate())); - list.add( - translateToLocal("tooltip.energy.stat") + ": " - + EnumChatFormatting.WHITE - + ConfigHandler.getLaserTurretSettings().getPowerUsage() - + " RF"); - list.add(""); - list.add(EnumChatFormatting.DARK_GRAY + translateToLocal("flavour.turret.4")); - } -} diff --git a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretheads/TurretHeadItemRenderEM.java b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretheads/TurretHeadItemRenderEM.java deleted file mode 100644 index 4fdc413261..0000000000 --- a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretheads/TurretHeadItemRenderEM.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.github.technus.tectech.compatibility.openmodularturrets.blocks.turretheads; - -import net.minecraft.item.ItemStack; -import net.minecraftforge.client.IItemRenderer; - -import org.lwjgl.opengl.GL11; - -import com.github.technus.tectech.compatibility.openmodularturrets.tileentity.turret.TileTurretHeadEM; - -import openmodularturrets.client.render.models.ModelLaserTurret; - -/** - * Created by Tec on 30.07.2017. - */ -public class TurretHeadItemRenderEM implements IItemRenderer { - - private final TurretHeadRenderEM turretRenderer; - private final TileTurretHeadEM turretTileEntity; - private final ModelLaserTurret model; - - public TurretHeadItemRenderEM(TurretHeadRenderEM turretRenderer, TileTurretHeadEM turretTileEntity) { - this.turretRenderer = turretRenderer; - this.turretTileEntity = turretTileEntity; - model = new ModelLaserTurret(); - } - - @Override - public boolean handleRenderType(ItemStack item, ItemRenderType type) { - return true; - } - - @Override - public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { - return true; - } - - @Override - public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - GL11.glPushMatrix(); - GL11.glTranslated(-0.5D, -0.5D, -0.5D); - turretRenderer.renderTileEntityAt(turretTileEntity, 0.0D, 0.0D, 0.0D, 0.0F); - GL11.glPopMatrix(); - } -} diff --git a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretheads/TurretHeadRenderEM.java b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretheads/TurretHeadRenderEM.java deleted file mode 100644 index d73d9b29be..0000000000 --- a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretheads/TurretHeadRenderEM.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.github.technus.tectech.compatibility.openmodularturrets.blocks.turretheads; - -import openmodularturrets.client.render.renderers.blockitem.LaserTurretRenderer; - -/** - * Created by Tec on 28/07/2017. - */ -public class TurretHeadRenderEM extends LaserTurretRenderer { -} diff --git a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/entity/projectiles/projectileEM.java b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/entity/projectiles/projectileEM.java deleted file mode 100644 index eec1121fff..0000000000 --- a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/entity/projectiles/projectileEM.java +++ /dev/null @@ -1,192 +0,0 @@ -package com.github.technus.tectech.compatibility.openmodularturrets.entity.projectiles; - -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.world.World; - -import com.github.technus.tectech.TecTech; -import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMInstanceStack; -import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMHadronDefinition; - -import gregtech.api.enums.SoundResource; -import gregtech.api.util.GT_Utility; -import openmodularturrets.entity.projectiles.LaserProjectile; -import openmodularturrets.entity.projectiles.damagesources.NormalDamageSource; -import openmodularturrets.handler.ConfigHandler; -import openmodularturrets.tileentity.turretbase.TurretBase; -import openmodularturrets.util.PlayerUtil; -import openmodularturrets.util.TurretHeadUtil; - -/** - * Created by Bass on 27/07/2017. - */ -public class projectileEM extends LaserProjectile { - - public float gravity = 0; - private TurretBase turretBase; - - private boolean strange, antiMatter, isAmped; - - private int ampLevel; - - private float massFactor; - private double mass, charge; - - public projectileEM(World par1World) { - super(par1World); - } - - public projectileEM(World par1World, TurretBase turretBase) { - super(par1World, turretBase); - int amp = TurretHeadUtil.getAmpLevel(turretBase); - if (amp > 0) { - this.isAmped = true; - this.ampLevel = amp; - } - } - - public projectileEM(World par1World, TurretBase turretBase, EMInstanceStack projectileContent) { - super(par1World, turretBase); - this.turretBase = turretBase; - if (projectileContent != null) { - mass = projectileContent.getMass(); - charge = projectileContent.getCharge(); - massFactor = (float) (projectileContent.getDefinition().getMass() / EMHadronDefinition.hadron_n_.getMass()); - - if (projectileContent.getDefinition().getGeneration() > 1 - || projectileContent.getDefinition().getGeneration() < -1) { - strange = true; - } - if (projectileContent.getDefinition().getGeneration() < 0) { - antiMatter = true; - } - - if (projectileContent.getDefinition().getCharge() == 0) { - gravity = massFactor / 100f; - } else { - gravity = Math - .min(0.0025F / Math.abs(projectileContent.getDefinition().getCharge()), massFactor / 100f); - } - } - } - - @Override - protected void onImpact(MovingObjectPosition movingobjectposition) { - if (ticksExisted > 1) { - if (!worldObj.isRemote) { - worldObj.playSoundEffect( - posX, - posY, - posZ, - "openmodularturrets:laserHit", - ConfigHandler.getTurretSoundVolume(), - TecTech.RANDOM.nextFloat() + 0.5F); - switch (movingobjectposition.typeOfHit) { - case BLOCK: - Block hitBlock = worldObj.getBlock( - movingobjectposition.blockX, - movingobjectposition.blockY, - movingobjectposition.blockZ); - if (hitBlock != null) { - if (TecTech.configTecTech.ENABLE_TURRET_EXPLOSIONS && antiMatter - && hitBlock.getMaterial().isSolid()) { - GT_Utility.sendSoundToPlayers( - worldObj, - SoundResource.IC2_MACHINES_MACHINE_OVERLOAD, - 1.0F, - -1.0F, - movingobjectposition.blockX, - movingobjectposition.blockY, - movingobjectposition.blockZ); - worldObj.createExplosion( - null, - movingobjectposition.blockX + 0.5D, - movingobjectposition.blockY + 0.5D, - movingobjectposition.blockZ + 0.5D, - TecTech.configTecTech.TURRET_EXPLOSION_FACTOR * (strange ? 10 : 1) - * massFactor - * (isAmped ? ampLevel * .1f + 1 : 1) - * (ticksExisted / 250f), - true); - } else { - return; - } - } - break; - case ENTITY: - float damage = (strange ? 10 : 1) * TecTech.configTecTech.TURRET_DAMAGE_FACTOR - * massFactor - * (isAmped ? ampLevel * .1f + 1 : 1); - - if (movingobjectposition.entityHit instanceof EntityPlayer) { - EntityPlayer player = (EntityPlayer) movingobjectposition.entityHit; - if (canDamagePlayer(player)) { - movingobjectposition.entityHit.setFire((strange ? 10 : 1) * 2); - movingobjectposition.entityHit - .attackEntityFrom(new NormalDamageSource("laser"), damage); - if (antiMatter) { - movingobjectposition.entityHit.hurtResistantTime = 0; - } - if (strange) { - TecTech.anomalyHandler.addCancer(player, mass); - } - if (charge != 0) { - TecTech.anomalyHandler.addCharge(player, charge); - } - } - } else { - movingobjectposition.entityHit.setFire((strange ? 10 : 1) * 2); - movingobjectposition.entityHit.attackEntityFrom(new NormalDamageSource("laser"), damage); - if (antiMatter) { - movingobjectposition.entityHit.hurtResistantTime = 0; - } - } - - if (TecTech.configTecTech.ENABLE_TURRET_EXPLOSIONS && antiMatter) { - GT_Utility.sendSoundToPlayers( - worldObj, - SoundResource.IC2_MACHINES_MACHINE_OVERLOAD, - 1.0F, - -1.0F, - (int) movingobjectposition.entityHit.posX, - (int) movingobjectposition.entityHit.posY, - (int) movingobjectposition.entityHit.posZ); - worldObj.createExplosion( - null, - movingobjectposition.entityHit.posX, - movingobjectposition.entityHit.posY, - movingobjectposition.entityHit.posZ, - (strange ? 10 : 1) * TecTech.configTecTech.TURRET_EXPLOSION_FACTOR - * massFactor - * (isAmped ? ampLevel * .1f + 1 : 1) - * (ticksExisted / 250f), - true); - } - break; - default: - break; - } - } - setDead(); - } - } - - public boolean canDamagePlayer(EntityPlayer entityPlayer) { - return ConfigHandler.turretDamageTrustedPlayers || this.turretBase.getTrustedPlayer(entityPlayer.getUniqueID()) - == null - && !PlayerUtil.getPlayerUIDUnstable(this.turretBase.getOwner()).equals(entityPlayer.getUniqueID()); - } - - @Override - public void onEntityUpdate() { - if (ticksExisted >= 75) { - setDead(); - } - } - - @Override - protected float getGravityVelocity() { - return gravity; - } -} diff --git a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/entity/projectiles/projectileRenderEM.java b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/entity/projectiles/projectileRenderEM.java deleted file mode 100644 index 3c4ff2bcca..0000000000 --- a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/entity/projectiles/projectileRenderEM.java +++ /dev/null @@ -1,86 +0,0 @@ -package com.github.technus.tectech.compatibility.openmodularturrets.entity.projectiles; - -import net.minecraft.client.renderer.OpenGlHelper; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.entity.Render; -import net.minecraft.entity.Entity; -import net.minecraft.util.MathHelper; -import net.minecraft.util.ResourceLocation; - -import org.lwjgl.opengl.GL11; - -import com.github.technus.tectech.Reference; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -/** - * Created by Tec on 29.07.2017. - */ -@SideOnly(Side.CLIENT) -public class projectileRenderEM extends Render { - - private static final ResourceLocation textures = new ResourceLocation( - Reference.MODID + ":textures/entity/projectileEM.png"); - - private void render(projectileEM entity, double par2, double par4, double par6, float par9) { - bindEntityTexture(entity); - GL11.glPushMatrix(); - GL11.glTranslatef((float) par2, (float) par4 + 0.3F, (float) par6); - GL11.glRotatef( - entity.prevRotationYaw + (entity.rotationYaw - entity.prevRotationYaw) * par9 - 90.0F, - 0.0F, - 1.0F, - 0.0F); - GL11.glRotatef( - entity.prevRotationPitch + (entity.rotationPitch - entity.prevRotationPitch) * par9, - 0.0F, - 0.0F, - 1.0F); - Tessellator var18 = Tessellator.instance; - byte b0 = 0; - float f2 = 0.0F; - float f3 = 0.5F; - float f4 = (float) (b0 * 10) / 32.0F; - float f5 = (float) (5 + b0 * 10) / 32.0F; - float f10 = 0.05625F; - GL11.glEnable('\u803a'); - float f11 = -par9; - if (f11 > 0.0F) { - float f = -MathHelper.sin(f11 * 3.0F) * f11; - GL11.glRotatef(f, 0.0F, 0.0F, 1.0F); - } - - GL11.glDisable(2896); - OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, 240.0F, 240.0F); - GL11.glRotatef(45.0F, 1.0F, 0.0F, 0.0F); - GL11.glScalef(f10, f10, f10); - GL11.glTranslatef(0.0F, 0.0F, 0.0F); - GL11.glNormal3f(f10, 0.0F, 0.0F); - - for (int var19 = 0; var19 < 4; ++var19) { - GL11.glRotatef(90.0F, 1.0F, 0.0F, 0.0F); - GL11.glNormal3f(0.0F, 0.0F, f10); - var18.startDrawingQuads(); - var18.addVertexWithUV(-16.0D, -2.0D, 0.0D, (double) f2, (double) f4); - var18.addVertexWithUV(16.0D, -2.0D, 0.0D, (double) f3, (double) f4); - var18.addVertexWithUV(16.0D, 2.0D, 0.0D, (double) f3, (double) f5); - var18.addVertexWithUV(-16.0D, 2.0D, 0.0D, (double) f2, (double) f5); - var18.draw(); - } - - GL11.glEnable(2896); - GL11.glDisable('\u803a'); - GL11.glPopMatrix(); - } - - @Override - protected ResourceLocation getEntityTexture(Entity par1Entity) { - return textures; - } - - @Override - public void doRender(Entity par1Entity, double par2, double par4, double par6, float par8, float par9) { - render((projectileEM) par1Entity, par2, par4, par6, par9); - } -} diff --git a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/tileentity/turret/TileTurretHeadEM.java b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/tileentity/turret/TileTurretHeadEM.java deleted file mode 100644 index 62177c16db..0000000000 --- a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/tileentity/turret/TileTurretHeadEM.java +++ /dev/null @@ -1,89 +0,0 @@ -package com.github.technus.tectech.compatibility.openmodularturrets.tileentity.turret; - -import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry.EM_COUNT_PER_MATERIAL_AMOUNT; - -import net.minecraft.entity.Entity; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - -import com.github.technus.tectech.compatibility.openmodularturrets.entity.projectiles.projectileEM; -import com.github.technus.tectech.compatibility.openmodularturrets.tileentity.turretbase.TileTurretBaseEM; -import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap; -import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMInstanceStack; -import com.github.technus.tectech.thing.item.DebugElementalInstanceContainer_EM; - -import openmodularturrets.entity.projectiles.TurretProjectile; -import openmodularturrets.handler.ConfigHandler; -import openmodularturrets.tileentity.turrets.TurretHead; -import openmodularturrets.util.TurretHeadUtil; - -/** - * Created by Bass on 27/07/2017. - */ -public class TileTurretHeadEM extends Tur