Skip to content

Commit

Permalink
Rewritten and improved data structure:
Browse files Browse the repository at this point in the history 
- Islands have owner property
- Multi Dimension support
- Islands spawn in the center of each region file
  • Loading branch information
@ThePixelbrain
ThePixelbrain committed Jun 16, 2023
1 parent f6fbdc0 commit 19b3499
Show file tree
Hide file tree
Showing 16 changed files with 500 additions and 556 deletions.
3 changes: 0 additions & 3 deletions CODEOWNERS
View file

This file was deleted.

21 changes: 0 additions & 21 deletions LICENSE-template
View file

This file was deleted.

91 changes: 91 additions & 0 deletions src/main/java/com/cricketcraft/ftbisland/Config.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
package com.cricketcraft.ftbisland;

import java.io.File;
import java.util.ArrayList;

import net.minecraftforge.common.config.Configuration;

import cpw.mods.fml.client.event.ConfigChangedEvent;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;

public class Config {

private static Configuration config;

public static void init(File file) {
if (config == null) {
config = new Configuration(file);
loadConfig();
}
}

private static void loadConfig() {
FTBIslands.maxIslands = config.getInt(
"Max Islands",
"misc",
100,
1,
1000,
"The maximum amount of islands that can be created. This number will be multiplied by four."
+ " Be careful with high numbers.");
if (!config.hasKey("misc", "Island Type")) {
boolean skyFactory = config
.getBoolean("Sky Factory", "misc", false, "Set this to true if you are playing on Sky Factory.");
boolean platform = config.getBoolean(
"Platform",
"misc",
false,
"Set to true if you want to start on a 3x3 platform, or false for a tree.");
if (skyFactory || !platform) {
FTBIslands.islandType = config.getString(
"Island Type",
"misc",
"tree",
"Set this to the type of platform you want:\n" + " 'grass' A single grass block.\n"
+ " 'tree' A small oak tree on a grass block. This is the standard start.\n"
+ " 'platform' A 3x3 platform with a chest.\n"
+ " 'GoG' An island similar to Garden of Glass from Botania.\n");
config.moveProperty("misc", "Sky Factory", "forRemoval");
config.moveProperty("misc", "Platform", "forRemoval");
config.removeCategory(config.getCategory("forRemoval"));
}
} else {
FTBIslands.islandType = config.getString(
"Island Type",
"misc",
"tree",
"Set this to the type of platform you want:\n" + " 'grass' A single grass block.\n"
+ " 'tree' A small oak tree on a grass block. This is the standard start.\n"
+ " 'platform' A 3x3 platform with a chest.\n"
+ " 'GoG' An island similar to Garden of Glass from Botania.\n");
ArrayList<String> types = new ArrayList<>();
types.add("grass");
types.add("tree");
types.add("platform");
types.add("GoG");

boolean valid = false;
for (String s : types) {
if (FTBIslands.islandType.equalsIgnoreCase(s)) {
valid = true;
break;
}
}
if (!valid) {
FTBIslands.logger.warn("Invalid island option detected. Using 'platform' as default.");
FTBIslands.islandType = "platform";
}
}

if (config.hasChanged()) {
config.save();
}
}

@SubscribeEvent
public void onChanged(ConfigChangedEvent.OnConfigChangedEvent event) {
if (event.modID.equalsIgnoreCase(Tags.MODID)) {
loadConfig();
}
}
}
213 changes: 9 additions & 204 deletions src/main/java/com/cricketcraft/ftbisland/FTBIslands.java
View file
Original file line number Diff line number Diff line change
@@ -1,26 +1,15 @@
package com.cricketcraft.ftbisland;

import java.io.*;
import java.util.ArrayList;
import java.util.HashMap;

import net.minecraftforge.common.config.Configuration;

import org.apache.commons.io.FileUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;

import com.cricketcraft.ftbisland.commands.*;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.reflect.TypeToken;

