scrow/scrow-monorepo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

merge: fix workspace.xml conflict

Browse source
This commit is contained in:
Leonid Azgihin 2026-07-06 18:58:42 +04:00 • committed by redstone2888
commit ef1d717a48
9 changed files with 48 additions and 365 deletions
Download patch file Download diff file Expand all files Collapse all files

3
core-bukkit-impl/run/eula.txt Normal file
View file

@ -0,0 +1,3 @@
#By changing the setting below to TRUE you are indicating your agreement to our EULA (https://aka.ms/MinecraftEULA).
#Mon Jul 06 16:35:59 CEST 2026
eula=true

2
core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/CoreImplPlugin.java
View file

@ -18,7 +18,7 @@ public class CoreImplPlugin extends JavaPlugin {
@Override
public void onEnable() {
ScrowAPISurface.initScrowAPI(this, true);
ScrowAPISurface.initScrowAPI(this);
{
ScrowAPI.getCommandApi().register(new CoinsCommand().getRootNode());
ScrowAPI.getCommandApi().register(FriendCommand.create());

16
core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/ScrowAPISurface.java
View file

@ -19,16 +19,18 @@ import io.nats.client.Nats;
import io.nats.client.Options;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.bukkit.plugin.Plugin;
import org.jdbi.v3.core.Jdbi;
import java.io.IOException;
import java.util.Properties;
@Slf4j
@NoArgsConstructor(access = AccessLevel.NONE)
public class ScrowAPISurface {
public static void initScrowAPI(Plugin plugin, boolean enableDatabase) {
public static void initScrowAPI(Plugin plugin) {
ScrowAPI.setCorePlugin(plugin);
try {
@ -42,15 +44,15 @@ public class ScrowAPISurface {
throw new RuntimeException(e);
}
if (enableDatabase) {
try {
Class.forName("org.postgresql.Driver", true, ScrowAPISurface.class.getClassLoader());
} catch (ClassNotFoundException e) {
throw new RuntimeException(e);
}
try {
Class.forName("org.postgresql.Driver", true, ScrowAPISurface.class.getClassLoader());
var props = new Properties();
props.setProperty("user", "postgres");
ScrowAPI.setJdbi(Jdbi.create(EnvUtils.envOrThrow("HOST_POSTGRES"), props));
} catch (ClassNotFoundException e) {
throw new RuntimeException(e);
} catch (IllegalStateException e) {
log.error("HOST_POSTGRES not set -> Using in-memory database");
}
ScrowAPI.setPlayerFactory(playerId -> new NetworkPlayerImpl(ScrowAPI.getMessageBroker(), playerId));

4
core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/economy/CoinsCommand.java
View file

@ -10,15 +10,12 @@ import de.kentoj.kencommandapi.api.platform.MessageStyle;
import de.kentoj.scrow.bukkit.ScrowAPI;
import de.kentoj.scrow.bukkit.scheduler.Tasks;
import de.kentoj.scrowlib.convention.ScrowMessageStyle;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.NoArgsConstructor;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import java.util.concurrent.CompletableFuture;
@NoArgsConstructor(access = AccessLevel.NONE)
public class CoinsCommand implements CommandExecutor<CommandSender> {
@Getter
private final RootCommandNode<CommandSender> rootNode;
@ -39,7 +36,6 @@ public class CoinsCommand implements CommandExecutor<CommandSender> {
rootNode.addLiteral(getLiteral);
}
@Override
public CompletableFuture<Result<Object, String>> execute(CommandContext<CommandSender> ctx) {
var player = ((Player) ctx.getSender());