lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Added particles to the Blood Altar.

Browse source
This commit is contained in:
WayofTime 2016-01-19 22:03:46 -05:00
parent 470b5fce9c
commit fa15499388
2 changed files with 23 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.txt
View file

@ -3,6 +3,7 @@ Version 2.0.0-7
------------------------------------------------------ ------------------------------------------------------
- [API] Method to easily get instances of Items and Blocks - [API] Method to easily get instances of Items and Blocks
- JEI now displays more information for Altar recipes. Hover over the Altar image to view it. - JEI now displays more information for Altar recipes. Hover over the Altar image to view it.
- Added particles to the Blood Altar on the server-side.
------------------------------------------------------ ------------------------------------------------------
Version 2.0.0-6 Version 2.0.0-6

35
src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java
View file

@ -9,6 +9,7 @@ import net.minecraft.util.BlockPos;
import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.EnumParticleTypes;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraft.world.WorldServer;
import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidContainerRegistry;
import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidStack;
import WayofTime.bloodmagic.api.BlockStack; import WayofTime.bloodmagic.api.BlockStack;
@ -392,11 +393,6 @@ public class BloodAltar
if (world.isRemote) if (world.isRemote)
return; return;
float f = 1.0F;
float f1 = f * 0.6F + 0.4F;
float f2 = f * f * 0.7F - 0.5F;
float f3 = f * f * 0.6F - 0.7F;
if (!canBeFilled) if (!canBeFilled)
{ {
boolean hasOperated = false; boolean hasOperated = false;
@ -423,15 +419,21 @@ public class BloodAltar
hasOperated = true; hasOperated = true;
if (internalCounter % 4 == 0) if (internalCounter % 4 == 0 && world instanceof WorldServer)
world.spawnParticle(EnumParticleTypes.REDSTONE, pos.getX() + Math.random() - Math.random(), pos.getY() + Math.random() - Math.random(), pos.getZ() + Math.random() - Math.random(), f1, f2, f3); {
WorldServer server = (WorldServer) world;
server.spawnParticle(EnumParticleTypes.REDSTONE, pos.getX() + 0.5, pos.getY() + 1, pos.getZ() + 0.5, 1, 0.2, 0, 0.2, 0, new int[0]);
}
} else if (!hasOperated && progress > 0) } else if (!hasOperated && progress > 0)
{ {
progress -= (int) (efficiencyMultiplier * drainRate); progress -= (int) (efficiencyMultiplier * drainRate);
if (internalCounter % 2 == 0) if (internalCounter % 2 == 0 && world instanceof WorldServer)
world.spawnParticle(EnumParticleTypes.REDSTONE, pos.getX() + Math.random() - Math.random(), pos.getY() + Math.random() - Math.random(), pos.getZ() + Math.random() - Math.random(), f1, f2, f3); {
WorldServer server = (WorldServer) world;
server.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, pos.getX() + 0.5, pos.getY() + 1, pos.getZ() + 0.5, 1, 0.1, 0, 0.1, 0, new int[0]);
}
} }
if (hasOperated) if (hasOperated)
@ -446,9 +448,13 @@ public class BloodAltar
tileAltar.setInventorySlotContents(0, result); tileAltar.setInventorySlotContents(0, result);
progress = 0; progress = 0;
for (int i = 0; i < 8; i++) if (world instanceof WorldServer)
world.spawnParticle(EnumParticleTypes.REDSTONE, pos.getX() + Math.random() - Math.random(), pos.getY() + Math.random() - Math.random(), pos.getZ() + Math.random() - Math.random(), f1, f2, f3); {
WorldServer server = (WorldServer) world;
server.spawnParticle(EnumParticleTypes.REDSTONE, pos.getX() + 0.5, pos.getY() + 1, pos.getZ() + 0.5, 40, 0.3, 0, 0.3, 0, new int[0]);
}
this.cooldownAfterCrafting = 100;
this.isActive = false; this.isActive = false;
} }
} }
@ -478,8 +484,11 @@ public class BloodAltar
fluid.amount = fluid.amount - drain; fluid.amount = fluid.amount - drain;
if (internalCounter % 4 == 0) if (drain > 0 && internalCounter % 4 == 0 && world instanceof WorldServer)
world.spawnParticle(EnumParticleTypes.REDSTONE, pos.getX() + Math.random() - Math.random(), pos.getY() + Math.random() - Math.random(), pos.getZ() + Math.random() - Math.random(), f1, f2, f3); {
WorldServer server = (WorldServer) world;
server.spawnParticle(EnumParticleTypes.SPELL_WITCH, pos.getX() + 0.5, pos.getY() + 1, pos.getZ() + 0.5, 1, 0, 0, 0, 0.001, new int[] {});
}
} }
} }