Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/1.5.1-1.20.1' into 1.5.1-1.20.1
Browse files Browse the repository at this point in the history
  • Loading branch information
mrsterner committed Oct 27, 2023
2 parents 9ddf881 + e48f499 commit e49a379
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,18 @@ public static ParticleEffectSpawner<ItemCrumbParticleBuilder> spawnItemCrumbs(Le
var rand = level.getRandom();
final SpinParticleData spinData = SpinParticleData.createRandomDirection(rand, 0, nextFloat(rand, 0.5f, 0.75f), 0).setCoefficient(0.75f).randomSpinOffset(rand).build();
final Consumer<LodestoneWorldParticleActor> slowDown = p -> p.setParticleMotion(p.getParticleSpeed().scale(0.925f));
int lifetime = RandomHelper.randomBetween(rand, 20, 40);
int lifetime = RandomHelper.randomBetween(rand, 30, 40);
final ItemCrumbParticleBuilder worldParticleBuilder = makeCrumbles(rand, stack, spinData, lifetime, slowDown);
return new ParticleEffectSpawner<>(level, pos, worldParticleBuilder);
}
public static ParticleEffectSpawner<ItemCrumbParticleBuilder> spawnGlowingItemCrumbs(Level level, Vec3 pos, ItemStack stack, MalumSpiritType spiritType) {

var rand = level.getRandom();
final SpinParticleData spinData = SpinParticleData.createRandomDirection(rand, nextFloat(rand, 0.05f, 0.1f)).randomSpinOffset(rand).build();

final SpinParticleData spinData = SpinParticleData.createRandomDirection(rand, 0, nextFloat(rand, 0.5f, 0.75f), 0).setCoefficient(0.75f).randomSpinOffset(rand).build();

final Consumer<LodestoneWorldParticleActor> slowDown = p -> p.setParticleMotion(p.getParticleSpeed().scale(0.925f));
int lifetime = RandomHelper.randomBetween(rand, 20, 40);
int lifetime = RandomHelper.randomBetween(rand, 30, 40);
final ItemCrumbParticleBuilder worldParticleBuilder = makeCrumbles(rand, stack, spinData, lifetime, slowDown);
final WorldParticleBuilder bloomParticleBuilder = SpiritLightSpecs.spiritBloom(level, spiritType, spinData, lifetime).addActor(slowDown);
return new ParticleEffectSpawner<>(level, pos, worldParticleBuilder, bloomParticleBuilder);
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit e49a379

Please sign in to comment.