Skip to content

Commit ff4ca68

Browse files
committed
Use DyeColor.values() to get better array of colors for fireworks.
1 parent 0148a62 commit ff4ca68

1 file changed

Lines changed: 8 additions & 3 deletions

File tree

src/main/js/modules/canary/fireworks.js

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,24 @@ var Canary = Packages.net.canarymod.Canary;
55
var cmFireworkHelper = Packages.net.canarymod.api.inventory.helper.FireworkHelper;
66
var cmExplosionType = Packages.net.canarymod.api.inventory.helper.FireworkHelper.ExplosionType;
77
var explosionTypes = ['STAR','BURST','CREEPER','LARGE','SMALL'];
8+
var cmDyeColor = Packages.net.canarymod.api.DyeColor;
89
var entityFactory = Canary.factory().entityFactory;
910
var cmEntityType = Packages.net.canarymod.api.entity.EntityType;
10-
var colors = [0xff0000, 0xffff00, 0x00ff00, 0x0000ff];
11+
var colors = [].concat(cmDyeColor.values());
12+
1113
function canaryFirework( location ) {
14+
1215
var firework = items.fireworkStar(1);
1316
var i1 = Math.floor(Math.random()* colors.length);
1417
var i2 = Math.floor(Math.random()* colors.length);
1518
var colorsToUse = colors.slice(Math.min(i1,i2),Math.max(i1,i2));
1619
if (colorsToUse.length == 0){
1720
colorsToUse = colors;
1821
}
19-
cmFireworkHelper.addStarColorsRaw(firework, colorsToUse);
20-
cmFireworkHelper.setDoesFlicker( firework, true);
22+
cmFireworkHelper.addStarColors( firework, colorsToUse );
23+
cmFireworkHelper.setDoesFlicker( firework, true );
2124
cmFireworkHelper.setDoesTrail( firework, true );
25+
2226
// use a random explosion type
2327
var rnd = Math.floor(Math.random() * explosionTypes.length);
2428
var type = explosionTypes[rnd];
@@ -29,6 +33,7 @@ function canaryFirework( location ) {
2933
var rocketEntity = entityFactory.newEntity(cmEntityType.FIREWORKROCKET, location);
3034
rocketEntity.item = rocket;
3135
rocketEntity.spawn();
36+
3237
}
3338

3439
module.exports = canaryFirework;

0 commit comments

Comments
 (0)