pietru/CR_CookieServerUtils_Mod
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

update scripts for 0.4.17
Some checks failed
/ Auto-Build-App (push) Failing after 55s
Details

Browse source
This commit is contained in:
pietru 2025-08-24 23:32:21 +02:00
parent e2adbc4070
commit 88d1bcfea1
19 changed files with 70 additions and 159 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

167
build.gradle
View file

@ -1,115 +1,56 @@
plugins {
id "java-library"
id "java"
id "cosmicloom"
id "maven-publish"
}
loom {}
repositories {
ivy {
name = "Cosmic Reach"
url = "https://github.com/CRModders/CosmicArchive/raw/main/versions"
patternLayout {
artifact "[classifier]/[revision]/client/Cosmic-Reach-[revision].jar"
}
// This is required in Gradle 6.0+ as metadata file (ivy.xml) is mandatory
metadataSources {
artifact()
}
content {
includeModule "finalforeach", "cosmicreach"
}
}
ivy {
name = "Cosmic Reach"
url = "https://github.com/CRModders/CosmicArchive/raw/main/versions"
patternLayout {
artifact "[classifier]/[revision]/server/Cosmic-Reach-Server-[revision].jar"
}
// This is required in Gradle 6.0+ as metadata file (ivy.xml) is mandatory
metadataSources {
artifact()
}
content {
includeModule "finalforeach", "cosmicreach-server"
}
}
maven {
name = "crmReleases"
url = "https://maven.crmodders.dev/releases"
}
maven {
name = "crmReleases"
url = "https://maven.crmodders.dev/snapshots"
}
maven {
name = "JitPack"
url = "https://jitpack.io"
}
maven {
name = "Quilt"
url = "https://maven.quiltmc.org/repository/release"
}
maven {
name = "Fabric"
url = "https://maven.fabricmc.net/"
}
maven {
name = "Sponge"
url = "https://repo.spongepowered.org/maven/"
}
mavenCentral()
flatDir {
dirs "${rootDir}/mods/"
content {
includeGroup "quilt-mod"
}
}
}
configurations {
// Config to provide the Cosmic Reach project
cosmicreach
// Config to provide the Cosmic Reach project
cosmicreachServer
// Allows cosmic reach to be used in the codebase
compileOnly.extendsFrom(cosmicreach)
compileOnly.extendsFrom(cosmicreachServer)
internal {
visible = false
canBeConsumed = false
canBeResolved = false
exclusiveContent {
forRepository {
ivy {
name = "GitHub Releases"
url = uri("https://github.com")
patternLayout {
artifact("[organization]/releases/download/[revision]/[module](-[classifier]).[ext]")
artifact("[organization]/releases/download/[revision]/[module]-[revision](-[classifier]).[ext]")
setM2compatible(true)
}
metadataSources {
artifact()
}
}
}
filter {
// you may add more repos but for now this is what we need
includeGroup("PuzzlesHQ.CRArchive")
}
}
compileClasspath.extendsFrom(internal)
runtimeClasspath.extendsFrom(internal)
testCompileClasspath.extendsFrom(internal)
testRuntimeClasspath.extendsFrom(internal)
}
dependencies {
// Cosmic Reach jar
cosmicreach "finalforeach:cosmicreach:${cosmic_reach_version}:${cosmic_reach_rev}"
cosmicreachServer "finalforeach:cosmicreach-server:${cosmic_reach_server_version? cosmic_reach_server_version: cosmic_reach_version}:${cosmic_reach_rev}"
// Cosmic Reach
// cosmicReach(loom.cosmicReachClient(cosmic_reach_rev, cosmic_reach_version))
// cosmicReachServer(loom.cosmicReachServer(cosmic_reach_rev, cosmic_reach_version))
// Client Jar
cosmicReach("PuzzlesHQ.CRArchive:cosmic-reach-client:${cosmic_reach_version}-${cosmic_reach_rev}")
// Server Jar
cosmicReachServer ("PuzzlesHQ.CRArchive:cosmic-reach-server:${cosmic_reach_version}-${cosmic_reach_rev}")
// Cosmic Quilt
internal "org.codeberg.CRModders:cosmic-quilt:${cosmic_quilt_version}"
modImplementation(loom.cosmicQuilt(cosmic_quilt_version))
// Modmenu
// internal "org.codeberg.CRModders:modmenu:${modmenu_version}"
//quiltMod "quilt-mod:fluxapi:0.5.8r2"
//quiltMod "dev.crmodders:fluxapi:${fluxapi_version}"//0.5.5
def dir = new File(project.projectDir, "src/main/resources/${id}");
def dir_path = dir.getPath()
@ -159,50 +100,6 @@ processResources {
}
tasks.register("runClient", JavaExec) {
// We need to build the jar before we can actually run
dependsOn "jar"
// We need to use Quilt's main class so that we can actually modify the game
mainClass = "dev.crmodders.cosmicquilt.loader.knot.KnotClient"
// Tells this task the dependencies needed for it to run properly.
classpath sourceSets.main.runtimeClasspath
// Allows stuff to be found through the classpath
jvmArgs "-Dloader.development=true"
// Tells the loader where the game jar is located
jvmArgs "-Dloader.gameJarPath=" + configurations.cosmicreach.asPath
// Change the run directory
File runningDir = new File("run/")
if (!runningDir.exists())
runningDir.mkdirs()
workingDir = runningDir
}
tasks.register("runServer", JavaExec) {
// We need to build the jar before we can actually run
dependsOn "jar"
standardInput = System.in
// We need to use Quilt's main class so that we can actually modify the game
mainClass = "dev.crmodders.cosmicquilt.loader.knot.KnotServer"
// Tells this task the dependencies needed for it to run properly.
classpath sourceSets.main.runtimeClasspath
// Allows stuff to be found through the classpath
jvmArgs "-Dloader.development=true"
// Tells the loader where the game jar is located
jvmArgs "-Dloader.gameJarPath=" + configurations.cosmicreachServer.asPath
// Change the run directory
File runningDir = new File("run/")
if (!runningDir.exists())
runningDir.mkdirs()
workingDir = runningDir
}
java {
withSourcesJar()
// withJavadocJar() // If docs are included with the project, this line can be un-commented

4
gradle.properties
View file

@ -10,9 +10,9 @@ id=cookie_utils
# Dependency Versions
cosmic_reach_rev=alpha
cosmic_reach_version=0.4.11
cosmic_reach_version=0.4.17
# If unspecified, will use the version above
cosmic_reach_server_version=0.4.11
cosmic_reach_server_version=0.4.17
cosmic_quilt_version=7b04941cee
#2.3.1
#2.2.0

18
settings.gradle
View file

@ -1 +1,19 @@
buildscript() {
repositories {
maven {
name "JitPack"
url "https://jitpack.io"
}
mavenCentral()
mavenLocal()
}
dependencies {
// classpath "org.codeberg.CRModders:cosmic-loom:1.1.1"
classpath "org.codeberg.CRModders:cosmic-loom:1a98ea8cae"
}
}
rootProject.name = "CookieServerUtils"

2
src/main/java/net/pietru/cookie_utils/CookieUtils.java
View file

@ -1,7 +1,7 @@
package net.pietru.cookie_utils;
import dev.crmodders.cosmicquilt.api.entrypoint.ModInitializer;
import finalforeach.cosmicreach.GameSingletons;
import finalforeach.cosmicreach.singletons.GameSingletons;
import finalforeach.cosmicreach.Threads;
import finalforeach.cosmicreach.networking.netty.NettyServer;
import finalforeach.cosmicreach.networking.packets.MessagePacket;

2
src/main/java/net/pietru/cookie_utils/commands/dump_command.java
View file

@ -2,11 +2,11 @@ package net.pietru.cookie_utils.commands;
import com.badlogic.gdx.utils.Json;
import com.badlogic.gdx.utils.JsonWriter;
import finalforeach.cosmicreach.ZoneLoaders;
import finalforeach.cosmicreach.io.SaveLocation;
import finalforeach.cosmicreach.networking.NetworkIdentity;
import finalforeach.cosmicreach.networking.packets.MessagePacket;
import finalforeach.cosmicreach.world.IZoneLoader;
import finalforeach.cosmicreach.world.ZoneLoaders;
import io.netty.channel.ChannelHandlerContext;
import java.io.BufferedWriter;

2
src/main/java/net/pietru/cookie_utils/commands/make_zone_command.java
View file

@ -1,6 +1,6 @@
package net.pietru.cookie_utils.commands;
import finalforeach.cosmicreach.GameSingletons;
import finalforeach.cosmicreach.singletons.GameSingletons;
import finalforeach.cosmicreach.networking.NetworkIdentity;
import finalforeach.cosmicreach.networking.packets.MessagePacket;
import finalforeach.cosmicreach.worldgen.ZoneGenerator;

2
src/main/java/net/pietru/cookie_utils/commands/send_command.java
View file

@ -1,6 +1,6 @@
package net.pietru.cookie_utils.commands;
import finalforeach.cosmicreach.GameSingletons;
import finalforeach.cosmicreach.singletons.GameSingletons;
import finalforeach.cosmicreach.accounts.Account;
import finalforeach.cosmicreach.entities.player.Player;
import finalforeach.cosmicreach.networking.NetworkIdentity;

4
src/main/java/net/pietru/cookie_utils/mixins/EntityLaserProjectileMixin.java
View file

@ -1,7 +1,7 @@
package net.pietru.cookie_utils.mixins;
import com.badlogic.gdx.math.Vector3;
import finalforeach.cosmicreach.GameSingletons;
import finalforeach.cosmicreach.singletons.GameSingletons;
import finalforeach.cosmicreach.accounts.Account;
import finalforeach.cosmicreach.blocks.BlockPosition;
import finalforeach.cosmicreach.blocks.BlockState;
@ -38,7 +38,7 @@ public class EntityLaserProjectileMixin extends EntityMixin {
}
}
if (plr!=null) {
Account account = GameSingletons.getAccountFromPlayer(plr);
Account account = plr.getAccount();
if (!Permissions.has_user_special_perm(account.getUniqueId()) && !can_edit_block(blockPos, "laser", account.getUniqueId())) {
ci.cancel();

4
src/main/java/net/pietru/cookie_utils/mixins/NettyServerMixin.java
View file

@ -1,8 +1,6 @@
package net.pietru.cookie_utils.mixins;
import finalforeach.cosmicreach.GameSingletons;
import finalforeach.cosmicreach.Threads;
import finalforeach.cosmicreach.TickRunner;
import finalforeach.cosmicreach.singletons.GameSingletons;
import finalforeach.cosmicreach.networking.netty.NettyServer;
import finalforeach.cosmicreach.world.Zone;
import org.spongepowered.asm.mixin.Mixin;

2
src/main/java/net/pietru/cookie_utils/mixins/ServerSingletonsMixin.java
View file

@ -1,7 +1,7 @@
package net.pietru.cookie_utils.mixins;
import com.llamalad7.mixinextras.sugar.Local;
import finalforeach.cosmicreach.GameSingletons;
import finalforeach.cosmicreach.singletons.GameSingletons;
import finalforeach.cosmicreach.accounts.Account;
import finalforeach.cosmicreach.entities.player.Player;
import finalforeach.cosmicreach.networking.NetworkIdentity;

2
src/main/java/net/pietru/cookie_utils/mixins/ZoneLoaderMixin.java
View file

@ -2,8 +2,8 @@ package net.pietru.cookie_utils.mixins;
import com.badlogic.gdx.utils.Array;
import com.badlogic.gdx.utils.Queue;
import finalforeach.cosmicreach.ZoneLoader;
import finalforeach.cosmicreach.util.Point3DMap;
import finalforeach.cosmicreach.world.ZoneLoader;
import finalforeach.cosmicreach.worldgen.ChunkColumn;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;

2
src/main/java/net/pietru/cookie_utils/npcs/NpcDef.java
View file

@ -3,7 +3,7 @@ package net.pietru.cookie_utils.npcs;
import com.badlogic.gdx.math.Vector3;
import com.badlogic.gdx.utils.JsonReader;
import com.badlogic.gdx.utils.JsonValue;
import finalforeach.cosmicreach.GameSingletons;
import finalforeach.cosmicreach.singletons.GameSingletons;
import finalforeach.cosmicreach.accounts.AccountOffline;
import finalforeach.cosmicreach.entities.Entity;
import finalforeach.cosmicreach.entities.player.Player;

2
src/main/java/net/pietru/cookie_utils/scripting/tokens/TokenMessage.java
View file

@ -1,6 +1,6 @@
package net.pietru.cookie_utils.scripting.tokens;
import finalforeach.cosmicreach.GameSingletons;
import finalforeach.cosmicreach.singletons.GameSingletons;
import finalforeach.cosmicreach.entities.player.Player;
import finalforeach.cosmicreach.networking.packets.MessagePacket;
import finalforeach.cosmicreach.networking.packets.ParticleSystemPacket;

2
src/main/java/net/pietru/cookie_utils/scripting/tokens/TokenParticle.java
View file

@ -1,7 +1,7 @@
package net.pietru.cookie_utils.scripting.tokens;
import com.badlogic.gdx.graphics.Color;
import finalforeach.cosmicreach.GameSingletons;
import finalforeach.cosmicreach.singletons.GameSingletons;
import finalforeach.cosmicreach.entities.player.Player;
import finalforeach.cosmicreach.networking.packets.ParticleSystemPacket;
import finalforeach.cosmicreach.networking.server.ServerSingletons;

2
src/main/java/net/pietru/cookie_utils/scripting/tokens/TokenRespawn.java
View file

@ -1,6 +1,6 @@
package net.pietru.cookie_utils.scripting.tokens;
import finalforeach.cosmicreach.GameSingletons;
import finalforeach.cosmicreach.singletons.GameSingletons;
import finalforeach.cosmicreach.entities.player.Player;
import finalforeach.cosmicreach.world.Zone;
import net.pietru.cookie_utils.scripting.BaseScript;

2
src/main/java/net/pietru/cookie_utils/scripting/tokens/TokenSwitchZone.java
View file

@ -1,6 +1,6 @@
package net.pietru.cookie_utils.scripting.tokens;
import finalforeach.cosmicreach.GameSingletons;
import finalforeach.cosmicreach.singletons.GameSingletons;
import finalforeach.cosmicreach.entities.player.Player;
import finalforeach.cosmicreach.world.Zone;
import net.pietru.cookie_utils.scripting.BaseScript;

2
src/main/java/net/pietru/cookie_utils/scripting/tokens/TokenTeleport.java
View file

@ -1,7 +1,7 @@
package net.pietru.cookie_utils.scripting.tokens;
import com.badlogic.gdx.math.Vector3;
import finalforeach.cosmicreach.GameSingletons;
import finalforeach.cosmicreach.singletons.GameSingletons;
import finalforeach.cosmicreach.entities.player.Player;
import finalforeach.cosmicreach.networking.packets.entities.PlayerPositionPacket;
import finalforeach.cosmicreach.networking.server.ServerSingletons;

4
src/main/java/net/pietru/cookie_utils/setups/areaPermSetup.java
View file

@ -4,7 +4,7 @@ import com.badlogic.gdx.math.Vector3;
import com.badlogic.gdx.utils.Json;
import com.badlogic.gdx.utils.JsonValue;
import com.badlogic.gdx.utils.JsonWriter;
import finalforeach.cosmicreach.GameSingletons;
import finalforeach.cosmicreach.singletons.GameSingletons;
import finalforeach.cosmicreach.accounts.Account;
import finalforeach.cosmicreach.blocks.BlockPosition;
import finalforeach.cosmicreach.entities.player.Player;
@ -33,7 +33,7 @@ public class areaPermSetup extends Setup {
@Override
public boolean can_start_setup(String playerId) {
Player player = GameSingletons.getPlayerFromUniqueId(playerId);
Player player = ServerSingletons.getAccountByUniqueId(playerId).getPlayer();
area=get_area_at_pos(player.getPosition(), player.getZone());
return area!=null&&Region.is_area_user_type(player.getPosition(),playerId,"Owner");
}

4
src/main/java/net/pietru/cookie_utils/utils/player_utils.java
View file

@ -1,11 +1,9 @@
package net.pietru.cookie_utils.utils;
import com.badlogic.gdx.utils.Array;
import finalforeach.cosmicreach.GameSingletons;
import finalforeach.cosmicreach.accounts.Account;
import finalforeach.cosmicreach.chat.commands.Command;
import finalforeach.cosmicreach.entities.player.Player;
import finalforeach.cosmicreach.gamestates.InGame;
import finalforeach.cosmicreach.singletons.GameSingletons;
import finalforeach.cosmicreach.util.ArrayUtils;
import net.pietru.cookie_utils.api.Area;
import net.pietru.cookie_utils.permissions.PlayerAreaPerm;