Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] main from FN-FAL113:main #162

Merged
merged 2 commits into from
Feb 9, 2024
Merged

[pull] main from FN-FAL113:main #162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9c63956
jukebox missing discs and duration tick rate fix
FN-FAL113 Feb 9, 2024
db4457d
Merge pull request #119 from FN-FAL113/Dev/jukebox-fixes
FN-FAL113 Feb 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@

<groupId>ne.fnfal113</groupId>
<artifactId>FNAmplifications</artifactId>
<version>Unoffical-4.1.7</version>
<version>Unoffical-4.1.8</version>
<packaging>jar</packaging>

<name>FNAmplifications</name>

<description>Adds different kind of items in-game from machines, utilities to pvp related items! Take part on exploring FN's offering!</description>
<description>Adds different kind of in-game items from machines, utilities to pvp related items! Take part on exploring FN's offering!</description>

<properties>
<java.version>1.8</java.version>
Expand Down
18 changes: 11 additions & 7 deletions src/main/java/ne/fnfal113/fnamplifications/machines/ElectricJukebox.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import me.mrCookieSlime.Slimefun.api.inventory.BlockMenu;
import me.mrCookieSlime.Slimefun.api.inventory.BlockMenuPreset;
import me.mrCookieSlime.Slimefun.api.item_transport.ItemTransportFlow;
import ne.fnfal113.fnamplifications.FNAmplifications;
import ne.fnfal113.fnamplifications.machines.abstracts.AbstractJukeBox;
import ne.fnfal113.fnamplifications.machines.implementation.DiscDurationsEnum;
import ne.fnfal113.fnamplifications.utils.Utils;
Expand Down Expand Up @@ -303,17 +302,22 @@ public void onTick(@Nonnull Block b) {
menu.replaceExistingItem(48, OPERATING);

if(jukebox.getPlaying() != Material.AIR) {
menu.replaceExistingItem(49, new CustomItemStack(Material.PINK_STAINED_GLASS_PANE,
"&d&lPlaying: " + jukebox.getPlaying().toString().replace("_", " "),
"&eDuration : " +
durationMap.get(b.getLocation()) + "/" +
(DiscDurationsEnum.valueOf(jukebox.getPlaying().toString().toUpperCase()).getDurationInSec() * 2)));
menu.replaceExistingItem(
49,
new CustomItemStack(
Material.PINK_STAINED_GLASS_PANE,
"&d&lPlaying: " + jukebox.getPlaying().toString().replace("_", " "),
"&eDuration : " +
durationMap.get(b.getLocation()) + "/" +
(DiscDurationsEnum.valueOf(jukebox.getPlaying().toString().toUpperCase()).getDuration())
)
);
}
}

// when disc duration has elapsed, check next slot if there is a disc else stop the jukebox or go back to default slot when upper bound is reached
if(durationMap.containsKey(b.getLocation())) {
if (durationMap.get(b.getLocation()) >= (DiscDurationsEnum.valueOf(jukebox.getPlaying().toString().toUpperCase()).getDurationInSec() * 2)) {
if (durationMap.get(b.getLocation()) >= DiscDurationsEnum.valueOf(jukebox.getPlaying().toString().toUpperCase()).getDuration()) {
goToNextSlot(menu, null);

currentTime = 0;
Expand Down
14 changes: 9 additions & 5 deletions src/main/java/ne/fnfal113/fnamplifications/machines/implementation/DiscDurationsEnum.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package ne.fnfal113.fnamplifications.machines.implementation;

import io.github.thebusybiscuit.slimefun4.implementation.Slimefun;

public enum DiscDurationsEnum {

MUSIC_DISC_13(180),
Expand All @@ -16,16 +18,18 @@ public enum DiscDurationsEnum {
MUSIC_DISC_WAIT(235),
MUSIC_DISC_OTHERSIDE(180),
MUSIC_DISC_PIGSTEP(148),
MUSIC_DISC_5(178),
MUSIC_DISC_RELIC(216),
;

private final int durationInSec;
private final int duration;

DiscDurationsEnum(int durationInSec) {
this.durationInSec = durationInSec;
DiscDurationsEnum(int durationInSeconds) {
this.duration = durationInSeconds * (int) 20.0 / Slimefun.getTickerTask().getTickRate();
Comment on lines +27 to +28
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

构造函数中使用 Slimefun.getTickerTask().getTickRate() 动态计算持续时间，这是一个改进，确保了持续时间的计算与服务器的实际滴答率相匹配。但是，应该考虑异常处理，以防 getTickRate() 返回零或负值，避免除以零的错误。

}

public int getDurationInSec(){
return durationInSec;
public int getDuration() {
return duration;
}

}