Skip to content

Commit

Permalink
updated to 1.19
Browse files Browse the repository at this point in the history
  • Loading branch information
@DaFuqs
DaFuqs committed Jul 1, 2022
1 parent 6cd9243 commit adceb69
Show file tree
Hide file tree
Showing 13 changed files with 585 additions and 587 deletions.
2 changes: 1 addition & 1 deletion build.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id 'fabric-loom' version '0.10-SNAPSHOT'
id 'fabric-loom' version '0.12-SNAPSHOT'
id 'maven-publish'
}

Expand Down
14 changes: 7 additions & 7 deletions gradle.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@
org.gradle.jvmargs = -Xmx2G

# Fabric Properties
minecraft_version=1.18.2
yarn_mappings=1.18.2+build.2
loader_version=0.13.3
minecraft_version=1.19
yarn_mappings=1.19+build.4
loader_version=0.14.8

# Mod Properties
mod_version = 1.5.2-1.18.2
mod_version = 1.6.0-1.19.0
maven_group = de.dafuqs.globalspawn
archives_base_name = globalspawn

# Dependencies
fabric_version=0.48.0+1.18.2
fabric_version=0.57.0+1.19
# https://shedaniel.gitbook.io/cloth-config/setup-cloth-config/cloth-config-fabric
cloth_config_version=6.1.48
modmenu_version=3.0.0
cloth_config_version=7.0.72
modmenu_version=4.0.0
66 changes: 33 additions & 33 deletions src/main/java/de/dafuqs/globalspawn/GlobalSpawnCommon.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,37 +15,37 @@
import org.apache.logging.log4j.Logger;

public class GlobalSpawnCommon implements ModInitializer {

public static final String MOD_ID = "globalspawn";
public static ConfigManager<GlobalSpawnConfig> GLOBAL_SPAWN_CONFIG_MANAGER;
public static GlobalSpawnConfig GLOBAL_SPAWN_CONFIG;
private static final Logger LOGGER = LogManager.getLogger(MOD_ID);

public static MinecraftServer minecraftServer;

@Override
public void onInitialize() {
//Set up config
log(Level.INFO, "Loading config file...");
ConfigHolder<GlobalSpawnConfig> configHolder = AutoConfig.register(GlobalSpawnConfig.class, JanksonConfigSerializer::new);
GLOBAL_SPAWN_CONFIG_MANAGER = ((ConfigManager<GlobalSpawnConfig>) configHolder);
GLOBAL_SPAWN_CONFIG = AutoConfig.getConfigHolder(GlobalSpawnConfig.class).getConfig();
log(Level.INFO, "Registering Spawn Override...");
GlobalSpawnCommand.register();
InitialSpawnCommand.register();
GlobalSpawnManager.initialize();

ServerWorldEvents.LOAD.register((server, world) -> {
GlobalSpawnCommon.minecraftServer = server;
GlobalSpawnManager.addWorld(world);
});
log(Level.INFO, "Startup finished.");
}
public static void log(Level logLevel, String message) {
LOGGER.log(logLevel, "[GlobalSpawn] " + message);
}

public static final String MOD_ID = "globalspawn";
public static ConfigManager<GlobalSpawnConfig> GLOBAL_SPAWN_CONFIG_MANAGER;
public static GlobalSpawnConfig GLOBAL_SPAWN_CONFIG;
private static final Logger LOGGER = LogManager.getLogger(MOD_ID);
public static MinecraftServer minecraftServer;
@Override
public void onInitialize() {
//Set up config
log(Level.INFO, "Loading config file...");
ConfigHolder<GlobalSpawnConfig> configHolder = AutoConfig.register(GlobalSpawnConfig.class, JanksonConfigSerializer::new);
GLOBAL_SPAWN_CONFIG_MANAGER = ((ConfigManager<GlobalSpawnConfig>) configHolder);
GLOBAL_SPAWN_CONFIG = AutoConfig.getConfigHolder(GlobalSpawnConfig.class).getConfig();
log(Level.INFO, "Registering Spawn Override...");
GlobalSpawnCommand.register();
InitialSpawnCommand.register();
GlobalSpawnManager.initialize();
ServerWorldEvents.LOAD.register((server, world) -> {
GlobalSpawnCommon.minecraftServer = server;
GlobalSpawnManager.addWorld(world);
});
log(Level.INFO, "Startup finished.");
}
public static void log(Level logLevel, String message) {
LOGGER.log(logLevel, "[GlobalSpawn] " + message);
}
}
280 changes: 140 additions & 140 deletions src/main/java/de/dafuqs/globalspawn/GlobalSpawnManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,144 +9,144 @@
import java.util.HashMap;

