Ellpeck/NaturesAura
1
0
Fork 0
mirror of https://github.com/Ellpeck/NaturesAura.git synced 2024-11-22 19:58:34 +01:00
Code Issues Projects Releases Wiki Activity

some fixes

Browse source
This commit is contained in:
Ellpeck 2019-01-29 16:01:10 +01:00
parent 6fc0ef8a43
commit dcebaf2c84
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/de/ellpeck/naturesaura/blocks/tiles/TileEntityNatureAltar.java
View file

@ -99,7 +99,7 @@ public class TileEntityNatureAltar extends TileEntityImpl implements ITickable {
ItemStack stack = this.items.getStackInSlot(0); ItemStack stack = this.items.getStackInSlot(0);
if (!stack.isEmpty() && stack.hasCapability(NaturesAuraAPI.capAuraContainer, null)) { if (!stack.isEmpty() && stack.hasCapability(NaturesAuraAPI.capAuraContainer, null)) {
IAuraContainer container = stack.getCapability(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) { if (theoreticalDrain > 0) {
int stored = container.storeAura(theoreticalDrain, false); int stored = container.storeAura(theoreticalDrain, false);
if (stored > 0) { if (stored > 0) {

12
src/main/java/de/ellpeck/naturesaura/events/ClientEvents.java
View file

@ -49,6 +49,7 @@ import net.minecraftforge.items.IItemHandler;
import org.apache.commons.lang3.mutable.MutableInt; import org.apache.commons.lang3.mutable.MutableInt;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;
import java.text.NumberFormat;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -69,16 +70,14 @@ public class ClientEvents {
left.add(prefix + "Particles: " + ParticleHandler.getParticleAmount()); left.add(prefix + "Particles: " + ParticleHandler.getParticleAmount());
if (mc.player.capabilities.isCreativeMode) { if (mc.player.capabilities.isCreativeMode) {
left.add(prefix + "Aura (range 35)");
MutableInt amount = new MutableInt(IAuraChunk.DEFAULT_AURA); MutableInt amount = new MutableInt(IAuraChunk.DEFAULT_AURA);
MutableInt spots = new MutableInt(); MutableInt spots = new MutableInt();
IAuraChunk.getSpotsInArea(mc.world, mc.player.getPosition(), 35, (blockPos, drainSpot) -> { IAuraChunk.getSpotsInArea(mc.world, mc.player.getPosition(), 35, (blockPos, drainSpot) -> {
spots.increment(); spots.increment();
amount.add(drainSpot); 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()); left.add(prefix + "Type: " + IAuraType.forWorld(mc.world).getName());
} }
} }
@ -177,14 +176,15 @@ public class ClientEvents {
GL11.glPopAttrib(); GL11.glPopAttrib();
float scale = 0.03F; float scale = 0.03F;
NumberFormat format = NumberFormat.getInstance();
GlStateManager.scale(scale, scale, scale); GlStateManager.scale(scale, scale, scale);
for (Map.Entry<BlockPos, Integer> spot : spots.entrySet()) { for (Map.Entry<BlockPos, Integer> spot : spots.entrySet()) {
BlockPos pos = spot.getKey(); BlockPos pos = spot.getKey();
GlStateManager.pushMatrix(); GlStateManager.pushMatrix();
GlStateManager.translate((pos.getX() + 0.1) / scale, (pos.getY() + 1) / scale, (pos.getZ() + 0.1) / scale); GlStateManager.translate((pos.getX() + 0.1) / scale, (pos.getY() + 1) / scale, (pos.getZ() + 0.1) / scale);
GlStateManager.rotate(90F, 1F, 0F, 0F); GlStateManager.rotate(90F, 1F, 0F, 0F);
GlStateManager.scale(0.75F, 0.75F, 0.75F); GlStateManager.scale(0.65F, 0.65F, 0.65F);
mc.fontRenderer.drawString(spot.getValue().toString(), 0, 0, 0); mc.fontRenderer.drawString(format.format(spot.getValue()), 0, 0, 0);
GlStateManager.popMatrix(); GlStateManager.popMatrix();
} }