2vb/SGM
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

messed up applying but applying works
Some checks are pending
Build plugin / build (push) Waiting to run
Details

Browse Source
This commit is contained in:
2vb 2024-07-03 23:26:34 -07:00
parent 90b3a1922d
commit 62e3b4a4a2
2 changed files with 43 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/main/java/xyz/twovb/sgm/games/impl/capturethebrick/CTB.java
View File

@ -6,7 +6,9 @@ package xyz.twovb.sgm.games.impl.capturethebrick;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.block.Block;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.configuration.file.YamlConfiguration;
@ -22,10 +24,7 @@ import xyz.twovb.toolbox.utils.ChatUtils;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.*;
import java.util.Arrays;
import java.util.List;
import java.util.UUID;
public class CTB implements Minigame { public class CTB implements Minigame {
final static String name = "CaptureTheBrick"; final static String name = "CaptureTheBrick";
@ -46,10 +45,12 @@ public class CTB implements Minigame {
Bukkit.getPluginManager().registerEvents(this, SGM.getInstance()); Bukkit.getPluginManager().registerEvents(this, SGM.getInstance());
gameWorld = createGameWorld(world, uuid); gameWorld = createGameWorld(world, uuid);
gameWorld.setAutoSave(false); gameWorld.setAutoSave(false);
if (applyOptions()) { try {
state = GameState.READY; if (applyOptions()) {
owner.sendMessage("A new " + name + " instance with ID " + uuid + " has been created and is now ready!"); state = GameState.READY;
} else { owner.sendMessage("A new " + name + " instance with ID " + uuid + " has been created and is now ready!");
}
} catch (Exception ex) {
owner.sendMessage(ChatUtils.translate(SGM.getInstance().getMessages().getString("sgm.game.cant-start"))); owner.sendMessage(ChatUtils.translate(SGM.getInstance().getMessages().getString("sgm.game.cant-start")));
} }
} }
@ -76,9 +77,18 @@ public class CTB implements Minigame {
SGM.getInstance().getCLogger().log(teamName + " Player Spawn Area: " + playerSpawnArea); SGM.getInstance().getCLogger().log(teamName + " Player Spawn Area: " + playerSpawnArea);
// Log each team's brick spawns // Log each team's brick spawns
for (int i = 0; i < brickSpawns.size(); i++) { for (String brickSpawn : brickSpawns) {
SGM.getInstance().getCLogger().log(teamName + " Brick Spawn " + (i + 1) + ": " + brickSpawns.get(i)); String[] coords = brickSpawn.split(",");
// Process each brick spawn here if needed if (coords.length == 3) {
int x = Integer.parseInt(coords[0]);
int y = Integer.parseInt(coords[1]);
int z = Integer.parseInt(coords[2]);
// Now you have x, y, z coordinates to work with
placeBrick(new Location(gameWorld, x, y, z), teamName);
} else {
SGM.getInstance().getCLogger().error("Invalid brick spawn: " + coords[0]);
return false;
}
} }
} }
} }
@ -105,9 +115,15 @@ public class CTB implements Minigame {
return true; return true;
} }
// private void placeBrick(Integer integer) { private void placeBrick(Location location, String team) {
// Block brick = location.getBlock();
// } if (Objects.equals(team, "red")) {
brick.setType(Material.RED_WOOL);
}
if (Objects.equals(team, "blue")) {
brick.setType(Material.BLUE_WOOL);
}
}
@Override @Override
public void start() { public void start() {

19
src/main/java/xyz/twovb/sgm/levels/LevelManager.java
View File

@ -167,26 +167,33 @@ public class LevelManager {
} }
public void loadLevels() { public void loadLevels() {
// Initialize enabledMaps for each registered game
for (String game : SGM.getInstance().getGameManager().getRegisteredGames()) { for (String game : SGM.getInstance().getGameManager().getRegisteredGames()) {
enabledMaps.put(game, new ArrayList<>()); // Initialize an empty ArrayList for each game enabledMaps.put(game, new ArrayList<>()); // Initialize an empty ArrayList for each game
} }
// List all files (worlds) in the folder
File folder = new File(mapPath); // Load levels from levelPath
loadWorldDir(levelPath, LevelType.LEVEL);
}
private void loadWorldDir(String path, LevelType levelType) {
File folder = new File(path);
File[] files = folder.listFiles(); File[] files = folder.listFiles();
if (files != null) { if (files != null) {
for (File file : files) { for (File file : files) {
if (file.isDirectory()) { if (file.isDirectory()) {
// Check if sgm.yml exists in the world directory
File configFile = new File(file, "sgm.yml"); File configFile = new File(file, "sgm.yml");
if (configFile.exists()) { if (configFile.exists()) {
YamlConfiguration config = YamlConfiguration.loadConfiguration(configFile); YamlConfiguration config = YamlConfiguration.loadConfiguration(configFile);
String game = config.getString("game"); String game = config.getString("game");
String name = config.getString("name"); String name = config.getString("name");
if (enabledMaps.containsKey(game)) {
if (enabledMaps.containsKey(game) && levelType == LevelType.MAP) {
enabledMaps.get(game).add(name); enabledMaps.get(game).add(name);
// Load the world if sgm.yml exists
loadWorld(file.getName(), LevelType.LEVEL);
} }
// Load the world if sgm.yml exists
loadWorld(file.getName(), levelType);
} else { } else {
SGM.getInstance().getCLogger().log("Skipping directory " + file.getName() + ": sgm.yml not found."); SGM.getInstance().getCLogger().log("Skipping directory " + file.getName() + ": sgm.yml not found.");
} }