Skip to content

Commit

Permalink
Merge pull request #473 from IPECTER/main
Browse files Browse the repository at this point in the history 
Update to 1.20.4(3)
  • Loading branch information
@NextdoorPsycho
NextdoorPsycho authored Mar 30, 2024
2 parents 1aac5f1 + 6aca20f commit afb31e9
Show file tree
Hide file tree
Showing 51 changed files with 349 additions and 227 deletions.
10 changes: 5 additions & 5 deletions build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ plugins {
id "de.undercouch.download" version "5.0.1"
}

version '1.14.0-1.20.2'
def nmsVersion = "1.20.2" //[NMS]
version '1.14.0-1.20.4'
def nmsVersion = "1.20.4" //[NMS]
def apiVersion = '1.20'
def specialSourceVersion = '1.11.0' //[NMS]
def spigotJarVersion = '1.20.2-R0.1-SNAPSHOT' //[NMS]
def spigotJarVersion = '1.20.4-R0.1-SNAPSHOT' //[NMS]
def name = getRootProject().getName() // Defined in settings.gradle
def main = 'com.volmit.adapt.Adapt'
def manifoldVersion = '2023.1.29'
Expand Down Expand Up @@ -124,8 +124,8 @@ dependencies {
// Provided or Classpath
compileOnly 'org.projectlombok:lombok:1.18.24'
annotationProcessor 'org.projectlombok:lombok:1.18.24'
implementation 'org.spigotmc:spigot-api:1.20.2-R0.1-SNAPSHOT' //[NMS]
implementation 'org.bukkit:craftbukkit:1.20.2-R0.1-SNAPSHOT' //[NMS]
implementation 'org.spigotmc:spigot-api:1.20.4-R0.1-SNAPSHOT' //[NMS]
implementation 'org.bukkit:craftbukkit:1.20.4-R0.1-SNAPSHOT' //[NMS]

// Cancer
implementation 'art.arcane:Amulet:22.7.18'
Expand Down
Binary file added libs/CrazyAdvancementsAPI-2.1.17.jar
View file
Binary file not shown.
Binary file removed libs/CrazyAdvancementsAPI.jar
View file
Binary file not shown.
8 changes: 6 additions & 2 deletions src/main/java/com/volmit/adapt/api/Component.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -799,7 +799,9 @@ default void damageHand(Player p, int damage) {

if (dm.getDamage() > is.getType().getMaxDurability()) {
p.getInventory().setItemInMainHand(new ItemStack(Material.AIR));
p.getWorld().playSound(p.getLocation(), Sound.ENTITY_ITEM_BREAK, 1f, 1f);
for (Player players : p.getWorld().getPlayers()) {
players.playSound(p.getLocation(), Sound.ENTITY_ITEM_BREAK, 1f, 1f);
}
return;
}

Expand All @@ -824,7 +826,9 @@ default void damageOffHand(Player p, int damage) {

if (dm.getDamage() > is.getType().getMaxDurability()) {
p.getInventory().setItemInOffHand(new ItemStack(Material.AIR));
p.getWorld().playSound(p.getLocation(), Sound.ENTITY_ITEM_BREAK, 1f, 1f);
for (Player players : p.getWorld().getPlayers()) {
players.playSound(p.getLocation(), Sound.ENTITY_ITEM_BREAK, 1f, 1f);
}
return;
}

Expand Down
50 changes: 32 additions & 18 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 @@ -384,9 +384,11 @@ default boolean openGui(Player player, boolean checkPermissions) {
}

default void openGui(Player player) {
player.getWorld().playSound(player.getLocation(), Sound.ITEM_BOOK_PAGE_TURN, 1.1f, 1.255f);
player.getWorld().playSound(player.getLocation(), Sound.ITEM_BOOK_PAGE_TURN, 0.7f, 0.655f);
player.getWorld().playSound(player.getLocation(), Sound.ITEM_BOOK_PAGE_TURN, 0.3f, 0.855f);
for (Player players : player.getWorld().getPlayers()) {
players.playSound(player.getLocation(), Sound.ITEM_BOOK_PAGE_TURN, 1.1f, 1.255f);
players.playSound(player.getLocation(), Sound.ITEM_BOOK_PAGE_TURN, 0.7f, 0.655f);
players.playSound(player.getLocation(), Sound.ITEM_BOOK_PAGE_TURN, 0.3f, 0.855f);
}
Window w = new UIWindow(player);
w.setTag("skill/" + getSkill().getName() + "/" + getName());
w.setDecorator((window, position, row) -> new UIElement("bg").setName(" ").setMaterial(new MaterialBlock(Material.BLACK_STAINED_GLASS_PANE)));
Expand Down Expand Up @@ -433,12 +435,16 @@ default void openGui(Player player) {
if (mylevel >= lvl) {
unlearn(player, lvl, false);

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);
for (Player players : player.getWorld().getPlayers()) {
players.playSound(player.getLocation(), Sound.BLOCK_NETHER_GOLD_ORE_PLACE, 0.7f, 1.355f);
players.playSound(player.getLocation(), Sound.BLOCK_BEACON_DEACTIVATE, 0.4f, 0.755f);
}
w.close();
if (AdaptConfig.get().getLearnUnlearnButtonDelayTicks() != 0) {
if (isPermanent()) {
player.getWorld().playSound(player.getLocation(), Sound.ENTITY_BLAZE_DEATH, 0.5f, 1.355f);
for (Player players : player.getWorld().getPlayers()) {
players.playSound(player.getLocation(), Sound.ENTITY_BLAZE_DEATH, 0.5f, 1.355f);
}
player.sendTitle(" ", C.RED + "" + C.BOLD + Localizer.dLocalize("snippets", "adaptmenu", "maynotunlearn") + " " + getDisplayName(mylevel), 1, 10, 11);
} else {
player.sendTitle(" ", C.GRAY + Localizer.dLocalize("snippets", "adaptmenu", "unlearned") + " " + getDisplayName(mylevel), 1, 10, 11);
Expand All @@ -451,24 +457,30 @@ default void openGui(Player player) {
if (k >= c && getPlayer(player).getData().hasPowerAvailable(pc)) {
if (getPlayer(player).getData().getSkillLine(getSkill().getName()).spendKnowledge(c)) {
getPlayer(player).getData().getSkillLine(getSkill().getName()).setAdaptation(this, lvl);
player.getWorld().playSound(player.getLocation(), Sound.BLOCK_NETHER_GOLD_ORE_PLACE, 0.9f, 1.355f);
player.getWorld().playSound(player.getLocation(), Sound.BLOCK_ENCHANTMENT_TABLE_USE, 1.7f, 0.355f);
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);
if (isPermanent()) {
player.getWorld().playSound(player.getLocation(), Sound.ENTITY_PLAYER_LEVELUP, 0.7f, 1.355f);
player.getWorld().playSound(player.getLocation(), Sound.ITEM_GOAT_HORN_SOUND_1, 0.7f, 1.355f);
for (Player players : player.getWorld().getPlayers()) {
players.playSound(player.getLocation(), Sound.BLOCK_NETHER_GOLD_ORE_PLACE, 0.9f, 1.355f);
players.playSound(player.getLocation(), Sound.BLOCK_ENCHANTMENT_TABLE_USE, 1.7f, 0.355f);
players.playSound(player.getLocation(), Sound.BLOCK_BEACON_POWER_SELECT, 0.4f, 0.155f);
players.playSound(player.getLocation(), Sound.BLOCK_BEACON_ACTIVATE, 0.2f, 1.455f);
if (isPermanent()) {
players.playSound(player.getLocation(), Sound.ENTITY_PLAYER_LEVELUP, 0.7f, 1.355f);
players.playSound(player.getLocation(), Sound.ITEM_GOAT_HORN_SOUND_1, 0.7f, 1.355f);
}
}
w.close();
if (AdaptConfig.get().getLearnUnlearnButtonDelayTicks() != 0) {
player.sendTitle(" ", C.GRAY + Localizer.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);
for (Player players : player.getWorld().getPlayers()) {
players.playSound(player.getLocation(), Sound.BLOCK_BAMBOO_HIT, 0.7f, 1.855f);
}
}
} else {
player.getWorld().playSound(player.getLocation(), Sound.BLOCK_BAMBOO_HIT, 0.7f, 1.855f);
for (Player players : player.getWorld().getPlayers()) {
players.playSound(player.getLocation(), Sound.BLOCK_BAMBOO_HIT, 0.7f, 1.855f);
}
}
});
de.addLore(" ");
Expand Down Expand Up @@ -496,9 +508,11 @@ default void openGui(Player player) {
}

private void onGuiClose(Player player, boolean openPrevGui) {
player.getWorld().playSound(player.getLocation(), Sound.ITEM_BOOK_PAGE_TURN, 1.1f, 1.255f);
player.getWorld().playSound(player.getLocation(), Sound.ITEM_BOOK_PAGE_TURN, 0.7f, 0.655f);
player.getWorld().playSound(player.getLocation(), Sound.ITEM_BOOK_PAGE_TURN, 0.3f, 0.855f);
for (Player players : player.getWorld().getPlayers()) {
players.playSound(player.getLocation(), Sound.ITEM_BOOK_PAGE_TURN, 1.1f, 1.255f);
players.playSound(player.getLocation(), Sound.ITEM_BOOK_PAGE_TURN, 0.7f, 0.655f);
players.playSound(player.getLocation(), Sound.ITEM_BOOK_PAGE_TURN, 0.3f, 0.855f);
}
if (openPrevGui) {
getSkill().openGui(player);
}
Expand Down
16 changes: 10 additions & 6 deletions src/main/java/com/volmit/adapt/api/skill/Skill.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -202,9 +202,11 @@ default void openGui(Player player) {
if (!player.getClass().getSimpleName().equals("CraftPlayer")) {
return;
}
player.getWorld().playSound(player.getLocation(), Sound.ITEM_BOOK_PAGE_TURN, 1.1f, 1.255f);
player.getWorld().playSound(player.getLocation(), Sound.ITEM_BOOK_PAGE_TURN, 0.7f, 1.455f);
player.getWorld().playSound(player.getLocation(), Sound.ITEM_BOOK_PAGE_TURN, 0.3f, 1.855f);
for (Player players : player.getWorld().getPlayers()) {
players.playSound(player.getLocation(), Sound.ITEM_BOOK_PAGE_TURN, 1.1f, 1.255f);
players.playSound(player.getLocation(), Sound.ITEM_BOOK_PAGE_TURN, 0.7f, 1.455f);
player.playSound(player.getLocation(), Sound.ITEM_BOOK_PAGE_TURN, 0.3f, 1.855f);
}
Window w = new UIWindow(player);
w.setTag("skill/" + getName());
w.setDecorator((window, position, row) -> new UIElement("bg").setName(" ").setMaterial(new MaterialBlock(Material.BLACK_STAINED_GLASS_PANE)));
Expand Down Expand Up @@ -252,9 +254,11 @@ default void openGui(Player player) {
}

private void onGuiClose(Player player, boolean openPrevGui) {
player.getWorld().playSound(player.getLocation(), Sound.ITEM_BOOK_PAGE_TURN, 1.1f, 1.255f);
player.getWorld().playSound(player.getLocation(), Sound.ITEM_BOOK_PAGE_TURN, 0.7f, 1.455f);
player.getWorld().playSound(player.getLocation(), Sound.ITEM_BOOK_PAGE_TURN, 0.3f, 1.855f);
for (Player players : player.getWorld().getPlayers()) {
players.playSound(player.getLocation(), Sound.ITEM_BOOK_PAGE_TURN, 1.1f, 1.255f);
players.playSound(player.getLocation(), Sound.ITEM_BOOK_PAGE_TURN, 0.7f, 1.455f);
player.playSound(player.getLocation(), Sound.ITEM_BOOK_PAGE_TURN, 0.3f, 1.855f);
}
if (openPrevGui) {
SkillsGui.open(player);
}
Expand Down
6 changes: 4 additions & 2 deletions src/main/java/com/volmit/adapt/api/skill/SkillRegistry.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,10 @@ && canInteract(p, e.getClickedBlock().getLocation())
(p.getInventory().getItemInOffHand().getType().equals(Material.AIR) || !p.getInventory().getItemInOffHand().getType().isBlock());

if (isAdaptActivator) {
e.getClickedBlock().getWorld().playSound(e.getClickedBlock().getLocation(), Sound.ITEM_BOOK_PAGE_TURN, 0.5f, 0.72f);
e.getClickedBlock().getWorld().playSound(e.getClickedBlock().getLocation(), Sound.BLOCK_ENCHANTMENT_TABLE_USE, 0.35f, 0.755f);
for (Player players : e.getClickedBlock().getWorld().getPlayers()) {
players.playSound(e.getClickedBlock().getLocation(), Sound.ITEM_BOOK_PAGE_TURN, 0.5f, 0.72f);
players.playSound(e.getClickedBlock().getLocation(), Sound.BLOCK_ENCHANTMENT_TABLE_USE, 0.35f, 0.755f);
}
SkillsGui.open(p);
e.setCancelled(true);
p.getWorld().spawnParticle(Particle.CRIT_MAGIC, e.getClickedBlock().getLocation().clone().add(0.5, 1, 0.5), 25, 0, 0, 0, 1.1);
Expand Down
52 changes: 0 additions & 52 deletions src/main/java/com/volmit/adapt/content/Enchantments.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,57 +19,5 @@
package com.volmit.adapt.content;


import com.volmit.adapt.Adapt;
import org.bukkit.NamespacedKey;
import org.bukkit.enchantments.Enchantment;
import org.bukkit.enchantments.EnchantmentTarget;
import org.bukkit.inventory.ItemStack;
import org.jetbrains.annotations.NotNull;

public class Enchantments {
public static final Enchantment BOUND = new Enchantment(new NamespacedKey(Adapt.instance, "bound")) {
@NotNull
@Override
public String getName() {
return "Bound";
}

@Override
public int getMaxLevel() {
return 0;
}

@Override
public int getStartLevel() {
return 0;
}

@NotNull
@Override
public EnchantmentTarget getItemTarget() {
return EnchantmentTarget.ALL;
}

@Override
public boolean isTreasure() {
return false;
}

@Override
public boolean isCursed() {
return false;
}

@Override
public boolean conflictsWith(@NotNull Enchantment other) { // ignore
return false;
}

@Override
public boolean canEnchantItem(@NotNull ItemStack item) {
return false;
}
};


}
6 changes: 4 additions & 2 deletions src/main/java/com/volmit/adapt/content/adaptation/agility/AgilitySuperJump.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,10 @@ public void on(PlayerMoveEvent e) {
lastJump.remove(p);
}
if (p.getLocation().getBlock().getType() != Material.LADDER && velocity.getY() > jumpVelocity && p.isOnline()) {
p.getWorld().playSound(p.getLocation(), Sound.ITEM_ARMOR_EQUIP_LEATHER, 1.25f, 0.7f);
p.getWorld().playSound(p.getLocation(), Sound.ITEM_ARMOR_EQUIP_LEATHER, 1.25f, 1.7f);
for (Player players : p.getWorld().getPlayers()) {
players.playSound(p.getLocation(), Sound.ITEM_ARMOR_EQUIP_LEATHER, 1.25f, 0.7f);
players.playSound(p.getLocation(), Sound.ITEM_ARMOR_EQUIP_LEATHER, 1.25f, 1.7f);
}
if (getConfig().showParticles) {
p.getWorld().spawnParticle(Particle.BLOCK_CRACK, p.getLocation().clone().add(0, 0.3, 0), 15, 0.1, 0.8, 0.1, 0.1, p.getLocation().getBlock().getRelative(BlockFace.DOWN).getBlockData());
}
Expand Down
10 changes: 7 additions & 3 deletions src/main/java/com/volmit/adapt/content/adaptation/agility/AgilityWallJump.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,15 +131,19 @@ public void onTick() {

if (!jumped && !p.hasGravity()) {
p.setGravity(true);
p.getLocation().getWorld().playSound(p.getLocation(), Sound.ITEM_ARMOR_EQUIP_LEATHER, 1f, 0.439f);
for (Player players : p.getWorld().getPlayers()) {
players.playSound(p.getLocation(), Sound.ITEM_ARMOR_EQUIP_LEATHER, 1f, 0.439f);
}
}
continue;
}

if (canStick(p)) {
if (p.hasGravity()) {
p.getLocation().getWorld().playSound(p.getLocation(), Sound.ITEM_ARMOR_EQUIP_LEATHER, 1f, 0.89f);
p.getLocation().getWorld().playSound(p.getLocation(), Sound.ITEM_ARMOR_EQUIP_CHAIN, 1f, 1.39f);
for (Player players : p.getWorld().getPlayers()) {
players.playSound(p.getLocation(), Sound.ITEM_ARMOR_EQUIP_LEATHER, 1f, 0.89f);
players.playSound(p.getLocation(), Sound.ITEM_ARMOR_EQUIP_CHAIN, 1f, 1.39f);
}
if (getConfig().showParticles && getStick(p) != null) {
p.getWorld().spawnParticle(Particle.BLOCK_CRACK, p.getLocation().clone().add(0, 0.3, 0), 15, 0.1, 0.2, 0.1, 0.1, getStick(p).getBlockData());
}
Expand Down
14 changes: 10 additions & 4 deletions src/main/java/com/volmit/adapt/content/adaptation/architect/ArchitectFoundation.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,9 @@ public boolean addFoundation(Block block) {
block.setBlockData(BLOCK);
activeBlocks.add(block);
});
block.getWorld().playSound(block.getLocation(), Sound.BLOCK_DEEPSLATE_PLACE, 1.0f, 1.0f);
for (Player players : block.getWorld().getPlayers()) {
players.playSound(block.getLocation(), Sound.BLOCK_DEEPSLATE_PLACE, 1.0f, 1.0f);
}
if (getConfig().showParticles) {

vfxCuboidOutline(block, Particle.REVERSE_PORTAL);
Expand All @@ -230,7 +232,9 @@ public void removeFoundation(Block block) {
block.setBlockData(AIR);
activeBlocks.remove(block);
});
block.getWorld().playSound(block.getLocation(), Sound.BLOCK_DEEPSLATE_BREAK, 1.0f, 1.0f);
for (Player players : block.getWorld().getPlayers()) {
players.playSound(block.getLocation(), Sound.BLOCK_DEEPSLATE_BREAK, 1.0f, 1.0f);
}
if (getConfig().showParticles) {
vfxCuboidOutline(block, Particle.ENCHANTMENT_TABLE);
}
Expand All @@ -255,8 +259,10 @@ public void onTick() {
return 0;
}

i.getWorld().playSound(i.getLocation(), Sound.BLOCK_BEACON_ACTIVATE, 1.0f, 10.0f);
i.getWorld().playSound(i.getLocation(), Sound.BLOCK_RESPAWN_ANCHOR_CHARGE, 1.0f, 0.81f);
for (Player players : i.getWorld().getPlayers()) {
players.playSound(i.getLocation(), Sound.BLOCK_BEACON_ACTIVATE, 1.0f, 10.0f);
players.playSound(i.getLocation(), Sound.BLOCK_RESPAWN_ANCHOR_CHARGE, 1.0f, 0.81f);
}
return availablePower;
}
return v;
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/com/volmit/adapt/content/adaptation/architect/ArchitectGlass.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,9 @@ public void on(BlockBreakEvent e) {
}
if (e.getBlock().getType().toString().contains("GLASS") && !e.getBlock().getType().toString().contains("TINTED_GLASS")) {
e.getBlock().getWorld().dropItemNaturally(e.getBlock().getLocation(), new ItemStack(e.getBlock().getType(), 1));
e.getBlock().getWorld().playSound(e.getBlock().getLocation(), Sound.BLOCK_LARGE_AMETHYST_BUD_BREAK, 1.0f, 1.0f);
for (Player players : e.getBlock().getWorld().getPlayers()) {
players.playSound(e.getBlock().getLocation(), Sound.BLOCK_LARGE_AMETHYST_BUD_BREAK, 1.0f, 1.0f);
}
if (getConfig().showParticles) {

e.getBlock().getWorld().spawnParticle(Particle.SCRAPE, e.getBlock().getLocation(), 1);
Expand Down
10 changes: 7 additions & 3 deletions src/main/java/com/volmit/adapt/content/adaptation/architect/ArchitectWirelessRedstone.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -199,8 +199,10 @@ private void linkTorch(Player p, Location l) {
if (getConfig().showParticles) {
vfxCuboidOutline(l.getBlock(), l.getBlock(), Color.RED, 1);
}
p.getWorld().playSound(l, Sound.BLOCK_CHEST_OPEN, 0.1f, 9f);
p.getWorld().playSound(l, Sound.ENTITY_ENDER_EYE_DEATH, 0.2f, 0.48f);
for (Player players : p.getWorld().getPlayers()) {
players.playSound(l, Sound.BLOCK_CHEST_OPEN, 0.1f, 9f);
players.playSound(l, Sound.ENTITY_ENDER_EYE_DEATH, 0.2f, 0.48f);
}
ItemStack hand = p.getInventory().getItemInMainHand();
if (hand.getAmount() == 1) {
BoundRedstoneTorch.setData(hand, l);
Expand All @@ -219,7 +221,9 @@ private void triggerPulse(Player p, ItemStack item) {
Block b = l.getBlock();
BlockData data = b.getBlockData();
if (data instanceof AnaloguePowerable redBlock && b.getType().equals(Material.TARGET)) {
p.getWorld().playSound(l, Sound.BLOCK_CHEST_OPEN, 0.1f, 9f);
for (Player players : p.getWorld().getPlayers()) {
players.playSound(l, Sound.BLOCK_CHEST_OPEN, 0.1f, 9f);
}
redBlock.setPower(15);
vfxCuboidOutline(l.getBlock(), l.getBlock(), Color.RED, 1);
b.setBlockData(redBlock);
Expand Down
Loading

0 comments on commit afb31e9

Please sign in to comment.