aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/de/hype/bbsentials/client
diff options
context:
space:
mode:
authorHacktheTime <l4bg0jb7@duck.com>2023-09-21 21:55:59 +0200
committerHacktheTime <l4bg0jb7@duck.com>2023-09-21 21:55:59 +0200
commitf30090beaa3f116ec3fcbe103fc72a393e5f9162 (patch)
treea4ad0a417a12641c237f4b4934c0002fbb296293 /src/main/java/de/hype/bbsentials/client
parent2486da0f63a2c2cce7341a1402df7834414b6c42 (diff)
parenta4b899e994577a9cbc1d2f19135268a3ff0bde63 (diff)
downloadBBsentials-f30090beaa3f116ec3fcbe103fc72a393e5f9162.tar.gz
BBsentials-f30090beaa3f116ec3fcbe103fc72a393e5f9162.tar.bz2
BBsentials-f30090beaa3f116ec3fcbe103fc72a393e5f9162.zip
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'src/main/java/de/hype/bbsentials/client')
-rw-r--r--src/main/java/de/hype/bbsentials/client/BBsentials.java2
-rw-r--r--src/main/java/de/hype/bbsentials/client/BBsentialsConfigScreemFactory.java5
-rw-r--r--src/main/java/de/hype/bbsentials/client/ToDisplayConfig.java2
3 files changed, 8 insertions, 1 deletions
diff --git a/src/main/java/de/hype/bbsentials/client/BBsentials.java b/src/main/java/de/hype/bbsentials/client/BBsentials.java
index 6641c10..70384f6 100644
--- a/src/main/java/de/hype/bbsentials/client/BBsentials.java
+++ b/src/main/java/de/hype/bbsentials/client/BBsentials.java
@@ -219,7 +219,7 @@ public class BBsentials implements ClientModInitializer {
bbthread = new Thread(() -> {
bbserver = new BBsentialConnection();
coms = new CommandsOLD();
- bbserver.setMessageReceivedCallback(message -> bbserver.onMessageReceived(message));
+ bbserver.setMessageReceivedCallback(message -> executionService.execute(()->bbserver.onMessageReceived(message)));
if (beta) {
bbserver.connect(config.getBBServerURL(), 5011);
}
diff --git a/src/main/java/de/hype/bbsentials/client/BBsentialsConfigScreemFactory.java b/src/main/java/de/hype/bbsentials/client/BBsentialsConfigScreemFactory.java
index 4719557..2d0039c 100644
--- a/src/main/java/de/hype/bbsentials/client/BBsentialsConfigScreemFactory.java
+++ b/src/main/java/de/hype/bbsentials/client/BBsentialsConfigScreemFactory.java
@@ -172,6 +172,11 @@ public class BBsentialsConfigScreemFactory {
.setTooltip(Text.of("Select to receive notifications when any Flawless Gemstone is found"))
.setSaveConsumer(newValue -> config.toDisplayConfig.flawlessGemstone = newValue)
.build());
+ chChestItems.addEntry(entryBuilder.startBooleanToggle(Text.of("Jungle Heart"), config.toDisplayConfig.jungleHeart)
+ .setDefaultValue(false)
+ .setTooltip(Text.of("Select to receive notifications when a JungleHeart is found"))
+ .setSaveConsumer(newValue -> config.toDisplayConfig.jungleHeart = newValue)
+ .build());
}//CHChestItems
ConfigCategory miningEvents = builder.getOrCreateCategory(Text.of("Mining Events"));
{
diff --git a/src/main/java/de/hype/bbsentials/client/ToDisplayConfig.java b/src/main/java/de/hype/bbsentials/client/ToDisplayConfig.java
index d3a1707..4a048ab 100644
--- a/src/main/java/de/hype/bbsentials/client/ToDisplayConfig.java
+++ b/src/main/java/de/hype/bbsentials/client/ToDisplayConfig.java
@@ -25,6 +25,8 @@ public class ToDisplayConfig {
public boolean superliteMotor = false;
public boolean syntheticHeart = false;
public boolean flawlessGemstone = false;
+ public boolean jungleHeart = false;
+
//Mining Events.
public boolean allEvents = true;
public boolean blockChEvents = false;