diff --git a/.gitignore b/.gitignore index 96a7fcf..d46346a 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,7 @@ /classes /bin/ /run/ +/logs *.classpath *.project diff --git a/src/main/java/de/ellpeck/prettypipes/misc/ItemTerminalWidget.java b/src/main/java/de/ellpeck/prettypipes/misc/ItemTerminalWidget.java index 8c9dde7..5b3bded 100644 --- a/src/main/java/de/ellpeck/prettypipes/misc/ItemTerminalWidget.java +++ b/src/main/java/de/ellpeck/prettypipes/misc/ItemTerminalWidget.java @@ -54,9 +54,10 @@ public class ItemTerminalWidget extends Widget { renderer.renderItemAndEffectIntoGUI(mc.player, this.stack, this.x, this.y); int amount = this.stack.getCount(); String amountStrg = this.stack.getCount() >= 1000 ? amount / 1000 + "k" : String.valueOf(amount); - // TODO figure out how to get the unicode font renderer for the terminal - FontRenderer font = mc.fontRenderer;//mc.getFontResourceManager().getFontRenderer(FONT); - renderer.renderItemOverlayIntoGUI(font, this.stack, this.x, this.y, amountStrg); + RenderSystem.pushMatrix(); + RenderSystem.scalef(0.8F, 0.8F, 1); + renderer.renderItemOverlayIntoGUI(mc.fontRenderer, this.stack, (int) (this.x / 0.8F) + 4, (int) (this.y / 0.8F) + 4, amountStrg); + RenderSystem.popMatrix(); renderer.zLevel = 0; this.setBlitOffset(0); diff --git a/src/main/java/de/ellpeck/prettypipes/network/PipeNetwork.java b/src/main/java/de/ellpeck/prettypipes/network/PipeNetwork.java index 615a04c..7306be0 100644 --- a/src/main/java/de/ellpeck/prettypipes/network/PipeNetwork.java +++ b/src/main/java/de/ellpeck/prettypipes/network/PipeNetwork.java @@ -390,7 +390,6 @@ public class PipeNetwork implements ICapabilitySerializable, GraphL } public int getItemsOnTheWay(BlockPos goalInv, ItemStack type, ItemEqualityType... equalityTypes) { - // TODO pending auto-crafting requests should be marked as "on the way" here to allow over-sending prevention return this.getPipeItemsOnTheWay(goalInv) .filter(i -> type == null || ItemEqualityType.compareItems(i.stack, type, equalityTypes)) .mapToInt(i -> i.stack.getCount()).sum(); diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 5181716..22dff34 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -9,6 +9,7 @@ modLoader="javafml" #mandatory loaderVersion="[28,)" #mandatory (28 is current forge version) # A URL to refer people to when problems occur with this mod issueTrackerURL="https://github.com/Ellpeck/PrettyPipes" #optional +license="MIT" # A list of mods - how many allowed here is determined by the individual mod loader [[mods]] #mandatory # The modid of the mod