mirror of
https://github.com/songoda/UltimateStacker.git
synced 2025-02-28 17:21:02 +01:00
Merge branch 'development'
This commit is contained in:
Brianna
commit
50d21f1118
2
pom.xml
2
pom.xml
@ -2,7 +2,7 @@
|
||||
<groupId>com.songoda</groupId>
|
||||
<artifactId>UltimateStacker</artifactId>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<version>1.11.14</version>
|
||||
<version>1.11.15</version>
|
||||
<build>
|
||||
<defaultGoal>clean install</defaultGoal>
|
||||
<finalName>UltimateStacker-${project.version}</finalName>
|
||||
|
||||
@ -62,7 +62,6 @@ public class LootablesManager {
|
||||
return loot2;
|
||||
};
|
||||
}
|
||||
|
||||
EntityType killer = null;
|
||||
if (entity.getLastDamageCause() instanceof EntityDamageByEntityEvent) {
|
||||
Entity killerEntity = ((EntityDamageByEntityEvent) entity.getLastDamageCause()).getDamager();
|
||||
@ -76,6 +75,7 @@ public class LootablesManager {
|
||||
}
|
||||
return lootManager.runLoot(modify,
|
||||
entity.getFireTicks() > 0,
|
||||
entity instanceof Creeper && ((Creeper) entity).isPowered(),
|
||||
entity.getKiller() != null ? entity.getKiller().getItemInHand() : null,
|
||||
killer,
|
||||
loot,
|
||||
@ -432,6 +432,9 @@ public class LootablesManager {
|
||||
.setMaterial(CompatibleMaterial.ROTTEN_FLESH)
|
||||
.setMin(0)
|
||||
.setMax(2).build(),
|
||||
new LootBuilder()
|
||||
.setMaterial(CompatibleMaterial.ZOMBIE_HEAD)
|
||||
.setRequireCharged(true).build(),
|
||||
new LootBuilder()
|
||||
.setChance(2.5)
|
||||
.setChildDropCount(1)
|
||||
@ -464,69 +467,32 @@ public class LootablesManager {
|
||||
.setAllowLootingEnchant(false).build())
|
||||
.build()));
|
||||
|
||||
Loot discs;
|
||||
if (ServerVersion.isServerVersionAtLeast(ServerVersion.V1_13)) {
|
||||
discs = new LootBuilder()
|
||||
.setChildDropCount(1)
|
||||
.addOnlyDropFors(EntityType.SKELETON,
|
||||
EntityType.STRAY)
|
||||
.addChildLoot(new LootBuilder().setMaterial(CompatibleMaterial.MUSIC_DISC_11).build(),
|
||||
new LootBuilder().setMaterial(CompatibleMaterial.MUSIC_DISC_13).build(),
|
||||
new LootBuilder().setMaterial(CompatibleMaterial.MUSIC_DISC_BLOCKS).build(),
|
||||
new LootBuilder().setMaterial(CompatibleMaterial.MUSIC_DISC_CAT).build(),
|
||||
new LootBuilder().setMaterial(CompatibleMaterial.MUSIC_DISC_CHIRP).build(),
|
||||
new LootBuilder().setMaterial(CompatibleMaterial.MUSIC_DISC_FAR).build(),
|
||||
new LootBuilder().setMaterial(CompatibleMaterial.MUSIC_DISC_MALL).build(),
|
||||
new LootBuilder().setMaterial(CompatibleMaterial.MUSIC_DISC_MELLOHI).build(),
|
||||
new LootBuilder().setMaterial(CompatibleMaterial.MUSIC_DISC_STAL).build(),
|
||||
new LootBuilder().setMaterial(CompatibleMaterial.MUSIC_DISC_STRAD).build(),
|
||||
new LootBuilder().setMaterial(CompatibleMaterial.MUSIC_DISC_WAIT).build(),
|
||||
new LootBuilder().setMaterial(CompatibleMaterial.MUSIC_DISC_WARD).build())
|
||||
.build();
|
||||
} else if (ServerVersion.isServerVersionAtLeast(ServerVersion.V1_11)) {
|
||||
discs = new LootBuilder()
|
||||
.setChildDropCount(1)
|
||||
.addOnlyDropFors(EntityType.SKELETON,
|
||||
EntityType.STRAY)
|
||||
.addChildLoot(new LootBuilder().setMaterial(CompatibleMaterial.valueOf("GOLD_RECORD")).build(),
|
||||
new LootBuilder().setMaterial(CompatibleMaterial.valueOf("GREEN_RECORD")).build(),
|
||||
new LootBuilder().setMaterial(CompatibleMaterial.valueOf("RECORD_3")).build(),
|
||||
new LootBuilder().setMaterial(CompatibleMaterial.valueOf("RECORD_4")).build(),
|
||||
new LootBuilder().setMaterial(CompatibleMaterial.valueOf("RECORD_5")).build(),
|
||||
new LootBuilder().setMaterial(CompatibleMaterial.valueOf("RECORD_6")).build(),
|
||||
new LootBuilder().setMaterial(CompatibleMaterial.valueOf("RECORD_7")).build(),
|
||||
new LootBuilder().setMaterial(CompatibleMaterial.valueOf("RECORD_8")).build(),
|
||||
new LootBuilder().setMaterial(CompatibleMaterial.valueOf("RECORD_9")).build(),
|
||||
new LootBuilder().setMaterial(CompatibleMaterial.valueOf("RECORD_10")).build(),
|
||||
new LootBuilder().setMaterial(CompatibleMaterial.valueOf("RECORD_11")).build(),
|
||||
new LootBuilder().setMaterial(CompatibleMaterial.valueOf("RECORD_12")).build())
|
||||
.build();
|
||||
} else {
|
||||
discs = new LootBuilder()
|
||||
.setChildDropCount(1)
|
||||
.addOnlyDropFors(EntityType.SKELETON)
|
||||
.addChildLoot(new LootBuilder().setMaterial(CompatibleMaterial.valueOf("GOLD_RECORD")).build(),
|
||||
new LootBuilder().setMaterial(CompatibleMaterial.valueOf("GREEN_RECORD")).build(),
|
||||
new LootBuilder().setMaterial(CompatibleMaterial.valueOf("RECORD_3")).build(),
|
||||
new LootBuilder().setMaterial(CompatibleMaterial.valueOf("RECORD_4")).build(),
|
||||
new LootBuilder().setMaterial(CompatibleMaterial.valueOf("RECORD_5")).build(),
|
||||
new LootBuilder().setMaterial(CompatibleMaterial.valueOf("RECORD_6")).build(),
|
||||
new LootBuilder().setMaterial(CompatibleMaterial.valueOf("RECORD_7")).build(),
|
||||
new LootBuilder().setMaterial(CompatibleMaterial.valueOf("RECORD_8")).build(),
|
||||
new LootBuilder().setMaterial(CompatibleMaterial.valueOf("RECORD_9")).build(),
|
||||
new LootBuilder().setMaterial(CompatibleMaterial.valueOf("RECORD_10")).build(),
|
||||
new LootBuilder().setMaterial(CompatibleMaterial.valueOf("RECORD_11")).build(),
|
||||
new LootBuilder().setMaterial(CompatibleMaterial.valueOf("RECORD_12")).build())
|
||||
.build();
|
||||
}
|
||||
|
||||
// Add Creeper.
|
||||
lootManager.addLootable(new Lootable("CREEPER",
|
||||
new LootBuilder()
|
||||
.setMaterial(CompatibleMaterial.GUNPOWDER)
|
||||
.setMin(0)
|
||||
.setMax(2).build(),
|
||||
discs));
|
||||
new LootBuilder()
|
||||
.setMaterial(CompatibleMaterial.CREEPER_HEAD)
|
||||
.setRequireCharged(true).build(),
|
||||
new LootBuilder()
|
||||
.setChildDropCount(1)
|
||||
.addOnlyDropFors(EntityType.SKELETON,
|
||||
EntityType.STRAY)
|
||||
.addChildLoot(new LootBuilder().setMaterial(CompatibleMaterial.MUSIC_DISC_11).build(),
|
||||
new LootBuilder().setMaterial(CompatibleMaterial.MUSIC_DISC_13).build(),
|
||||
new LootBuilder().setMaterial(CompatibleMaterial.MUSIC_DISC_BLOCKS).build(),
|
||||
new LootBuilder().setMaterial(CompatibleMaterial.MUSIC_DISC_CAT).build(),
|
||||
new LootBuilder().setMaterial(CompatibleMaterial.MUSIC_DISC_CHIRP).build(),
|
||||
new LootBuilder().setMaterial(CompatibleMaterial.MUSIC_DISC_FAR).build(),
|
||||
new LootBuilder().setMaterial(CompatibleMaterial.MUSIC_DISC_MALL).build(),
|
||||
new LootBuilder().setMaterial(CompatibleMaterial.MUSIC_DISC_MELLOHI).build(),
|
||||
new LootBuilder().setMaterial(CompatibleMaterial.MUSIC_DISC_STAL).build(),
|
||||
new LootBuilder().setMaterial(CompatibleMaterial.MUSIC_DISC_STRAD).build(),
|
||||
new LootBuilder().setMaterial(CompatibleMaterial.MUSIC_DISC_WAIT).build(),
|
||||
new LootBuilder().setMaterial(CompatibleMaterial.MUSIC_DISC_WARD).build())
|
||||
.build()));
|
||||
|
||||
// Add Guardian.
|
||||
lootManager.addLootable(new Lootable("GUARDIAN",
|
||||
@ -656,7 +622,10 @@ public class LootablesManager {
|
||||
new LootBuilder()
|
||||
.setMaterial(CompatibleMaterial.BONE)
|
||||
.setMin(0)
|
||||
.setMax(2).build()));
|
||||
.setMax(2).build(),
|
||||
new LootBuilder()
|
||||
.setMaterial(CompatibleMaterial.SKELETON_SKULL)
|
||||
.setRequireCharged(true).build()));
|
||||
|
||||
// Add Snowman.
|
||||
lootManager.addLootable(new Lootable("SNOWMAN",
|
||||
@ -671,6 +640,11 @@ public class LootablesManager {
|
||||
.setMaterial(CompatibleMaterial.RABBIT_HIDE)
|
||||
.setMin(0)
|
||||
.setMax(1).build(),
|
||||
new LootBuilder()
|
||||
.setMaterial(CompatibleMaterial.RABBIT_FOOT)
|
||||
.setMin(0)
|
||||
.setMax(1)
|
||||
.setChance(10).build(),
|
||||
new LootBuilder()
|
||||
.setMaterial(CompatibleMaterial.RABBIT)
|
||||
.setBurnedMaterial(CompatibleMaterial.COOKED_RABBIT)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user