Skip to content

Commit

Permalink
Merge pull request #10 from PixelOutlaw/develop
Browse files Browse the repository at this point in the history 
Develop
  • Loading branch information
@UltraFaceguy
UltraFaceguy committed May 11, 2020
2 parents f680dc8 + 2399745 commit 729085a
Show file tree
Hide file tree
Showing 93 changed files with 2,073 additions and 1,528 deletions.
20 changes: 16 additions & 4 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
</parent>

<artifactId>strife</artifactId>
<version>3.0.5</version>
<version>3.0.6</version>
<packaging>jar</packaging>

<name>strife</name>
Expand Down Expand Up @@ -77,7 +77,7 @@
<dependency>
<groupId>io.pixeloutlaw</groupId>
<artifactId>facecore</artifactId>
<version>1.15.2.4</version>
<version>1.15.2.5</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand All @@ -89,7 +89,7 @@
<dependency>
<groupId>LibsDisguises</groupId>
<artifactId>LibsDisguises</artifactId>
<version>9.9.3-SNAPSHOT</version>
<version>10.0.5-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand All @@ -101,9 +101,21 @@
<dependency>
<groupId>com.github.UltraFaceguy</groupId>
<artifactId>SnazzyParties</artifactId>
<version>1.0.2</version>
<version>1.0.4</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>me.glaremasters</groupId>
<artifactId>guilds</artifactId>
<version>3.5.4.9</version>
<scope>system</scope>
<systemPath>${basedir}/lib/Guilds-3.5.4.9.jar</systemPath>
</dependency>
<dependency>
<groupId>com.github.shynixn.headdatabase</groupId>
<artifactId>hdb-api</artifactId>
<version>1.0</version>
</dependency>
</dependencies>

