NotAlexNoyle/Hide-and-Seek
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to latest version

Browse Source
This commit is contained in:
Bensonheimer992 committed 2025-02-06 17:41:02 +01:00
1 parent 16d554bbf7
commit 6a99e651b7
4 files changed
+68 -29
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

build.xml
+9
View File
@@ -0,0 +1,9 @@
<?xml version="1.0" ?>
<!DOCTYPE xml>
<project name="hideandseek" default="Build">
<xmlproperty file="pom.xml" prefix="pom" keeproot="false"/>
<target name="Build">
<jar jarfile="C:\Users\alex\Downloads\HS Test\plugins\${ant.project.name}.jar" basedir="./target/classes/" includes="**/*">
</jar>
</target>
</project>
pom.xml
+7 -3
View File
@@ -1,4 +1,6 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"><modelVersion>4.0.0</modelVersion>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>dev.tylerm</groupId>
<artifactId>KenshinsHideAndSeek</artifactId>
<version>1.8.2</version>
@@ -61,7 +63,8 @@
</filter>
</filters>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<transformer
implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/services/java.sql.Driver</resource>
</transformer>
</transformers>
@@ -96,6 +99,7 @@
<url>https://repo.extendedclip.com/content/repositories/placeholderapi/</url>
</repository>
</repositories>
<dependencies>
<dependency>
<groupId>org.spigotmc</groupId>
@@ -129,7 +133,7 @@
<dependency>
<groupId>com.github.cryptomorin</groupId>
<artifactId>XSeries</artifactId>
<version>11.3.0</version>
<version>13.0.0</version>
</dependency>
<dependency>
<groupId>me.clip</groupId>
src/main/java/dev/tylerm/khs/Main.java
+37 -26
View File
@@ -4,22 +4,23 @@ import dev.tylerm.khs.command.*;
import dev.tylerm.khs.command.map.Debug;
import dev.tylerm.khs.command.map.GoTo;
import dev.tylerm.khs.command.map.Save;
import dev.tylerm.khs.command.map.blockhunt.Enabled;
import dev.tylerm.khs.command.map.blockhunt.blocks.Add;
import dev.tylerm.khs.command.map.blockhunt.blocks.List;
import dev.tylerm.khs.command.map.blockhunt.blocks.Remove;
import dev.tylerm.khs.command.map.set.*;
import dev.tylerm.khs.command.util.CommandGroup;
import dev.tylerm.khs.command.world.Create;
import dev.tylerm.khs.command.world.Delete;
import dev.tylerm.khs.command.world.Tp;
import dev.tylerm.khs.configuration.*;
import dev.tylerm.khs.database.Database;
import dev.tylerm.khs.game.*;
import dev.tylerm.khs.game.events.AntiFire;
import dev.tylerm.khs.game.events.Blockchange;
import dev.tylerm.khs.game.listener.*;
import dev.tylerm.khs.game.util.Status;
import dev.tylerm.khs.util.PAPIExpansion;
import dev.tylerm.khs.command.map.blockhunt.Enabled;
import dev.tylerm.khs.command.world.Create;
import dev.tylerm.khs.command.world.Delete;
import dev.tylerm.khs.command.world.Tp;
import dev.tylerm.khs.database.Database;
import dev.tylerm.khs.command.util.CommandGroup;
import org.bukkit.Bukkit;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
@@ -34,7 +35,8 @@ import java.util.Arrays;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import static dev.tylerm.khs.configuration.Config.*;
import static dev.tylerm.khs.configuration.Config.errorPrefix;
import static dev.tylerm.khs.configuration.Config.exitPosition;
import static dev.tylerm.khs.configuration.Localization.message;
public class Main extends JavaPlugin implements Listener {
@@ -59,7 +61,8 @@ public class Main extends JavaPlugin implements Listener {
Main.instance = this;
getLogger().info("Getting minecraft version...");
this.updateVersion();;
this.updateVersion();
;
try {
getLogger().info("Loading config.yml...");
@@ -141,7 +144,7 @@ public class Main extends JavaPlugin implements Listener {
game = new Game(null, board);
getLogger().info("Scheduling tick tasks...");
getServer().getScheduler().runTaskTimer(this, this::onTick,0,1).getTaskId();
getServer().getScheduler().runTaskTimer(this, this::onTick, 0, 1).getTaskId();
getLogger().info("Registering outgoing bungeecord plugin channel...");
Bukkit.getServer().getMessenger().registerOutgoingPluginChannel(this, "BungeeCord");
@@ -154,7 +157,7 @@ public class Main extends JavaPlugin implements Listener {
}
long end = System.currentTimeMillis();
getLogger().info("Finished loading plugin ("+(end-start)+"ms)");
getLogger().info("Finished loading plugin (" + (end - start) + "ms)");
loaded = true;
}
@@ -163,7 +166,7 @@ public class Main extends JavaPlugin implements Listener {
version = 0;
if(board != null) {
if (board != null) {
board.getPlayers().forEach(player -> {
board.removeBoard(player);
PlayerLoader.unloadPlayer(player);
@@ -172,7 +175,7 @@ public class Main extends JavaPlugin implements Listener {
board.cleanup();
}
if(disguiser != null) {
if (disguiser != null) {
disguiser.cleanUp();
}
@@ -180,7 +183,7 @@ public class Main extends JavaPlugin implements Listener {
}
private void onTick() {
if(game.getStatus() == Status.ENDED) game = new Game(game.getCurrentMap(), board);
if (game.getStatus() == Status.ENDED) game = new Game(game.getCurrentMap(), board);
game.onTick();
disguiser.check();
}
@@ -198,9 +201,10 @@ public class Main extends JavaPlugin implements Listener {
getServer().getPluginManager().registerEvents(new RespawnHandler(), this);
getServer().getPluginManager().registerEvents(new WorldInteractHandler(), this);
getServer().getPluginManager().registerEvents(new Blockchange(), this);
getServer().getPluginManager().registerEvents(new AntiFire(), this);
}
private void updateVersion(){
private void updateVersion() {
Matcher matcher = Pattern.compile("MC: \\d\\.(\\d+).(\\d+)").matcher(Bukkit.getVersion());
if (matcher.find()) {
version = Integer.parseInt(matcher.group(1));
@@ -230,7 +234,7 @@ public class Main extends JavaPlugin implements Listener {
sender.sendMessage(errorPrefix + message("COMMAND_PLAYER_ONLY"));
return true;
}
commandGroup.handleCommand((Player)sender, args);
commandGroup.handleCommand((Player) sender, args);
return true;
}
@@ -239,7 +243,7 @@ public class Main extends JavaPlugin implements Listener {
sender.sendMessage(errorPrefix + message("COMMAND_PLAYER_ONLY"));
return new ArrayList<>();
}
return commandGroup.handleTabComplete((Player)sender, args);
return commandGroup.handleTabComplete((Player) sender, args);
}
public static Main getInstance() {
@@ -254,37 +258,44 @@ public class Main extends JavaPlugin implements Listener {
return database;
}
public Board getBoard(){
public Board getBoard() {
return board;
}
public Game getGame(){
public Game getGame() {
return game;
}
public Disguiser getDisguiser() { return disguiser; }
public Disguiser getDisguiser() {
return disguiser;
}
public EntityHider getEntityHider() { return entityHider; }
public EntityHider getEntityHider() {
return entityHider;
}
public CommandGroup getCommandGroup() { return commandGroup; }
public CommandGroup getCommandGroup() {
return commandGroup;
}
public boolean supports(int v){
public boolean supports(int v) {
return version >= v;
}
public boolean supports(int v, int s){
public boolean supports(int v, int s) {
return (version == v) ? sub_version >= s : version >= v;
}
public java.util.List<String> getWorlds() {
java.util.List<String> worlds = new ArrayList<>();
File[] containers = getWorldContainer().listFiles();
if(containers != null) {
if (containers != null) {
Arrays.stream(containers).forEach(file -> {
if (!file.isDirectory()) return;
String[] files = file.list();
if (files == null) return;
if (!Arrays.asList(files).contains("session.lock") && !Arrays.asList(files).contains("level.dat")) return;
if (!Arrays.asList(files).contains("session.lock") && !Arrays.asList(files).contains("level.dat"))
return;
worlds.add(file.getName());
});
}
@@ -296,7 +307,7 @@ public class Main extends JavaPlugin implements Listener {
}
public void scheduleTask(Runnable task) {
if(!isEnabled()) return;
if (!isEnabled()) return;
Bukkit.getServer().getScheduler().runTask(this, task);
}
src/main/java/dev/tylerm/khs/game/events/AntiFire.java
+15
View File
@@ -0,0 +1,15 @@
package dev.tylerm.khs.game.events;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.entity.EntityCombustEvent;
public class AntiFire implements Listener {
@EventHandler
public void onPlayerFireTick(EntityCombustEvent event) {
if (event.getEntity() instanceof Player) {
event.setCancelled(true);
}
}
}