Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

maybe we can try again? #18

Closed
wants to merge 13 commits into from
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 2 additions & 0 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
51 changes: 33 additions & 18 deletions gradlew
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/sh

#
# Copyright © 2015-2021 the original authors.
# Copyright © 2015-2021 the original authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -32,10 +32,10 @@
# Busybox and similar reduced shells will NOT work, because this script
# requires all of these POSIX shell features:
# * functions;
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
# * compound commands having a testable exit status, especially «case»;
# * various built-in commands including «command», «set», and «ulimit».
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
# * compound commands having a testable exit status, especially «case»;
# * various built-in commands including «command», «set», and «ulimit».
#
# Important for patching:
#
Expand All @@ -55,7 +55,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
Expand All @@ -80,13 +80,11 @@ do
esac
done

APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit

APP_NAME="Gradle"
# This is normally unused
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}

# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
Expand Down Expand Up @@ -133,22 +131,29 @@ location of your Java installation."
fi
else
JAVACMD=java
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
if ! command -v java >/dev/null 2>&1
then
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.

Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
fi

# Increase the maximum file descriptors if we can.
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC2039,SC3045
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
case $MAX_FD in #(
'' | soft) :;; #(
*)
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC2039,SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
Expand Down Expand Up @@ -193,18 +198,28 @@ if "$cygwin" || "$msys" ; then
done
fi

# Collect all arguments for the java command;
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
# shell script including quotes and variable substitutions, so put them in
# double quotes to make sure that they get re-expanded; and
# * put everything else in single quotes, so that it's not re-expanded.

# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

# Collect all arguments for the java command:
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
# and any embedded shellness will be escaped.
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
# treated as '${Hostname}' itself on the command line.

set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \
-classpath "$CLASSPATH" \
org.gradle.wrapper.GradleWrapperMain \
"$@"

# Stop when "xargs" is not available.
if ! command -v xargs >/dev/null 2>&1
then
die "xargs is not available"
fi

# Use "xargs" to parse quoted args.
#
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
Expand Down
35 changes: 19 additions & 16 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
@rem limitations under the License.
@rem

@if "%DEBUG%" == "" @echo off
@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
Expand All @@ -25,7 +25,8 @@
if "%OS%"=="Windows_NT" setlocal

set DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=.
if "%DIRNAME%"=="" set DIRNAME=.
@rem This is normally unused
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%

Expand All @@ -40,13 +41,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome

set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if "%ERRORLEVEL%" == "0" goto execute
if %ERRORLEVEL% equ 0 goto execute

echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
echo. 1>&2
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2

goto fail

Expand All @@ -56,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe

if exist "%JAVA_EXE%" goto execute

echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
echo. 1>&2
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2

goto fail

Expand All @@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar

:end
@rem End local scope for the variables with windows NT shell
if "%ERRORLEVEL%"=="0" goto mainEnd
if %ERRORLEVEL% equ 0 goto mainEnd

:fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code!
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
exit /b 1
set EXIT_CODE=%ERRORLEVEL%
if %EXIT_CODE% equ 0 set EXIT_CODE=1
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
exit /b %EXIT_CODE%

:mainEnd
if "%OS%"=="Windows_NT" endlocal
Expand Down
16 changes: 9 additions & 7 deletions src/main/java/com/nexia/base/player/PlayerDataManager.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
package com.nexia.base.player;

