Skip to content

Commit

Permalink
Merge pull request #214 from VolmitSoftware/Development
Browse files Browse the repository at this point in the history 
Development
  • Loading branch information
@NextdoorPsycho
NextdoorPsycho authored Sep 25, 2022
2 parents 51d592b + 10a0705 commit 0c02921
Show file tree
Hide file tree
Showing 32 changed files with 513 additions and 194 deletions.
2 changes: 1 addition & 1 deletion build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ plugins {
}


version '1.3.5-1.19.2' // Needs to be version specific
version '1.3.6-1.19.2' // Needs to be version specific
def nmsVersion = "1.19.2" //[NMS]
def apiVersion = '1.19'
def specialSourceVersion = '1.11.0' //[NMS]
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/com/volmit/adapt/AdaptConfig.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,9 @@ public class AdaptConfig {
private boolean loginBonus = true;
private boolean advancements = true;
private boolean useSql = false;
private int learnUnlearnButtonDelayTicks = 14;
private boolean actionbarNotifyXp = true;
private boolean actionbarNotifyLevel = true;
private SqlSettings sql = new SqlSettings();

public static AdaptConfig get() {
Expand Down Expand Up @@ -84,6 +87,7 @@ public static AdaptConfig get() {
return config;
}


@Getter
public static class SqlSettings {
private String host = "localhost";
Expand Down
12 changes: 8 additions & 4 deletions src/main/java/com/volmit/adapt/api/adaptation/Adaptation.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -320,8 +320,10 @@ default void openGui(Player player) {
player.getWorld().playSound(player.getLocation(), Sound.BLOCK_NETHER_GOLD_ORE_PLACE, 0.7f, 1.355f);
player.getWorld().playSound(player.getLocation(), Sound.BLOCK_BEACON_DEACTIVATE, 0.4f, 0.755f);
w.close();
player.sendTitle(" ", C.GRAY + Adapt.dLocalize("snippets", "adaptmenu", "unlearned") + " " + getDisplayName(mylevel), 1, 5, 11);
J.s(() -> openGui(player), 14);
if (AdaptConfig.get().getLearnUnlearnButtonDelayTicks() != 0) {
player.sendTitle(" ", C.GRAY + Adapt.dLocalize("snippets", "adaptmenu", "unlearned") + " " + getDisplayName(mylevel), 1, 5, 11);
}
J.s(() -> openGui(player), AdaptConfig.get().getLearnUnlearnButtonDelayTicks());
return;
}

Expand All @@ -333,8 +335,10 @@ default void openGui(Player player) {
player.getWorld().playSound(player.getLocation(), Sound.BLOCK_BEACON_POWER_SELECT, 0.4f, 0.155f);
player.getWorld().playSound(player.getLocation(), Sound.BLOCK_BEACON_ACTIVATE, 0.2f, 1.455f);
w.close();
player.sendTitle(" ", C.GRAY + Adapt.dLocalize("snippets", "adaptmenu", "learned") + " " + getDisplayName(lvl), 1, 5, 11);
J.s(() -> openGui(player), 14);
if (AdaptConfig.get().getLearnUnlearnButtonDelayTicks() != 0) {
player.sendTitle(" ", C.GRAY + Adapt.dLocalize("snippets", "adaptmenu", "learned") + " " + getDisplayName(lvl), 1, 5, 11);
}
J.s(() -> openGui(player), AdaptConfig.get().getLearnUnlearnButtonDelayTicks());
} else {
player.getWorld().playSound(player.getLocation(), Sound.BLOCK_BAMBOO_HIT, 0.7f, 1.855f);

Expand Down
27 changes: 0 additions & 27 deletions src/main/java/com/volmit/adapt/api/skill/SimpleSkill.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
import art.arcane.amulet.io.FileWatcher;
import com.google.gson.Gson;
import com.volmit.adapt.Adapt;
import com.volmit.adapt.AdaptConfig;
import com.volmit.adapt.api.adaptation.Adaptation;
import com.volmit.adapt.api.advancement.AdaptAdvancement;
import com.volmit.adapt.api.recipe.AdaptRecipe;
Expand All @@ -34,9 +33,7 @@
import com.volmit.adapt.util.advancements.advancement.AdvancementVisibility;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.bukkit.GameMode;
import org.bukkit.Material;
import org.bukkit.entity.Player;

import java.io.File;
import java.io.IOException;
Expand Down Expand Up @@ -147,30 +144,6 @@ public void registerRecipe(AdaptRecipe r) {
recipes.add(r);
}

public boolean canUseSkill(Player p) {
if (!this.isEnabled()) {
return false;
}
if (AdaptConfig.get().blacklistedWorlds.contains(p.getWorld().getName())) {
return false;
}
if (!AdaptConfig.get().isXpInCreative()
&& (p.getGameMode().equals(GameMode.CREATIVE)
|| p.getGameMode().equals(GameMode.SPECTATOR)
|| p.isDead()
|| p.isInvulnerable()
|| p.isDead()
|| p.isInvulnerable())) {
return false;
}
return true;
}

public boolean canUseSkill() {
return this.isEnabled();
}


public void registerAdvancement(AdaptAdvancement a) {
cachedAdvancements.add(a);
}
Expand Down
5 changes: 4 additions & 1 deletion src/main/java/com/volmit/adapt/api/skill/Skill.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,10 @@ default void checkStatTrackers(AdaptPlayer player) {
if (player.getPlayer().getClass().getSimpleName().equals("PlayerNPC")) {
return;
}
if (!player.getAdvancementHandler().isReady() && AdaptConfig.get().isAdvancements()) {
if (!player.getAdvancementHandler().isReady() ) {
return;
}
if (!AdaptConfig.get().isAdvancements()) {
return;
}
PlayerData d = player.getData();
Expand Down
12 changes: 10 additions & 2 deletions src/main/java/com/volmit/adapt/api/world/AdvancementHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,11 +77,19 @@ public void activate() {

public void grant(String key, boolean toast) {
getPlayer().getData().ensureGranted(key);
J.s(() -> getManager().grantAdvancement(player.getPlayer(), real.get(key)), 5);
try {
J.s(() -> getManager().grantAdvancement(player.getPlayer(), real.get(key)), 5);
} catch (Exception e) {
Adapt.error("Failed to grant advancement " + key);
}

if (toast) {
if (getPlayer() != null && getPlayer().getPlayer() != null) {
real.get(key).displayToast(getPlayer().getPlayer());
try {
real.get(key).displayToast(getPlayer().getPlayer());
} catch (Exception e) {
Adapt.error("Failed to grant advancement " + key + " Reattaching!");
}
}
}
}
Expand Down
9 changes: 6 additions & 3 deletions src/main/java/com/volmit/adapt/api/world/PlayerSkillLine.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,9 @@ public void giveXP(Notifier p, double xp) {

if (p != null) {
last = M.ms();
p.notifyXP(line, xp);
if (AdaptConfig.get().isActionbarNotifyXp()) {
p.notifyXP(line, xp);
}
}
}

Expand Down Expand Up @@ -173,8 +175,9 @@ public void update(AdaptPlayer p, String line, PlayerData data) {
giveKnowledge((i / 13) + 1);
p.getData().giveMasterXp((i * AdaptConfig.get().getPlayerXpPerSkillLevelUpLevelMultiplier()) + AdaptConfig.get().getPlayerXpPerSkillLevelUpBase());
}

notifyLevel(p, getLevel(), getKnowledge());
if (AdaptConfig.get().isActionbarNotifyLevel()) {
notifyLevel(p, getLevel(), getKnowledge());
}
lastLevel = getLevel();
}
}
Expand Down
21 changes: 18 additions & 3 deletions src/main/java/com/volmit/adapt/content/skill/SkillAgility.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
package com.volmit.adapt.content.skill;

import com.volmit.adapt.Adapt;
import com.volmit.adapt.AdaptConfig;
import com.volmit.adapt.api.advancement.AdaptAdvancement;
import com.volmit.adapt.api.skill.SimpleSkill;
import com.volmit.adapt.api.world.AdaptStatTracker;
Expand All @@ -31,6 +32,7 @@
import com.volmit.adapt.util.advancements.advancement.AdvancementVisibility;
import lombok.NoArgsConstructor;
import org.bukkit.Bukkit;
import org.bukkit.GameMode;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
Expand Down Expand Up @@ -81,13 +83,19 @@ public SkillAgility() {

@EventHandler(priority = EventPriority.HIGHEST)
public void on(PlayerMoveEvent e) {
if (canUseSkill(e.getPlayer())) {
if (!this.isEnabled()) {
return;
}
if (e.isCancelled()) {
return;
}
Player p = e.getPlayer();
if (AdaptConfig.get().blacklistedWorlds.contains(p.getWorld().getName())) {
return;
}
if (!AdaptConfig.get().isXpInCreative() && (p.getGameMode().equals(GameMode.CREATIVE) || p.getGameMode().equals(GameMode.SPECTATOR))) {
return;
}
if (e.getFrom().getWorld() != null && e.getTo() != null && e.getFrom().getWorld().equals(e.getTo().getWorld())) {
double d = e.getFrom().distance(e.getTo());
getPlayer(p).getData().addStat("move", d);
Expand All @@ -105,12 +113,19 @@ public void on(PlayerMoveEvent e) {

@Override
public void onTick() {

for (Player i : Bukkit.getOnlinePlayers()) {
if (canUseSkill(i.getPlayer())) {
checkStatTrackers(getPlayer(i));
if (AdaptConfig.get().blacklistedWorlds.contains(i.getWorld().getName())) {
return;
}
checkStatTrackers(getPlayer(i));
if (i.isSprinting() && !i.isFlying() && !i.isSwimming() && !i.isSneaking()) {
if (!AdaptConfig.get().isXpInCreative() && (i.getGameMode().equals(GameMode.CREATIVE) || i.getGameMode().equals(GameMode.SPECTATOR))) {
return;
}
if (!this.isEnabled()) {
return;
}
xpSilent(i, getConfig().sprintXpPassive);
}
}
Expand Down
26 changes: 20 additions & 6 deletions src/main/java/com/volmit/adapt/content/skill/SkillArchitect.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
package com.volmit.adapt.content.skill;

import com.volmit.adapt.Adapt;
import com.volmit.adapt.AdaptConfig;
import com.volmit.adapt.api.advancement.AdaptAdvancement;
import com.volmit.adapt.api.skill.SimpleSkill;
import com.volmit.adapt.api.world.AdaptStatTracker;
Expand All @@ -31,6 +32,7 @@
import com.volmit.adapt.util.advancements.advancement.AdvancementVisibility;
import lombok.NoArgsConstructor;
import org.bukkit.Bukkit;
import org.bukkit.GameMode;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
Expand All @@ -57,13 +59,19 @@ public SkillArchitect() {

@EventHandler(priority = EventPriority.HIGHEST)
public void on(BlockPlaceEvent e) {
Player p = e.getPlayer();
if (canUseSkill(e.getPlayer())) {
if (!this.isEnabled()) {
return;
}
if (e.isCancelled()) {
return;
}
Player p = e.getPlayer();
if (AdaptConfig.get().blacklistedWorlds.contains(p.getWorld().getName())) {
return;
}
if (!AdaptConfig.get().isXpInCreative() && (p.getGameMode().equals(GameMode.CREATIVE) || p.getGameMode().equals(GameMode.SPECTATOR))) {
return;
}
double v = getValue(e.getBlock()) * getConfig().xpValueMultiplier;
J.a(() -> xp(p, e.getBlock().getLocation().clone().add(0.5, 0.5, 0.5), blockXP(e.getBlock(), getConfig().xpBase + v)));
getPlayer(p).getData().addStat("blocks.placed", 1);
Expand All @@ -73,23 +81,29 @@ public void on(BlockPlaceEvent e) {

@EventHandler(priority = EventPriority.HIGHEST)
public void on(BlockBreakEvent e) {
Player p = e.getPlayer();
if (canUseSkill(e.getPlayer())) {
if (!this.isEnabled()) {
return;
}
if (e.isCancelled()) {
return;
}
Player p = e.getPlayer();
if (AdaptConfig.get().blacklistedWorlds.contains(p.getWorld().getName())) {
return;
}
if (!AdaptConfig.get().isXpInCreative() && (p.getGameMode().equals(GameMode.CREATIVE) || p.getGameMode().equals(GameMode.SPECTATOR))) {
return;
}
getPlayer(p).getData().addStat("blocks.broken", 1);
}

@Override
public void onTick() {
for (Player i : Bukkit.getOnlinePlayers()) {
if (canUseSkill(i)) {
checkStatTrackers(getPlayer(i));
if (AdaptConfig.get().blacklistedWorlds.contains(i.getWorld().getName())) {
return;
}
checkStatTrackers(getPlayer(i));
}
}

Expand Down
27 changes: 21 additions & 6 deletions src/main/java/com/volmit/adapt/content/skill/SkillAxes.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
package com.volmit.adapt.content.skill;

import com.volmit.adapt.Adapt;
import com.volmit.adapt.AdaptConfig;
import com.volmit.adapt.api.skill.SimpleSkill;
import com.volmit.adapt.api.world.AdaptPlayer;
import com.volmit.adapt.content.adaptation.axe.AxeChop;
Expand All @@ -28,6 +29,7 @@
import com.volmit.adapt.util.C;
import com.volmit.adapt.util.J;
import lombok.NoArgsConstructor;
import org.bukkit.GameMode;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
Expand All @@ -53,16 +55,22 @@ public SkillAxes() {

@EventHandler(priority = EventPriority.HIGHEST)
public void on(EntityDamageByEntityEvent e) {
if (!this.isEnabled()) {
return;
}
if (!e.isCancelled()) {
if (e.getDamager() instanceof Player p) {
if (canUseSkill(p)) {
if (e.isCancelled()) {
return;
}
if (e.isCancelled()) {
if (AdaptConfig.get().blacklistedWorlds.contains(p.getWorld().getName())) {
return;
}

if (e.getEntity().isDead() || e.getEntity().isInvulnerable()) {
if (!AdaptConfig.get().isXpInCreative() && (p.getGameMode().equals(GameMode.CREATIVE) || p.getGameMode().equals(GameMode.SPECTATOR))
|| e.getEntity().isDead()
|| e.getEntity().isInvulnerable()
|| p.isDead()
|| p.isInvulnerable()) {
return;
}
AdaptPlayer a = getPlayer((Player) e.getDamager());
Expand All @@ -79,13 +87,20 @@ public void on(EntityDamageByEntityEvent e) {

@EventHandler(priority = EventPriority.HIGHEST)
public void on(BlockBreakEvent e) {
Player p = e.getPlayer();
if (canUseSkill(p)) {
if (!this.isEnabled()) {
return;
}
if (e.isCancelled()) {
return;
}
Player p = e.getPlayer();
if (AdaptConfig.get().blacklistedWorlds.contains(p.getWorld().getName())) {
return;
}

if (!AdaptConfig.get().isXpInCreative() && (p.getGameMode().equals(GameMode.CREATIVE) || p.getGameMode().equals(GameMode.SPECTATOR))) {
return;
}
if (isAxe(p.getInventory().getItemInMainHand())) {
double v = getValue(e.getBlock().getType());
getPlayer(p).getData().addStat("axes.blocks.broken", 1);
Expand Down
Loading

0 comments on commit 0c02921

Please sign in to comment.