Skip to content

Removed GTNHLib from required dependency #866

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
UltraProdigy merged 1 commit into from
Feb 16, 2026
Merged

Removed GTNHLib from required dependency #866

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dependencies.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')

Expand Down
19 changes: 19 additions & 0 deletions src/main/java/codechicken/nei/NEIClientUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
}
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/codechicken/nei/NEIModContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -80,7 +80,6 @@ public Set<ArtifactVersion> getRequirements() {
public List<ArtifactVersion> getDependencies() {
List<ArtifactVersion> deps = new ArrayList<>();
deps.add(VersionParser.parseVersionReference("CodeChickenCore@[" + codechicken.core.asm.Tags.VERSION + ",)"));
deps.add(VersionParser.parseVersionReference("gtnhlib@[0.6.0,)"));
return deps;
}

Expand Down
11 changes: 4 additions & 7 deletions src/main/java/codechicken/nei/guihook/GuiContainerManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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));
}
}
Expand All @@ -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);
}
}

Expand All @@ -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);
}

/**
Expand Down