Skip to content

Commit 2f8d893

Browse files
committed
add 4A and 16A energy hatch / modify getMaxVoltage()
1 parent 4a48f99 commit 2f8d893

1 file changed

Lines changed: 6 additions & 1 deletion

File tree

src/main/java/com/github/gtexpert/gtbm/integration/gendustry/metatileentities/multiblock/MetaTileEntityMegaApiary.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,8 @@ private TraceabilityPredicate getEnergyInputPredicate() {
235235
List<MetaTileEntity> energyHatch = new ArrayList<>();
236236

237237
energyHatch.addAll(Arrays.asList(MetaTileEntities.ENERGY_INPUT_HATCH));
238+
energyHatch.addAll(Arrays.asList(MetaTileEntities.ENERGY_INPUT_HATCH_4A));
239+
energyHatch.addAll(Arrays.asList(MetaTileEntities.ENERGY_INPUT_HATCH_16A));
238240
energyHatch.addAll(Arrays.asList(MetaTileEntities.SUBSTATION_ENERGY_INPUT_HATCH));
239241
energyHatch.addAll(Arrays.asList(MetaTileEntities.LASER_INPUT_HATCH_256));
240242
energyHatch.addAll(Arrays.asList(MetaTileEntities.LASER_INPUT_HATCH_1024));
@@ -320,7 +322,10 @@ private void resetConsumption() {
320322

321323
public long getMaxVoltage() {
322324
long highestVoltage = energyContainer.getHighestInputVoltage();
323-
if (energyContainer.getNumHighestInputContainers() > 1) {
325+
if (energyContainer.getNumHighestInputContainers() > 7) {
326+
int tier = GTUtility.getTierByVoltage(highestVoltage);
327+
return GTValues.V[Math.min(tier + 2, GTValues.MAX)];
328+
} else if (energyContainer.getNumHighestInputContainers() > 1) {
324329
int tier = GTUtility.getTierByVoltage(highestVoltage);
325330
return GTValues.V[Math.min(tier + 1, GTValues.MAX)];
326331
} else {

0 commit comments

Comments
 (0)