From cad65505b4754cd734f8f462b1be4878eb6e27d8 Mon Sep 17 00:00:00 2001 From: Zorbatron <46525467+Zorbatron@users.noreply.github.com> Date: Sun, 12 Jan 2025 19:28:28 -0500 Subject: [PATCH] rename --- .../ZBGTMetaTileEntities.java | 168 +++++++++--------- ...TileEntityYOTTank.java => MTEYOTTank.java} | 10 +- ...yLine.java => MTECircuitAssemblyLine.java} | 6 +- .../{MetaTileEntityCoAL.java => MTECoAL.java} | 10 +- ...cFreezer.java => MTECryogenicFreezer.java} | 6 +- ...leEntityVolcanus.java => MTEVolcanus.java} | 6 +- ...llector.java => MTELargeAirCollector.java} | 6 +- ...Smelter.java => MTELargeAlloySmelter.java} | 8 +- ...kBreaker.java => MTELargeRockBreaker.java} | 6 +- ...TileEntityMegaABS.java => MTEMegaABS.java} | 6 +- ...TileEntityMegaEBF.java => MTEMegaEBF.java} | 6 +- ...Reactor.java => MTEMegaFusionReactor.java} | 8 +- ...TileEntityMegaLCR.java => MTEMegaLCR.java} | 6 +- ...TileEntityMegaOCU.java => MTEMegaOCU.java} | 8 +- ...taTileEntityMegaVF.java => MTEMegaVF.java} | 6 +- ...ssembler.java => MTEPreciseAssembler.java} | 6 +- ...TileEntityQuacker.java => MTEQuacker.java} | 6 +- ...taTileEntityQueebf.java => MTEQueebf.java} | 6 +- ...TileEntityQueezer.java => MTEQueezer.java} | 6 +- ...ntakeHatch.java => MTEAirIntakeHatch.java} | 8 +- ...Hatch.java => MTECreativeEnergyHatch.java} | 10 +- ...dHatch.java => MTECreativeFluidHatch.java} | 8 +- ...veItemBus.java => MTECreativeItemBus.java} | 10 +- ...lteredHatch.java => MTEFilteredHatch.java} | 12 +- ...lHatch.java => MTELargeParallelHatch.java} | 8 +- ...putBus.java => MTESingleItemInputBus.java} | 6 +- ...atch.java => MTESterileCleaningHatch.java} | 6 +- ...perInputBus.java => MTESuperInputBus.java} | 8 +- ...ankMEHatch.java => MTEYOTTankMEHatch.java} | 44 ++--- ...va => MTECreativeComputationProvider.java} | 8 +- 30 files changed, 209 insertions(+), 209 deletions(-) rename src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/{MetaTileEntityYOTTank.java => MTEYOTTank.java} (98%) rename src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/{MetaTileEntityCircuitAssemblyLine.java => MTECircuitAssemblyLine.java} (95%) rename src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/{MetaTileEntityCoAL.java => MTECoAL.java} (97%) rename src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/{MetaTileEntityCryogenicFreezer.java => MTECryogenicFreezer.java} (94%) rename src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/{MetaTileEntityVolcanus.java => MTEVolcanus.java} (97%) rename src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/large/{MetaTileEntityLargeAirCollector.java => MTELargeAirCollector.java} (94%) rename src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/large/{MetaTileEntityLargeAlloySmelter.java => MTELargeAlloySmelter.java} (94%) rename src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/large/{MetaTileEntityLargeRockBreaker.java => MTELargeRockBreaker.java} (95%) rename src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/mega/{MetaTileEntityMegaABS.java => MTEMegaABS.java} (98%) rename src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/mega/{MetaTileEntityMegaEBF.java => MTEMegaEBF.java} (98%) rename src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/mega/{MetaTileEntityMegaFusionReactor.java => MTEMegaFusionReactor.java} (98%) rename src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/mega/{MetaTileEntityMegaLCR.java => MTEMegaLCR.java} (95%) rename src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/mega/{MetaTileEntityMegaOCU.java => MTEMegaOCU.java} (97%) rename src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/mega/{MetaTileEntityMegaVF.java => MTEMegaVF.java} (96%) rename src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/mega/{MetaTileEntityPreciseAssembler.java => MTEPreciseAssembler.java} (98%) rename src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/quad/{MetaTileEntityQuacker.java => MTEQuacker.java} (94%) rename src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/quad/{MetaTileEntityQueebf.java => MTEQueebf.java} (97%) rename src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/quad/{MetaTileEntityQueezer.java => MTEQueezer.java} (93%) rename src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/multiblockpart/{MetaTileEntityAirIntakeHatch.java => MTEAirIntakeHatch.java} (96%) rename src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/multiblockpart/{MetaTileEntityCreativeEnergyHatch.java => MTECreativeEnergyHatch.java} (96%) rename src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/multiblockpart/{MetaTileEntityCreativeFluidHatch.java => MTECreativeFluidHatch.java} (96%) rename src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/multiblockpart/{MetaTileEntityCreativeItemBus.java => MTECreativeItemBus.java} (95%) rename src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/multiblockpart/{MetaTileEntityFilteredHatch.java => MTEFilteredHatch.java} (92%) rename src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/multiblockpart/{MetaTileEntityLargeParallelHatch.java => MTELargeParallelHatch.java} (93%) rename src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/multiblockpart/{MetaTileEntitySingleItemInputBus.java => MTESingleItemInputBus.java} (90%) rename src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/multiblockpart/{MetaTileEntitySterileCleaningHatch.java => MTESterileCleaningHatch.java} (93%) rename src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/multiblockpart/{MetaTileEntitySuperInputBus.java => MTESuperInputBus.java} (97%) rename src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/multiblockpart/{MetaTileEntityYOTTankMEHatch.java => MTEYOTTankMEHatch.java} (92%) rename src/main/java/com/zorbatron/zbgt/common/metatileentities/storage/{MetaTileEntityCreativeComputationProvider.java => MTECreativeComputationProvider.java} (95%) diff --git a/src/main/java/com/zorbatron/zbgt/common/metatileentities/ZBGTMetaTileEntities.java b/src/main/java/com/zorbatron/zbgt/common/metatileentities/ZBGTMetaTileEntities.java index 706d0b42..a9dc423c 100644 --- a/src/main/java/com/zorbatron/zbgt/common/metatileentities/ZBGTMetaTileEntities.java +++ b/src/main/java/com/zorbatron/zbgt/common/metatileentities/ZBGTMetaTileEntities.java @@ -5,174 +5,174 @@ import com.zorbatron.zbgt.api.ZBGTAPI; import com.zorbatron.zbgt.api.metatileentity.ZBGTMultiblockAbilities; -import com.zorbatron.zbgt.common.metatileentities.multi.MetaTileEntityYOTTank; -import com.zorbatron.zbgt.common.metatileentities.multi.electric.MetaTileEntityCircuitAssemblyLine; -import com.zorbatron.zbgt.common.metatileentities.multi.electric.MetaTileEntityCoAL; -import com.zorbatron.zbgt.common.metatileentities.multi.electric.MetaTileEntityCryogenicFreezer; -import com.zorbatron.zbgt.common.metatileentities.multi.electric.MetaTileEntityVolcanus; +import com.zorbatron.zbgt.common.metatileentities.multi.MTEYOTTank; +import com.zorbatron.zbgt.common.metatileentities.multi.electric.MTECircuitAssemblyLine; +import com.zorbatron.zbgt.common.metatileentities.multi.electric.MTECoAL; +import com.zorbatron.zbgt.common.metatileentities.multi.electric.MTECryogenicFreezer; +import com.zorbatron.zbgt.common.metatileentities.multi.electric.MTEVolcanus; import com.zorbatron.zbgt.common.metatileentities.multi.electric.large.*; import com.zorbatron.zbgt.common.metatileentities.multi.electric.mega.*; import com.zorbatron.zbgt.common.metatileentities.multi.electric.quad.*; import com.zorbatron.zbgt.common.metatileentities.multi.multiblockpart.*; -import com.zorbatron.zbgt.common.metatileentities.storage.MetaTileEntityCreativeComputationProvider; +import com.zorbatron.zbgt.common.metatileentities.storage.MTECreativeComputationProvider; import gregtech.api.GTValues; import gregtech.api.block.machines.MachineItemBlock; public class ZBGTMetaTileEntities { - public static MetaTileEntityCreativeEnergyHatch CREATIVE_ENERGY_SOURCE; - public static MetaTileEntityCreativeEnergyHatch CREATIVE_ENERGY_SINK; - public static MetaTileEntityCreativeFluidHatch CREATIVE_RESERVOIR_HATCH; - public static MetaTileEntityCreativeComputationProvider CREATIVE_COMPUTATION_PROVIDER; - public static MetaTileEntityAirIntakeHatch AIR_INTAKE_HATCH; - public static MetaTileEntityAirIntakeHatch EXTREME_AIR_INTAKE_HATCH; - public static MetaTileEntitySingleItemInputBus SINGLE_ITEM_INPUT_BUS; - public static MetaTileEntityCreativeItemBus CREATIVE_ITEM_BUS; - public static MetaTileEntitySuperInputBus SUPER_INPUT_BUS; - public static MetaTileEntityLargeParallelHatch[] ZBGT_PARALLEL_HATCHES = new MetaTileEntityLargeParallelHatch[7]; - public static MetaTileEntityYOTTankMEHatch YOTTANK_ME_HATCH; - public static MetaTileEntitySterileCleaningHatch STERILE_CLEANING_HATCH; - public static MetaTileEntityFilteredHatch PYROTHEUM_HEATING_HATCH; - public static MetaTileEntityFilteredHatch CRYOTHEUM_COOLING_HATCH; - - public static MetaTileEntityMegaEBF MEGA_EBF; - public static MetaTileEntityMegaLCR MEGA_LCR; - public static MetaTileEntityMegaVF MEGA_VF; - public static MetaTileEntityMegaOCU MEGA_OCU; - public static MetaTileEntityMegaABS MEGA_ABS; - public static MetaTileEntityPreciseAssembler PRASS; - public static MetaTileEntityMegaFusionReactor[] MEGA_FUSION = new MetaTileEntityMegaFusionReactor[3]; - - public static MetaTileEntityCoAL CoAL; - public static MetaTileEntityCircuitAssemblyLine CAL; - - public static MetaTileEntityQueebf QUAD_EBF; - public static MetaTileEntityQueezer QUEEZER; - public static MetaTileEntityQuacker QUACKER; - - public static MetaTileEntityYOTTank YOTTANK; - - public static MetaTileEntityLargeRockBreaker LARGE_ROCK_BREAKER; - public static MetaTileEntityLargeAirCollector LARGE_AIR_COLLECTOR; - public static MetaTileEntityLargeAlloySmelter LARGE_ALLOY_SMELTER; - - public static MetaTileEntityVolcanus VOLCANUS; - public static MetaTileEntityCryogenicFreezer CRYOGENIC_FREEZER; + public static MTECreativeEnergyHatch CREATIVE_ENERGY_SOURCE; + public static MTECreativeEnergyHatch CREATIVE_ENERGY_SINK; + public static MTECreativeFluidHatch CREATIVE_RESERVOIR_HATCH; + public static MTECreativeComputationProvider CREATIVE_COMPUTATION_PROVIDER; + public static MTEAirIntakeHatch AIR_INTAKE_HATCH; + public static MTEAirIntakeHatch EXTREME_AIR_INTAKE_HATCH; + public static MTESingleItemInputBus SINGLE_ITEM_INPUT_BUS; + public static MTECreativeItemBus CREATIVE_ITEM_BUS; + public static MTESuperInputBus SUPER_INPUT_BUS; + public static MTELargeParallelHatch[] ZBGT_PARALLEL_HATCHES = new MTELargeParallelHatch[7]; + public static MTEYOTTankMEHatch YOTTANK_ME_HATCH; + public static MTESterileCleaningHatch STERILE_CLEANING_HATCH; + public static MTEFilteredHatch PYROTHEUM_HEATING_HATCH; + public static MTEFilteredHatch CRYOTHEUM_COOLING_HATCH; + + public static MTEMegaEBF MEGA_EBF; + public static MTEMegaLCR MEGA_LCR; + public static MTEMegaVF MEGA_VF; + public static MTEMegaOCU MEGA_OCU; + public static MTEMegaABS MEGA_ABS; + public static MTEPreciseAssembler PRASS; + public static MTEMegaFusionReactor[] MEGA_FUSION = new MTEMegaFusionReactor[3]; + + public static MTECoAL CoAL; + public static MTECircuitAssemblyLine CAL; + + public static MTEQueebf QUAD_EBF; + public static MTEQueezer QUEEZER; + public static MTEQuacker QUACKER; + + public static MTEYOTTank YOTTANK; + + public static MTELargeRockBreaker LARGE_ROCK_BREAKER; + public static MTELargeAirCollector LARGE_AIR_COLLECTOR; + public static MTELargeAlloySmelter LARGE_ALLOY_SMELTER; + + public static MTEVolcanus VOLCANUS; + public static MTECryogenicFreezer CRYOGENIC_FREEZER; public static void init() { MachineItemBlock.addCreativeTab(ZBGTAPI.TAB_ZBGT); // 18000-18049 (50) reserved for multiblock parts CREATIVE_ENERGY_SOURCE = registerMetaTileEntity(18000, - new MetaTileEntityCreativeEnergyHatch(zbgtId("creative_energy_source"), false)); + new MTECreativeEnergyHatch(zbgtId("creative_energy_source"), false)); CREATIVE_ENERGY_SINK = registerMetaTileEntity(18001, - new MetaTileEntityCreativeEnergyHatch(zbgtId("creative_energy_sink"), true)); + new MTECreativeEnergyHatch(zbgtId("creative_energy_sink"), true)); CREATIVE_RESERVOIR_HATCH = registerMetaTileEntity(18002, - new MetaTileEntityCreativeFluidHatch(zbgtId("creative_reservoir_hatch"), false)); + new MTECreativeFluidHatch(zbgtId("creative_reservoir_hatch"), false)); CREATIVE_COMPUTATION_PROVIDER = registerMetaTileEntity(18003, - new MetaTileEntityCreativeComputationProvider(zbgtId("creative_computation_provider"))); + new MTECreativeComputationProvider(zbgtId("creative_computation_provider"))); AIR_INTAKE_HATCH = registerMetaTileEntity(18004, - new MetaTileEntityAirIntakeHatch(zbgtId("air_intake_hatch"), GTValues.IV, 128_000, 1000)); + new MTEAirIntakeHatch(zbgtId("air_intake_hatch"), GTValues.IV, 128_000, 1000)); EXTREME_AIR_INTAKE_HATCH = registerMetaTileEntity(18005, - new MetaTileEntityAirIntakeHatch(zbgtId("extreme_air_intake_hatch"), GTValues.LuV, 256_000, + new MTEAirIntakeHatch(zbgtId("extreme_air_intake_hatch"), GTValues.LuV, 256_000, 8000)); SINGLE_ITEM_INPUT_BUS = registerMetaTileEntity(18006, - new MetaTileEntitySingleItemInputBus(zbgtId("single_item_input_bus"))); + new MTESingleItemInputBus(zbgtId("single_item_input_bus"))); CREATIVE_ITEM_BUS = registerMetaTileEntity(18008, - new MetaTileEntityCreativeItemBus(zbgtId("creative_item_bus"))); + new MTECreativeItemBus(zbgtId("creative_item_bus"))); SUPER_INPUT_BUS = registerMetaTileEntity(18009, - new MetaTileEntitySuperInputBus(zbgtId("super_input_bus"))); + new MTESuperInputBus(zbgtId("super_input_bus"))); - ZBGT_PARALLEL_HATCHES[0] = registerMetaTileEntity(18010, new MetaTileEntityLargeParallelHatch( + ZBGT_PARALLEL_HATCHES[0] = registerMetaTileEntity(18010, new MTELargeParallelHatch( zbgtId(String.format("parallel_hatch.%s", GTValues.VN[GTValues.UEV])), GTValues.UHV, 1024)); - ZBGT_PARALLEL_HATCHES[1] = registerMetaTileEntity(18011, new MetaTileEntityLargeParallelHatch( + ZBGT_PARALLEL_HATCHES[1] = registerMetaTileEntity(18011, new MTELargeParallelHatch( zbgtId(String.format("parallel_hatch.%s", GTValues.VN[GTValues.UIV])), GTValues.UEV, 4096)); - ZBGT_PARALLEL_HATCHES[2] = registerMetaTileEntity(18012, new MetaTileEntityLargeParallelHatch( + ZBGT_PARALLEL_HATCHES[2] = registerMetaTileEntity(18012, new MTELargeParallelHatch( zbgtId(String.format("parallel_hatch.%s", GTValues.VN[GTValues.UXV])), GTValues.UIV, 16_384)); - ZBGT_PARALLEL_HATCHES[3] = registerMetaTileEntity(18013, new MetaTileEntityLargeParallelHatch( + ZBGT_PARALLEL_HATCHES[3] = registerMetaTileEntity(18013, new MTELargeParallelHatch( zbgtId(String.format("parallel_hatch.%s", GTValues.VN[GTValues.OpV])), GTValues.UXV, 65_536)); - ZBGT_PARALLEL_HATCHES[4] = registerMetaTileEntity(18014, new MetaTileEntityLargeParallelHatch( + ZBGT_PARALLEL_HATCHES[4] = registerMetaTileEntity(18014, new MTELargeParallelHatch( zbgtId(String.format("parallel_hatch.%s", GTValues.VN[GTValues.MAX])), GTValues.OpV, 262_144)); - ZBGT_PARALLEL_HATCHES[5] = registerMetaTileEntity(18015, new MetaTileEntityLargeParallelHatch( + ZBGT_PARALLEL_HATCHES[5] = registerMetaTileEntity(18015, new MTELargeParallelHatch( zbgtId(String.format("parallel_hatch.%s", GTValues.VN[GTValues.MAX]) + ".1"), GTValues.MAX, 1_048_576)); - ZBGT_PARALLEL_HATCHES[6] = registerMetaTileEntity(18016, new MetaTileEntityLargeParallelHatch( + ZBGT_PARALLEL_HATCHES[6] = registerMetaTileEntity(18016, new MTELargeParallelHatch( zbgtId("parallel_hatch.final"), GTValues.MAX, Integer.MAX_VALUE)); YOTTANK_ME_HATCH = registerMetaTileEntity(18017, - new MetaTileEntityYOTTankMEHatch(zbgtId("yottank_me_hatch"), GTValues.IV)); + new MTEYOTTankMEHatch(zbgtId("yottank_me_hatch"), GTValues.IV)); STERILE_CLEANING_HATCH = registerMetaTileEntity(18018, - new MetaTileEntitySterileCleaningHatch(zbgtId("sterile_cleaning_hatch"))); + new MTESterileCleaningHatch(zbgtId("sterile_cleaning_hatch"))); PYROTHEUM_HEATING_HATCH = registerMetaTileEntity(18019, - new MetaTileEntityFilteredHatch(zbgtId("pyrotheum_heating_hatch"), GTValues.IV, + new MTEFilteredHatch(zbgtId("pyrotheum_heating_hatch"), GTValues.IV, ZBGTMultiblockAbilities.PYROTHEUM_HATCH, () -> ZBGTAPI.pyrotheum, 128_000)); CRYOTHEUM_COOLING_HATCH = registerMetaTileEntity(18020, - new MetaTileEntityFilteredHatch(zbgtId("cryotheum_cooling_hatch"), GTValues.IV, + new MTEFilteredHatch(zbgtId("cryotheum_cooling_hatch"), GTValues.IV, ZBGTMultiblockAbilities.CRYOTHEUM_HATCH, () -> ZBGTAPI.cryotheum, 128_000)); // 18050-18099 (50) reserved for multiblocks MEGA_EBF = registerMetaTileEntity(18050, - new MetaTileEntityMegaEBF(zbgtId("mega_ebf"))); + new MTEMegaEBF(zbgtId("mega_ebf"))); MEGA_LCR = registerMetaTileEntity(18051, - new MetaTileEntityMegaLCR(zbgtId("mega_lcr"))); + new MTEMegaLCR(zbgtId("mega_lcr"))); MEGA_VF = registerMetaTileEntity(18052, - new MetaTileEntityMegaVF(zbgtId("mega_vf"))); + new MTEMegaVF(zbgtId("mega_vf"))); MEGA_OCU = registerMetaTileEntity(18053, - new MetaTileEntityMegaOCU(zbgtId("mega_ocu"))); + new MTEMegaOCU(zbgtId("mega_ocu"))); MEGA_ABS = registerMetaTileEntity(18054, - new MetaTileEntityMegaABS(zbgtId("mega_abs"))); + new MTEMegaABS(zbgtId("mega_abs"))); PRASS = registerMetaTileEntity(18055, - new MetaTileEntityPreciseAssembler(zbgtId("precise_assembler"))); + new MTEPreciseAssembler(zbgtId("precise_assembler"))); CoAL = registerMetaTileEntity(18056, - new MetaTileEntityCoAL(zbgtId("coal"))); + new MTECoAL(zbgtId("coal"))); QUAD_EBF = registerMetaTileEntity(18057, - new MetaTileEntityQueebf(zbgtId("quad_ebf"))); + new MTEQueebf(zbgtId("quad_ebf"))); QUEEZER = registerMetaTileEntity(18058, - new MetaTileEntityQueezer(zbgtId("queezer"))); + new MTEQueezer(zbgtId("queezer"))); YOTTANK = registerMetaTileEntity(18059, - new MetaTileEntityYOTTank(zbgtId("yottank"))); + new MTEYOTTank(zbgtId("yottank"))); MEGA_FUSION[0] = registerMetaTileEntity(18060, - new MetaTileEntityMegaFusionReactor(zbgtId("mega_fusion_1"), GTValues.LuV)); + new MTEMegaFusionReactor(zbgtId("mega_fusion_1"), GTValues.LuV)); MEGA_FUSION[1] = registerMetaTileEntity(18061, - new MetaTileEntityMegaFusionReactor(zbgtId("mega_fusion_2"), GTValues.ZPM)); + new MTEMegaFusionReactor(zbgtId("mega_fusion_2"), GTValues.ZPM)); MEGA_FUSION[2] = registerMetaTileEntity(18062, - new MetaTileEntityMegaFusionReactor(zbgtId("mega_fusion_3"), GTValues.UV)); + new MTEMegaFusionReactor(zbgtId("mega_fusion_3"), GTValues.UV)); // Reserve 18063 and 18064 for the mega fusion 4 and 5 if I ever do them LARGE_ROCK_BREAKER = registerMetaTileEntity(18065, - new MetaTileEntityLargeRockBreaker(zbgtId("large_rock_breaker"))); + new MTELargeRockBreaker(zbgtId("large_rock_breaker"))); LARGE_AIR_COLLECTOR = registerMetaTileEntity(18066, - new MetaTileEntityLargeAirCollector(zbgtId("large_air_collector"))); + new MTELargeAirCollector(zbgtId("large_air_collector"))); LARGE_ALLOY_SMELTER = registerMetaTileEntity(18068, - new MetaTileEntityLargeAlloySmelter(zbgtId("large_alloy_smelter"))); + new MTELargeAlloySmelter(zbgtId("large_alloy_smelter"))); QUACKER = registerMetaTileEntity(18069, - new MetaTileEntityQuacker(zbgtId("quacker"))); + new MTEQuacker(zbgtId("quacker"))); CAL = registerMetaTileEntity(18070, - new MetaTileEntityCircuitAssemblyLine(zbgtId("cal"))); + new MTECircuitAssemblyLine(zbgtId("cal"))); VOLCANUS = registerMetaTileEntity(18071, - new MetaTileEntityVolcanus(zbgtId("volcanus"))); + new MTEVolcanus(zbgtId("volcanus"))); CRYOGENIC_FREEZER = registerMetaTileEntity(18072, - new MetaTileEntityCryogenicFreezer(zbgtId("cryogenic_freezer"))); + new MTECryogenicFreezer(zbgtId("cryogenic_freezer"))); } } diff --git a/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/MetaTileEntityYOTTank.java b/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/MTEYOTTank.java similarity index 98% rename from src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/MetaTileEntityYOTTank.java rename to src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/MTEYOTTank.java index 8c0b1310..df669cb5 100644 --- a/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/MetaTileEntityYOTTank.java +++ b/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/MTEYOTTank.java @@ -36,7 +36,7 @@ import com.zorbatron.zbgt.common.block.blocks.MiscCasing; import com.zorbatron.zbgt.common.block.blocks.YOTTankCell; import com.zorbatron.zbgt.common.metatileentities.ZBGTMetaTileEntities; -import com.zorbatron.zbgt.common.metatileentities.multi.multiblockpart.MetaTileEntityYOTTankMEHatch; +import com.zorbatron.zbgt.common.metatileentities.multi.multiblockpart.MTEYOTTankMEHatch; import com.zorbatron.zbgt.core.sound.ZBGTSoundEvents; import codechicken.lib.render.CCRenderState; @@ -67,7 +67,7 @@ import gregtech.common.blocks.BlockGlassCasing; import gregtech.common.blocks.MetaBlocks; -public class MetaTileEntityYOTTank extends MultiblockWithDisplayBase implements IControllable { +public class MTEYOTTank extends MultiblockWithDisplayBase implements IControllable { private boolean isWorkingEnabled; private boolean isFluidLocked; @@ -84,7 +84,7 @@ public class MetaTileEntityYOTTank extends MultiblockWithDisplayBase implements private static final String YOTTANK_CELL_HEADER = "YOTTANK_CELL_"; - public MetaTileEntityYOTTank(ResourceLocation metaTileEntityId) { + public MTEYOTTank(ResourceLocation metaTileEntityId) { super(metaTileEntityId); this.isWorkingEnabled = true; this.isFluidLocked = false; @@ -99,7 +99,7 @@ public MetaTileEntityYOTTank(ResourceLocation metaTileEntityId) { @Override public MetaTileEntity createMetaTileEntity(IGregTechTileEntity tileEntity) { - return new MetaTileEntityYOTTank(metaTileEntityId); + return new MTEYOTTank(metaTileEntityId); } @Override @@ -314,7 +314,7 @@ private void resetTileAbilities() { private void resetMEHatches() { for (IMultiblockPart multiblockPart : this.getMultiblockParts()) { - if (multiblockPart instanceof MetaTileEntityYOTTankMEHatch meHatch) { + if (multiblockPart instanceof MTEYOTTankMEHatch meHatch) { meHatch.notifyME(); } } diff --git a/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/MetaTileEntityCircuitAssemblyLine.java b/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/MTECircuitAssemblyLine.java similarity index 95% rename from src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/MetaTileEntityCircuitAssemblyLine.java rename to src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/MTECircuitAssemblyLine.java index 517c5bd1..eb8adffd 100644 --- a/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/MetaTileEntityCircuitAssemblyLine.java +++ b/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/MTECircuitAssemblyLine.java @@ -42,9 +42,9 @@ import gregtech.common.blocks.BlockMultiblockCasing; import gregtech.common.blocks.MetaBlocks; -public class MetaTileEntityCircuitAssemblyLine extends MultiMapMultiblockController { +public class MTECircuitAssemblyLine extends MultiMapMultiblockController { - public MetaTileEntityCircuitAssemblyLine(ResourceLocation metaTileEntityId) { + public MTECircuitAssemblyLine(ResourceLocation metaTileEntityId) { super(metaTileEntityId, new gregtech.api.recipes.RecipeMap[] { ZBGTRecipeMaps.CIRCUIT_ASSEMBLY_LINE_RECIPES, RecipeMaps.CIRCUIT_ASSEMBLER_RECIPES }); this.recipeMapWorkable = new MultiblockRecipeLogic(this, true); @@ -52,7 +52,7 @@ public MetaTileEntityCircuitAssemblyLine(ResourceLocation metaTileEntityId) { @Override public MetaTileEntity createMetaTileEntity(IGregTechTileEntity tileEntity) { - return new MetaTileEntityCircuitAssemblyLine(metaTileEntityId); + return new MTECircuitAssemblyLine(metaTileEntityId); } @Override diff --git a/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/MetaTileEntityCoAL.java b/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/MTECoAL.java similarity index 97% rename from src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/MetaTileEntityCoAL.java rename to src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/MTECoAL.java index c3ec70b5..9c3a8442 100644 --- a/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/MetaTileEntityCoAL.java +++ b/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/MTECoAL.java @@ -50,20 +50,20 @@ import gregtech.client.renderer.ICubeRenderer; import gregtech.common.blocks.*; -public class MetaTileEntityCoAL extends LaserCapableRecipeMapMultiblockController - implements IOpticalComputationReceiver { +public class MTECoAL extends LaserCapableRecipeMapMultiblockController + implements IOpticalComputationReceiver { private IOpticalComputationProvider computationProvider; private int tier; - public MetaTileEntityCoAL(ResourceLocation metaTileEntityId) { + public MTECoAL(ResourceLocation metaTileEntityId) { super(metaTileEntityId, CoAL_RECIPES); this.recipeMapWorkable = new CoALRecipeLogic(this); } @Override public MetaTileEntity createMetaTileEntity(IGregTechTileEntity tileEntity) { - return new MetaTileEntityCoAL(metaTileEntityId); + return new MTECoAL(metaTileEntityId); } @NotNull @@ -266,7 +266,7 @@ public IOpticalComputationProvider getComputationProvider() { protected class CoALRecipeLogic extends ComputationRecipeLogic { - public CoALRecipeLogic(MetaTileEntityCoAL metaTileEntity) { + public CoALRecipeLogic(MTECoAL metaTileEntity) { super(metaTileEntity, ComputationType.STEADY); } diff --git a/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/MetaTileEntityCryogenicFreezer.java b/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/MTECryogenicFreezer.java similarity index 94% rename from src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/MetaTileEntityCryogenicFreezer.java rename to src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/MTECryogenicFreezer.java index 9d50bbb8..74a66437 100644 --- a/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/MetaTileEntityCryogenicFreezer.java +++ b/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/MTECryogenicFreezer.java @@ -31,13 +31,13 @@ import gregtech.api.recipes.RecipeMaps; import gregtech.client.renderer.ICubeRenderer; -public class MetaTileEntityCryogenicFreezer extends RecipeMapMultiblockController { +public class MTECryogenicFreezer extends RecipeMapMultiblockController { private final int CRYOTHEUM_DRAIN_AMOUNT = 10; private IFluidTank cryotheumTank; - public MetaTileEntityCryogenicFreezer(ResourceLocation metaTileEntityId) { + public MTECryogenicFreezer(ResourceLocation metaTileEntityId) { super(metaTileEntityId, RecipeMaps.VACUUM_RECIPES); recipeMapWorkable = new MultiblockRecipeLogic(this) { @@ -57,7 +57,7 @@ protected boolean canProgressRecipe() { @Override public MetaTileEntity createMetaTileEntity(IGregTechTileEntity tileEntity) { - return new MetaTileEntityCryogenicFreezer(metaTileEntityId); + return new MTECryogenicFreezer(metaTileEntityId); } @Override diff --git a/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/MetaTileEntityVolcanus.java b/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/MTEVolcanus.java similarity index 97% rename from src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/MetaTileEntityVolcanus.java rename to src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/MTEVolcanus.java index 52f3ebdd..5dec8b42 100644 --- a/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/MetaTileEntityVolcanus.java +++ b/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/MTEVolcanus.java @@ -56,14 +56,14 @@ import gregtech.common.metatileentities.MetaTileEntities; import gregtech.core.sound.GTSoundEvents; -public class MetaTileEntityVolcanus extends RecipeMapMultiblockController implements IHeatingCoil { +public class MTEVolcanus extends RecipeMapMultiblockController implements IHeatingCoil { private final int PYROTHEUM_DRAIN_AMOUNT = 10; private int blastFurnaceTemperature; private IFluidTank pyrotheumTank; - public MetaTileEntityVolcanus(ResourceLocation metaTileEntityId) { + public MTEVolcanus(ResourceLocation metaTileEntityId) { super(metaTileEntityId, RecipeMaps.BLAST_RECIPES); recipeMapWorkable = new HeatingCoilRecipeLogic(this) { @@ -84,7 +84,7 @@ protected boolean canProgressRecipe() { @Override public MetaTileEntity createMetaTileEntity(IGregTechTileEntity tileEntity) { - return new MetaTileEntityVolcanus(metaTileEntityId); + return new MTEVolcanus(metaTileEntityId); } @Override diff --git a/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/large/MetaTileEntityLargeAirCollector.java b/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/large/MTELargeAirCollector.java similarity index 94% rename from src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/large/MetaTileEntityLargeAirCollector.java rename to src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/large/MTELargeAirCollector.java index 32ee94e0..1d9c8066 100644 --- a/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/large/MetaTileEntityLargeAirCollector.java +++ b/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/large/MTELargeAirCollector.java @@ -25,15 +25,15 @@ import gregtech.common.blocks.*; import it.unimi.dsi.fastutil.ints.IntLists; -public class MetaTileEntityLargeAirCollector extends GCYMRecipeMapMultiblockController { +public class MTELargeAirCollector extends GCYMRecipeMapMultiblockController { - public MetaTileEntityLargeAirCollector(ResourceLocation metaTileEntityId) { + public MTELargeAirCollector(ResourceLocation metaTileEntityId) { super(metaTileEntityId, RecipeMaps.GAS_COLLECTOR_RECIPES); } @Override public MetaTileEntity createMetaTileEntity(IGregTechTileEntity tileEntity) { - return new MetaTileEntityLargeAirCollector(metaTileEntityId); + return new MTELargeAirCollector(metaTileEntityId); } @Override diff --git a/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/large/MetaTileEntityLargeAlloySmelter.java b/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/large/MTELargeAlloySmelter.java similarity index 94% rename from src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/large/MetaTileEntityLargeAlloySmelter.java rename to src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/large/MTELargeAlloySmelter.java index c34eef5c..b913ed97 100644 --- a/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/large/MetaTileEntityLargeAlloySmelter.java +++ b/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/large/MTELargeAlloySmelter.java @@ -35,18 +35,18 @@ import gregtech.api.util.TextComponentUtil; import gregtech.client.renderer.ICubeRenderer; -public class MetaTileEntityLargeAlloySmelter extends GCYMRecipeMapMultiblockController { +public class MTELargeAlloySmelter extends GCYMRecipeMapMultiblockController { private int coilTier; - public MetaTileEntityLargeAlloySmelter(ResourceLocation metaTileEntityId) { + public MTELargeAlloySmelter(ResourceLocation metaTileEntityId) { super(metaTileEntityId, RecipeMaps.ALLOY_SMELTER_RECIPES); this.recipeMapWorkable = new LargeAlloySmelterRecipeLogic(this); } @Override public MetaTileEntity createMetaTileEntity(IGregTechTileEntity tileEntity) { - return new MetaTileEntityLargeAlloySmelter(metaTileEntityId); + return new MTELargeAlloySmelter(metaTileEntityId); } @Override @@ -147,7 +147,7 @@ public LargeAlloySmelterRecipeLogic(RecipeMapMultiblockController tileEntity) { protected void modifyOverclockPost(int[] overclockResults, @NotNull IRecipePropertyStorage storage) { super.modifyOverclockPost(overclockResults, storage); - int coilTier = ((MetaTileEntityLargeAlloySmelter) metaTileEntity).getCoilTier(); + int coilTier = ((MTELargeAlloySmelter) metaTileEntity).getCoilTier(); if (coilTier <= 0) return; overclockResults[0] = (int) Math.max(1, overclockResults[0] * (1.0f - coilTier * 0.1)); diff --git a/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/large/MetaTileEntityLargeRockBreaker.java b/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/large/MTELargeRockBreaker.java similarity index 95% rename from src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/large/MetaTileEntityLargeRockBreaker.java rename to src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/large/MTELargeRockBreaker.java index 298cd7e6..dbe8db03 100644 --- a/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/large/MetaTileEntityLargeRockBreaker.java +++ b/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/large/MTELargeRockBreaker.java @@ -26,15 +26,15 @@ import gregtech.client.renderer.ICubeRenderer; import gregtech.common.blocks.*; -public class MetaTileEntityLargeRockBreaker extends GCYMRecipeMapMultiblockController { +public class MTELargeRockBreaker extends GCYMRecipeMapMultiblockController { - public MetaTileEntityLargeRockBreaker(ResourceLocation metaTileEntityId) { + public MTELargeRockBreaker(ResourceLocation metaTileEntityId) { super(metaTileEntityId, RecipeMaps.ROCK_BREAKER_RECIPES); } @Override public MetaTileEntity createMetaTileEntity(IGregTechTileEntity tileEntity) { - return new MetaTileEntityLargeRockBreaker(metaTileEntityId); + return new MTELargeRockBreaker(metaTileEntityId); } @Override diff --git a/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/mega/MetaTileEntityMegaABS.java b/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/mega/MTEMegaABS.java similarity index 98% rename from src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/mega/MetaTileEntityMegaABS.java rename to src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/mega/MTEMegaABS.java index bd158177..efc51205 100644 --- a/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/mega/MetaTileEntityMegaABS.java +++ b/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/mega/MTEMegaABS.java @@ -58,18 +58,18 @@ import gregtech.common.blocks.MetaBlocks; import gregtech.common.metatileentities.MetaTileEntities; -public class MetaTileEntityMegaABS extends LaserCapableGCYMRecipeMapMultiblockController implements IHeatingCoil { +public class MTEMegaABS extends LaserCapableGCYMRecipeMapMultiblockController implements IHeatingCoil { private int temperature; - public MetaTileEntityMegaABS(ResourceLocation metaTileEntityId) { + public MTEMegaABS(ResourceLocation metaTileEntityId) { super(metaTileEntityId, GCYMRecipeMaps.ALLOY_BLAST_RECIPES); this.recipeMapWorkable = new HeatingCoilGCYMMultiblockRecipeLogic(this); } @Override public MetaTileEntity createMetaTileEntity(IGregTechTileEntity tileEntity) { - return new MetaTileEntityMegaABS(metaTileEntityId); + return new MTEMegaABS(metaTileEntityId); } @Override diff --git a/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/mega/MetaTileEntityMegaEBF.java b/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/mega/MTEMegaEBF.java similarity index 98% rename from src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/mega/MetaTileEntityMegaEBF.java rename to src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/mega/MTEMegaEBF.java index 8e5be36f..bc9f1e23 100644 --- a/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/mega/MetaTileEntityMegaEBF.java +++ b/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/mega/MTEMegaEBF.java @@ -59,18 +59,18 @@ import gregtech.common.metatileentities.MetaTileEntities; import gregtech.core.sound.GTSoundEvents; -public class MetaTileEntityMegaEBF extends LaserCapableGCYMRecipeMapMultiblockController implements IHeatingCoil { +public class MTEMegaEBF extends LaserCapableGCYMRecipeMapMultiblockController implements IHeatingCoil { private int blastFurnaceTemperature; - public MetaTileEntityMegaEBF(ResourceLocation metaTileEntityId) { + public MTEMegaEBF(ResourceLocation metaTileEntityId) { super(metaTileEntityId, RecipeMaps.BLAST_RECIPES); this.recipeMapWorkable = new HeatingCoilGCYMMultiblockRecipeLogic(this); } @Override public MetaTileEntity createMetaTileEntity(IGregTechTileEntity tileEntity) { - return new MetaTileEntityMegaEBF(metaTileEntityId); + return new MTEMegaEBF(metaTileEntityId); } @Override diff --git a/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/mega/MetaTileEntityMegaFusionReactor.java b/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/mega/MTEMegaFusionReactor.java similarity index 98% rename from src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/mega/MetaTileEntityMegaFusionReactor.java rename to src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/mega/MTEMegaFusionReactor.java index 7f2795a0..a8f8671d 100644 --- a/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/mega/MetaTileEntityMegaFusionReactor.java +++ b/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/mega/MTEMegaFusionReactor.java @@ -61,7 +61,7 @@ import gregtech.common.blocks.MetaBlocks; import gregtech.common.metatileentities.MetaTileEntities; -public class MetaTileEntityMegaFusionReactor extends RecipeMapMultiblockController { +public class MTEMegaFusionReactor extends RecipeMapMultiblockController { private EnergyContainerList inputEnergyContainers; private final int tier; @@ -69,7 +69,7 @@ public class MetaTileEntityMegaFusionReactor extends RecipeMapMultiblockControll private long previouslyStoredEnergy; - public MetaTileEntityMegaFusionReactor(ResourceLocation metaTileEntityId, int tier) { + public MTEMegaFusionReactor(ResourceLocation metaTileEntityId, int tier) { super(metaTileEntityId, RecipeMaps.FUSION_RECIPES); this.recipeMapWorkable = new MegaFusionRecipeLogic(this); this.recipeMapWorkable.setParallelLimit(64 * (tier - GTValues.IV)); @@ -80,7 +80,7 @@ public MetaTileEntityMegaFusionReactor(ResourceLocation metaTileEntityId, int ti @Override public MetaTileEntity createMetaTileEntity(IGregTechTileEntity tileEntity) { - return new MetaTileEntityMegaFusionReactor(metaTileEntityId, tier); + return new MTEMegaFusionReactor(metaTileEntityId, tier); } @Override @@ -531,7 +531,7 @@ public void addInformation(ItemStack stack, @Nullable World world, @NotNull List private class MegaFusionRecipeLogic extends MultiblockRecipeLogic { - public MegaFusionRecipeLogic(MetaTileEntityMegaFusionReactor tileEntity) { + public MegaFusionRecipeLogic(MTEMegaFusionReactor tileEntity) { super(tileEntity); } diff --git a/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/mega/MetaTileEntityMegaLCR.java b/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/mega/MTEMegaLCR.java similarity index 95% rename from src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/mega/MetaTileEntityMegaLCR.java rename to src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/mega/MTEMegaLCR.java index 8badde49..5bdde1e6 100644 --- a/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/mega/MetaTileEntityMegaLCR.java +++ b/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/mega/MTEMegaLCR.java @@ -32,16 +32,16 @@ import gregtech.client.utils.TooltipHelper; import gregtech.common.blocks.*; -public class MetaTileEntityMegaLCR extends LaserCapableGCYMRecipeMapMultiblockController { +public class MTEMegaLCR extends LaserCapableGCYMRecipeMapMultiblockController { - public MetaTileEntityMegaLCR(ResourceLocation metaTileEntityId) { + public MTEMegaLCR(ResourceLocation metaTileEntityId) { super(metaTileEntityId, RecipeMaps.LARGE_CHEMICAL_RECIPES); this.recipeMapWorkable = new ZBGT_GCYMMultiblockRecipeLogic(this, true); } @Override public MetaTileEntity createMetaTileEntity(IGregTechTileEntity tileEntity) { - return new MetaTileEntityMegaLCR(metaTileEntityId); + return new MTEMegaLCR(metaTileEntityId); } @Override diff --git a/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/mega/MetaTileEntityMegaOCU.java b/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/mega/MTEMegaOCU.java similarity index 97% rename from src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/mega/MetaTileEntityMegaOCU.java rename to src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/mega/MTEMegaOCU.java index e90edc0e..9a1b16c4 100644 --- a/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/mega/MetaTileEntityMegaOCU.java +++ b/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/mega/MTEMegaOCU.java @@ -52,18 +52,18 @@ import gregtech.common.metatileentities.MetaTileEntities; import gregtech.core.sound.GTSoundEvents; -public class MetaTileEntityMegaOCU extends LaserCapableGCYMRecipeMapMultiblockController { +public class MTEMegaOCU extends LaserCapableGCYMRecipeMapMultiblockController { private int coilTier; - public MetaTileEntityMegaOCU(ResourceLocation metaTileEntityId) { + public MTEMegaOCU(ResourceLocation metaTileEntityId) { super(metaTileEntityId, RecipeMaps.CRACKING_RECIPES); this.recipeMapWorkable = new CrackingUnitWorkableHandler(this); } @Override public MetaTileEntity createMetaTileEntity(IGregTechTileEntity tileEntity) { - return new MetaTileEntityMegaOCU(metaTileEntityId); + return new MTEMegaOCU(metaTileEntityId); } @Override @@ -226,7 +226,7 @@ public CrackingUnitWorkableHandler(RecipeMapMultiblockController tileEntity) { protected void modifyOverclockPost(int[] resultOverclock, @NotNull IRecipePropertyStorage storage) { super.modifyOverclockPost(resultOverclock, storage); - int coilTier = ((MetaTileEntityMegaOCU) metaTileEntity).getCoilTier(); + int coilTier = ((MTEMegaOCU) metaTileEntity).getCoilTier(); if (coilTier <= 0) return; diff --git a/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/mega/MetaTileEntityMegaVF.java b/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/mega/MTEMegaVF.java similarity index 96% rename from src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/mega/MetaTileEntityMegaVF.java rename to src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/mega/MTEMegaVF.java index c28814b3..f3d59f0d 100644 --- a/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/mega/MetaTileEntityMegaVF.java +++ b/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/mega/MTEMegaVF.java @@ -23,15 +23,15 @@ import gregtech.common.blocks.BlockMetalCasing; import gregtech.common.blocks.MetaBlocks; -public class MetaTileEntityMegaVF extends LaserCapableGCYMRecipeMapMultiblockController { +public class MTEMegaVF extends LaserCapableGCYMRecipeMapMultiblockController { - public MetaTileEntityMegaVF(ResourceLocation metaTileEntityId) { + public MTEMegaVF(ResourceLocation metaTileEntityId) { super(metaTileEntityId, RecipeMaps.VACUUM_RECIPES); } @Override public MetaTileEntity createMetaTileEntity(IGregTechTileEntity tileEntity) { - return new MetaTileEntityMegaVF(metaTileEntityId); + return new MTEMegaVF(metaTileEntityId); } @Override diff --git a/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/mega/MetaTileEntityPreciseAssembler.java b/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/mega/MTEPreciseAssembler.java similarity index 98% rename from src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/mega/MetaTileEntityPreciseAssembler.java rename to src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/mega/MTEPreciseAssembler.java index e333197e..7a18895d 100644 --- a/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/mega/MetaTileEntityPreciseAssembler.java +++ b/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/mega/MTEPreciseAssembler.java @@ -56,12 +56,12 @@ import gregtech.common.blocks.MetaBlocks; import gregtech.common.metatileentities.MetaTileEntities; -public class MetaTileEntityPreciseAssembler extends LaserCapableMultiMapMultiblockController { +public class MTEPreciseAssembler extends LaserCapableMultiMapMultiblockController { private int preciseCasingTier = -1; private int machineCasingTier = -1; - public MetaTileEntityPreciseAssembler(ResourceLocation metaTileEntityId) { + public MTEPreciseAssembler(ResourceLocation metaTileEntityId) { super(metaTileEntityId, new gregtech.api.recipes.RecipeMap[] { RecipeMaps.ASSEMBLER_RECIPES, ZBGTRecipeMaps.PRECISE_ASSEMBLER_RECIPES }); this.recipeMapWorkable = new PreciseAssemblerRecipeLogic(this); @@ -69,7 +69,7 @@ public MetaTileEntityPreciseAssembler(ResourceLocation metaTileEntityId) { @Override public MetaTileEntity createMetaTileEntity(IGregTechTileEntity tileEntity) { - return new MetaTileEntityPreciseAssembler(metaTileEntityId); + return new MTEPreciseAssembler(metaTileEntityId); } @Override diff --git a/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/quad/MetaTileEntityQuacker.java b/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/quad/MTEQuacker.java similarity index 94% rename from src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/quad/MetaTileEntityQuacker.java rename to src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/quad/MTEQuacker.java index fc07e352..f0999e9d 100644 --- a/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/quad/MetaTileEntityQuacker.java +++ b/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/quad/MTEQuacker.java @@ -25,11 +25,11 @@ import gregtech.api.pattern.FactoryBlockPattern; import gregtech.common.metatileentities.multi.electric.MetaTileEntityCrackingUnit; -public class MetaTileEntityQuacker extends MetaTileEntityCrackingUnit { +public class MTEQuacker extends MetaTileEntityCrackingUnit { private int quackTimer; - public MetaTileEntityQuacker(ResourceLocation metaTileEntityId) { + public MTEQuacker(ResourceLocation metaTileEntityId) { super(metaTileEntityId); this.recipeMapWorkable.setParallelLimit(4); this.quackTimer = calculateQuackInterval(); @@ -37,7 +37,7 @@ public MetaTileEntityQuacker(ResourceLocation metaTileEntityId) { @Override public MetaTileEntity createMetaTileEntity(IGregTechTileEntity tileEntity) { - return new MetaTileEntityQuacker(metaTileEntityId); + return new MTEQuacker(metaTileEntityId); } @Override diff --git a/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/quad/MetaTileEntityQueebf.java b/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/quad/MTEQueebf.java similarity index 97% rename from src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/quad/MetaTileEntityQueebf.java rename to src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/quad/MTEQueebf.java index 5ce23a28..1a6a50ac 100644 --- a/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/quad/MetaTileEntityQueebf.java +++ b/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/quad/MTEQueebf.java @@ -57,11 +57,11 @@ import gregtech.common.metatileentities.MetaTileEntities; import gregtech.core.sound.GTSoundEvents; -public class MetaTileEntityQueebf extends RecipeMapMultiblockController implements IHeatingCoil { +public class MTEQueebf extends RecipeMapMultiblockController implements IHeatingCoil { private int blastFurnaceTemperature; - public MetaTileEntityQueebf(ResourceLocation metaTileEntityId) { + public MTEQueebf(ResourceLocation metaTileEntityId) { super(metaTileEntityId, RecipeMaps.BLAST_RECIPES); this.recipeMapWorkable = new HeatingCoilMRL(this); this.recipeMapWorkable.setParallelLimit(4); @@ -69,7 +69,7 @@ public MetaTileEntityQueebf(ResourceLocation metaTileEntityId) { @Override public MetaTileEntity createMetaTileEntity(IGregTechTileEntity tileEntity) { - return new MetaTileEntityQueebf(metaTileEntityId); + return new MTEQueebf(metaTileEntityId); } @Override diff --git a/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/quad/MetaTileEntityQueezer.java b/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/quad/MTEQueezer.java similarity index 93% rename from src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/quad/MetaTileEntityQueezer.java rename to src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/quad/MTEQueezer.java index e8a75bb5..16ac7f4a 100644 --- a/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/quad/MetaTileEntityQueezer.java +++ b/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/quad/MTEQueezer.java @@ -27,16 +27,16 @@ import gregtech.common.blocks.MetaBlocks; import gregtech.core.sound.GTSoundEvents; -public class MetaTileEntityQueezer extends RecipeMapMultiblockController { +public class MTEQueezer extends RecipeMapMultiblockController { - public MetaTileEntityQueezer(ResourceLocation metaTileEntityId) { + public MTEQueezer(ResourceLocation metaTileEntityId) { super(metaTileEntityId, RecipeMaps.VACUUM_RECIPES); this.recipeMapWorkable.setParallelLimit(4); } @Override public MetaTileEntity createMetaTileEntity(IGregTechTileEntity tileEntity) { - return new MetaTileEntityQueezer(metaTileEntityId); + return new MTEQueezer(metaTileEntityId); } @Override diff --git a/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/multiblockpart/MetaTileEntityAirIntakeHatch.java b/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/multiblockpart/MTEAirIntakeHatch.java similarity index 96% rename from src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/multiblockpart/MetaTileEntityAirIntakeHatch.java rename to src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/multiblockpart/MTEAirIntakeHatch.java index e1d3c0ab..1f881e2c 100644 --- a/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/multiblockpart/MetaTileEntityAirIntakeHatch.java +++ b/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/multiblockpart/MTEAirIntakeHatch.java @@ -57,8 +57,8 @@ import it.unimi.dsi.fastutil.ints.IntList; import it.unimi.dsi.fastutil.ints.IntLists; -public class MetaTileEntityAirIntakeHatch extends MetaTileEntityMultiblockNotifiablePart - implements IMultiblockAbilityPart { +public class MTEAirIntakeHatch extends MetaTileEntityMultiblockNotifiablePart + implements IMultiblockAbilityPart { private final FluidTank fluidTank; private boolean isWorkingEnabled; @@ -68,7 +68,7 @@ public class MetaTileEntityAirIntakeHatch extends MetaTileEntityMultiblockNotifi private final int tickRate = 5; - public MetaTileEntityAirIntakeHatch(ResourceLocation metaTileEntityId, int tier, int tankCapacity, int fillAmount) { + public MTEAirIntakeHatch(ResourceLocation metaTileEntityId, int tier, int tankCapacity, int fillAmount) { super(metaTileEntityId, tier, false); this.fluidTank = new NotifiableFluidTank(tankCapacity, this, false); @@ -80,7 +80,7 @@ public MetaTileEntityAirIntakeHatch(ResourceLocation metaTileEntityId, int tier, @Override public MetaTileEntity createMetaTileEntity(IGregTechTileEntity iGregTechTileEntity) { - return new MetaTileEntityAirIntakeHatch(metaTileEntityId, getTier(), tankCapacity, fillAmount); + return new MTEAirIntakeHatch(metaTileEntityId, getTier(), tankCapacity, fillAmount); } @Override diff --git a/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/multiblockpart/MetaTileEntityCreativeEnergyHatch.java b/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/multiblockpart/MTECreativeEnergyHatch.java similarity index 96% rename from src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/multiblockpart/MetaTileEntityCreativeEnergyHatch.java rename to src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/multiblockpart/MTECreativeEnergyHatch.java index 5c19b462..b9421ac9 100644 --- a/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/multiblockpart/MetaTileEntityCreativeEnergyHatch.java +++ b/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/multiblockpart/MTECreativeEnergyHatch.java @@ -47,9 +47,9 @@ import gregtech.common.metatileentities.multi.electric.MetaTileEntityPowerSubstation; import gregtech.common.metatileentities.multi.multiblockpart.MetaTileEntityMultiblockPart; -public class MetaTileEntityCreativeEnergyHatch extends MetaTileEntityMultiblockPart implements - IMultiblockAbilityPart, IControllable, - IDataStickIntractable { +public class MTECreativeEnergyHatch extends MetaTileEntityMultiblockPart implements + IMultiblockAbilityPart, IControllable, + IDataStickIntractable { protected InfiniteEnergyContainer energyContainer; @@ -60,7 +60,7 @@ public class MetaTileEntityCreativeEnergyHatch extends MetaTileEntityMultiblockP private boolean isPSSOrAT = false; private boolean isWorkingEnabled = true; - public MetaTileEntityCreativeEnergyHatch(ResourceLocation metaTileEntityId, boolean isExportHatch) { + public MTECreativeEnergyHatch(ResourceLocation metaTileEntityId, boolean isExportHatch) { super(metaTileEntityId, GTValues.MAX); this.isExportHatch = isExportHatch; setInitialEnergyConfiguration(); @@ -68,7 +68,7 @@ public MetaTileEntityCreativeEnergyHatch(ResourceLocation metaTileEntityId, bool @Override public MetaTileEntity createMetaTileEntity(IGregTechTileEntity tileEntity) { - return new MetaTileEntityCreativeEnergyHatch(metaTileEntityId, isExportHatch); + return new MTECreativeEnergyHatch(metaTileEntityId, isExportHatch); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/multiblockpart/MetaTileEntityCreativeFluidHatch.java b/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/multiblockpart/MTECreativeFluidHatch.java similarity index 96% rename from src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/multiblockpart/MetaTileEntityCreativeFluidHatch.java rename to src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/multiblockpart/MTECreativeFluidHatch.java index 3f9e9bd1..f403eccf 100644 --- a/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/multiblockpart/MetaTileEntityCreativeFluidHatch.java +++ b/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/multiblockpart/MTECreativeFluidHatch.java @@ -47,13 +47,13 @@ import gregtech.client.utils.TooltipHelper; import gregtech.common.metatileentities.multi.multiblockpart.MetaTileEntityMultiblockNotifiablePart; -public class MetaTileEntityCreativeFluidHatch extends MetaTileEntityMultiblockNotifiablePart implements - IMultiblockAbilityPart, IDataStickIntractable { +public class MTECreativeFluidHatch extends MetaTileEntityMultiblockNotifiablePart implements + IMultiblockAbilityPart, IDataStickIntractable { private final InfiniteFluidTank fluidTank; private int slotLimit = Integer.MAX_VALUE; - public MetaTileEntityCreativeFluidHatch(ResourceLocation metaTileEntityId, boolean isExportHatch) { + public MTECreativeFluidHatch(ResourceLocation metaTileEntityId, boolean isExportHatch) { super(metaTileEntityId, GTValues.MAX, isExportHatch); this.fluidTank = new InfiniteFluidTank(this, isExportHatch, () -> slotLimit); initializeInventory(); @@ -61,7 +61,7 @@ public MetaTileEntityCreativeFluidHatch(ResourceLocation metaTileEntityId, boole @Override public MetaTileEntity createMetaTileEntity(IGregTechTileEntity tileEntity) { - return new MetaTileEntityCreativeFluidHatch(metaTileEntityId, isExportHatch); + return new MTECreativeFluidHatch(metaTileEntityId, isExportHatch); } @Override diff --git a/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/multiblockpart/MetaTileEntityCreativeItemBus.java b/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/multiblockpart/MTECreativeItemBus.java similarity index 95% rename from src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/multiblockpart/MetaTileEntityCreativeItemBus.java rename to src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/multiblockpart/MTECreativeItemBus.java index 94dc6718..2fc52b64 100644 --- a/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/multiblockpart/MetaTileEntityCreativeItemBus.java +++ b/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/multiblockpart/MTECreativeItemBus.java @@ -46,22 +46,22 @@ import gregtech.client.utils.TooltipHelper; import gregtech.common.metatileentities.multi.multiblockpart.MetaTileEntityMultiblockNotifiablePart; -public class MetaTileEntityCreativeItemBus extends MetaTileEntityMultiblockNotifiablePart implements - IMultiblockAbilityPart, IGhostSlotConfigurable, - IDataStickIntractable { +public class MTECreativeItemBus extends MetaTileEntityMultiblockNotifiablePart implements + IMultiblockAbilityPart, IGhostSlotConfigurable, + IDataStickIntractable { private InfiniteItemStackHandler infiniteItemStackHandler; private GhostCircuitItemStackHandler circuitItemStackHandler; private ItemHandlerList actualImportItems; private int slotLimit = Integer.MAX_VALUE; - public MetaTileEntityCreativeItemBus(ResourceLocation metaTileEntityId) { + public MTECreativeItemBus(ResourceLocation metaTileEntityId) { super(metaTileEntityId, GTValues.MAX, false); } @Override public MetaTileEntity createMetaTileEntity(IGregTechTileEntity tileEntity) { - return new MetaTileEntityCreativeItemBus(metaTileEntityId); + return new MTECreativeItemBus(metaTileEntityId); } @Override diff --git a/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/multiblockpart/MetaTileEntityFilteredHatch.java b/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/multiblockpart/MTEFilteredHatch.java similarity index 92% rename from src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/multiblockpart/MetaTileEntityFilteredHatch.java rename to src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/multiblockpart/MTEFilteredHatch.java index e07302af..02081d34 100644 --- a/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/multiblockpart/MetaTileEntityFilteredHatch.java +++ b/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/multiblockpart/MTEFilteredHatch.java @@ -39,8 +39,8 @@ import gregtech.client.renderer.texture.Textures; import gregtech.common.metatileentities.multi.multiblockpart.MetaTileEntityMultiblockPart; -public class MetaTileEntityFilteredHatch extends MetaTileEntityMultiblockPart - implements IMultiblockAbilityPart, IControllable { +public class MTEFilteredHatch extends MetaTileEntityMultiblockPart + implements IMultiblockAbilityPart, IControllable { private final MultiblockAbility multiblockAbility; private final Supplier filter; @@ -50,9 +50,9 @@ public class MetaTileEntityFilteredHatch extends MetaTileEntityMultiblockPart private boolean workingEnabled = true; - public MetaTileEntityFilteredHatch(ResourceLocation metaTileEntityId, int tier, - MultiblockAbility multiblockAbility, Supplier filter, - int tankCapacity) { + public MTEFilteredHatch(ResourceLocation metaTileEntityId, int tier, + MultiblockAbility multiblockAbility, Supplier filter, + int tankCapacity) { super(metaTileEntityId, tier); this.multiblockAbility = multiblockAbility; this.filter = filter; @@ -71,7 +71,7 @@ public boolean canFillFluidType(FluidStack fluid) { @Override public MetaTileEntity createMetaTileEntity(IGregTechTileEntity tileEntity) { - return new MetaTileEntityFilteredHatch(metaTileEntityId, getTier(), multiblockAbility, filter, tankCapacity); + return new MTEFilteredHatch(metaTileEntityId, getTier(), multiblockAbility, filter, tankCapacity); } @Override diff --git a/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/multiblockpart/MetaTileEntityLargeParallelHatch.java b/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/multiblockpart/MTELargeParallelHatch.java similarity index 93% rename from src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/multiblockpart/MetaTileEntityLargeParallelHatch.java rename to src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/multiblockpart/MTELargeParallelHatch.java index e1266f34..a2dc019f 100644 --- a/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/multiblockpart/MetaTileEntityLargeParallelHatch.java +++ b/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/multiblockpart/MTELargeParallelHatch.java @@ -29,18 +29,18 @@ // I need to do all of this shit just so I can have more than 1,048,576 as a parallel amount // It's marginally easier to extend and override than make a class from scratch (not sure about that anymore...) -public class MetaTileEntityLargeParallelHatch extends MetaTileEntityParallelHatch { +public class MTELargeParallelHatch extends MetaTileEntityParallelHatch { private final int maxParallelUpper; private int currentParallelUpper; - public MetaTileEntityLargeParallelHatch(ResourceLocation metaTileEntityId, int tier, int maxParallel) { + public MTELargeParallelHatch(ResourceLocation metaTileEntityId, int tier, int maxParallel) { super(metaTileEntityId, tier); this.maxParallelUpper = maxParallel; this.currentParallelUpper = maxParallel; } - public MetaTileEntityLargeParallelHatch(ResourceLocation metaTileEntityId, int tier) { + public MTELargeParallelHatch(ResourceLocation metaTileEntityId, int tier) { super(metaTileEntityId, tier); this.maxParallelUpper = (int) Math.pow(4, tier - GTValues.EV); this.currentParallelUpper = maxParallelUpper; @@ -48,7 +48,7 @@ public MetaTileEntityLargeParallelHatch(ResourceLocation metaTileEntityId, int t @Override public MetaTileEntity createMetaTileEntity(IGregTechTileEntity metaTileEntityHolder) { - return new MetaTileEntityLargeParallelHatch(metaTileEntityId, getTier(), getMaxParallel()); + return new MTELargeParallelHatch(metaTileEntityId, getTier(), getMaxParallel()); } @Override diff --git a/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/multiblockpart/MetaTileEntitySingleItemInputBus.java b/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/multiblockpart/MTESingleItemInputBus.java similarity index 90% rename from src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/multiblockpart/MetaTileEntitySingleItemInputBus.java rename to src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/multiblockpart/MTESingleItemInputBus.java index da5853ab..d7b75378 100644 --- a/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/multiblockpart/MetaTileEntitySingleItemInputBus.java +++ b/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/multiblockpart/MTESingleItemInputBus.java @@ -22,18 +22,18 @@ import gregtech.api.metatileentity.interfaces.IGregTechTileEntity; import gregtech.common.metatileentities.multi.multiblockpart.MetaTileEntityItemBus; -public class MetaTileEntitySingleItemInputBus extends MetaTileEntityItemBus { +public class MTESingleItemInputBus extends MetaTileEntityItemBus { private final int stackSizeLimit = 1; private final int slotSize = 1; - public MetaTileEntitySingleItemInputBus(ResourceLocation metaTileEntityId) { + public MTESingleItemInputBus(ResourceLocation metaTileEntityId) { super(metaTileEntityId, GTValues.ULV, false); } @Override public MetaTileEntity createMetaTileEntity(IGregTechTileEntity tileEntity) { - return new MetaTileEntitySingleItemInputBus(metaTileEntityId); + return new MTESingleItemInputBus(metaTileEntityId); } @Override diff --git a/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/multiblockpart/MetaTileEntitySterileCleaningHatch.java b/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/multiblockpart/MTESterileCleaningHatch.java similarity index 93% rename from src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/multiblockpart/MetaTileEntitySterileCleaningHatch.java rename to src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/multiblockpart/MTESterileCleaningHatch.java index 3c35f687..43995f61 100644 --- a/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/multiblockpart/MetaTileEntitySterileCleaningHatch.java +++ b/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/multiblockpart/MTESterileCleaningHatch.java @@ -32,11 +32,11 @@ import gregtech.client.renderer.texture.Textures; import gregtech.common.metatileentities.multi.multiblockpart.MetaTileEntityAutoMaintenanceHatch; -public class MetaTileEntitySterileCleaningHatch extends MetaTileEntityAutoMaintenanceHatch { +public class MTESterileCleaningHatch extends MetaTileEntityAutoMaintenanceHatch { private static ICleanroomProvider DUMMY_CLEANROOM; - public MetaTileEntitySterileCleaningHatch(ResourceLocation metaTileEntityId) { + public MTESterileCleaningHatch(ResourceLocation metaTileEntityId) { super(metaTileEntityId); DUMMY_CLEANROOM = DummyCleanroom.createForAllTypes(); @@ -44,7 +44,7 @@ public MetaTileEntitySterileCleaningHatch(ResourceLocation metaTileEntityId) { @Override public MetaTileEntity createMetaTileEntity(IGregTechTileEntity tileEntity) { - return new MetaTileEntitySterileCleaningHatch(metaTileEntityId); + return new MTESterileCleaningHatch(metaTileEntityId); } @Override diff --git a/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/multiblockpart/MetaTileEntitySuperInputBus.java b/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/multiblockpart/MTESuperInputBus.java similarity index 97% rename from src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/multiblockpart/MetaTileEntitySuperInputBus.java rename to src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/multiblockpart/MTESuperInputBus.java index d641c329..702c420b 100644 --- a/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/multiblockpart/MetaTileEntitySuperInputBus.java +++ b/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/multiblockpart/MTESuperInputBus.java @@ -51,8 +51,8 @@ import gregtech.client.renderer.texture.Textures; import gregtech.common.metatileentities.multi.multiblockpart.MetaTileEntityMultiblockNotifiablePart; -public class MetaTileEntitySuperInputBus extends MetaTileEntityMultiblockNotifiablePart - implements IMultiblockAbilityPart, IControllable { +public class MTESuperInputBus extends MetaTileEntityMultiblockNotifiablePart + implements IMultiblockAbilityPart, IControllable { private boolean workingEnabled = false; private boolean shouldReturnItems = false; @@ -61,7 +61,7 @@ public class MetaTileEntitySuperInputBus extends MetaTileEntityMultiblockNotifia private LargeSlotItemStackHandler largeSlotItemStackHandler; private ItemHandlerList actualImportItems; - public MetaTileEntitySuperInputBus(ResourceLocation metaTileEntityId) { + public MTESuperInputBus(ResourceLocation metaTileEntityId) { super(metaTileEntityId, GTValues.HV, false); } @@ -78,7 +78,7 @@ protected void initializeInventory() { @Override public MetaTileEntity createMetaTileEntity(IGregTechTileEntity tileEntity) { - return new MetaTileEntitySuperInputBus(metaTileEntityId); + return new MTESuperInputBus(metaTileEntityId); } @Override diff --git a/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/multiblockpart/MetaTileEntityYOTTankMEHatch.java b/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/multiblockpart/MTEYOTTankMEHatch.java similarity index 92% rename from src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/multiblockpart/MetaTileEntityYOTTankMEHatch.java rename to src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/multiblockpart/MTEYOTTankMEHatch.java index 490ba3a8..1fe492ee 100644 --- a/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/multiblockpart/MetaTileEntityYOTTankMEHatch.java +++ b/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/multiblockpart/MTEYOTTankMEHatch.java @@ -25,7 +25,7 @@ import com.zorbatron.zbgt.api.ZBGTAPI; import com.zorbatron.zbgt.api.render.ZBGTTextures; -import com.zorbatron.zbgt.common.metatileentities.multi.MetaTileEntityYOTTank; +import com.zorbatron.zbgt.common.metatileentities.multi.MTEYOTTank; import appeng.api.AEApi; import appeng.api.config.AccessRestriction; @@ -61,10 +61,10 @@ import gregtech.common.ConfigHolder; import gregtech.common.metatileentities.multi.multiblockpart.MetaTileEntityMultiblockPart; -public class MetaTileEntityYOTTankMEHatch extends MetaTileEntityMultiblockPart - implements IGridProxyable, IActionHost, ICellContainer, - IMEInventory, IMEInventoryHandler, - IDataStickIntractable { +public class MTEYOTTankMEHatch extends MetaTileEntityMultiblockPart + implements IGridProxyable, IActionHost, ICellContainer, + IMEInventory, IMEInventoryHandler, + IDataStickIntractable { private int priority; private AccessRestriction readMode; @@ -80,7 +80,7 @@ public class MetaTileEntityYOTTankMEHatch extends MetaTileEntityMultiblockPart private boolean lastActive; - public MetaTileEntityYOTTankMEHatch(ResourceLocation metaTileEntityId, int tier) { + public MTEYOTTankMEHatch(ResourceLocation metaTileEntityId, int tier) { super(metaTileEntityId, tier); this.priority = 0; this.readMode = AccessRestriction.READ_WRITE; @@ -94,7 +94,7 @@ public MetaTileEntityYOTTankMEHatch(ResourceLocation metaTileEntityId, int tier) @Override public MetaTileEntity createMetaTileEntity(IGregTechTileEntity tileEntity) { - return new MetaTileEntityYOTTankMEHatch(metaTileEntityId, getTier()); + return new MTEYOTTankMEHatch(metaTileEntityId, getTier()); } @Override @@ -102,11 +102,11 @@ public void update() { super.update(); if (getOffsetTimer() % (tickRateOverride ? overriddenTickRate : tickRate) == 0 && !getWorld().isRemote) { - if (getController() instanceof MetaTileEntityYOTTank metaTileEntityYOTTank) { - if (isChanged(metaTileEntityYOTTank)) { + if (getController() instanceof MTEYOTTank MTEYOTTank) { + if (isChanged(MTEYOTTank)) { notifyME(); faster(); - updateLast(metaTileEntityYOTTank); + updateLast(MTEYOTTank); } else { slower(); } @@ -129,15 +129,15 @@ public void notifyME() { } } - private boolean isChanged(MetaTileEntityYOTTank metaTileEntityYOTTank) { - return !this.lastAmount.equals(metaTileEntityYOTTank.getStorageCurrent()) || - this.lastFluid != metaTileEntityYOTTank.getFluid(); + private boolean isChanged(MTEYOTTank MTEYOTTank) { + return !this.lastAmount.equals(MTEYOTTank.getStorageCurrent()) || + this.lastFluid != MTEYOTTank.getFluid(); } - private void updateLast(MetaTileEntityYOTTank metaTileEntityYOTTank) { - if (metaTileEntityYOTTank != null) { - this.lastAmount = metaTileEntityYOTTank.getStorageCurrent(); - this.lastFluid = metaTileEntityYOTTank.getFluid(); + private void updateLast(MTEYOTTank MTEYOTTank) { + if (MTEYOTTank != null) { + this.lastAmount = MTEYOTTank.getStorageCurrent(); + this.lastFluid = MTEYOTTank.getFluid(); } else { this.lastAmount = BigInteger.ZERO; this.lastFluid = null; @@ -348,8 +348,8 @@ public AccessRestriction getAccess() { @Override public boolean isPrioritized(IAEFluidStack iaeFluidStack) { - if (getController() instanceof MetaTileEntityYOTTank metaTileEntityYOTTank) { - return metaTileEntityYOTTank.getFluid().isFluidEqual(iaeFluidStack.getFluidStack()); + if (getController() instanceof MTEYOTTank MTEYOTTank) { + return MTEYOTTank.getFluid().isFluidEqual(iaeFluidStack.getFluidStack()); } return false; @@ -380,7 +380,7 @@ public boolean validForPass(int i) { public void saveChanges(@Nullable ICellInventory iCellInventory) {} private long fill(IAEFluidStack iaeFluidStack, boolean doFill) { - if (!(getController() instanceof MetaTileEntityYOTTank controller)) return 0; + if (!(getController() instanceof MTEYOTTank controller)) return 0; if (!controller.isWorkingEnabled()) return 0; FluidStack controllerFluid = controller.getFluid(); @@ -430,7 +430,7 @@ public IAEFluidStack injectItems(IAEFluidStack iaeFluidStack, Actionable actiona } private IAEFluidStack drain(IAEFluidStack iaeFluidStack, boolean doDrain) { - if (!(getController() instanceof MetaTileEntityYOTTank controller)) return null; + if (!(getController() instanceof MTEYOTTank controller)) return null; if (!controller.isWorkingEnabled()) return null; FluidStack controllerFluid = controller.getFluid(); @@ -467,7 +467,7 @@ public IItemList getAvailableItems(IItemList iItem iItemList.add(null); return iItemList; } - if (!(getController() instanceof MetaTileEntityYOTTank controller)) return iItemList; + if (!(getController() instanceof MTEYOTTank controller)) return iItemList; if (!controller.isWorkingEnabled()) return iItemList; final BigInteger controllerCurrent = controller.getStorageCurrent(); diff --git a/src/main/java/com/zorbatron/zbgt/common/metatileentities/storage/MetaTileEntityCreativeComputationProvider.java b/src/main/java/com/zorbatron/zbgt/common/metatileentities/storage/MTECreativeComputationProvider.java similarity index 95% rename from src/main/java/com/zorbatron/zbgt/common/metatileentities/storage/MetaTileEntityCreativeComputationProvider.java rename to src/main/java/com/zorbatron/zbgt/common/metatileentities/storage/MTECreativeComputationProvider.java index 2000cb39..7106a8de 100644 --- a/src/main/java/com/zorbatron/zbgt/common/metatileentities/storage/MetaTileEntityCreativeComputationProvider.java +++ b/src/main/java/com/zorbatron/zbgt/common/metatileentities/storage/MTECreativeComputationProvider.java @@ -43,8 +43,8 @@ import gregtech.client.renderer.texture.Textures; import gregtech.client.utils.TooltipHelper; -public class MetaTileEntityCreativeComputationProvider extends MetaTileEntity - implements IOpticalComputationProvider, IControllable { +public class MTECreativeComputationProvider extends MetaTileEntity + implements IOpticalComputationProvider, IControllable { private boolean isWorkingEnabled = true; private int maxCWUt = 0; @@ -52,13 +52,13 @@ public class MetaTileEntityCreativeComputationProvider extends MetaTileEntity private int lastRequestedCWUt; private int requestedCWUPerSec; - public MetaTileEntityCreativeComputationProvider(ResourceLocation metaTileEntityId) { + public MTECreativeComputationProvider(ResourceLocation metaTileEntityId) { super(metaTileEntityId); } @Override public MetaTileEntity createMetaTileEntity(IGregTechTileEntity tileEntity) { - return new MetaTileEntityCreativeComputationProvider(metaTileEntityId); + return new MTECreativeComputationProvider(metaTileEntityId); } @Override