diff --git a/dependencies.gradle b/dependencies.gradle index 17ec69f12..5d35fa407 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -2,7 +2,7 @@ dependencies { api('com.github.GTNewHorizons:CodeChickenCore:1.4.10:dev') - implementation('com.github.GTNewHorizons:GTNHLib:0.9.13:dev') + devOnlyNonPublishable('com.github.GTNewHorizons:GTNHLib:0.9.13:dev') shadowImplementation('org.apache.commons:commons-csv:1.10.0') diff --git a/src/main/java/codechicken/nei/NEIClientUtils.java b/src/main/java/codechicken/nei/NEIClientUtils.java index ea2361003..1d55c49fe 100644 --- a/src/main/java/codechicken/nei/NEIClientUtils.java +++ b/src/main/java/codechicken/nei/NEIClientUtils.java @@ -46,6 +46,7 @@ import org.lwjgl.opengl.GL11; import com.google.common.collect.Iterables; +import com.gtnewhorizon.gtnhlib.util.numberformatting.NumberFormatUtil; import codechicken.lib.gui.GuiDraw; import codechicken.lib.inventory.InventoryRange; @@ -125,6 +126,24 @@ private static DecimalFormat getDecimalFormat() { }); } + public static String formatNumber(long aNumber) { + + if (NEIModContainer.isGTNHLibLoaded()) { + return NumberFormatUtil.formatNumber(aNumber); + } + + return getDecimalFormat().format(aNumber); + } + + public static String formatFluid(long aNumber) { + + if (NEIModContainer.isGTNHLibLoaded()) { + return NumberFormatUtil.formatFluid(aNumber); + } + + return getDecimalFormat().format(aNumber) + " L"; + } + public static void deleteHeldItem() { deleteSlotStack(-999); } diff --git a/src/main/java/codechicken/nei/NEIModContainer.java b/src/main/java/codechicken/nei/NEIModContainer.java index 6529720f0..c185800fe 100644 --- a/src/main/java/codechicken/nei/NEIModContainer.java +++ b/src/main/java/codechicken/nei/NEIModContainer.java @@ -55,7 +55,7 @@ private static ModMetadata getModMetadata() { modMetadata.name = "NotEnoughItems"; modMetadata.modId = "NotEnoughItems"; modMetadata.version = Tags.VERSION; - modMetadata.authorList = Arrays.asList("ChickenBones", "mitchej123"); + modMetadata.authorList = Arrays.asList("ChickenBones", "mitchej123", "SLPrime"); modMetadata.url = "https://github.com/GTNewHorizons/NotEnoughItems"; modMetadata.description = "Recipe Viewer, Inventory Manager, Item Spawner, Cheats and more; GTNH Version includes many enhancements."; return modMetadata; @@ -80,7 +80,6 @@ public Set getRequirements() { public List getDependencies() { List deps = new ArrayList<>(); deps.add(VersionParser.parseVersionReference("CodeChickenCore@[" + codechicken.core.asm.Tags.VERSION + ",)")); - deps.add(VersionParser.parseVersionReference("gtnhlib@[0.6.0,)")); return deps; } diff --git a/src/main/java/codechicken/nei/guihook/GuiContainerManager.java b/src/main/java/codechicken/nei/guihook/GuiContainerManager.java index 663deaec8..0a231f992 100644 --- a/src/main/java/codechicken/nei/guihook/GuiContainerManager.java +++ b/src/main/java/codechicken/nei/guihook/GuiContainerManager.java @@ -5,7 +5,6 @@ import static codechicken.lib.gui.GuiDraw.getMousePosition; import static codechicken.lib.gui.GuiDraw.renderEngine; import static codechicken.nei.NEIClientUtils.translate; -import static com.gtnewhorizon.gtnhlib.util.numberformatting.NumberFormatUtil.formatNumber; import java.awt.Point; import java.util.ArrayList; @@ -44,8 +43,6 @@ import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import com.gtnewhorizon.gtnhlib.util.numberformatting.NumberFormatUtil; - import codechicken.lib.gui.GuiDraw; import codechicken.nei.ItemList; import codechicken.nei.ItemStackSet; @@ -213,14 +210,14 @@ public static String countDetails(int stackSize, int maxStackSize, String fullPa return String.format( fullPattern, valueFormatter.apply(stackSize), - formatNumber(units), + NEIClientUtils.formatNumber(units), valueFormatter.apply(maxStackSize), valueFormatter.apply(remainder)); } else { return String.format( shortPattern, valueFormatter.apply(stackSize), - formatNumber(units), + NEIClientUtils.formatNumber(units), valueFormatter.apply(maxStackSize)); } } @@ -238,7 +235,7 @@ public static String itemCountDetails(ItemStack stack) { stack.getMaxStackSize(), translate("inventory.tooltip.count.item", "%s = %s * %s + %s"), translate("inventory.tooltip.count.item", "%s = %s * %s"), - NumberFormatUtil::formatNumber); + NEIClientUtils::formatNumber); } } @@ -255,7 +252,7 @@ public static String fluidAmountDetails(int amount) { 144, translate("inventory.tooltip.count.fluid", "%s = %s * %s + %s"), translate("inventory.tooltip.count.fluid", "%s = %s * %s"), - NumberFormatUtil::formatFluid); + NEIClientUtils::formatFluid); } /**