Merge branch 'master' of ssh://git.nmd.so:12000/nmd/ForgeCraft

This commit is contained in:
Mohammad-Ali Minaie
2017-06-11 21:09:49 -04:00
4 changed files with 58 additions and 1 deletions

View File

@@ -13,6 +13,8 @@ import nmd.primal.forgecraft.compat.ModDictionary;
import nmd.primal.forgecraft.gui.GuiHandler; import nmd.primal.forgecraft.gui.GuiHandler;
import nmd.primal.forgecraft.init.*; import nmd.primal.forgecraft.init.*;
import nmd.primal.forgecraft.proxy.CommonProxy; import nmd.primal.forgecraft.proxy.CommonProxy;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
//import nmd.primal.forgecraft.common.init.*; //import nmd.primal.forgecraft.common.init.*;
@@ -31,6 +33,7 @@ public class ForgeCraft
public static SimpleNetworkWrapper NETWORK; public static SimpleNetworkWrapper NETWORK;
@SidedProxy(clientSide = ModInfo.CLIENT_PROXY, serverSide = ModInfo.SERVER_PROXY) @SidedProxy(clientSide = ModInfo.CLIENT_PROXY, serverSide = ModInfo.SERVER_PROXY)
public static CommonProxy proxy; public static CommonProxy proxy;
public static Logger LOGGER = LogManager.getLogger(ModInfo.MOD_ID);
@EventHandler @EventHandler
public void preInit(FMLPreInitializationEvent event) public void preInit(FMLPreInitializationEvent event)

View File

@@ -14,6 +14,7 @@ public class ModInfo {
/** Mod Details**/ /** Mod Details**/
public static final String MOD_ID = "forgecraft"; public static final String MOD_ID = "forgecraft";
public static final String MOD_NAME = "Kitsu's ForgeCraft"; public static final String MOD_NAME = "Kitsu's ForgeCraft";
public static final String MOD_CONFIG = "primal/" + MOD_ID;
//public static final String MOD_PREFIX = MOD_ID + ":"; //public static final String MOD_PREFIX = MOD_ID + ":";
public static final String MOD_CHANNEL = MOD_ID; public static final String MOD_CHANNEL = MOD_ID;
public static final String MOD_VERSION = "1.2.30"; public static final String MOD_VERSION = "1.2.30";

View File

@@ -0,0 +1,47 @@
package nmd.primal.forgecraft.init;
import net.minecraftforge.common.config.Config;
import nmd.primal.forgecraft.ForgeCraft;
import nmd.primal.forgecraft.ModInfo;
@Config(modid = ModInfo.MOD_ID, name = ModInfo.MOD_CONFIG, category = "")
@Config.LangKey("forgecraft.config.title")
@SuppressWarnings("unused")
public class ModConfig
{
static {
ForgeCraft.LOGGER.info("Loading Config File: " + ModInfo.MOD_CONFIG + ".cfg");
}
/**
* Main Config Sections
*/
public static Compatibility compatibility;
public static ModConfig.Features features;
/**
* Options related to compatibility with mods and vanilla features
*/
public static class Compatibility
{
@Config.Comment({"Ore Dictionary Wootz steel for compatibility with common mod steel"})
public static boolean COMPAT_DICTIONARY_WOOTZ_STEEL;
}
/**
* Customize main features of the mod
*/
public static class Features
{
@Config.Comment({"Smoke is produced from various forge blocks when active"})
public static boolean FEATURE_ENABLE_SMOKE = true;
@Config.RequiresMcRestart
@Config.Comment({"Various forge blocks will set fire to their surroundings when active"})
public static boolean FEATURE_ENABLE_FIRE = true;
@Config.Comment({"Sample config for a numeric range"})
@Config.RangeInt(min = 0, max = 1000)
public static int FEATURE_HEAT_RANGE = 0;
}
}

View File

@@ -33,3 +33,9 @@ item.ironaxe.name=Iron Axe
item.ironshovel.name=Iron Shovel item.ironshovel.name=Iron Shovel
item.ironhoe.name=Iron Hoe item.ironhoe.name=Iron Hoe
item.ironsword.name=Iron Sword item.ironsword.name=Iron Sword
# -- configuration -- #
forgecraft.config.title=ForgeCraft Config
forgecraft.compatibility=Compatibility
forgecraft.compatibility.tooltip=Compatibility Features