From dcebaf2c844977239b03323cf63a5395b60dc9a6 Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Tue, 29 Jan 2019 16:01:10 +0100 Subject: [PATCH] some fixes --- .../blocks/tiles/TileEntityNatureAltar.java | 2 +- .../de/ellpeck/naturesaura/events/ClientEvents.java | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/TileEntityNatureAltar.java b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/TileEntityNatureAltar.java index 24488197..2c5c2ad2 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/TileEntityNatureAltar.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/TileEntityNatureAltar.java @@ -99,7 +99,7 @@ public class TileEntityNatureAltar extends TileEntityImpl implements ITickable { ItemStack stack = this.items.getStackInSlot(0); if (!stack.isEmpty() && stack.hasCapability(NaturesAuraAPI.capAuraContainer, null)) { IAuraContainer container = stack.getCapability(NaturesAuraAPI.capAuraContainer, null); - int theoreticalDrain = this.container.drainAura(10, true); + int theoreticalDrain = this.container.drainAura(1000, true); if (theoreticalDrain > 0) { int stored = container.storeAura(theoreticalDrain, false); if (stored > 0) { diff --git a/src/main/java/de/ellpeck/naturesaura/events/ClientEvents.java b/src/main/java/de/ellpeck/naturesaura/events/ClientEvents.java index b61722d8..da56d308 100644 --- a/src/main/java/de/ellpeck/naturesaura/events/ClientEvents.java +++ b/src/main/java/de/ellpeck/naturesaura/events/ClientEvents.java @@ -49,6 +49,7 @@ import net.minecraftforge.items.IItemHandler; import org.apache.commons.lang3.mutable.MutableInt; import org.lwjgl.opengl.GL11; +import java.text.NumberFormat; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -69,16 +70,14 @@ public class ClientEvents { left.add(prefix + "Particles: " + ParticleHandler.getParticleAmount()); if (mc.player.capabilities.isCreativeMode) { - left.add(prefix + "Aura (range 35)"); MutableInt amount = new MutableInt(IAuraChunk.DEFAULT_AURA); MutableInt spots = new MutableInt(); IAuraChunk.getSpotsInArea(mc.world, mc.player.getPosition(), 35, (blockPos, drainSpot) -> { spots.increment(); amount.add(drainSpot); - if (mc.player.isSneaking()) - left.add(prefix + drainSpot + " @ " + blockPos.getX() + " " + blockPos.getY() + " " + blockPos.getZ()); }); - left.add(prefix + "Total: " + amount.intValue() + " in " + spots.intValue() + " spots"); + NumberFormat format = NumberFormat.getInstance(); + left.add(prefix + "Aura: " + format.format(amount.intValue()) + " in " + spots.intValue() + " spots (range 35)"); left.add(prefix + "Type: " + IAuraType.forWorld(mc.world).getName()); } } @@ -177,14 +176,15 @@ public class ClientEvents { GL11.glPopAttrib(); float scale = 0.03F; + NumberFormat format = NumberFormat.getInstance(); GlStateManager.scale(scale, scale, scale); for (Map.Entry spot : spots.entrySet()) { BlockPos pos = spot.getKey(); GlStateManager.pushMatrix(); GlStateManager.translate((pos.getX() + 0.1) / scale, (pos.getY() + 1) / scale, (pos.getZ() + 0.1) / scale); GlStateManager.rotate(90F, 1F, 0F, 0F); - GlStateManager.scale(0.75F, 0.75F, 0.75F); - mc.fontRenderer.drawString(spot.getValue().toString(), 0, 0, 0); + GlStateManager.scale(0.65F, 0.65F, 0.65F); + mc.fontRenderer.drawString(format.format(spot.getValue()), 0, 0, 0); GlStateManager.popMatrix(); }