import cpw.mods.fml.client.event.ConfigChangedEvent;
import cpw.mods.fml.common.Mod;
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import cpw.mods.fml.common.event.FMLServerStartingEvent;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import ftb.lib.LMMod;

@Mod(
Expand All @@ -32,14 +21,12 @@
public class FTBIslands {

public static int maxIslands;
public static File islandFile;
public static Logger logger;
public static String islandType;
public static LMMod mod;
private static File oldIslands;
private static File directory;
public static ArrayList<IslandCreator.IslandPos> islandLoc = new ArrayList<IslandCreator.IslandPos>();
private static HashMap<String, IslandCreator.IslandPos> islands = new HashMap<>();

private static IslandStorage islandStorage;

@Mod.EventHandler
public void serverLoading(FMLServerStartingEvent event) {
Expand All @@ -49,208 +36,26 @@ public void serverLoading(FMLServerStartingEvent event) {
event.registerServerCommand(new JoinIslandCommand());
event.registerServerCommand(new ListIslandCommand());
event.registerServerCommand(new RenameIslandCommand());
event.registerServerCommand(new SetIslandSpawnCommand());
event.registerServerCommand(new TeleportIslandCommand());
logger.info("Finished registering commands.");
loadIslands();
loadChestLoot();
reloadIslands();
}

public static HashMap<String, IslandCreator.IslandPos> getIslands() {
return islands;
}

private void loadIslands() {
for (int c = 0; c < maxIslands; c++) {
addIslandToList(c);
}
}

private void addIslandToList(int x) {
if (x != 0) {
islandLoc.add(new IslandCreator.IslandPos(x * 1000, 60, x * 1000));
islandLoc.add(new IslandCreator.IslandPos(-x * 1000, 60, x * 1000));
islandLoc.add(new IslandCreator.IslandPos(-x * 1000, 60, -x * 1000));
islandLoc.add(new IslandCreator.IslandPos(x * 1000, 60, -x * 1000));
} else {
islandLoc.add(new IslandCreator.IslandPos(x * 1000, 60, x * 1000));
}
}

private void loadChestLoot() {

islandStorage.reloadContainer();
}

@Mod.EventHandler
public void preInit(FMLPreInitializationEvent event) {
public static void preInit(FMLPreInitializationEvent event) {
Config.init(new File(event.getModConfigurationDirectory(), "ftbi/FTB_Islands.cfg"));
logger = LogManager.getLogger("FTBI");
mod = LMMod.create("FTBI");
File dir = event.getModConfigurationDirectory();
directory = new File(dir.getParentFile(), "local");
oldIslands = new File(directory, "islands.ser");
islandFile = new File(directory, "islands.json");
if (oldIslands.exists()) {
logger.info("Islands.ser found, attempting conversion.");
try {
convert();
} catch (IOException e) {
e.printStackTrace();
} catch (ClassNotFoundException e) {
e.printStackTrace();
}
}
try {
directory.mkdirs();
islandFile.createNewFile();
} catch (IOException e) {
e.printStackTrace();
}
islandStorage = new IslandStorage();
}

@Mod.EventHandler
public void postInit(FMLPostInitializationEvent event) throws IOException {
BufferedReader br = new BufferedReader(new FileReader(islandFile.getPath()));
if (br.readLine() == null) {
logger.info("Islands file empty, placing a default value.");
FTBIslands.islands.put("default", new IslandCreator.IslandPos(0, 60, 0));
try {
saveIslands(FTBIslands.islands);
} catch (IOException e) {
e.printStackTrace();
}
}
br.close();
public static File getDirectory() {
return directory;
}

public static void saveIslands(HashMap<String, IslandCreator.IslandPos> map) throws IOException {
String s = new GsonBuilder().create()
.toJson(map);
FileUtils.writeStringToFile(islandFile, s);
}

public static void reloadIslands() {
try {
islands = FTBIslands.getIslandsFromFile();
} catch (EOFException e) {
// silent catch
} catch (IOException e) {
FTBIslands.logger.error("Couldn't get islands from save file");
e.printStackTrace();
}
}

private static HashMap<String, IslandCreator.IslandPos> getIslandsFromFile() throws IOException {
try (FileInputStream ignored = new FileInputStream(islandFile)) {
return new Gson().fromJson(
FileUtils.readFileToString(islandFile),
new TypeToken<HashMap<String, IslandCreator.IslandPos>>() {}.getType());
}
}

private static class Config {

private static Configuration config;

public static void init(File file) {
if (config == null) {
config = new Configuration(file);
loadConfig();
}
}

private static void loadConfig() {
FTBIslands.maxIslands = config.getInt(
"Max Islands",
"misc",
100,
1,
1000,
"The maximum amount of islands that can be created. This number will be multiplied by four."
+ " Be careful with high numbers.");
if (!config.hasKey("misc", "Island Type")) {
boolean skyFactory = config
.getBoolean("Sky Factory", "misc", false, "Set this to true if you are playing on Sky Factory.");
boolean platform = config.getBoolean(
"Platform",
"misc",
false,
"Set to true if you want to start on a 3x3 platform, or false for a tree.");
if (skyFactory || !platform) {
FTBIslands.islandType = config.getString(
"Island Type",
"misc",
"tree",
"Set this to the type of platform you want:\n" + " 'grass' A single grass block.\n"
+ " 'tree' A small oak tree on a grass block. This is the standard start.\n"
+ " 'platform' A 3x3 platform with a chest.\n"
+ " 'GoG' An island similar to Garden of Glass from Botania.\n");
config.moveProperty("misc", "Sky Factory", "forRemoval");
config.moveProperty("misc", "Platform", "forRemoval");
config.removeCategory(config.getCategory("forRemoval"));
}
} else {
FTBIslands.islandType = config.getString(
"Island Type",
"misc",
"tree",
"Set this to the type of platform you want:\n" + " 'grass' A single grass block.\n"
+ " 'tree' A small oak tree on a grass block. This is the standard start.\n"
+ " 'platform' A 3x3 platform with a chest.\n"
+ " 'GoG' An island similar to Garden of Glass from Botania.\n");
ArrayList<String> types = new ArrayList<>();
types.add("grass");
types.add("tree");
types.add("platform");
types.add("GoG");

boolean valid = false;
for (String s : types) {
if (FTBIslands.islandType.equalsIgnoreCase(s)) {
valid = true;
break;
}
}
if (!valid) {
logger.warn("Invalid island option detected. Using 'platform' as default.");
FTBIslands.islandType = "platform";
}
}

if (config.hasChanged()) {
config.save();
}
}

@SubscribeEvent
public void onChanged(ConfigChangedEvent.OnConfigChangedEvent event) {
if (event.modID.equalsIgnoreCase(Tags.MODID)) {
loadConfig();
}
}
}

private static void convert() throws IOException, ClassNotFoundException {
if (!oldIslands.exists()) {
return;
}
logger.info("Old islands file found! Trying to convert to new format!");

FileInputStream fileIn = new FileInputStream(oldIslands);
ObjectInputStream in = new ObjectInputStream(fileIn);

HashMap<String, IslandCreator.IslandPos> map = (HashMap<String, IslandCreator.IslandPos>) in.readObject();
in.close();
fileIn.close();
String s = new GsonBuilder().create()
.toJson(map);

File newFile = new File(directory, "islands.json");
FileOutputStream outputStream = new FileOutputStream(newFile);
FileUtils.writeStringToFile(newFile, s);
outputStream.close();
oldIslands.delete();
logger.info("Conversion completed.");
public static IslandStorage getIslandStorage() {
return islandStorage;
}
}
Loading

0 comments on commit 19b3499

Please sign in to comment.