mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-16 18:44:44 +00:00
Merge branch 'MC19' of github.com:williewillus/Botania into MC19
This commit is contained in:
commit
c07febc67d
2 files changed
+6
-6
No files matched your search
@@ -43,9 +43,9 @@ public class TileManaFlame extends TileMod {
|
||||
double luminance = 0.2126 * r + 0.7152 * g + 0.0722 * b; // Standard relative luminance calculation
|
||||
|
||||
if (luminance < v) {
|
||||
r += (float) (Math.random() - 0.5) * 0.25;
|
||||
g += (float) (Math.random() - 0.5) * 0.25;
|
||||
b += (float) (Math.random() - 0.5) * 0.25;
|
||||
r += (float) Math.random() * 0.125F;
|
||||
g += (float) Math.random() * 0.125F;
|
||||
b += (float) Math.random() * 0.125F;
|
||||
}
|
||||
|
||||
float w = 0.15F;
|
||||
|
||||
@@ -560,9 +560,9 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst {
|
||||
|
||||
do {
|
||||
if (luminance < 0.1) {
|
||||
r = or + ((float) Math.random() - 0.5F) * 0.25F;
|
||||
g = og + ((float) Math.random() - 0.5F) * 0.25F;
|
||||
b = ob + ((float) Math.random() - 0.5F) * 0.25F;
|
||||
r = or + (float) Math.random() * 0.125F;
|
||||
g = og + (float) Math.random() * 0.125F;
|
||||
b = ob + (float) Math.random() * 0.125F;
|
||||
}
|
||||
size = osize + ((float) Math.random() - 0.5F) * 0.065F + (float) Math.sin(new Random(entityUniqueID.getMostSignificantBits()).nextInt(9001)) * 0.4F;
|
||||
Botania.proxy.wispFX(worldObj, posX, posY, posZ, r, g, b, 0.2F * size, (float) -motionX * 0.01F, (float) -motionY * 0.01F, (float) -motionZ * 0.01F);
|
||||
|
||||
Reference in new issue
Block a user