Skip to content

Commit 902f479

Browse files
committed
replace our big int sync handler with mui2
avoid potential divide be zero
1 parent 00c40e8 commit 902f479

File tree

4 files changed

+8
-104
lines changed

4 files changed

+8
-104
lines changed

src/main/java/gregtech/api/metatileentity/multiblock/ui/UISyncer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ default float syncFloat(float initial) {
102102
}
103103

104104
default BigInteger syncBigInt(BigInteger initial) {
105-
return syncObject(initial, GTByteBufAdapters.BIG_INT);
105+
return syncObject(initial, ByteBufAdapters.BIG_INT);
106106
}
107107

108108
default <T> T syncObject(T initial, IByteBufSerializer<T> serializer, IByteBufDeserializer<T> deserializer) {

src/main/java/gregtech/api/mui/GTByteBufAdapters.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import org.jetbrains.annotations.NotNull;
1212

1313
import java.io.IOException;
14-
import java.math.BigInteger;
1514
import java.util.Objects;
1615

1716
public class GTByteBufAdapters {
@@ -22,10 +21,6 @@ public class GTByteBufAdapters {
2221
public static final IByteBufAdapter<ChancedFluidOutput> CHANCED_FLUID_OUTPUT = makeAdapter(
2322
ChancedFluidOutput::fromBuffer, ChancedFluidOutput::toBuffer);
2423

25-
public static final IByteBufAdapter<BigInteger> BIG_INT = makeAdapter(
26-
buffer -> new BigInteger(buffer.readByteArray()),
27-
(buffer, value) -> buffer.writeByteArray(value.toByteArray()));
28-
2924
public static final IByteBufAdapter<Fluid> FLUID = makeAdapter(NetworkUtil::readFluid, NetworkUtil::writeFluid);
3025

3126
public static <T> IByteBufAdapter<T> makeAdapter(@NotNull IByteBufDeserializer<T> deserializer,

src/main/java/gregtech/api/mui/sync/BigIntegerSyncValue.java

Lines changed: 0 additions & 92 deletions
This file was deleted.

src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityPowerSubstation.java

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import gregtech.api.metatileentity.multiblock.ui.MultiblockUIBuilder;
1818
import gregtech.api.metatileentity.multiblock.ui.TemplateBarBuilder;
1919
import gregtech.api.mui.GTGuiTextures;
20-
import gregtech.api.mui.sync.BigIntegerSyncValue;
2120
import gregtech.api.pattern.BlockPattern;
2221
import gregtech.api.pattern.FactoryBlockPattern;
2322
import gregtech.api.pattern.MultiblockShapeInfo;
@@ -54,6 +53,7 @@
5453
import codechicken.lib.render.pipeline.IVertexOperation;
5554
import codechicken.lib.vec.Matrix4;
5655
import com.cleanroommc.modularui.api.drawable.IKey;
56+
import com.cleanroommc.modularui.value.sync.BigIntSyncValue;
5757
import com.cleanroommc.modularui.value.sync.PanelSyncManager;
5858
import org.jetbrains.annotations.NotNull;
5959
import org.jetbrains.annotations.Nullable;
@@ -579,16 +579,17 @@ public int getProgressBarCount() {
579579

580580
@Override
581581
public void registerBars(List<UnaryOperator<TemplateBarBuilder>> bars, PanelSyncManager syncManager) {
582-
BigIntegerSyncValue energyStoredValue = new BigIntegerSyncValue(
582+
BigIntSyncValue energyStoredValue = new BigIntSyncValue(
583583
() -> energyBank == null ? BigInteger.ZERO : energyBank.getStored(), null);
584-
BigIntegerSyncValue energyCapacityValue = new BigIntegerSyncValue(
584+
BigIntSyncValue energyCapacityValue = new BigIntSyncValue(
585585
() -> energyBank == null ? BigInteger.ZERO : energyBank.getCapacity(), null);
586586
syncManager.syncValue("energy_stored", energyStoredValue);
587587
syncManager.syncValue("energy_capacity", energyCapacityValue);
588588

589-
bars.add(b -> b
590-
.progress(
591-
() -> energyStoredValue.getValue().doubleValue() / energyCapacityValue.getValue().doubleValue())
589+
bars.add(b -> b.progress(() -> {
590+
if (energyCapacityValue.getValue().equals(BigInteger.ZERO)) return 0;
591+
return energyStoredValue.getValue().divide(energyCapacityValue.getValue()).doubleValue();
592+
})
592593
.texture(GTGuiTextures.PROGRESS_BAR_MULTI_ENERGY_YELLOW)
593594
.tooltipBuilder(t -> {
594595
if (isStructureFormed()) {

0 commit comments

Comments
 (0)