Properly load MekanismTools configuration

This commit is contained in:
Aidan C. Brady 2014-06-21 11:57:08 -04:00
parent b3a3dbb827
commit 59df1b5c8f
4 changed files with 42 additions and 5 deletions

View file

@ -99,6 +99,7 @@ public class GeneratorsCommonProxy
case 5: case 5:
return new ContainerWindTurbine(player.inventory, (TileEntityWindTurbine)tileEntity); return new ContainerWindTurbine(player.inventory, (TileEntityWindTurbine)tileEntity);
} }
return null; return null;
} }
} }

View file

@ -0,0 +1,5 @@
package mekanism.tools.client;
import mekanism.tools.common.ToolsCommonProxy;
public class ToolsClientProxy extends ToolsCommonProxy {}

View file

@ -1,6 +1,9 @@
package mekanism.tools.common; package mekanism.tools.common;
import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBuf;
import java.io.IOException;
import mekanism.common.IModule; import mekanism.common.IModule;
import mekanism.common.Mekanism; import mekanism.common.Mekanism;
import mekanism.common.Version; import mekanism.common.Version;
@ -21,18 +24,21 @@ import net.minecraft.item.ItemArmor.ArmorMaterial;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.CraftingManager; import net.minecraft.item.crafting.CraftingManager;
import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.common.config.Configuration;
import net.minecraftforge.common.util.EnumHelper; import net.minecraftforge.common.util.EnumHelper;
import net.minecraftforge.event.entity.living.LivingSpawnEvent; import net.minecraftforge.event.entity.living.LivingSpawnEvent;
import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.Mod;
import cpw.mods.fml.common.Mod.EventHandler; import cpw.mods.fml.common.Mod.EventHandler;
import cpw.mods.fml.common.Mod.Instance; import cpw.mods.fml.common.Mod.Instance;
import cpw.mods.fml.common.SidedProxy;
import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLInitializationEvent;
import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.GameRegistry;
@Mod(modid = "MekanismTools", name = "MekanismTools", version = "7.0.0", dependencies = "required-after:Mekanism") @Mod(modid = "MekanismTools", name = "MekanismTools", version = "7.0.0", dependencies = "required-after:Mekanism")
public class MekanismTools implements IModule public class MekanismTools implements IModule
{ {
@SidedProxy(clientSide = "mekanism.tools.client.ToolsClientProxy", serverSide = "mekanism.tools.common.ToolsCommonProxy")
public static ToolsCommonProxy proxy;
@Instance("MekanismTools") @Instance("MekanismTools")
public static MekanismTools instance; public static MekanismTools instance;
@ -140,6 +146,7 @@ public class MekanismTools implements IModule
public static Item SteelLeggings; public static Item SteelLeggings;
public static Item SteelBoots; public static Item SteelBoots;
//Tools Configuration
public static double armourSpawnRate; public static double armourSpawnRate;
@EventHandler @EventHandler
@ -151,6 +158,9 @@ public class MekanismTools implements IModule
//Register this class to the event bus for special mob spawning (mobs with Mekanism armor/tools) //Register this class to the event bus for special mob spawning (mobs with Mekanism armor/tools)
MinecraftForge.EVENT_BUS.register(this); MinecraftForge.EVENT_BUS.register(this);
//Load the proxy
proxy.loadConfiguration();
//Load this module //Load this module
addItems(); addItems();
addRecipes(); addRecipes();
@ -531,8 +541,6 @@ public class MekanismTools implements IModule
, Mekanism.configuration.get("armor-balance", "steel-enchantability", 50).getInt() , Mekanism.configuration.get("armor-balance", "steel-enchantability", 50).getInt()
); );
armourSpawnRate = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "mob-armour-spawn-rate", 0.03).getDouble(0.03);
//Bronze //Bronze
BronzeHelmet = (new ItemMekanismArmor(armorBRONZE, Mekanism.proxy.getArmorIndex("bronze"), 0)).setUnlocalizedName("BronzeHelmet"); BronzeHelmet = (new ItemMekanismArmor(armorBRONZE, Mekanism.proxy.getArmorIndex("bronze"), 0)).setUnlocalizedName("BronzeHelmet");
BronzeChestplate = (new ItemMekanismArmor(armorBRONZE, Mekanism.proxy.getArmorIndex("bronze"), 1)).setUnlocalizedName("BronzeChestplate"); BronzeChestplate = (new ItemMekanismArmor(armorBRONZE, Mekanism.proxy.getArmorIndex("bronze"), 1)).setUnlocalizedName("BronzeChestplate");
@ -804,8 +812,14 @@ public class MekanismTools implements IModule
} }
@Override @Override
public void writeConfig(ByteBuf dataStream) {} public void writeConfig(ByteBuf dataStream) throws IOException
{
dataStream.writeDouble(armourSpawnRate);
}
@Override @Override
public void readConfig(ByteBuf dataStream) {} public void readConfig(ByteBuf dataStream) throws IOException
{
armourSpawnRate = dataStream.readDouble();
}
} }

View file

@ -0,0 +1,17 @@
package mekanism.tools.common;
import mekanism.common.Mekanism;
import net.minecraftforge.common.config.Configuration;
public class ToolsCommonProxy
{
/**
* Set and load the mod's common configuration properties.
*/
public void loadConfiguration()
{
Mekanism.configuration.load();
MekanismTools.armourSpawnRate = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "mob-armor-spawn-rate", 0.03).getDouble(0.03);
Mekanism.configuration.save();
}
}