<build>
Expand Down
83 changes: 55 additions & 28 deletions src/main/java/land/face/strife/StrifePlugin.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@
import land.face.strife.managers.BarrierManager;
import land.face.strife.managers.BleedManager;
import land.face.strife.managers.BlockManager;
import land.face.strife.managers.BoostManager;
import land.face.strife.managers.BossBarManager;
import land.face.strife.managers.BuffManager;
import land.face.strife.managers.ChampionManager;
Expand All @@ -98,7 +99,6 @@
import land.face.strife.managers.EnergyManager;
import land.face.strife.managers.EntityEquipmentManager;
import land.face.strife.managers.ExperienceManager;
import land.face.strife.managers.GlobalBoostManager;
import land.face.strife.managers.IndicatorManager;
import land.face.strife.managers.LoreAbilityManager;
import land.face.strife.managers.MinionManager;
Expand Down Expand Up @@ -126,21 +126,21 @@
import land.face.strife.storage.FlatfileStorage;
import land.face.strife.tasks.AbilityTickTask;
import land.face.strife.tasks.BarrierTask;
import land.face.strife.tasks.BoostTickTask;
import land.face.strife.tasks.BossBarsTask;
import land.face.strife.tasks.CombatStatusTask;
import land.face.strife.tasks.DamageOverTimeTask;
import land.face.strife.tasks.EnergyRegenTask;
import land.face.strife.tasks.EveryTickTask;
import land.face.strife.tasks.ForceAttackSpeed;
import land.face.strife.tasks.GlobalMultiplierTask;
import land.face.strife.tasks.IndicatorTask;
import land.face.strife.tasks.MinionDecayTask;
import land.face.strife.tasks.ParticleTask;
import land.face.strife.tasks.PruneBossBarsTask;
import land.face.strife.tasks.RegenTask;
import land.face.strife.tasks.SaveTask;
import land.face.strife.tasks.SpawnerSpawnTask;
import land.face.strife.tasks.StealthParticleTask;
import land.face.strife.tasks.TrackedPruneTask;
import land.face.strife.tasks.StrifeMobTracker;
import land.face.strife.tasks.VirtualEntityTask;
import land.face.strife.util.DamageUtil;
import land.face.strife.util.LogUtil;
Expand Down Expand Up @@ -214,7 +214,7 @@ public class StrifePlugin extends FacePlugin {
private CombatStatusManager combatStatusManager;
private SpawnerManager spawnerManager;
private MobModManager mobModManager;
private GlobalBoostManager globalBoostManager;
private BoostManager boostManager;
private SoulManager soulManager;
private EnergyManager energyManager;
private WSEManager wseManager;
Expand All @@ -224,6 +224,7 @@ public class StrifePlugin extends FacePlugin {

private List<BukkitTask> taskList = new ArrayList<>();
private ParticleTask particleTask;
private DamageOverTimeTask damageOverTimeTask;
private EnergyRegenTask energyRegenTask;
private RegenTask regenTask;

Expand All @@ -242,9 +243,12 @@ public static StrifePlugin getInstance() {
return instance;
}

public StrifePlugin() {
instance = this;
}

@Override
public void enable() {
instance = this;
debugPrinter = new PluginLogger(this);

List<VersionedSmartYamlConfiguration> configurations = new ArrayList<>();
Expand Down Expand Up @@ -293,7 +297,7 @@ public void enable() {
attackSpeedManager = new AttackSpeedManager(this);
indicatorManager = new IndicatorManager();
equipmentManager = new EntityEquipmentManager();
globalBoostManager = new GlobalBoostManager();
boostManager = new BoostManager(this);
soulManager = new SoulManager(this);
energyManager = new EnergyManager(this);
barrierManager = new BarrierManager();
Expand Down Expand Up @@ -339,20 +343,20 @@ public void enable() {
loadSpawners();

SaveTask saveTask = new SaveTask(this);
TrackedPruneTask trackedPruneTask = new TrackedPruneTask(this);
StrifeMobTracker strifeMobTracker = new StrifeMobTracker(this);
StealthParticleTask stealthParticleTask = new StealthParticleTask(stealthManager);
ForceAttackSpeed forceAttackSpeed = new ForceAttackSpeed();
BarrierTask barrierTask = new BarrierTask(this);
BossBarsTask bossBarsTask = new BossBarsTask(bossBarManager);
MinionDecayTask minionDecayTask = new MinionDecayTask(minionManager);
GlobalMultiplierTask globalMultiplierTask = new GlobalMultiplierTask(globalBoostManager);
PruneBossBarsTask pruneBossBarsTask = new PruneBossBarsTask(bossBarManager);
BoostTickTask boostTickTask = new BoostTickTask(boostManager);
SpawnerSpawnTask spawnerSpawnTask = new SpawnerSpawnTask(spawnerManager);
AbilityTickTask iconDuraTask = new AbilityTickTask(abilityManager);
VirtualEntityTask virtualEntityTask = new VirtualEntityTask();
CombatStatusTask combatStatusTask = new CombatStatusTask(combatStatusManager);
EveryTickTask everyTickTask = new EveryTickTask();
IndicatorTask indicatorTask = new IndicatorTask(this);
damageOverTimeTask = new DamageOverTimeTask(this);
particleTask = new ParticleTask();
energyRegenTask = new EnergyRegenTask(this);
regenTask = new RegenTask(this);
Expand Down Expand Up @@ -383,9 +387,9 @@ public void enable() {
20L * 5, // Start save after 5s
9L // Run slightly more often than every 0.5s to catch odd rounding
));
taskList.add(trackedPruneTask.runTaskTimer(this,
taskList.add(strifeMobTracker.runTaskTimer(this,
20L * 61, // Start save after 1 minute
20L * 60 // Run every 1 minute after that
20L * 120 // Run every 2 minutes after that
));
taskList.add(saveTask.runTaskTimer(this,
20L * 680, // Start save after 11 minutes, 20 seconds cuz yolo
Expand All @@ -407,6 +411,10 @@ public void enable() {
11 * 20L, // Start timer after 11s
2L // Run it every 1/5th of a second after
));
taskList.add(damageOverTimeTask.runTaskTimer(this,
20L, // Start timer after 11s
5L // Run it every 5 ticks
));
taskList.add(bossBarsTask.runTaskTimer(this,
240L, // Start timer after 12s
2L // Run it every 1/10th of a second after
Expand All @@ -415,13 +423,9 @@ public void enable() {
220L, // Start timer after 11s
11L
));
taskList.add(globalMultiplierTask.runTaskTimer(this,
20L * 15, // Start timer after 15s
20L * 60 // Run it every minute after
));
taskList.add(pruneBossBarsTask.runTaskTimer(this,
20L * 13, // Start timer after 13s
20L * 60 * 7 // Run it every 7 minutes
taskList.add(boostTickTask.runTaskTimer(this,
20L,
20L
));
taskList.add(particleTask.runTaskTimer(this,
2L,
Expand Down Expand Up @@ -451,9 +455,14 @@ public void enable() {
3 * 20L + 2L, // Start timer after 3s
20L
));
taskList.add(Bukkit.getScheduler().runTaskTimer(this,
() -> boostManager.checkBoostSchedule(),
60L,
20L * 900
));

globalBoostManager.startScheduledEvents();
agilityManager.loadAgilityContainers();
boostManager.loadBoosts();

Bukkit.getPluginManager().registerEvents(new EndermanListener(), this);
Bukkit.getPluginManager().registerEvents(new ExperienceListener(this), this);
Expand Down Expand Up @@ -483,7 +492,8 @@ public void enable() {
Bukkit.getPluginManager().registerEvents(new FallListener(this), this);
Bukkit.getPluginManager().registerEvents(new LaunchAndLandListener(this), this);
Bukkit.getPluginManager().registerEvents(new DogeListener(strifeMobManager), this);
Bukkit.getPluginManager().registerEvents(new LoreAbilityListener(strifeMobManager, loreAbilityManager), this);
Bukkit.getPluginManager()
.registerEvents(new LoreAbilityListener(strifeMobManager, loreAbilityManager), this);
Bukkit.getPluginManager().registerEvents(new InventoryListener(this), this);
if (Bukkit.getPluginManager().getPlugin("Bullion") != null) {
Bukkit.getPluginManager().registerEvents(new BullionListener(this), this);
Expand All @@ -500,9 +510,11 @@ public void enable() {
menu.setId(menuId);

String name = abilityMenus.getString(menuId + ".name", "CONFIGURE ME");
List<String> lore = abilityMenus.getStringList(menuId + ".lore");
Material material = Material.valueOf(abilityMenus.getString(menuId + ".material", "BARRIER"));
int slot = abilityMenus.getInt(menuId + ".slot", 0);
AbilityPickerPickerItem subMenuIcon = new AbilityPickerPickerItem(menu, material, name, slot);
AbilityPickerPickerItem subMenuIcon = new AbilityPickerPickerItem(menu, material, name, lore,
slot);
pickerItems.add(subMenuIcon);
}

Expand Down Expand Up @@ -530,13 +542,14 @@ public void enable() {
@Override
public void disable() {
saveSpawners();
boostManager.saveBoosts();
storage.saveAll();

HandlerList.unregisterAll(this);
Bukkit.getScheduler().cancelTasks(this);

strifeMobManager.despawnAllTempEntities();
bossBarManager.removeAllBars();
bossBarManager.clearBars();
agilityManager.saveLocations();
spawnerManager.cancelAll();
rageManager.endRageTasks();
Expand Down Expand Up @@ -661,12 +674,12 @@ private void buildMobMods() {

private void loadScheduledBoosts() {
ConfigurationSection cs = globalBoostsYAML.getConfigurationSection("scheduled-boosts");
globalBoostManager.loadScheduledBoosts(cs);
boostManager.loadScheduledBoosts(cs);
}

private void loadBoosts() {
ConfigurationSection cs = globalBoostsYAML.getConfigurationSection("boost-templates");
globalBoostManager.loadStatBoosts(cs);
boostManager.loadStatBoosts(cs);
}

private void buildUniqueEnemies() {
Expand All @@ -692,7 +705,7 @@ private void buildUniqueEnemies() {
uniqueEntity.setDisplaceMultiplier(cs.getDouble("displace-multiplier", 1.0));
uniqueEntity.setExperienceMultiplier((float) cs.getDouble("experience-multiplier", 1));
uniqueEntity.setKnockbackImmune(cs.getBoolean("knockback-immune", false));
uniqueEntity.setCharmImmune(cs.getBoolean("charm-immune", true));
uniqueEntity.setCharmImmune(cs.getBoolean("charm-immune", false));
uniqueEntity.setBurnImmune(cs.getBoolean("burn-immune", false));
uniqueEntity.setFallImmune(cs.getBoolean("fall-immune", false));
uniqueEntity.setIgnoreSneak(cs.getBoolean("ignore-sneak", false));
Expand All @@ -707,6 +720,7 @@ private void buildUniqueEnemies() {
uniqueEntity.setSize(cs.getInt("size", -1));
uniqueEntity.getFactions().addAll(cs.getStringList("factions"));
uniqueEntity.setBaby(cs.getBoolean("baby", false));
uniqueEntity.setAngry(cs.getBoolean("angry", false));
uniqueEntity.setBaseLevel(cs.getInt("base-level", -1));

Disguise disguise = PlayerDataUtil.parseDisguise(cs.getConfigurationSection("disguise"),
Expand All @@ -723,6 +737,11 @@ private void buildUniqueEnemies() {
ConfigurationSection equipmentCS = cs.getConfigurationSection("equipment");
uniqueEntity.setEquipment(equipmentManager.buildEquipmentFromConfigSection(equipmentCS));

String passengerItem = cs.getString("item-passenger", "");
if (StringUtils.isNotBlank(passengerItem)) {
uniqueEntity.setItemPassenger(equipmentManager.getItem(passengerItem));
}

String particle = cs.getString("particle", "");
if (StringUtils.isNotBlank(particle)) {
Effect effect = effectManager.getEffect(particle);
Expand Down Expand Up @@ -788,6 +807,10 @@ private void saveSpawners() {
LogUtil.printDebug("Spawner " + spawnerId + " has been removed.");
}
}
if (spawnerManager.getSpawnerMap().size() == 0) {
Bukkit.getLogger().warning("Spawner map size in memory is 0. Not saving.");
return;
}
for (String spawnerId : spawnerManager.getSpawnerMap().keySet()) {
Spawner spawner = spawnerManager.getSpawnerMap().get(spawnerId);
spawnerYAML.set(spawnerId + ".unique", spawner.getUniqueId());
Expand Down Expand Up @@ -887,8 +910,8 @@ public SpawnerManager getSpawnerManager() {
return spawnerManager;
}

public GlobalBoostManager getGlobalBoostManager() {
return globalBoostManager;
public BoostManager getBoostManager() {
return boostManager;
}

public SoulManager getSoulManager() {
Expand Down Expand Up @@ -979,6 +1002,10 @@ public EnergyRegenTask getEnergyRegenTask() {
return energyRegenTask;
}

public DamageOverTimeTask getDamageOverTimeTask() {
return damageOverTimeTask;
}

public RegenTask getRegenTask() {
return regenTask;
}
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/land/face/strife/commands/StrifeCommand.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ public void profileCommand(CommandSender sender, @Arg(name = "target") Player ta
@Command(identifier = "strife mobinfo", permissions = "strife.command.strife.info")
public void infoCommand(CommandSender sender) {
List<LivingEntity> targets = new ArrayList<>(
TargetingUtil.getEntitiesInLine((Player) sender, 30));
TargetingUtil.getEntitiesInLine(((Player) sender).getEyeLocation(), 30));
if (targets.isEmpty()) {
sendMessage(sender, "&eNo target found...");
return;
Expand Down Expand Up @@ -332,7 +332,7 @@ public void addXpCommand(CommandSender sender, @Arg(name = "target") Player play
@Command(identifier = "strife startBoost", permissions = "strife.command.strife.boosts", onlyPlayers = false)
public void startBoostCommand(CommandSender sender, @Arg(name = "boostId") String boostId,
@Arg(name = "creator") String creator, @Arg(name = "duration") int duration) {
boolean success = plugin.getGlobalBoostManager().createStatBoost(boostId, creator, duration);
boolean success = plugin.getBoostManager().startBoost(creator, boostId, duration);
if (!success) {
sendMessage(sender, "&cBoost with that ID doesn't exist, or this boost is running");
}
Expand Down
12 changes: 6 additions & 6 deletions ...and/face/strife/data/DamageContainer.java → ...va/land/face/strife/data/BonusDamage.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
import land.face.strife.util.DamageUtil.DamageScale;
import land.face.strife.util.DamageUtil.DamageType;

public class DamageContainer {
public class BonusDamage {

private DamageScale damageScale;
private DamageType damageType;
private StrifeStat damageStat;
private float amount;
private final DamageScale damageScale;
private final DamageType damageType;
private final StrifeStat damageStat;
private final float amount;

public DamageContainer(DamageScale damageScale, DamageType damageType,
public BonusDamage(DamageScale damageScale, DamageType damageType,
StrifeStat damageStat, float amount) {
this.damageScale = damageScale;
this.damageType = damageType;
Expand Down
Loading

0 comments on commit 729085a

Please sign in to comment.