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

some fixes I missed for the renumbering

Browse source
This commit is contained in:
Ellpeck 2019-02-03 22:05:56 +01:00
parent 4e370dffe7
commit b6adc13f36
5 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -21,7 +21,7 @@ public class TileEntityHopperUpgrade extends TileEntityImpl implements ITickable
@Override @Override
public void update() { public void update() {
if (!this.world.isRemote && this.world.getTotalWorldTime() % 10 == 0) { if (!this.world.isRemote && this.world.getTotalWorldTime() % 10 == 0) {
if (IAuraChunk.getAuraInArea(this.world, this.pos, 25) < 1000) if (IAuraChunk.getAuraInArea(this.world, this.pos, 25) < 100000)
return; return;
TileEntity tile = this.world.getTileEntity(this.pos.down()); TileEntity tile = this.world.getTileEntity(this.pos.down());
if (!isValidHopper(tile)) if (!isValidHopper(tile))

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

@ -71,7 +71,7 @@ public class TileEntityRFConverter extends TileEntityImpl implements ITickable {
int aura = IAuraChunk.getAuraInArea(this.world, this.pos, 45); int aura = IAuraChunk.getAuraInArea(this.world, this.pos, 45);
if (aura <= IAuraChunk.DEFAULT_AURA) if (aura <= IAuraChunk.DEFAULT_AURA)
return; return;
int amountToGen = Math.min(Math.min(1000, aura / 1000), emptyPart); int amountToGen = Math.min(Math.min(10000, aura / 1000), emptyPart);
int amountToUse = MathHelper.ceil(amountToGen / ModConfig.general.auraToRFRatio); int amountToUse = MathHelper.ceil(amountToGen / ModConfig.general.auraToRFRatio);
this.storage.setEnergy(this.storage.getEnergyStored() + amountToGen); this.storage.setEnergy(this.storage.getEnergyStored() + amountToGen);

2
src/main/java/de/ellpeck/naturesaura/events/CommonEvents.java
View file

@ -57,7 +57,7 @@ public class CommonEvents {
int aura = IAuraChunk.triangulateAuraInArea(event.player.world, event.player.getPosition(), 25); int aura = IAuraChunk.triangulateAuraInArea(event.player.world, event.player.getPosition(), 25);
if (aura <= 0) if (aura <= 0)
Helper.addAdvancement(event.player, new ResourceLocation(NaturesAura.MOD_ID, "negative_imbalance"), "triggered_in_code"); Helper.addAdvancement(event.player, new ResourceLocation(NaturesAura.MOD_ID, "negative_imbalance"), "triggered_in_code");
else if (aura >= 15000) else if (aura >= 1500000)
Helper.addAdvancement(event.player, new ResourceLocation(NaturesAura.MOD_ID, "positive_imbalance"), "triggered_in_code"); Helper.addAdvancement(event.player, new ResourceLocation(NaturesAura.MOD_ID, "positive_imbalance"), "triggered_in_code");
} }
} }

4
src/main/java/de/ellpeck/naturesaura/items/ItemAuraBottle.java
View file

@ -45,7 +45,7 @@ public class ItemAuraBottle extends ItemImpl implements IColorProvidingItem {
ItemStack dispense = stack.splitStack(1); ItemStack dispense = stack.splitStack(1);
if (offsetState.getBlock().isAir(offsetState, world, offset)) { if (offsetState.getBlock().isAir(offsetState, world, offset)) {
if (IAuraChunk.getAuraInArea(world, offset, 30) >= 1000) { if (IAuraChunk.getAuraInArea(world, offset, 30) >= 100000) {
dispense = setType(new ItemStack(ItemAuraBottle.this), IAuraType.forWorld(world)); dispense = setType(new ItemStack(ItemAuraBottle.this), IAuraType.forWorld(world));
BlockPos spot = IAuraChunk.getHighestSpot(world, offset, 30, offset); BlockPos spot = IAuraChunk.getHighestSpot(world, offset, 30, offset);
@ -69,7 +69,7 @@ public class ItemAuraBottle extends ItemImpl implements IColorProvidingItem {
if (ray != null && ray.typeOfHit == RayTraceResult.Type.BLOCK) if (ray != null && ray.typeOfHit == RayTraceResult.Type.BLOCK)
return; return;
BlockPos pos = player.getPosition(); BlockPos pos = player.getPosition();
if (IAuraChunk.getAuraInArea(player.world, pos, 30) < 1000) if (IAuraChunk.getAuraInArea(player.world, pos, 30) < 100000)
return; return;
if (!player.world.isRemote) { if (!player.world.isRemote) {

2
src/main/java/de/ellpeck/naturesaura/items/ItemBirthSpirit.java
View file

@ -21,7 +21,7 @@ public class ItemBirthSpirit extends ItemGlowing {
if (!parent.world.isRemote && event.getCausedByPlayer() != null) { if (!parent.world.isRemote && event.getCausedByPlayer() != null) {
BlockPos pos = parent.getPosition(); BlockPos pos = parent.getPosition();
int aura = IAuraChunk.getAuraInArea(parent.world, pos, 30); int aura = IAuraChunk.getAuraInArea(parent.world, pos, 30);
if (aura < 12000) if (aura < 1200000)
return; return;
int amount = parent.world.rand.nextInt(3) + 1; int amount = parent.world.rand.nextInt(3) + 1;