import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.mongodb.client.model.Filters;
import com.mongodb.client.result.UpdateResult;
import com.nexia.core.NexiaCore;
Expand All @@ -13,6 +11,8 @@
import com.nexia.minigames.games.base.player.WLKSavedPlayerData;
import com.nexia.minigames.games.bedwars.util.player.BedwarsPlayerData;
import com.nexia.minigames.games.bedwars.util.player.BedwarsSavedPlayerData;
import com.nexia.minigames.games.bridge.util.player.BridgePlayerData;
import com.nexia.minigames.games.bridge.util.player.BridgeSavedPlayerData;
import com.nexia.minigames.games.duels.util.player.DuelsPlayerData;
import com.nexia.minigames.games.duels.util.player.DuelsSavedPlayerData;
import com.nexia.minigames.games.football.util.player.FootballPlayerData;
Expand All @@ -31,12 +31,9 @@ public class PlayerDataManager {
public static Map<ResourceLocation, PlayerDataManager> dataManagerMap = new HashMap<>();

private final String collectionName;

HashMap<UUID, PlayerData> allPlayerData = new HashMap<>();

public Class<? extends SavedPlayerData> savedPlayerDataClass;

public Class<? extends PlayerData> playerDataClass;
HashMap<UUID, PlayerData> allPlayerData = new HashMap<>();

public PlayerDataManager(ResourceLocation id, String collectionName, Class<? extends SavedPlayerData> savedPlayerDataClass, Class<? extends PlayerData> playerDataClass) {
this.collectionName = collectionName;
Expand All @@ -48,6 +45,7 @@ public PlayerDataManager(ResourceLocation id, String collectionName, Class<? ext
public static PlayerDataManager getDataManager(ResourceLocation identifier) {
return dataManagerMap.get(identifier);
}

public static void init() {
// <----------- Core --------------->
new PlayerDataManager(NexiaCore.CORE_DATA_MANAGER, "core", CoreSavedPlayerData.class, CorePlayerData.class);
Expand All @@ -71,6 +69,9 @@ public static void init() {
// <----------- Football --------------->
new PlayerDataManager(NexiaCore.FOOTBALL_DATA_MANAGER, "football", FootballSavedPlayerData.class, FootballPlayerData.class);

// <----------- Bridge --------------->
new PlayerDataManager(NexiaCore.BRIDGE_DATA_MANAGER, "bridge", BridgeSavedPlayerData.class, BridgePlayerData.class);

// <----------- OITC --------------->
new PlayerDataManager(NexiaCore.OITC_DATA_MANAGER, "oitc", WLKSavedPlayerData.class, OITCPlayerData.class);

Expand Down Expand Up @@ -101,7 +102,8 @@ public void addPlayerData(UUID uuid) {
PlayerData playerData;
try {
playerData = playerDataClass.getConstructor(SavedPlayerData.class).newInstance(loadPlayerData(uuid, savedPlayerDataClass));
} catch (InstantiationException | IllegalAccessException | NoSuchMethodException | InvocationTargetException e) {
} catch (InstantiationException | IllegalAccessException | NoSuchMethodException |
InvocationTargetException e) {
throw new RuntimeException(e);
}
allPlayerData.put(uuid, playerData);
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/com/nexia/core/NexiaCore.java
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ public class NexiaCore implements ModInitializer, NexusPlugin {

public static final ResourceLocation FOOTBALL_DATA_MANAGER = id("football");

public static final ResourceLocation BRIDGE_DATA_MANAGER = id("bridge");

public static final ResourceLocation OITC_DATA_MANAGER = id("oitc");

public static final ResourceLocation SKYWARS_DATA_MANAGER = id("skywars");
Expand Down
18 changes: 17 additions & 1 deletion src/main/java/com/nexia/core/games/util/LobbyUtil.java
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@
import com.nexia.minigames.games.football.FootballGame;
import com.nexia.minigames.games.football.FootballGameMode;
import com.nexia.minigames.games.football.util.player.FootballPlayerData;
import com.nexia.minigames.games.bridge.BridgeGame;
import com.nexia.minigames.games.bridge.BridgeGameMode;
import com.nexia.minigames.games.bridge.util.player.BridgePlayerData;
import com.nexia.minigames.games.oitc.OitcGame;
import com.nexia.minigames.games.oitc.OitcGameMode;
import com.nexia.minigames.games.oitc.util.player.OITCPlayerData;
Expand All @@ -42,7 +45,7 @@

public class LobbyUtil {

public static String[] statsGameModes = {"FFA CLASSIC", "SKY FFA", "UHC FFA", "KIT FFA", "BEDWARS", "OITC", "DUELS", "SKYWARS", "FOOTBALL"};
public static String[] statsGameModes = {"FFA CLASSIC", "SKY FFA", "UHC FFA", "KIT FFA", "BEDWARS", "OITC", "DUELS", "SKYWARS", "FOOTBALL", "BRIDGE"};

public static ServerLevel lobbyWorld = null;

Expand Down Expand Up @@ -86,6 +89,9 @@ public static void setLobbyWorld(MinecraftServer server) {
PlayerGameMode.FOOTBALL.tag,
"in_football_game",
"duels",
PlayerGameMode.BRIDGE.tag,
"in_bridge_game",
"duels",
PlayerGameMode.SKYWARS.tag,
PlayerGameMode.OITC.tag,
"in_oitc_game",
Expand Down Expand Up @@ -307,6 +313,16 @@ public static void sendGame(NexiaPlayer player, String game, boolean message, bo
if(message){player.sendActionBarMessage(Component.text("You have joined §7○ §7§lFootball §7\uD83D\uDDE1"));}
}

if(game.equalsIgnoreCase("bridge")){
player.addTag(BridgeGame.BRIDGE_TAG);
((CorePlayerData)PlayerDataManager.getDataManager(NexiaCore.CORE_DATA_MANAGER).get(player)).gameMode = PlayerGameMode.BRIDGE;
((BridgePlayerData)PlayerDataManager.getDataManager(NexiaCore.BRIDGE_DATA_MANAGER).get(player)).gameMode = BridgeGameMode.LOBBY;

BridgeGame.joinQueue(player);

if(message){player.sendActionBarMessage(Component.text("You have joined §7○ §7§lBridge §7\uD83D\uDDE1"));}
}


if(game.equalsIgnoreCase("skywars")){
player.addTag(PlayerGameMode.SKYWARS.tag);
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/com/nexia/core/games/util/PlayerGameMode.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import com.nexia.minigames.games.bedwars.players.BwPlayers;
import com.nexia.minigames.games.football.FootballGame;
import com.nexia.minigames.games.bridge.BridgeGame;
import com.nexia.minigames.games.oitc.OitcGame;
import com.nexia.minigames.games.skywars.SkywarsGame;
import org.jetbrains.annotations.NotNull;
Expand All @@ -27,7 +28,7 @@ public class PlayerGameMode {
public static final PlayerGameMode OITC = new PlayerGameMode("oitc", "OITC", OitcGame.OITC_TAG);
public static final PlayerGameMode FFA = new PlayerGameMode("ffa", "FFA", "ffa");
public static final PlayerGameMode FOOTBALL = new PlayerGameMode("football", "Football", FootballGame.FOOTBALL_TAG);

public static final PlayerGameMode BRIDGE = new PlayerGameMode("bridge", "Bridge", BridgeGame.BRIDGE_TAG);
//public static final PlayerGameMode DUELS = new PlayerGameMode("duels");

PlayerGameMode(String id, String name, String tag) {
Expand Down
20 changes: 19 additions & 1 deletion src/main/java/com/nexia/core/gui/PlayGUI.java
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import com.nexia.minigames.games.bedwars.areas.BwAreas;
import com.nexia.minigames.games.duels.DuelGameMode;
import com.nexia.minigames.games.football.FootballGame;
import com.nexia.minigames.games.bridge.BridgeGame;
import com.nexia.minigames.games.oitc.OitcGame;
import com.nexia.minigames.games.skywars.SkywarsGame;
import eu.pb4.sgui.api.ClickType;
Expand Down Expand Up @@ -229,13 +230,25 @@ private void setOtherGamesLayout() {
ItemDisplayUtil.addLore(football, "§f", 4);
ItemDisplayUtil.addLore(football, net.kyori.adventure.text.Component.text(String.format("There are %s people playing this gamemode.", FootballGame.world.players().size()), ChatFormat.Minecraft.white).decoration(ChatFormat.italic, false), 5);

ItemStack bridge = new ItemStack(Items.DIAMOND_PICKAXE, 1);
bridge.setHoverName(ObjectMappings.convertComponent(net.kyori.adventure.text.Component.text("Bridge", ChatFormat.Minecraft.blue).decoration(ChatFormat.italic, false)));
ItemDisplayUtil.addGlint(bridge);
bridge.hideTooltipPart(ItemStack.TooltipPart.MODIFIERS);

ItemDisplayUtil.addLore(bridge, "§f", 0);
ItemDisplayUtil.addLore(bridge, net.kyori.adventure.text.Component.text("FINNALLY BRIDGE", ChatFormat.Minecraft.gray).decoration(ChatFormat.italic, false), 1);
ItemDisplayUtil.addLore(bridge, net.kyori.adventure.text.Component.text("Jump into the opponents goal", ChatFormat.Minecraft.gray).decoration(ChatFormat.italic, false), 2);
ItemDisplayUtil.addLore(bridge, net.kyori.adventure.text.Component.text("to achieve victory!", ChatFormat.Minecraft.gray).decoration(ChatFormat.italic, false), 3);
ItemDisplayUtil.addLore(bridge, "§f", 4);
ItemDisplayUtil.addLore(bridge, net.kyori.adventure.text.Component.text(String.format("There are %s people playing this gamemode.", BridgeGame.world.players().size()), ChatFormat.Minecraft.white).decoration(ChatFormat.italic, false), 5);

fillEmptySlots(emptySlot);

this.setSlot(2, oitc);
this.setSlot(4, back);
this.setSlot(6, football);
this.setSlot(0, unknown);
this.setSlot(8, unknown);
this.setSlot(8, bridge);
}

public boolean click(int index, ClickType clickType, net.minecraft.world.inventory.ClickType action){
Expand Down Expand Up @@ -294,6 +307,11 @@ public boolean click(int index, ClickType clickType, net.minecraft.world.invento
this.close();
}

if(name.getString().contains("Bridge")){
LobbyUtil.sendGame(nexiaPlayer, "bridge", true, true);
this.close();
}

if(name.getString().contains("Duels")){
LobbyUtil.sendGame(nexiaPlayer, "duels", true, true);
this.close();
Expand Down
Loading
Loading