Leahnaya/FairyFactions
1
0
Fork 0
mirror of https://github.com/allaryin/FairyFactions.git synced 2026-04-24 23:36:48 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Moved config options into separate class (#8).

Browse Source
This commit is contained in:
Ammon Lauritzen 2016-02-22 10:12:46 -06:00
parent 7f94acd997
commit 6e8bc338cb
3 changed files with 32 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/main/java/fairies/FairyConfig.java Normal file
View File

@ -0,0 +1,27 @@
package fairies;
import java.io.File;
import net.minecraftforge.common.config.Configuration;
public class FairyConfig extends Configuration {
public static int SPAWN_FACTION_MIN_SIZE = 8;
public static int SPAWN_FACTION_MAX_SIZE = 10;
public FairyConfig(File file) {
super(file);
load();
init();
save();
}
private void init() {
SPAWN_FACTION_MAX_SIZE = getInt("max", "spawning", SPAWN_FACTION_MAX_SIZE,
0, 30, "maximum fairy spawn group size");
SPAWN_FACTION_MIN_SIZE = getInt("min", "spawning", SPAWN_FACTION_MIN_SIZE,
0, 30, "minimum fairy spawn group size");
}
}

15
src/main/java/fairies/FairyFactions.java
View File

@ -37,25 +37,14 @@ public class FairyFactions {
public static final Logger LOGGER = LogManager.getFormatterLogger(Version.MOD_ID);
private File BaseDir;
private static Configuration Config;
private static FairyConfig Config;
private Spawner fairySpawner;
public static int SPAWN_FACTION_MIN_SIZE = 8;
public static int SPAWN_FACTION_MAX_SIZE = 10;
@EventHandler
public void preInit(FMLPreInitializationEvent event) {
BaseDir = new File(event.getModConfigurationDirectory(), Version.MOD_ID);
Config = new Configuration(event.getSuggestedConfigurationFile());
Config.load();
SPAWN_FACTION_MAX_SIZE = Config.getInt("max", "spawning", SPAWN_FACTION_MAX_SIZE,
0, 30, "maximum fairy spawn group size");
SPAWN_FACTION_MIN_SIZE = Config.getInt("min", "spawning", SPAWN_FACTION_MIN_SIZE,
0, 30, "minimum fairy spawn group size");
Config.save();
Config = new FairyConfig(event.getSuggestedConfigurationFile());
if (!BaseDir.exists())
BaseDir.mkdir();

6
src/main/java/fairies/entity/EntityFairy.java
View File

@ -9,6 +9,7 @@ import org.apache.logging.log4j.Logger;
import cpw.mods.fml.relauncher.ReflectionHelper;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import fairies.FairyConfig;
import fairies.FairyFactions;
import fairies.Version;
import fairies.ai.FairyJob;
@ -287,8 +288,8 @@ public class EntityFairy extends EntityAnimal {
int k = MathHelper.floor_double(posZ);
final FairyGroupGenerator group = new FairyGroupGenerator(
FairyFactions.SPAWN_FACTION_MIN_SIZE,
FairyFactions.SPAWN_FACTION_MAX_SIZE,
FairyConfig.SPAWN_FACTION_MIN_SIZE,
FairyConfig.SPAWN_FACTION_MAX_SIZE,
getFaction());
if (group.generate(worldObj, rand, i, j, k)) {
// This is good.
@ -1578,7 +1579,6 @@ public class EntityFairy extends EntityAnimal {
if (y >= 0 && y < worldObj.getHeight()) {
final Block block = worldObj.getBlock(x, y, z);
if (block == Blocks.standing_sign || block == Blocks.wall_sign) {
TileEntity tileentity = worldObj.getTileEntity(x, y, z);