diff --git a/dependencies.gradle b/dependencies.gradle index c9ccb9cd..21581650 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,12 +1,12 @@ // Add your dependencies here dependencies { - api('com.github.GTNewHorizons:GT5-Unofficial:5.09.45.151:dev') - api('com.github.GTNewHorizons:bartworks:0.9.19:dev') + api('com.github.GTNewHorizons:GT5-Unofficial:5.09.45.155:dev') + api('com.github.GTNewHorizons:bartworks:0.9.21:dev') implementation('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') - implementation('com.github.GTNewHorizons:GTplusplus:1.11.53:dev') + implementation('com.github.GTNewHorizons:GTplusplus:1.11.57:dev') - compileOnly('com.github.GTNewHorizons:ThaumicEnergistics:1.6.4-GTNH:dev') {transitive = false} + compileOnly('com.github.GTNewHorizons:ThaumicEnergistics:1.6.5-GTNH:dev') {transitive = false} runtimeOnly('com.github.GTNewHorizons:Baubles:1.0.4:dev') } diff --git a/src/main/java/goodgenerator/blocks/tileEntity/NeutronActivator.java b/src/main/java/goodgenerator/blocks/tileEntity/NeutronActivator.java index 7053c010..690cc9ea 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/NeutronActivator.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/NeutronActivator.java @@ -69,7 +69,12 @@ public class NeutronActivator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM protected int height = 0; protected int eV = 0, mCeil = 0, mFloor = 0; private GT_Recipe lastRecipe; - protected static final NumberFormatMUI numberFormat = new NumberFormatMUI(); + protected static final NumberFormatMUI numberFormat; + static { + numberFormat = new NumberFormatMUI(); + numberFormat.setMinimumFractionDigits(2); + numberFormat.setMaximumFractionDigits(2); + } final XSTR R = new XSTR(); private static final IIconContainer textureFontOn = new Textures.BlockIcons.CustomIcon("icons/NeutronActivator_On"); @@ -451,7 +456,7 @@ protected void drawTexts(DynamicPositionedColumn screenElements, SlotWidget inve new TextWidget(StatCollector.translateToLocal("gui.NeutronActivator.0")) .setDefaultColor(COLOR_TEXT_WHITE.get())) .widget( - new TextWidget().setStringSupplier(() -> numberFormat.formatWithSuffix(eV) + "eV") + new TextWidget().setStringSupplier(() -> numberFormat.format(eV / 1_000_000d) + " MeV") .setDefaultColor(COLOR_TEXT_WHITE.get()) .setEnabled(widget -> getBaseMetaTileEntity().getErrorDisplayID() == 0)) .widget(new FakeSyncWidget.IntegerSyncer(() -> eV, val -> eV = val));