diff --git a/.gitignore b/.gitignore index aa0659f..543ac9e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ target/ test_server/ +server/ diff --git a/.gradle/8.11.1/checksums/checksums.lock b/.gradle/8.11.1/checksums/checksums.lock new file mode 100644 index 0000000..57db105 Binary files /dev/null and b/.gradle/8.11.1/checksums/checksums.lock differ diff --git a/.gradle/8.11.1/executionHistory/executionHistory.lock b/.gradle/8.11.1/executionHistory/executionHistory.lock new file mode 100644 index 0000000..bbb3f2e Binary files /dev/null and b/.gradle/8.11.1/executionHistory/executionHistory.lock differ diff --git a/.gradle/8.11.1/fileChanges/last-build.bin b/.gradle/8.11.1/fileChanges/last-build.bin new file mode 100644 index 0000000..f76dd23 Binary files /dev/null and b/.gradle/8.11.1/fileChanges/last-build.bin differ diff --git a/.gradle/8.11.1/fileHashes/fileHashes.bin b/.gradle/8.11.1/fileHashes/fileHashes.bin new file mode 100644 index 0000000..94228ac Binary files /dev/null and b/.gradle/8.11.1/fileHashes/fileHashes.bin differ diff --git a/.gradle/8.11.1/fileHashes/fileHashes.lock b/.gradle/8.11.1/fileHashes/fileHashes.lock new file mode 100644 index 0000000..8492033 Binary files /dev/null and b/.gradle/8.11.1/fileHashes/fileHashes.lock differ diff --git a/.gradle/8.11.1/gc.properties b/.gradle/8.11.1/gc.properties new file mode 100644 index 0000000..e69de29 diff --git a/.gradle/8.12/checksums/checksums.lock b/.gradle/8.12/checksums/checksums.lock new file mode 100644 index 0000000..e23a7e6 Binary files /dev/null and b/.gradle/8.12/checksums/checksums.lock differ diff --git a/.gradle/8.12/checksums/md5-checksums.bin b/.gradle/8.12/checksums/md5-checksums.bin new file mode 100644 index 0000000..0773e4f Binary files /dev/null and b/.gradle/8.12/checksums/md5-checksums.bin differ diff --git a/.gradle/8.12/checksums/sha1-checksums.bin b/.gradle/8.12/checksums/sha1-checksums.bin new file mode 100644 index 0000000..38367e2 Binary files /dev/null and b/.gradle/8.12/checksums/sha1-checksums.bin differ diff --git a/.gradle/8.12/executionHistory/executionHistory.bin b/.gradle/8.12/executionHistory/executionHistory.bin new file mode 100644 index 0000000..216bece Binary files /dev/null and b/.gradle/8.12/executionHistory/executionHistory.bin differ diff --git a/.gradle/8.12/executionHistory/executionHistory.lock b/.gradle/8.12/executionHistory/executionHistory.lock new file mode 100644 index 0000000..6364a53 Binary files /dev/null and b/.gradle/8.12/executionHistory/executionHistory.lock differ diff --git a/.gradle/8.12/fileChanges/last-build.bin b/.gradle/8.12/fileChanges/last-build.bin new file mode 100644 index 0000000..f76dd23 Binary files /dev/null and b/.gradle/8.12/fileChanges/last-build.bin differ diff --git a/.gradle/8.12/fileHashes/fileHashes.bin b/.gradle/8.12/fileHashes/fileHashes.bin new file mode 100644 index 0000000..429404d Binary files /dev/null and b/.gradle/8.12/fileHashes/fileHashes.bin differ diff --git a/.gradle/8.12/fileHashes/fileHashes.lock b/.gradle/8.12/fileHashes/fileHashes.lock new file mode 100644 index 0000000..815413f Binary files /dev/null and b/.gradle/8.12/fileHashes/fileHashes.lock differ diff --git a/.gradle/8.12/fileHashes/resourceHashesCache.bin b/.gradle/8.12/fileHashes/resourceHashesCache.bin new file mode 100644 index 0000000..f1168d7 Binary files /dev/null and b/.gradle/8.12/fileHashes/resourceHashesCache.bin differ diff --git a/.gradle/8.12/gc.properties b/.gradle/8.12/gc.properties new file mode 100644 index 0000000..e69de29 diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock new file mode 100644 index 0000000..ea5c82d Binary files /dev/null and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/.gradle/buildOutputCleanup/cache.properties b/.gradle/buildOutputCleanup/cache.properties new file mode 100644 index 0000000..3700b0b --- /dev/null +++ b/.gradle/buildOutputCleanup/cache.properties @@ -0,0 +1,2 @@ +#Fri Apr 18 18:22:42 CEST 2025 +gradle.version=8.12 diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin new file mode 100644 index 0000000..044e245 Binary files /dev/null and b/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/.gradle/configuration-cache/1n0hvhmh2ddtscvbtrbtv3rrd/.globals.work.bin b/.gradle/configuration-cache/1n0hvhmh2ddtscvbtrbtv3rrd/.globals.work.bin new file mode 100644 index 0000000..6d1f3ba Binary files /dev/null and b/.gradle/configuration-cache/1n0hvhmh2ddtscvbtrbtv3rrd/.globals.work.bin differ diff --git a/.gradle/configuration-cache/1n0hvhmh2ddtscvbtrbtv3rrd/.strings.work.bin b/.gradle/configuration-cache/1n0hvhmh2ddtscvbtrbtv3rrd/.strings.work.bin new file mode 100644 index 0000000..7e28ddb Binary files /dev/null and b/.gradle/configuration-cache/1n0hvhmh2ddtscvbtrbtv3rrd/.strings.work.bin differ diff --git a/.gradle/configuration-cache/1n0hvhmh2ddtscvbtrbtv3rrd/_.work.bin b/.gradle/configuration-cache/1n0hvhmh2ddtscvbtrbtv3rrd/_.work.bin new file mode 100644 index 0000000..24859d3 Binary files /dev/null and b/.gradle/configuration-cache/1n0hvhmh2ddtscvbtrbtv3rrd/_.work.bin differ diff --git a/.gradle/configuration-cache/1n0hvhmh2ddtscvbtrbtv3rrd/work.bin b/.gradle/configuration-cache/1n0hvhmh2ddtscvbtrbtv3rrd/work.bin new file mode 100644 index 0000000..06e3968 Binary files /dev/null and b/.gradle/configuration-cache/1n0hvhmh2ddtscvbtrbtv3rrd/work.bin differ diff --git a/.gradle/configuration-cache/bqee056obl3od79w1r6amf9sj/candidates.bin b/.gradle/configuration-cache/bqee056obl3od79w1r6amf9sj/candidates.bin new file mode 100644 index 0000000..b00e7d6 --- /dev/null +++ b/.gradle/configuration-cache/bqee056obl3od79w1r6amf9sj/candidates.bin @@ -0,0 +1 @@ +fb2c7600-62bf-456a-bf95-881f44d8056¸ \ No newline at end of file diff --git a/.gradle/configuration-cache/configuration-cache.lock b/.gradle/configuration-cache/configuration-cache.lock new file mode 100644 index 0000000..4b01fcb Binary files /dev/null and b/.gradle/configuration-cache/configuration-cache.lock differ diff --git a/.gradle/configuration-cache/fb2c7600-62bf-456a-bf95-881f44d80568/.globals.work.bin b/.gradle/configuration-cache/fb2c7600-62bf-456a-bf95-881f44d80568/.globals.work.bin new file mode 100644 index 0000000..53e1cea Binary files /dev/null and b/.gradle/configuration-cache/fb2c7600-62bf-456a-bf95-881f44d80568/.globals.work.bin differ diff --git a/.gradle/configuration-cache/fb2c7600-62bf-456a-bf95-881f44d80568/.strings.work.bin b/.gradle/configuration-cache/fb2c7600-62bf-456a-bf95-881f44d80568/.strings.work.bin new file mode 100644 index 0000000..44b7142 Binary files /dev/null and b/.gradle/configuration-cache/fb2c7600-62bf-456a-bf95-881f44d80568/.strings.work.bin differ diff --git a/.gradle/configuration-cache/fb2c7600-62bf-456a-bf95-881f44d80568/_.work.bin b/.gradle/configuration-cache/fb2c7600-62bf-456a-bf95-881f44d80568/_.work.bin new file mode 100644 index 0000000..da62f91 Binary files /dev/null and b/.gradle/configuration-cache/fb2c7600-62bf-456a-bf95-881f44d80568/_.work.bin differ diff --git a/.gradle/configuration-cache/fb2c7600-62bf-456a-bf95-881f44d80568/buildfingerprint.bin b/.gradle/configuration-cache/fb2c7600-62bf-456a-bf95-881f44d80568/buildfingerprint.bin new file mode 100644 index 0000000..0348f93 Binary files /dev/null and b/.gradle/configuration-cache/fb2c7600-62bf-456a-bf95-881f44d80568/buildfingerprint.bin differ diff --git a/.gradle/configuration-cache/fb2c7600-62bf-456a-bf95-881f44d80568/entry.bin b/.gradle/configuration-cache/fb2c7600-62bf-456a-bf95-881f44d80568/entry.bin new file mode 100644 index 0000000..76a6811 Binary files /dev/null and b/.gradle/configuration-cache/fb2c7600-62bf-456a-bf95-881f44d80568/entry.bin differ diff --git a/.gradle/configuration-cache/fb2c7600-62bf-456a-bf95-881f44d80568/projectfingerprint.bin b/.gradle/configuration-cache/fb2c7600-62bf-456a-bf95-881f44d80568/projectfingerprint.bin new file mode 100644 index 0000000..df01433 Binary files /dev/null and b/.gradle/configuration-cache/fb2c7600-62bf-456a-bf95-881f44d80568/projectfingerprint.bin differ diff --git a/.gradle/configuration-cache/fb2c7600-62bf-456a-bf95-881f44d80568/work.bin b/.gradle/configuration-cache/fb2c7600-62bf-456a-bf95-881f44d80568/work.bin new file mode 100644 index 0000000..e083fd1 Binary files /dev/null and b/.gradle/configuration-cache/fb2c7600-62bf-456a-bf95-881f44d80568/work.bin differ diff --git a/.gradle/configuration-cache/gc.properties b/.gradle/configuration-cache/gc.properties new file mode 100644 index 0000000..e69de29 diff --git a/.gradle/file-system.probe b/.gradle/file-system.probe new file mode 100644 index 0000000..07068c0 Binary files /dev/null and b/.gradle/file-system.probe differ diff --git a/.gradle/vcs-1/gc.properties b/.gradle/vcs-1/gc.properties new file mode 100644 index 0000000..e69de29 diff --git a/.kotlin/sessions/kotlin-compiler-9013992954605616578.salive b/.kotlin/sessions/kotlin-compiler-9013992954605616578.salive new file mode 100644 index 0000000..e69de29 diff --git a/build.sh b/build.sh index 88d8a70..4643f1e 100755 --- a/build.sh +++ b/build.sh @@ -1,4 +1,4 @@ -mvn clean package dependency:copy -DskipTests -DmcVersion=1.21 -DoutputDirectory=test_server/plugins -cd test_server +mvn clean package dependency:copy -DskipTests -DmcVersion=1.21 -DoutputDirectory=server/plugins +cd server java -jar server.jar -nogui cd ../ diff --git a/debug.sh b/debug.sh new file mode 100644 index 0000000..71b2263 --- /dev/null +++ b/debug.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +cp build/libs/*.jar server/plugins +cd server && java -jar server.jar -nogui && cd .. + + diff --git a/docker-compose.yml b/docker-compose.yml index 5765784..93ceec2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,6 +3,6 @@ services: civil_test_db: environment: - POSTGRES_PASSWORD=TEST123 - image: postgres:16.3 + image: docker.io/postgres:16.3 ports: - - 5432:5432 \ No newline at end of file + - 127.0.0.1:5432:5432 diff --git a/src/main/java/rip/iwakura/civilcore/CivilCore.java b/src/main/java/rip/iwakura/civilcore/CivilCore.java index 137e0e1..f323369 100644 --- a/src/main/java/rip/iwakura/civilcore/CivilCore.java +++ b/src/main/java/rip/iwakura/civilcore/CivilCore.java @@ -26,10 +26,6 @@ public class CivilCore extends JavaPlugin { this.bot = new Discord(getConfig().getString("discord.token"), getConfig().getString("discord.channel"), this); this.bot.initialize(); - if (Bukkit.getWorld("court") == null) { - new WorldCreator("court").createWorld(); - } - try { Class.forName("org.postgresql.Driver"); } catch (ClassNotFoundException e) { @@ -42,9 +38,7 @@ public class CivilCore extends JavaPlugin { e.printStackTrace(); } getServer().getPluginManager().registerEvents(new PlayerHandler(this), this); - getServer().getPluginManager().registerEvents(new Court(), this); this.getCommand("team").setExecutor(new TeamCommand(this)); - this.getCommand("court").setExecutor(new Court()); this.getCommand("tc").setExecutor(new TeamChatCommand(this)); } } diff --git a/src/main/java/rip/iwakura/civilcore/Court.java b/src/main/java/rip/iwakura/civilcore/Court.java deleted file mode 100644 index b0e723a..0000000 --- a/src/main/java/rip/iwakura/civilcore/Court.java +++ /dev/null @@ -1,89 +0,0 @@ -package rip.iwakura.civilcore; - -import org.bukkit.Bukkit; -import org.bukkit.Location; -import org.bukkit.World; -import org.bukkit.command.Command; -import org.bukkit.command.CommandExecutor; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; -import org.bukkit.event.EventHandler; -import org.bukkit.event.Listener; -import org.bukkit.event.block.BlockBreakEvent; -import org.bukkit.event.block.BlockBurnEvent; -import org.bukkit.event.block.BlockPlaceEvent; -import org.bukkit.event.block.BlockSpreadEvent; -import org.bukkit.event.entity.EntityDamageEvent; -import org.bukkit.event.entity.EntityDamageEvent.DamageCause; -import org.bukkit.event.player.PlayerBucketEmptyEvent; - -public class Court implements Listener,CommandExecutor{ - private World court_world = Bukkit.getWorld("court"); - - private Location court_location = new Location(court_world, 4.5, 70.0, 0.5, -90f, 1.0f); - - @EventHandler - public void PlayerPlaceWater(PlayerBucketEmptyEvent e) { - Player p = (Player) e.getPlayer(); - if (!p.getLocation().getWorld().getName().equals("court")) return; - e.setCancelled(true); - } - - @EventHandler - public void PlayerHurt(EntityDamageEvent e) { - if (!(e.getEntity() instanceof Player)) return; - Player p = (Player) e.getEntity(); - - if (!p.getLocation().getWorld().getName().equals("court")) return; - - e.setCancelled(true); - - if (e.getCause() == DamageCause.VOID) { - p.teleport(court_location); - return; - } - } - - @EventHandler - public void PlayerBreak(BlockBreakEvent e) { - if (e.getPlayer().isOp()) return; - if (e.getBlock().getWorld().getName().equals(court_world.getName())) e.setCancelled(true); - } - @EventHandler - public void PlayerPlace(BlockPlaceEvent e) { - if (e.getPlayer().isOp()) return; - if (e.getBlock().getWorld().getName().equals(court_world.getName())) e.setCancelled(true); - } - @EventHandler - public void PlayerBurn(BlockBurnEvent e) { - if (e.getBlock().getWorld().getName().equals(court_world.getName())) e.setCancelled(true); - } - @EventHandler - public void FireSpread(BlockSpreadEvent e) { - if (e.getBlock().getWorld().getName().equals(court_world.getName())) e.setCancelled(true); - } - @Override - public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) { - if (!(sender instanceof Player)) { - sender.sendMessage("Non-player type."); - return true; - } - - Player p = (Player) sender; - - switch (args[0]) { - case "enter": - p.teleport(court_location); - break; - case "leave": - Location loc = p.getBedSpawnLocation(); - if (loc == null) { - loc = Bukkit.getWorld("world").getSpawnLocation(); - } - p.teleport(loc); - break; - } - return true; - } - -} diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 529c1fa..fcea010 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -9,9 +9,6 @@ commands: description: Team Manager usage: / permission: "civil.teams" - court: - description: Court Manager - usage: / tc: description: Team Chat usage: /