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

removed a lot of machine caps and fixed a graphical issue

Browse source
This commit is contained in:
Ellpeck 2018-12-05 01:12:53 +01:00
parent cd5b98d68f
commit 6266d54aba
6 changed files with 21 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -11,7 +11,7 @@ public class TileEntityAuraDetector extends TileEntityImpl implements ITickable
@Override @Override
public void update() { public void update() {
if (!this.world.isRemote && this.world.getTotalWorldTime() % 80 == 0) { if (!this.world.isRemote && this.world.getTotalWorldTime() % 20 == 0) {
MutableFloat totalAmount = new MutableFloat(IAuraChunk.DEFAULT_AURA); MutableFloat totalAmount = new MutableFloat(IAuraChunk.DEFAULT_AURA);
IAuraChunk.getSpotsInArea(this.world, this.pos, 25, (pos, spot) -> { IAuraChunk.getSpotsInArea(this.world, this.pos, 25, (pos, spot) -> {
float percentage = 1F - (float) this.pos.getDistance(pos.getX(), pos.getY(), pos.getZ()) / 25F; float percentage = 1F - (float) this.pos.getDistance(pos.getX(), pos.getY(), pos.getZ()) / 25F;

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

@ -51,7 +51,7 @@ public class TileEntityFlowerGenerator extends TileEntityImpl implements ITickab
int addAmount = 200; int addAmount = 200;
int toAdd = Math.max(0, addAmount - curr.getValue()); int toAdd = Math.max(0, addAmount - curr.getValue());
if (toAdd > 0) { if (toAdd > 0) {
if (NaturesAuraAPI.TYPE_OVERWORLD.isPresentInWorld(this.world) && IAuraChunk.getAuraInArea(this.world, this.pos, 35) < 20000) { if (NaturesAuraAPI.TYPE_OVERWORLD.isPresentInWorld(this.world)) {
int remain = toAdd; int remain = toAdd;
while (remain > 0) { while (remain > 0) {
BlockPos spot = IAuraChunk.getLowestSpot(this.world, this.pos, 30, this.pos); BlockPos spot = IAuraChunk.getLowestSpot(this.world, this.pos, 30, this.pos);

17
src/main/java/de/ellpeck/naturesaura/blocks/tiles/TileEntityPotionGenerator.java
View file

@ -40,20 +40,15 @@ public class TileEntityPotionGenerator extends TileEntityImpl implements ITickab
continue; continue;
} }
boolean disperseParticles; int toAdd = ((effect.getAmplifier() * 6 + 1) * (effect.getDuration() / 30));
if (IAuraChunk.getAuraInArea(this.world, this.pos, 35) < 20000) { while (toAdd > 0) {
int toAdd = ((effect.getAmplifier() * 6 + 1) * (effect.getDuration() / 30)); BlockPos spot = IAuraChunk.getLowestSpot(this.world, this.pos, 30, this.pos);
while (toAdd > 0) { toAdd -= IAuraChunk.getAuraChunk(this.world, spot).storeAura(spot, toAdd);
BlockPos spot = IAuraChunk.getLowestSpot(this.world, this.pos, 30, this.pos); }
toAdd -= IAuraChunk.getAuraChunk(this.world, spot).storeAura(spot, toAdd);
}
disperseParticles = true;
} else
disperseParticles = false;
PacketHandler.sendToAllAround(this.world, this.pos, 32, new PacketParticles( PacketHandler.sendToAllAround(this.world, this.pos, 32, new PacketParticles(
this.pos.getX(), this.pos.getY(), this.pos.getZ(), 5, this.pos.getX(), this.pos.getY(), this.pos.getZ(), 5,
PotionUtils.getPotionColor(type), disperseParticles ? 1 : 0)); PotionUtils.getPotionColor(type)));
addedOne = true; addedOne = true;
break; break;

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

@ -104,7 +104,6 @@ public class ClientEvents {
if (mc.gameSettings.showDebugInfo && mc.player.capabilities.isCreativeMode && ModConfig.client.debugWorld) { if (mc.gameSettings.showDebugInfo && mc.player.capabilities.isCreativeMode && ModConfig.client.debugWorld) {
GL11.glPushMatrix(); GL11.glPushMatrix();
GL11.glDisable(GL11.GL_DEPTH_TEST); GL11.glDisable(GL11.GL_DEPTH_TEST);
GL11.glDisable(GL11.GL_LIGHTING);
float partial = event.getPartialTicks(); float partial = event.getPartialTicks();
GL11.glTranslated( GL11.glTranslated(
-mc.player.prevPosX - (mc.player.posX - mc.player.prevPosX) * partial, -mc.player.prevPosX - (mc.player.posX - mc.player.prevPosX) * partial,
@ -121,7 +120,7 @@ public class ClientEvents {
IAuraChunk.getSpotsInArea(mc.world, mc.player.getPosition(), 64, (pos, spot) -> { IAuraChunk.getSpotsInArea(mc.world, mc.player.getPosition(), 64, (pos, spot) -> {
spots.put(pos, spot); spots.put(pos, spot);
GlStateManager.color(spot > 0 ? 0F : 1F, spot > 0 ? 1F : 0F, 0F, 0.5F); GlStateManager.color(spot > 0 ? 0F : 1F, spot > 0 ? 1F : 0F, 0F, 0.35F);
int x = pos.getX(); int x = pos.getX();
int y = pos.getY(); int y = pos.getY();
int z = pos.getZ(); int z = pos.getZ();
@ -169,7 +168,6 @@ public class ClientEvents {
GL11.glPopMatrix(); GL11.glPopMatrix();
GL11.glEnable(GL11.GL_DEPTH_TEST); GL11.glEnable(GL11.GL_DEPTH_TEST);
GL11.glEnable(GL11.GL_LIGHTING);
GL11.glPopMatrix(); GL11.glPopMatrix();
} }
mc.profiler.endSection(); mc.profiler.endSection();

24
src/main/java/de/ellpeck/naturesaura/packet/PacketParticles.java
View file

@ -123,7 +123,6 @@ public class PacketParticles implements IMessage {
break; break;
case 5: // Potion generator case 5: // Potion generator
int color = message.data[0]; int color = message.data[0];
boolean disperse = message.data[1] > 0;
for (int i = world.rand.nextInt(5) + 5; i >= 0; i--) { for (int i = world.rand.nextInt(5) + 5; i >= 0; i--) {
NaturesAuraAPI.instance().spawnMagicParticle( NaturesAuraAPI.instance().spawnMagicParticle(
message.posX + world.rand.nextFloat(), message.posX + world.rand.nextFloat(),
@ -132,18 +131,17 @@ public class PacketParticles implements IMessage {
world.rand.nextGaussian() * 0.01F, world.rand.nextFloat() * 0.1F, world.rand.nextGaussian() * 0.01F, world.rand.nextGaussian() * 0.01F, world.rand.nextFloat() * 0.1F, world.rand.nextGaussian() * 0.01F,
color, 2F + world.rand.nextFloat(), 40, 0F, true, true); color, 2F + world.rand.nextFloat(), 40, 0F, true, true);
if (disperse) for (int x = -1; x <= 1; x += 2)
for (int x = -1; x <= 1; x += 2) for (int z = -1; z <= 1; z += 2) {
for (int z = -1; z <= 1; z += 2) { NaturesAuraAPI.instance().spawnMagicParticle(
NaturesAuraAPI.instance().spawnMagicParticle( message.posX + x * 3 + 0.5F,
message.posX + x * 3 + 0.5F, message.posY + 2.5,
message.posY + 2.5, message.posZ + z * 3 + 0.5F,
message.posZ + z * 3 + 0.5F, world.rand.nextGaussian() * 0.02F,
world.rand.nextGaussian() * 0.02F, world.rand.nextFloat() * 0.04F,
world.rand.nextFloat() * 0.04F, world.rand.nextGaussian() * 0.02F,
world.rand.nextGaussian() * 0.02F, 0xd6340c, 1F + world.rand.nextFloat() * 2F, 75, 0F, true, true);
0xd6340c, 1F + world.rand.nextFloat() * 2F, 75, 0F, true, true); }
}
} }
break; break;
case 6: // Plant boost effect case 6: // Plant boost effect

2
src/main/resources/assets/naturesaura/patchouli_books/book/en_us/entries/creating/potion_generator.json
View file

@ -10,7 +10,7 @@
}, },
{ {
"type": "text", "type": "text",
"text": "Then, throwing any kind of positive, lasting $(item)Lingering Potion$() down in its vicinity will cause the effect to be consumed and turned into $(aura). Needless to say, the longer and higher the effect, the more $(aura) gets created.$(br)Notice that, however, only one effect can be converted at one time, and throwing multiple potions at the ritual will cause their powers to go to waste. Additionally, once there is enough $(aura) in the area, additional potion effects will similarly go to waste." "text": "Then, throwing any kind of positive, lasting $(item)Lingering Potion$() down in its vicinity will cause the effect to be consumed and turned into $(aura). Needless to say, the longer and higher the effect, the more $(aura) gets created.$(br)Notice that, however, only one effect can be converted at one time, and throwing multiple potions at the ritual will cause their powers to go to waste."
}, },
{ {
"type": "multiblock", "type": "multiblock",