Skip to content

Commit

Permalink
fix with class and frozen Timer
Browse files Browse the repository at this point in the history
  • Loading branch information
@JanHeist
JanHeist committed Feb 5, 2022
1 parent bfe22cf commit 5a23d38
Show file tree
Hide file tree
Showing 5 changed files with 53 additions and 42 deletions.
13 changes: 7 additions & 6 deletions Addon.iws
View file
Expand Up @@ -2,10 +2,12 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="73361c94-1ecf-4468-8bcf-7a7db8b49ef9" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/src/main/java/dev/janheist/newsaddon/events/modifyMessage.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Addon.iws" beforeDir="false" afterPath="$PROJECT_DIR$/Addon.iws" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/dev/janheist/newsaddon/features/Auktionen.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/dev/janheist/newsaddon/features/Auktionen.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/dev/janheist/newsaddon/events/messageModifyChatEvent.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/dev/janheist/newsaddon/main/NewsAddon.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/dev/janheist/newsaddon/main/NewsAddon.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/addon.json" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/addon.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/dev/janheist/newsaddon/timer/DauerauftragTimer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/dev/janheist/newsaddon/timer/DauerauftragTimer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/dev/janheist/newsaddon/timer/WerbeTimer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/dev/janheist/newsaddon/timer/WerbeTimer.java" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
Expand Down Expand Up @@ -174,15 +176,13 @@
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration default="true" type="ArquillianTestNG" factoryName="" nameIsGenerated="true">
<configuration default="true" type="ArquillianJUnit" factoryName="" nameIsGenerated="true">
<option name="arquillianRunConfiguration">
<value>
<option name="containerStateName" value="" />
</value>
</option>
<option name="TEST_OBJECT" value="CLASS" />
<properties />
<listeners />
<option name="TEST_OBJECT" value="class" />
<method v="2">
<option name="Make" enabled="true" />
</method>
Expand Down Expand Up @@ -245,6 +245,7 @@
<workItem from="1643800154654" duration="16454000" />
<workItem from="1643835672311" duration="7820000" />
<workItem from="1643901266929" duration="9283000" />
<workItem from="1644095817499" duration="968000" />
</task>
<servers />
</component>
Expand Down
6 changes: 3 additions & 3 deletions ...saddon/events/messageModifyChatEvent.java → ...heist/newsaddon/events/modifyMessage.java
View file
Expand Up @@ -9,18 +9,18 @@

import java.util.UUID;

