spawnrys/FUCK-CustomDiscs
1
0
Fork 0
mirror of https://github.com/SPAWNRYS-ban/FUCK-CustomDiscs.git synced 2025-12-10 21:40:13 +05:00
Code Issues Packages Projects Releases Wiki Activity

1.20.2 Update

Browse Source
This commit is contained in:
Navoei
2023-10-14 15:51:42 -05:00
parent 5c62e04085
commit 4c74cbc077
6 changed files with 8 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@@ -12,7 +12,7 @@ group = maven_group
processResources { processResources {
filesMatching("plugin.yml") { filesMatching("plugin.yml") {
expand "version": plugin_version, expand "plugin_version": plugin_version,
"bukkit_api_version": bukkit_api_version "bukkit_api_version": bukkit_api_version
} }
} }

6
gradle.properties
View File

@@ -5,12 +5,12 @@ java_version=17
mp3spi_version=1.9.5.4 mp3spi_version=1.9.5.4
bukkit_api_version=1.20 bukkit_api_version=1.20
bukkit_version=1.20.1-R0.1-SNAPSHOT bukkit_version=1.20.2-R0.1-SNAPSHOT
mod_id=customdiscsplugin mod_id=customdiscsplugin
# Target an older API to make it compatible with older versions of Simple Voice Chat # Target an older API to make it compatible with older versions of Simple Voice Chat
voicechat_api_version=2.3.3 voicechat_api_version=2.4.11
plugin_version=2.4.1 plugin_version=2.5
maven_group=me.Navoei.customdiscsplugin maven_group=me.Navoei.customdiscsplugin
archives_base_name=custom-discs archives_base_name=custom-discs

20
src/main/java/me/Navoei/customdiscsplugin/HopperManager.java
View File

@@ -11,6 +11,7 @@ import org.bukkit.block.Block;
import org.bukkit.block.BlockFace; import org.bukkit.block.BlockFace;
import org.bukkit.block.BlockState; import org.bukkit.block.BlockState;
import org.bukkit.block.Jukebox; import org.bukkit.block.Jukebox;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority; import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener; import org.bukkit.event.Listener;
@@ -101,24 +102,7 @@ public class HopperManager implements Listener {
} }
private boolean isCustomMusicDisc (ItemStack item) { private boolean isCustomMusicDisc (ItemStack item) {
return item.getItemMeta().getPersistentDataContainer().has(new NamespacedKey(customDiscs, "customdisc"), PersistentDataType.STRING) && item.getType().toString().contains("MUSIC_DISC");
return item.getItemMeta().getPersistentDataContainer().has(new NamespacedKey(customDiscs, "customdisc"), PersistentDataType.STRING) && (
item.getType().equals(Material.MUSIC_DISC_13) ||
item.getType().equals(Material.MUSIC_DISC_CAT) ||
item.getType().equals(Material.MUSIC_DISC_BLOCKS) ||
item.getType().equals(Material.MUSIC_DISC_CHIRP) ||
item.getType().equals(Material.MUSIC_DISC_FAR) ||
item.getType().equals(Material.MUSIC_DISC_MALL) ||
item.getType().equals(Material.MUSIC_DISC_MELLOHI) ||
item.getType().equals(Material.MUSIC_DISC_STAL) ||
item.getType().equals(Material.MUSIC_DISC_STRAD) ||
item.getType().equals(Material.MUSIC_DISC_WARD) ||
item.getType().equals(Material.MUSIC_DISC_11) ||
item.getType().equals(Material.MUSIC_DISC_WAIT) ||
item.getType().equals(Material.MUSIC_DISC_OTHERSIDE) ||
item.getType().equals(Material.MUSIC_DISC_5) ||
item.getType().equals(Material.MUSIC_DISC_PIGSTEP)
);
} }
private static HopperManager instance; private static HopperManager instance;

1
src/main/java/me/Navoei/customdiscsplugin/ParticleManager.java
View File

@@ -3,7 +3,6 @@ package me.Navoei.customdiscsplugin;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.Particle; import org.bukkit.Particle;
import org.bukkit.block.Jukebox; import org.bukkit.block.Jukebox;
import org.bukkit.inventory.ItemStack;
import org.bukkit.scheduler.BukkitRunnable; import org.bukkit.scheduler.BukkitRunnable;
import java.util.HashMap; import java.util.HashMap;

17
src/main/java/me/Navoei/customdiscsplugin/command/SubCommands/CreateCommand.java
View File

@@ -159,22 +159,7 @@ public class CreateCommand extends SubCommand {
} }
private boolean isMusicDisc(Player p) { private boolean isMusicDisc(Player p) {
return p.getInventory().getItemInMainHand().getType().toString().contains("MUSIC_DISC");
return p.getInventory().getItemInMainHand().getType().equals(Material.MUSIC_DISC_13) ||
p.getInventory().getItemInMainHand().getType().equals(Material.MUSIC_DISC_CAT) ||
p.getInventory().getItemInMainHand().getType().equals(Material.MUSIC_DISC_BLOCKS) ||
p.getInventory().getItemInMainHand().getType().equals(Material.MUSIC_DISC_CHIRP) ||
p.getInventory().getItemInMainHand().getType().equals(Material.MUSIC_DISC_FAR) ||
p.getInventory().getItemInMainHand().getType().equals(Material.MUSIC_DISC_MALL) ||
p.getInventory().getItemInMainHand().getType().equals(Material.MUSIC_DISC_MELLOHI) ||
p.getInventory().getItemInMainHand().getType().equals(Material.MUSIC_DISC_STAL) ||
p.getInventory().getItemInMainHand().getType().equals(Material.MUSIC_DISC_STRAD) ||
p.getInventory().getItemInMainHand().getType().equals(Material.MUSIC_DISC_WARD) ||
p.getInventory().getItemInMainHand().getType().equals(Material.MUSIC_DISC_11) ||
p.getInventory().getItemInMainHand().getType().equals(Material.MUSIC_DISC_WAIT) ||
p.getInventory().getItemInMainHand().getType().equals(Material.MUSIC_DISC_OTHERSIDE) ||
p.getInventory().getItemInMainHand().getType().equals(Material.MUSIC_DISC_5) ||
p.getInventory().getItemInMainHand().getType().equals(Material.MUSIC_DISC_PIGSTEP);
} }
} }

2
src/main/resources/plugin.yml
View File

@@ -1,5 +1,5 @@
name: CustomDiscs name: CustomDiscs
version: '${version}' version: '${plugin_version}'
main: me.Navoei.customdiscsplugin.CustomDiscs main: me.Navoei.customdiscsplugin.CustomDiscs
api-version: '${bukkit_api_version}' api-version: '${bukkit_api_version}'
prefix: CustomDiscs prefix: CustomDiscs