Skip to content

Commit 94ebfd8

Browse files
committed
Add CableTierHolder to electric machines
1 parent 528720e commit 94ebfd8

File tree

4 files changed

+29
-4
lines changed

4 files changed

+29
-4
lines changed

src/main/java/aztech/modern_industrialization/machines/blockentities/ElectricCraftingMachineBlockEntity.java

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
package aztech.modern_industrialization.machines.blockentities;
2525

2626
import aztech.modern_industrialization.MICapabilities;
27+
import aztech.modern_industrialization.api.energy.CableTier;
28+
import aztech.modern_industrialization.api.energy.CableTierHolder;
2729
import aztech.modern_industrialization.api.energy.EnergyApi;
2830
import aztech.modern_industrialization.api.energy.MIEnergyStorage;
2931
import aztech.modern_industrialization.api.machine.holder.EnergyComponentHolder;
@@ -44,7 +46,7 @@
4446
import net.minecraft.world.entity.player.Player;
4547
import net.minecraft.world.level.block.entity.BlockEntityType;
4648

47-
public class ElectricCraftingMachineBlockEntity extends AbstractCraftingMachineBlockEntity implements EnergyComponentHolder {
49+
public class ElectricCraftingMachineBlockEntity extends AbstractCraftingMachineBlockEntity implements EnergyComponentHolder, CableTierHolder {
4850

4951
public ElectricCraftingMachineBlockEntity(BEP bep, MachineRecipeType recipeType, MachineInventoryComponent inventory,
5052
MachineGuiParameters guiParams, EnergyBar.Parameters energyBarParams, ProgressBar.Parameters progressBarParams,
@@ -132,4 +134,9 @@ public boolean isOverdriving() {
132134
public EnergyComponent getEnergyComponent() {
133135
return energy;
134136
}
137+
138+
@Override
139+
public CableTier getCableTier() {
140+
return casing.getCableTier();
141+
}
135142
}

src/main/java/aztech/modern_industrialization/machines/blockentities/ElectricWaterPumpBlockEntity.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525

2626
import aztech.modern_industrialization.MICapabilities;
2727
import aztech.modern_industrialization.api.energy.CableTier;
28+
import aztech.modern_industrialization.api.energy.CableTierHolder;
2829
import aztech.modern_industrialization.api.energy.EnergyApi;
2930
import aztech.modern_industrialization.api.energy.MIEnergyStorage;
3031
import aztech.modern_industrialization.api.machine.holder.EnergyComponentHolder;
@@ -43,7 +44,7 @@
4344
import net.minecraft.world.level.material.Fluids;
4445
import net.neoforged.neoforge.fluids.FluidType;
4546

46-
public class ElectricWaterPumpBlockEntity extends AbstractWaterPumpBlockEntity implements EnergyComponentHolder {
47+
public class ElectricWaterPumpBlockEntity extends AbstractWaterPumpBlockEntity implements EnergyComponentHolder, CableTierHolder {
4748
public ElectricWaterPumpBlockEntity(BEP bep) {
4849
super(bep, "electric_water_pump");
4950

@@ -105,4 +106,9 @@ public static void registerEnergyApi(BlockEntityType<?> bet) {
105106
event.registerBlockEntity(EnergyApi.SIDED, bet, (be, direction) -> ((ElectricWaterPumpBlockEntity) be).insertable);
106107
});
107108
}
109+
110+
@Override
111+
public CableTier getCableTier() {
112+
return CableTier.LV;
113+
}
108114
}

src/main/java/aztech/modern_industrialization/machines/blockentities/GeneratorMachineBlockEntity.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727

2828
import aztech.modern_industrialization.MICapabilities;
2929
import aztech.modern_industrialization.api.energy.CableTier;
30+
import aztech.modern_industrialization.api.energy.CableTierHolder;
3031
import aztech.modern_industrialization.api.energy.EnergyApi;
3132
import aztech.modern_industrialization.api.energy.MIEnergyStorage;
3233
import aztech.modern_industrialization.api.machine.holder.EnergyComponentHolder;
@@ -50,7 +51,7 @@
5051
import net.minecraft.network.chat.Component;
5152
import net.minecraft.world.level.block.entity.BlockEntityType;
5253

53-
public class GeneratorMachineBlockEntity extends MachineBlockEntity implements Tickable, EnergyComponentHolder {
54+
public class GeneratorMachineBlockEntity extends MachineBlockEntity implements Tickable, EnergyComponentHolder, CableTierHolder {
5455

5556
private final CableTier outputTier;
5657
private final MIEnergyStorage extractable;
@@ -212,4 +213,9 @@ public static void registerEnergyApi(BlockEntityType<?> bet) {
212213
public List<Component> getTooltips() {
213214
return fluidItemConsumer.getTooltips();
214215
}
216+
217+
@Override
218+
public CableTier getCableTier() {
219+
return outputTier;
220+
}
215221
}

src/main/java/aztech/modern_industrialization/machines/blockentities/StorageMachineBlockEntity.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,11 @@
2424
package aztech.modern_industrialization.machines.blockentities;
2525

2626
import aztech.modern_industrialization.api.energy.CableTier;
27+
import aztech.modern_industrialization.api.energy.CableTierHolder;
2728
import aztech.modern_industrialization.machines.BEP;
2829
import net.minecraft.util.Mth;
2930

30-
public class StorageMachineBlockEntity extends AbstractStorageMachineBlockEntity {
31+
public class StorageMachineBlockEntity extends AbstractStorageMachineBlockEntity implements CableTierHolder {
3132

3233
public StorageMachineBlockEntity(BEP bep, CableTier tier, String name, long eu_capacity) {
3334
super(bep, tier, tier, name, eu_capacity);
@@ -43,4 +44,9 @@ protected int getComparatorOutput() {
4344
double fillPercentage = (double) energy.getEu() / energy.getCapacity();
4445
return Mth.floor(fillPercentage * 14) + (energy.getEu() > 0 ? 1 : 0);
4546
}
47+
48+
@Override
49+
public CableTier getCableTier() {
50+
return to;
51+
}
4652
}

0 commit comments

Comments
 (0)