public class GlobalSpawnManager {

private static final HashMap<RegistryKey<World>, World> dimensions = new HashMap<>();
private static boolean respawnPointActive;
private static GlobalSpawnPoint globalRespawnPoint;

private static boolean initialSpawnActive;
private static GlobalSpawnPoint initialSpawnPoint;

// GENERAL
public static void initialize() {
respawnPointActive = false;
initialSpawnActive = false;
}

public static void addWorld(World world) {
dimensions.put(world.getRegistryKey(), world);

Identifier identifier = new Identifier(GlobalSpawnCommon.GLOBAL_SPAWN_CONFIG.globalRespawnDimension);
boolean shouldRespawnPointBeActive = respawnPointActive = GlobalSpawnCommon.GLOBAL_SPAWN_CONFIG.globalRespawnPointActive;
if (shouldRespawnPointBeActive && world.getRegistryKey().getValue().equals(identifier)) {
int x = GlobalSpawnCommon.GLOBAL_SPAWN_CONFIG.globalRespawnPositionX;
int y = GlobalSpawnCommon.GLOBAL_SPAWN_CONFIG.globalRespawnPositionY;
int z = GlobalSpawnCommon.GLOBAL_SPAWN_CONFIG.globalRespawnPositionZ;
globalRespawnPoint = new GlobalSpawnPoint(world.getRegistryKey(), new BlockPos(x, y, z));
respawnPointActive = true;
}

boolean shouldInitialSpawnPointBeActive = GlobalSpawnCommon.GLOBAL_SPAWN_CONFIG.initialSpawnPointActive;
identifier = new Identifier(GlobalSpawnCommon.GLOBAL_SPAWN_CONFIG.initialSpawnPointDimension);
if(shouldInitialSpawnPointBeActive && world.getRegistryKey().getValue().equals(identifier)) {
int x = GlobalSpawnCommon.GLOBAL_SPAWN_CONFIG.initialSpawnPositionX;
int y = GlobalSpawnCommon.GLOBAL_SPAWN_CONFIG.initialSpawnPositionY;
int z = GlobalSpawnCommon.GLOBAL_SPAWN_CONFIG.initialSpawnPositionZ;
initialSpawnPoint = new GlobalSpawnPoint(world.getRegistryKey(), new BlockPos(x, y, z));
initialSpawnActive = true;
}
}

private static boolean existsWorld(RegistryKey<World> registryKey) {
return dimensions.containsKey(registryKey);
}

private static void updateConfigFile() {
// respawn point
GlobalSpawnCommon.GLOBAL_SPAWN_CONFIG.globalRespawnPointActive = respawnPointActive;
if(globalRespawnPoint != null) {
GlobalSpawnCommon.GLOBAL_SPAWN_CONFIG.globalRespawnDimension = globalRespawnPoint.getSpawnDimension().getValue().toString();

BlockPos globalRespawnPointSpawnBlockPos = globalRespawnPoint.getSpawnBlockPos();
GlobalSpawnCommon.GLOBAL_SPAWN_CONFIG.globalRespawnPositionX = globalRespawnPointSpawnBlockPos.getX();
GlobalSpawnCommon.GLOBAL_SPAWN_CONFIG.globalRespawnPositionY = globalRespawnPointSpawnBlockPos.getY();
GlobalSpawnCommon.GLOBAL_SPAWN_CONFIG.globalRespawnPositionZ = globalRespawnPointSpawnBlockPos.getZ();
}

// initial spawn point
GlobalSpawnCommon.GLOBAL_SPAWN_CONFIG.initialSpawnPointActive = initialSpawnActive;
if(initialSpawnPoint != null) {
GlobalSpawnCommon.GLOBAL_SPAWN_CONFIG.initialSpawnPointDimension = initialSpawnPoint.getSpawnDimension().getValue().toString();

BlockPos initialSpawnPointSpawnBlockPos = initialSpawnPoint.getSpawnBlockPos();
GlobalSpawnCommon.GLOBAL_SPAWN_CONFIG.initialSpawnPositionX = initialSpawnPointSpawnBlockPos.getX();
GlobalSpawnCommon.GLOBAL_SPAWN_CONFIG.initialSpawnPositionY = initialSpawnPointSpawnBlockPos.getY();
GlobalSpawnCommon.GLOBAL_SPAWN_CONFIG.initialSpawnPositionZ = initialSpawnPointSpawnBlockPos.getZ();
}

GlobalSpawnCommon.GLOBAL_SPAWN_CONFIG_MANAGER.save();
}

// RESPAWN
public static void setRespawnPoint(GlobalSpawnPoint globalRespawnPoint) {
GlobalSpawnManager.globalRespawnPoint = globalRespawnPoint;
respawnPointActive = true;
updateConfigFile();
}

public static GlobalSpawnPoint getGlobalRespawnPoint() {
if(respawnPointActive) {
return globalRespawnPoint;
} else {
return null;
}
}

public static void unsetRespawnPoint() {
globalRespawnPoint = null;
respawnPointActive = false;
updateConfigFile();
}

public static boolean isGlobalRespawnPointActive() {
if(respawnPointActive && globalRespawnPoint != null) {
RegistryKey<World> spawnPointDimension = globalRespawnPoint.getSpawnDimension();

if (existsWorld(spawnPointDimension)) {
return true;
} else {
GlobalSpawnCommon.log(Level.WARN, "Respawn dimension " + spawnPointDimension + " is not loaded. GlobalRespawn is disabled");
return false;
}
} else {
return false;
}
}

// INITIAL SPAWN
public static void setInitialSpawnPoint(GlobalSpawnPoint initialSpawnPoint) {
GlobalSpawnManager.initialSpawnPoint = initialSpawnPoint;
initialSpawnActive = true;
updateConfigFile();
}

public static GlobalSpawnPoint getInitialSpawnPoint() {
if(initialSpawnActive) {
return initialSpawnPoint;
} else {
return null;
}
}

public static void unsetInitialSpawnPoint() {
initialSpawnPoint = null;
initialSpawnActive = false;
updateConfigFile();
}

public static boolean isInitialSpawnPointActive() {
if(initialSpawnActive && initialSpawnPoint != null) {
RegistryKey<World> spawnPointDimension = initialSpawnPoint.getSpawnDimension();

if (existsWorld(spawnPointDimension)) {
return true;
} else {
GlobalSpawnCommon.log(Level.WARN, "Initial spawn dimension " + spawnPointDimension + " is not loaded. InitialSpawn is disabled");
return false;
}
} else {
return false;
}
}

private static final HashMap<RegistryKey<World>, World> dimensions = new HashMap<>();
private static boolean respawnPointActive;
private static GlobalSpawnPoint globalRespawnPoint;
private static boolean initialSpawnActive;
private static GlobalSpawnPoint initialSpawnPoint;
// GENERAL
public static void initialize() {
respawnPointActive = false;
initialSpawnActive = false;
}
public static void addWorld(World world) {
dimensions.put(world.getRegistryKey(), world);
Identifier identifier = new Identifier(GlobalSpawnCommon.GLOBAL_SPAWN_CONFIG.globalRespawnDimension);
boolean shouldRespawnPointBeActive = respawnPointActive = GlobalSpawnCommon.GLOBAL_SPAWN_CONFIG.globalRespawnPointActive;
if (shouldRespawnPointBeActive && world.getRegistryKey().getValue().equals(identifier)) {
int x = GlobalSpawnCommon.GLOBAL_SPAWN_CONFIG.globalRespawnPositionX;
int y = GlobalSpawnCommon.GLOBAL_SPAWN_CONFIG.globalRespawnPositionY;
int z = GlobalSpawnCommon.GLOBAL_SPAWN_CONFIG.globalRespawnPositionZ;
globalRespawnPoint = new GlobalSpawnPoint(world.getRegistryKey(), new BlockPos(x, y, z));
respawnPointActive = true;
}
boolean shouldInitialSpawnPointBeActive = GlobalSpawnCommon.GLOBAL_SPAWN_CONFIG.initialSpawnPointActive;
identifier = new Identifier(GlobalSpawnCommon.GLOBAL_SPAWN_CONFIG.initialSpawnPointDimension);
if (shouldInitialSpawnPointBeActive && world.getRegistryKey().getValue().equals(identifier)) {
int x = GlobalSpawnCommon.GLOBAL_SPAWN_CONFIG.initialSpawnPositionX;
int y = GlobalSpawnCommon.GLOBAL_SPAWN_CONFIG.initialSpawnPositionY;
int z = GlobalSpawnCommon.GLOBAL_SPAWN_CONFIG.initialSpawnPositionZ;
initialSpawnPoint = new GlobalSpawnPoint(world.getRegistryKey(), new BlockPos(x, y, z));
initialSpawnActive = true;
}
}
private static boolean existsWorld(RegistryKey<World> registryKey) {
return dimensions.containsKey(registryKey);
}
private static void updateConfigFile() {
// respawn point
GlobalSpawnCommon.GLOBAL_SPAWN_CONFIG.globalRespawnPointActive = respawnPointActive;
if (globalRespawnPoint != null) {
GlobalSpawnCommon.GLOBAL_SPAWN_CONFIG.globalRespawnDimension = globalRespawnPoint.getSpawnDimension().getValue().toString();
BlockPos globalRespawnPointSpawnBlockPos = globalRespawnPoint.getSpawnBlockPos();
GlobalSpawnCommon.GLOBAL_SPAWN_CONFIG.globalRespawnPositionX = globalRespawnPointSpawnBlockPos.getX();
GlobalSpawnCommon.GLOBAL_SPAWN_CONFIG.globalRespawnPositionY = globalRespawnPointSpawnBlockPos.getY();
GlobalSpawnCommon.GLOBAL_SPAWN_CONFIG.globalRespawnPositionZ = globalRespawnPointSpawnBlockPos.getZ();
}
// initial spawn point
GlobalSpawnCommon.GLOBAL_SPAWN_CONFIG.initialSpawnPointActive = initialSpawnActive;
if (initialSpawnPoint != null) {
GlobalSpawnCommon.GLOBAL_SPAWN_CONFIG.initialSpawnPointDimension = initialSpawnPoint.getSpawnDimension().getValue().toString();
BlockPos initialSpawnPointSpawnBlockPos = initialSpawnPoint.getSpawnBlockPos();
GlobalSpawnCommon.GLOBAL_SPAWN_CONFIG.initialSpawnPositionX = initialSpawnPointSpawnBlockPos.getX();
GlobalSpawnCommon.GLOBAL_SPAWN_CONFIG.initialSpawnPositionY = initialSpawnPointSpawnBlockPos.getY();
GlobalSpawnCommon.GLOBAL_SPAWN_CONFIG.initialSpawnPositionZ = initialSpawnPointSpawnBlockPos.getZ();
}
GlobalSpawnCommon.GLOBAL_SPAWN_CONFIG_MANAGER.save();
}
// RESPAWN
public static void setRespawnPoint(GlobalSpawnPoint globalRespawnPoint) {
GlobalSpawnManager.globalRespawnPoint = globalRespawnPoint;
respawnPointActive = true;
updateConfigFile();
}
public static GlobalSpawnPoint getGlobalRespawnPoint() {
if (respawnPointActive) {
return globalRespawnPoint;
} else {
return null;
}
}
public static void unsetRespawnPoint() {
globalRespawnPoint = null;
respawnPointActive = false;
updateConfigFile();
}
public static boolean isGlobalRespawnPointActive() {
if (respawnPointActive && globalRespawnPoint != null) {
RegistryKey<World> spawnPointDimension = globalRespawnPoint.getSpawnDimension();
if (existsWorld(spawnPointDimension)) {
return true;
} else {
GlobalSpawnCommon.log(Level.WARN, "Respawn dimension " + spawnPointDimension + " is not loaded. GlobalRespawn is disabled");
return false;
}
} else {
return false;
}
}
// INITIAL SPAWN
public static void setInitialSpawnPoint(GlobalSpawnPoint initialSpawnPoint) {
GlobalSpawnManager.initialSpawnPoint = initialSpawnPoint;
initialSpawnActive = true;
updateConfigFile();
}
public static GlobalSpawnPoint getInitialSpawnPoint() {
if (initialSpawnActive) {
return initialSpawnPoint;
} else {
return null;
}
}
public static void unsetInitialSpawnPoint() {
initialSpawnPoint = null;
initialSpawnActive = false;
updateConfigFile();
}
public static boolean isInitialSpawnPointActive() {
if (initialSpawnActive && initialSpawnPoint != null) {
RegistryKey<World> spawnPointDimension = initialSpawnPoint.getSpawnDimension();
if (existsWorld(spawnPointDimension)) {
return true;
} else {
GlobalSpawnCommon.log(Level.WARN, "Initial spawn dimension " + spawnPointDimension + " is not loaded. InitialSpawn is disabled");
return false;
}
} else {
return false;
}
}
}
Loading

0 comments on commit adceb69

Please sign in to comment.