Upstream/UltimateStacker
1
0
Fork 0
mirror of https://github.com/songoda/UltimateStacker.git synced 2025-03-01 01:31:02 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'development'

Browse Source
This commit is contained in:
Brianna 2020-06-06 19:08:05 -05:00
commit 50d21f1118
2 changed files with 34 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -2,7 +2,7 @@
<groupId>com.songoda</groupId> <groupId>com.songoda</groupId>
<artifactId>UltimateStacker</artifactId> <artifactId>UltimateStacker</artifactId>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<version>1.11.14</version> <version>1.11.15</version>
<build> <build>
<defaultGoal>clean install</defaultGoal> <defaultGoal>clean install</defaultGoal>
<finalName>UltimateStacker-${project.version}</finalName> <finalName>UltimateStacker-${project.version}</finalName>

74
src/main/java/com/songoda/ultimatestacker/lootables/LootablesManager.java
View File

@ -62,7 +62,6 @@ public class LootablesManager {
return loot2; return loot2;
}; };
} }
EntityType killer = null; EntityType killer = null;
if (entity.getLastDamageCause() instanceof EntityDamageByEntityEvent) { if (entity.getLastDamageCause() instanceof EntityDamageByEntityEvent) {
Entity killerEntity = ((EntityDamageByEntityEvent) entity.getLastDamageCause()).getDamager(); Entity killerEntity = ((EntityDamageByEntityEvent) entity.getLastDamageCause()).getDamager();
@ -76,6 +75,7 @@ public class LootablesManager {
} }
return lootManager.runLoot(modify, return lootManager.runLoot(modify,
entity.getFireTicks() > 0, entity.getFireTicks() > 0,
entity instanceof Creeper && ((Creeper) entity).isPowered(),
entity.getKiller() != null ? entity.getKiller().getItemInHand() : null, entity.getKiller() != null ? entity.getKiller().getItemInHand() : null,
killer, killer,
loot, loot,
@ -432,6 +432,9 @@ public class LootablesManager {
.setMaterial(CompatibleMaterial.ROTTEN_FLESH) .setMaterial(CompatibleMaterial.ROTTEN_FLESH)
.setMin(0) .setMin(0)
.setMax(2).build(), .setMax(2).build(),
new LootBuilder()
.setMaterial(CompatibleMaterial.ZOMBIE_HEAD)
.setRequireCharged(true).build(),
new LootBuilder() new LootBuilder()
.setChance(2.5) .setChance(2.5)
.setChildDropCount(1) .setChildDropCount(1)
@ -464,9 +467,16 @@ public class LootablesManager {
.setAllowLootingEnchant(false).build()) .setAllowLootingEnchant(false).build())
.build())); .build()));
Loot discs; // Add Creeper.
if (ServerVersion.isServerVersionAtLeast(ServerVersion.V1_13)) { lootManager.addLootable(new Lootable("CREEPER",
discs = new LootBuilder() new LootBuilder()
.setMaterial(CompatibleMaterial.GUNPOWDER)
.setMin(0)
.setMax(2).build(),
new LootBuilder()
.setMaterial(CompatibleMaterial.CREEPER_HEAD)
.setRequireCharged(true).build(),
new LootBuilder()
.setChildDropCount(1) .setChildDropCount(1)
.addOnlyDropFors(EntityType.SKELETON, .addOnlyDropFors(EntityType.SKELETON,
EntityType.STRAY) EntityType.STRAY)
@ -482,51 +492,7 @@ public class LootablesManager {
new LootBuilder().setMaterial(CompatibleMaterial.MUSIC_DISC_STRAD).build(), new LootBuilder().setMaterial(CompatibleMaterial.MUSIC_DISC_STRAD).build(),
new LootBuilder().setMaterial(CompatibleMaterial.MUSIC_DISC_WAIT).build(), new LootBuilder().setMaterial(CompatibleMaterial.MUSIC_DISC_WAIT).build(),
new LootBuilder().setMaterial(CompatibleMaterial.MUSIC_DISC_WARD).build()) new LootBuilder().setMaterial(CompatibleMaterial.MUSIC_DISC_WARD).build())
.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));
// Add Guardian. // Add Guardian.
lootManager.addLootable(new Lootable("GUARDIAN", lootManager.addLootable(new Lootable("GUARDIAN",
@ -656,7 +622,10 @@ public class LootablesManager {
new LootBuilder() new LootBuilder()
.setMaterial(CompatibleMaterial.BONE) .setMaterial(CompatibleMaterial.BONE)
.setMin(0) .setMin(0)
.setMax(2).build())); .setMax(2).build(),
new LootBuilder()
.setMaterial(CompatibleMaterial.SKELETON_SKULL)
.setRequireCharged(true).build()));
// Add Snowman. // Add Snowman.
lootManager.addLootable(new Lootable("SNOWMAN", lootManager.addLootable(new Lootable("SNOWMAN",
@ -671,6 +640,11 @@ public class LootablesManager {
.setMaterial(CompatibleMaterial.RABBIT_HIDE) .setMaterial(CompatibleMaterial.RABBIT_HIDE)
.setMin(0) .setMin(0)
.setMax(1).build(), .setMax(1).build(),
new LootBuilder()
.setMaterial(CompatibleMaterial.RABBIT_FOOT)
.setMin(0)
.setMax(1)
.setChance(10).build(),
new LootBuilder() new LootBuilder()
.setMaterial(CompatibleMaterial.RABBIT) .setMaterial(CompatibleMaterial.RABBIT)
.setBurnedMaterial(CompatibleMaterial.COOKED_RABBIT) .setBurnedMaterial(CompatibleMaterial.COOKED_RABBIT)