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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Ellpeck 2019-03-03 23:33:51 +01:00
commit 3cdb508dbd
1 changed files with 24 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/main/java/de/ellpeck/naturesaura/entities/EntityMoverMinecart.java
View file

@ -5,6 +5,7 @@ import de.ellpeck.naturesaura.items.ModItems;
import de.ellpeck.naturesaura.packet.PacketHandler; import de.ellpeck.naturesaura.packet.PacketHandler;
import de.ellpeck.naturesaura.packet.PacketParticles; import de.ellpeck.naturesaura.packet.PacketParticles;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.Entity;
import net.minecraft.entity.item.EntityMinecart; import net.minecraft.entity.item.EntityMinecart;
import net.minecraft.init.Blocks; import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
@ -18,7 +19,9 @@ import net.minecraft.util.math.MathHelper;
import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.math.RayTraceResult;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.common.util.Constants; import net.minecraftforge.common.util.Constants;
import net.minecraftforge.common.util.ITeleporter;
import javax.annotation.Nullable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -51,9 +54,14 @@ public class EntityMoverMinecart extends EntityMinecart {
if (pos.distanceSq(this.lastPosition) < 8 * 8) if (pos.distanceSq(this.lastPosition) < 8 * 8)
return; return;
this.moveAura(this.world, this.lastPosition, this.world, pos);
this.lastPosition = pos;
}
private void moveAura(World oldWorld, BlockPos oldPos, World newWorld, BlockPos newPos) {
for (BlockPos offset : this.spotOffsets) { for (BlockPos offset : this.spotOffsets) {
BlockPos spot = this.lastPosition.add(offset); BlockPos spot = oldPos.add(offset);
IAuraChunk chunk = IAuraChunk.getAuraChunk(this.world, spot); IAuraChunk chunk = IAuraChunk.getAuraChunk(oldWorld, spot);
int amount = chunk.getDrainSpot(spot); int amount = chunk.getDrainSpot(spot);
if (amount <= 0) if (amount <= 0)
continue; continue;
@ -62,10 +70,9 @@ public class EntityMoverMinecart extends EntityMinecart {
if (drained <= 0) if (drained <= 0)
continue; continue;
int toLose = MathHelper.ceil(drained / 250F); int toLose = MathHelper.ceil(drained / 250F);
BlockPos newSpot = pos.add(offset); BlockPos newSpot = newPos.add(offset);
IAuraChunk.getAuraChunk(this.world, newSpot).storeAura(newSpot, drained - toLose, false, false); IAuraChunk.getAuraChunk(newWorld, newSpot).storeAura(newSpot, drained - toLose, false, false);
} }
this.lastPosition = pos;
} }
@Override @Override
@ -119,6 +126,18 @@ public class EntityMoverMinecart extends EntityMinecart {
this.spotOffsets.add(BlockPos.fromLong(((NBTTagLong) base).getLong())); this.spotOffsets.add(BlockPos.fromLong(((NBTTagLong) base).getLong()));
} }
@Nullable
@Override
public Entity changeDimension(int dimensionIn, ITeleporter teleporter) {
Entity entity = super.changeDimension(dimensionIn, teleporter);
if (entity instanceof EntityMoverMinecart) {
BlockPos pos = entity.getPosition();
this.moveAura(this.world, this.lastPosition, entity.world, pos);
((EntityMoverMinecart) entity).lastPosition = pos;
}
return entity;
}
@Override @Override
public IBlockState getDisplayTile() { public IBlockState getDisplayTile() {
return Blocks.STONE.getDefaultState(); return Blocks.STONE.getDefaultState();