public class messageModifyChatEvent implements MessageModifyChatEvent {

public class modifyMessage implements MessageModifyChatEvent {
private String lastMessage = UUID.randomUUID().toString();
NewsAddon newsAddon;
public messageModifyChatEvent(NewsAddon newsAddon) {
public modifyMessage(NewsAddon newsAddon) {
this.newsAddon = newsAddon;
}

@Override
public Object onModifyChatMessage(Object o) {
try {
ITextComponent cct = (ITextComponent) o;

String unformattedText = cct.getUnformattedText();
if(cct.getUnformattedText().equals(lastMessage) || cct.getUnformattedText().trim().isEmpty())
return o;
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/dev/janheist/newsaddon/main/NewsAddon.java
View file
@@ -1,6 +1,6 @@
package dev.janheist.newsaddon.main;

import dev.janheist.newsaddon.events.messageModifyChatEvent;
import dev.janheist.newsaddon.events.modifyMessage;
import dev.janheist.newsaddon.events.onReceiver;
import dev.janheist.newsaddon.events.onSend;
import dev.janheist.newsaddon.events.userMenuAction;
Expand Down Expand Up @@ -70,7 +70,7 @@ public void onEnable() {
eventManager = this.getApi().getEventManager();
eventManager.register(new onSend(this));
eventManager.register(new onReceiver(this));
eventManager.register(new messageModifyChatEvent(this));
eventManager.register(new modifyMessage(this));
eventManager.register(new userMenuAction(this));
eventManager.registerOnJoin(new Consumer<ServerData>() {
@Override
Expand Down Expand Up @@ -112,10 +112,10 @@ public void loadConfig() {
this.sound120 = !getConfig().has("sound120") || getConfig().get("sound120").getAsBoolean();
this.sound120ausw = getConfig().has("sound120ausw") ? getConfig().get("sound120ausw").getAsString() : "block.note.pling";
this.soundDA = !getConfig().has("soundDA") || getConfig().get("soundDA").getAsBoolean();
this.soundDAausw = getConfig().has("soundDAausw") ? getConfig().get("soundDAausw").getAsString() : "none";
this.soundDAausw = getConfig().has("soundDAausw") ? getConfig().get("soundDAausw").getAsString() : "sirene_2";
this.playermenu = !getConfig().has("playermenu") || getConfig().get("playermenu").getAsBoolean();

this.daurl = getConfig().has("daurl") ? getConfig().get("daurl").getAsString() : "none";
this.daurl = getConfig().has("daurl") ? getConfig().get("daurl").getAsString() : "sirene_2";
}

@Override
Expand Down
24 changes: 14 additions & 10 deletions src/main/java/dev/janheist/newsaddon/timer/DauerauftragTimer.java
View file
Expand Up @@ -20,19 +20,23 @@ public DauerauftragTimer(NewsAddon newsAddon) {

@Override
public void run() {
if (newsAddon.DEBUGMODE || LabyMod.getInstance().getCurrentServerData().getIp().toLowerCase().contains("germanminer")) {
PlayerUtilities pUtils = new PlayerUtilities();
pUtils.displayPrefix("§a§lEventuell muss ein Dauerauftrag geschaltet werden!");
try {
if (newsAddon.DEBUGMODE || LabyMod.getInstance().getCurrentServerData().getIp().toLowerCase().contains("germanminer")) {
PlayerUtilities pUtils = new PlayerUtilities();
pUtils.displayPrefix("§a§lEventuell muss ein Dauerauftrag geschaltet werden!");

if (!newsAddon.getConfig().has("soundDA") || newsAddon.getConfig().get("soundDA").getAsBoolean()) {
EntityPlayerSP p = Minecraft.getMinecraft().player;
if (newsAddon.soundDAausw.equalsIgnoreCase("none")) {
p.playSound(new SoundEvent(new ResourceLocation("sirene_2")), 0.25F, 1.0F);
} else {
LabyModCore.getMinecraft().playSound(new ResourceLocation(newsAddon.soundDAausw), 1.0F);
}
if (!newsAddon.getConfig().has("soundDA") || newsAddon.getConfig().get("soundDA").getAsBoolean()) {
EntityPlayerSP p = Minecraft.getMinecraft().player;
if (newsAddon.soundDAausw.equalsIgnoreCase("sirene_2")) {
p.playSound(new SoundEvent(new ResourceLocation("sirene_2")), 0.25F, 1.0F);
} else {
LabyModCore.getMinecraft().playSound(new ResourceLocation(newsAddon.soundDAausw), 1.0F);
}

}
}
} catch (NullPointerException ex) {
System.out.println("[NEWS-DEBUG] NullPointerException at DauerauftragTimer");
}
}
}
44 changes: 25 additions & 19 deletions src/main/java/dev/janheist/newsaddon/timer/WerbeTimer.java
View file
Expand Up @@ -5,6 +5,8 @@
import dev.janheist.newsaddon.modules.WerbeCounter90;
import net.labymod.core.LabyModCore;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fml.common.FMLLog;
import org.apache.logging.log4j.Level;

import java.util.TimerTask;

Expand All @@ -16,26 +18,30 @@ public WerbeTimer(NewsAddon newsAddon) {

@Override
public void run() {
if(WerbeCounter90.allowed == 0) {
newsAddon.seconds90++;
WerbeCounter90.end = String.valueOf(90 - newsAddon.seconds90);
}
if(WerbeCounter120.allowed == 0) {
newsAddon.seconds120++;
WerbeCounter120.end = String.valueOf(120 - newsAddon.seconds120);
}
try {
if (WerbeCounter90.allowed == 0) {
newsAddon.seconds90++;
WerbeCounter90.end = String.valueOf(90 - newsAddon.seconds90);
}
if (WerbeCounter120.allowed == 0) {
newsAddon.seconds120++;
WerbeCounter120.end = String.valueOf(120 - newsAddon.seconds120);
}

if(newsAddon.seconds90 == 90) {
WerbeCounter90.allowed = 1;
newsAddon.seconds90 = 0;
if(newsAddon.DEBUGMODE || newsAddon.sound90 && newsAddon.getServer().contains("germanminer"))
LabyModCore.getMinecraft().playSound(new ResourceLocation(newsAddon.sound90ausw), 1.0F);
}
if(newsAddon.seconds120 == 120) {
WerbeCounter120.allowed = 1;
newsAddon.seconds120 = 0;
if(newsAddon.DEBUGMODE || newsAddon.sound120 && newsAddon.getServer().contains("germanminer"))
LabyModCore.getMinecraft().playSound(new ResourceLocation(newsAddon.sound120ausw), 1.0F);
if (newsAddon.seconds90 == 90) {
WerbeCounter90.allowed = 1;
newsAddon.seconds90 = 0;
if (newsAddon.DEBUGMODE || newsAddon.sound90 && newsAddon.getServer().contains("germanminer"))
LabyModCore.getMinecraft().playSound(new ResourceLocation(newsAddon.sound90ausw), 1.0F);
}
if (newsAddon.seconds120 == 120) {
WerbeCounter120.allowed = 1;
newsAddon.seconds120 = 0;
if (newsAddon.DEBUGMODE || newsAddon.sound120 && newsAddon.getServer().contains("germanminer"))
LabyModCore.getMinecraft().playSound(new ResourceLocation(newsAddon.sound120ausw), 1.0F);
}
} catch (NullPointerException ex) {
System.out.println("[NEWS-DEBUG] NullPointerException at WerbeTimer");
}
}
}

0 comments on commit 5a23d38

Please sign in to comment.