administrator/MCPlugins
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: update README and added custom music disc feature

Browse Source
This commit is contained in:
Your Name
2025-03-18 16:22:11 +01:00
parent 0e65b29a5f
commit a9cbece872
4 changed files with 189 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
README.md
View File

@@ -1,8 +1,9 @@
ALLGEMEIN: recipes die custom items beinhalten werden nicht im crafting angezeigt (allgm. Bukkit problem)
INFO: CustomItemIcon count: 22
BUG: Autocrafter nicht von seite möglich
BUG: Music Disc 13 now unfunctional (vertrtbar)
IDEA: schere verschiedene versionen pferde/mule/cats/schafe/Axolotl/tropical etc?
TO RELEASE: waterbottle + sponge = empty bottle -> Warum nochmal?
TO RELEASE: Autocrafter
TO RELEASE: jukeboxes können mit Redstone gesteuert werden
TO RELEASE: jukeboxes können mit Redstone gesteuert werden + crafted music

4
environmentex/src/main/java/de/hessj/environmentex/App.java
View File

@@ -92,8 +92,11 @@ public class App extends JavaPlugin {
getLogger().info("Plugin enabled!");
main = this;
// if(App.main.getServer().getPort() == 25588){
CustomMusicDiscs cmd = new CustomMusicDiscs();
cmd.createDiscs(App.main);
//}
backPack = new ItemStack(Material.BARRIER, 1);
ItemMeta im = backPack.getItemMeta();
@@ -449,7 +452,6 @@ public class App extends JavaPlugin {
pM.registerEvents(new ArmoredElytra(), this);
pM.registerEvents(new ShulkerPreview(), this);
pM.registerEvents(new BetterTotems(), this);
pM.registerEvents(new RedstoneJukebox(), this);
pM.registerEvents(new CustomMusicDiscs(), this);
getCommand("test").setExecutor(new EnvironmentExCommands());
getCommand("y").setExecutor(new EnvironmentExCommands());

222
environmentex/src/main/java/de/hessj/environmentex/CustomMusicDiscs.java
View File

@@ -1,80 +1,226 @@
package de.hessj.environmentex;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import org.bukkit.Bukkit;
import org.bukkit.Material;
import org.bukkit.NamespacedKey;
import org.bukkit.block.Block;
import org.bukkit.block.Jukebox;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.block.Action;
import org.bukkit.event.block.BlockBreakEvent;
import org.bukkit.event.block.BlockRedstoneEvent;
import org.bukkit.event.player.PlayerInteractEvent;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.ShapelessRecipe;
import org.bukkit.inventory.meta.ItemMeta;
import org.bukkit.inventory.meta.components.CustomModelDataComponent;
import org.bukkit.scheduler.BukkitRunnable;
import net.kyori.adventure.key.Key;
import net.kyori.adventure.sound.Sound;
import net.kyori.adventure.sound.SoundStop;
import net.kyori.adventure.sound.Sound.Emitter;
import net.kyori.adventure.text.Component;
public class CustomMusicDiscs implements Listener {
Sound customSound = Sound.sound(
Key.key("custom.my_music"),
Sound.Source.RECORD,
1.0f,
1.0f
);
class Song {
private String title;
private String artist;
private NamespacedKey nsk;
private int number;
private String oggFile;
public void createDiscs(App app) {
ItemStack customDisc = new ItemStack(Material.MUSIC_DISC_13);
ItemMeta meta = customDisc.getItemMeta();
if (meta != null) {
meta.displayName(Component.text("§6Custom Music Disc"));
meta.setCustomModelData(12345); // Used in resource packs
customDisc.setItemMeta(meta);
public Song(String title, String artist, NamespacedKey nsk, int number, String oggFile) {
this.title = title;
this.artist = artist;
this.nsk = nsk;
this.number = number;
this.oggFile = oggFile;
}
NamespacedKey nskDisc = new NamespacedKey(app, "custom_music_disc");
ShapelessRecipe reciped = new ShapelessRecipe(nskDisc, customDisc);
reciped.addIngredient(1, Material.DIAMOND);
reciped.addIngredient(1, Material.PAPER);
//Bukkit.addRecipe(reciped);
public String getTitle() {
return title;
}
public String getArtist() {
return artist;
}
public NamespacedKey getNsk() {
return nsk;
}
public int getNo() {
return number;
}
public String getOGGPath() {
return oggFile;
}
}
public String getDiskKey(int customModelData, CustomModelDataComponent cmdc) {
String key = "custom.";
key += cmdc.getStrings().get(1);
return key;
}
public void createDiscs(App app) {
List<Song> songList = new ArrayList<>();
songList.add(new Song("Stairway to Heaven", "Led Zeppelin", new NamespacedKey(app, "custom_music_disc"), 1,
"stairway_to_heaven"));
songList.add(new Song("M@GICAL☆CURE! LOVE ♥ SHOT!", "Hatsune Miku",
new NamespacedKey(app, "custom_music_disc2"), 2, "magical_cure_love_shot"));
songList.add(new Song("Aishiteru Banzai!", "LoveLive!", new NamespacedKey(app, "custom_music_disc3"), 3,
"aishiteru_banzai"));
songList.add(new Song("Miku", "Anamanaguchi", new NamespacedKey(app, "custom_music_disc4"), 4, "miku"));
songList.add(new Song("Melt", "Hatsune Miku", new NamespacedKey(app, "custom_music_disc5"), 5, "melt"));
for (Song song : songList) {
ItemStack customDisc = new ItemStack(Material.MUSIC_DISC_13);
ItemMeta meta = customDisc.getItemMeta();
if (meta != null) {
meta.setCustomModelData(12345);
meta.displayName(Component.text("§6" + song.artist + " - " + song.title));
CustomModelDataComponent cmdc = meta.getCustomModelDataComponent();
List<String> list = Arrays.asList("custom_music_disc", song.getOGGPath());
cmdc.setStrings(list);
meta.setCustomModelDataComponent(cmdc);
customDisc.setItemMeta(meta);
}
NamespacedKey nskDisc = song.nsk;
ShapelessRecipe reciped = new ShapelessRecipe(nskDisc, customDisc);
reciped.addIngredient(1, Material.DIAMOND);
reciped.addIngredient(1, Material.PAPER);
Bukkit.addRecipe(reciped);
App.main.recipeKeys.add(reciped.getKey());
}
}
@EventHandler
public void onJukeboxInsert(PlayerInteractEvent event) {
if (event.getClickedBlock() != null && event.getClickedBlock().getType() == Material.JUKEBOX) {
if (event.getAction() == Action.LEFT_CLICK_BLOCK) {
return;
}
Jukebox jukebox = (Jukebox) event.getClickedBlock().getState();
ItemStack disc = event.getItem();
if (!jukebox.isPlaying()) {
if (disc != null && disc.hasItemMeta() && disc.getItemMeta().getCustomModelData() == 12345) {
event.setCancelled(true);
new BukkitRunnable() {
@Override
public void run() {
jukebox.setRecord(disc);
jukebox.update();
if (disc == null || !disc.hasItemMeta()) {
return;
}
if (event.getPlayer().getInventory().getItemInMainHand().equals(disc)) {
event.getPlayer().getInventory().setItemInMainHand(null);
} else if (event.getPlayer().getInventory().getItemInOffHand().equals(disc)) {
event.getPlayer().getInventory().setItemInOffHand(null);
}
final String k2 = getDiskKey(disc.getItemMeta().getCustomModelData(),
disc.getItemMeta().getCustomModelDataComponent());
event.setCancelled(true);
event.getPlayer().getWorld().playSound(customSound, (Emitter) event.getPlayer());
new BukkitRunnable() {
@Override
public void run() {
jukebox.setRecord(disc);
jukebox.update();
if (event.getPlayer().getInventory().getItemInMainHand().equals(disc)) {
event.getPlayer().getInventory().setItemInMainHand(null);
} else if (event.getPlayer().getInventory().getItemInOffHand().equals(disc)) {
event.getPlayer().getInventory().setItemInOffHand(null);
}
event.getPlayer().getWorld().playSound(event.getPlayer().getLocation(), k2,
org.bukkit.SoundCategory.RECORDS, 1F, 1f);
}
}.runTaskLater(App.main, 1L);
}.runTaskLater(App.main, 1L);
}
} else {
if (jukebox.getRecord().hasItemMeta()
&& jukebox.getRecord().getItemMeta().getCustomModelData() == 12345) {
event.getPlayer().stopSound(SoundStop.named(Key.key("custom.my_music")));
if (!jukebox.getRecord().hasItemMeta()) {
return;
}
String key = getDiskKey(jukebox.getRecord().getItemMeta().getCustomModelData(),
jukebox.getRecord().getItemMeta().getCustomModelDataComponent());
event.getPlayer().stopSound(SoundStop.named(Key.key(key)));
}
}
}
@EventHandler
public void onJukeboxBreak(BlockBreakEvent event) {
if (event.getBlock().getType() != Material.JUKEBOX) {
return;
}
Jukebox jukebox = (Jukebox) event.getBlock().getState();
if (!jukebox.hasRecord() || !jukebox.getRecord().hasItemMeta()) {
return;
}
String key = getDiskKey(jukebox.getRecord().getItemMeta().getCustomModelData(),
jukebox.getRecord().getItemMeta().getCustomModelDataComponent());
event.getPlayer().stopSound(SoundStop.named(Key.key(key)));
}
@EventHandler
public void onRedstonePower(BlockRedstoneEvent event) {
Block block = event.getBlock();
if (block == null || getNearbyJukebox(block) == null) {
return;
}
Jukebox jukebox = (Jukebox) (block.getType() == Material.JUKEBOX ? block.getState()
: getNearbyJukebox(block).getState());
if (event.getNewCurrent() > 0) {
if (!jukebox.isPlaying() && jukebox.hasRecord()) {
if (jukebox.getRecord().hasItemMeta()) {
String key = getDiskKey(jukebox.getRecord().getItemMeta().getCustomModelData(),
jukebox.getRecord().getItemMeta().getCustomModelDataComponent());
jukebox.getWorld().playSound(jukebox.getLocation(), key,
org.bukkit.SoundCategory.RECORDS, 1F, 1f);
}
jukebox.startPlaying();
} else if (jukebox.isPlaying() && jukebox.hasRecord()) {
if (jukebox.getRecord().hasItemMeta()) {
String key = getDiskKey(jukebox.getRecord().getItemMeta().getCustomModelData(),
jukebox.getRecord().getItemMeta().getCustomModelDataComponent());
jukebox.getWorld().stopSound(SoundStop.named(Key.key(key)));
}
jukebox.stopPlaying();
}
}
}
private Block getNearbyJukebox(Block block) {
Block[] distantNeighbors = {
block.getRelative(2, 0, 0),
block.getRelative(-2, 0, 0),
block.getRelative(0, 0, 2),
block.getRelative(0, 0, -2),
block.getRelative(0, 2, 0),
block.getRelative(0, -2, 0)
};
for (Block neighbor : distantNeighbors) {
if (neighbor.getType() == Material.JUKEBOX) {
Block between = block.getRelative((neighbor.getX() - block.getX()) / 2,
(neighbor.getY() - block.getY()) / 2, (neighbor.getZ() - block.getZ()) / 2);
if (between.getType() == Material.AIR) {
return neighbor;
}
}
}
return null;
}
}

52
environmentex/src/main/java/de/hessj/environmentex/RedstoneJukebox.java
View File

@@ -1,52 +0,0 @@
package de.hessj.environmentex;
import org.bukkit.Material;
import org.bukkit.block.Block;
import org.bukkit.block.Jukebox;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.block.BlockRedstoneEvent;
public class RedstoneJukebox implements Listener {
@EventHandler
public void onRedstonePower(BlockRedstoneEvent event) {
Block block = event.getBlock();
if (block == null || getNearbyJukebox(block) == null) {
return;
}
Jukebox jukebox = (Jukebox) (block.getType() == Material.JUKEBOX ? block.getState()
: getNearbyJukebox(block).getState());
if (event.getNewCurrent() > 0) {
if (!jukebox.isPlaying() && jukebox.hasRecord()) {
jukebox.startPlaying();
} else if (jukebox.isPlaying() && jukebox.hasRecord()) {
jukebox.stopPlaying();
}
}
}
private Block getNearbyJukebox(Block block) {
Block[] distantNeighbors = {
block.getRelative(2, 0, 0),
block.getRelative(-2, 0, 0),
block.getRelative(0, 0, 2),
block.getRelative(0, 0, -2),
block.getRelative(0, 2, 0),
block.getRelative(0, -2, 0)
};
for (Block neighbor : distantNeighbors) {
if (neighbor.getType() == Material.JUKEBOX) {
Block between = block.getRelative((neighbor.getX() - block.getX()) / 2,
(neighbor.getY() - block.getY()) / 2, (neighbor.getZ() - block.getZ()) / 2);
if (between.getType() == Material.AIR) {
return neighbor;
}
}
}
return null;
}
}