Skip to content

Commit

Permalink
rename
Browse files Browse the repository at this point in the history
  • Loading branch information
@Zorbatron
Zorbatron committed Jan 13, 2025
1 parent cb830a8 commit cad6550
Show file tree
Hide file tree
Showing 30 changed files with 209 additions and 209 deletions.
168 changes: 84 additions & 84 deletions src/main/java/com/zorbatron/zbgt/common/metatileentities/ZBGTMetaTileEntities.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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")));
}
}
10 changes: 5 additions & 5 deletions ...entities/multi/MetaTileEntityYOTTank.java → ...on/metatileentities/multi/MTEYOTTank.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -99,7 +99,7 @@ public MetaTileEntityYOTTank(ResourceLocation metaTileEntityId) {

@Override
public MetaTileEntity createMetaTileEntity(IGregTechTileEntity tileEntity) {
return new MetaTileEntityYOTTank(metaTileEntityId);
return new MTEYOTTank(metaTileEntityId);
}

@Override
Expand Down Expand Up @@ -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();
}
}
Expand Down
6 changes: 3 additions & 3 deletions ...ic/MetaTileEntityCircuitAssemblyLine.java → ...ulti/electric/MTECircuitAssemblyLine.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,17 +42,17 @@
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);
}

@Override
public MetaTileEntity createMetaTileEntity(IGregTechTileEntity tileEntity) {
return new MetaTileEntityCircuitAssemblyLine(metaTileEntityId);
return new MTECircuitAssemblyLine(metaTileEntityId);
}

@Override
Expand Down
10 changes: 5 additions & 5 deletions ...es/multi/electric/MetaTileEntityCoAL.java → ...atileentities/multi/electric/MTECoAL.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -266,7 +266,7 @@ public IOpticalComputationProvider getComputationProvider() {

protected class CoALRecipeLogic extends ComputationRecipeLogic {

public CoALRecipeLogic(MetaTileEntityCoAL metaTileEntity) {
public CoALRecipeLogic(MTECoAL metaTileEntity) {
super(metaTileEntity, ComputationType.STEADY);
}

Expand Down
6 changes: 3 additions & 3 deletions ...ctric/MetaTileEntityCryogenicFreezer.java → ...s/multi/electric/MTECryogenicFreezer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {

Expand All @@ -57,7 +57,7 @@ protected boolean canProgressRecipe() {

@Override
public MetaTileEntity createMetaTileEntity(IGregTechTileEntity tileEntity) {
return new MetaTileEntityCryogenicFreezer(metaTileEntityId);
return new MTECryogenicFreezer(metaTileEntityId);
}

@Override
Expand Down
Loading

0 comments on commit cad6550

Please sign in to comment.