Compare commits

..
2 Commits
Author SHA1 Message Date
D-Cysteine 28df6fa938 Sync teleport staff config (#100) 2023-02-27 20:48:44 +01:00
Pilzinsel64 1728809a8a fix single solar cell max capacity (#99) 2023-02-17 22:00:12 +01:00
2 changed files with 16 additions and 1 deletions

No files matched your search

@@ -22,6 +22,9 @@ public class PacketConfigSync implements IMessage, IMessageHandler<PacketConfigS
buf.writeInt(Config.travelStaffMaxDistance);
buf.writeInt(Config.travelStaffMaxBlinkDistance);
buf.writeFloat(Config.travelStaffPowerPerBlockRF);
buf.writeInt(Config.teleportStaffMaxDistance);
buf.writeInt(Config.teleportStaffMaxBlinkDistance);
buf.writeInt(Config.teleportStaffFailedBlinkDistance);
buf.writeBoolean(Config.telepadLockCoords);
buf.writeBoolean(Config.telepadLockDimension);
}
@@ -38,6 +41,9 @@ public class PacketConfigSync implements IMessage, IMessageHandler<PacketConfigS
Config.travelStaffMaxDistance = data.readInt();
Config.travelStaffMaxBlinkDistance = data.readInt();
Config.travelStaffPowerPerBlockRF = data.readFloat();
Config.teleportStaffMaxDistance = data.readInt();
Config.teleportStaffMaxBlinkDistance = data.readInt();
Config.teleportStaffFailedBlinkDistance = data.readInt();
Config.telepadLockCoords = data.readBoolean();
Config.telepadLockDimension = data.readBoolean();
}
@@ -18,6 +18,7 @@ public class SolarPanelNetwork {
private boolean empty = true;
private EnergyStorage energy;
private boolean hasAppliedMaxEnergyConfig = false;
public static final int ENERGY_PER = 10000;
@@ -96,7 +97,7 @@ public class SolarPanelNetwork {
return capacity;
}
private static int getCapacity(TileEntitySolarPanel panel, int panelsCount) {
private int getCapacity(TileEntitySolarPanel panel, int panelsCount) {
int capacity = ENERGY_PER;
if (panel != null && panel.hasWorldObj()) {
@@ -112,6 +113,7 @@ public class SolarPanelNetwork {
capacity = Config.photovoltaicVibrantCellCapacityRF;
break;
}
hasAppliedMaxEnergyConfig = true;
}
capacity = capacity * panelsCount;
@@ -119,6 +121,12 @@ public class SolarPanelNetwork {
return capacity;
}
private void updateEnergyIfNeeded() {
if (!hasAppliedMaxEnergyConfig) {
updateEnergy();
}
}
private void updateEnergy() {
energy.setCapacity(getCapacity());
energy.setMaxExtract(energy.getMaxEnergyStored());
@@ -155,6 +163,7 @@ public class SolarPanelNetwork {
}
public int setEnergyStored(int energy) {
updateEnergyIfNeeded();
if (isValid()) {
this.energy.setEnergyStored(energy);
}