update for core

DoubleDoorDevelopment · Aug 18, 2014 · 7ceca51 · 7ceca51
1 parent 9274e58
commit 7ceca51
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 168 deletions.
diff --git a/build.gradle b/build.gradle
@@ -28,7 +28,7 @@ apply plugin: "maven"
 apply plugin: "idea-utils"
 
 group = "net.doubledoordev.letitburn"
-version = "1.0.0"
+version = "1.1.0"
 
 targetCompatibility = 1.7
 sourceCompatibility = 1.7
@@ -41,6 +41,17 @@ minecraft {
     runDir = "jars"
 }
 
+repositories {
+    maven {
+         name "DDD repo"
+         url "http://doubledoordev.net/maven/"
+     }
+}
+
+dependencies {
+    compile "net.doubledoordev.d3core:D3Core:" + project.minecraft.version + "-+:dev"
+}
+
 if (System.getenv().BUILD_NUMBER != null) version += "." + System.getenv().BUILD_NUMBER
 def builder = new groovy.json.JsonBuilder()
 builder (version: version, mcversion: project.minecraft.version, apiversion: project.minecraft.apiVersion)

diff --git a/src/main/java/net/doubledoordev/letitburn/LetItBurn.java b/src/main/java/net/doubledoordev/letitburn/LetItBurn.java
@@ -30,27 +30,29 @@
 
 package net.doubledoordev.letitburn;
 
+import cpw.mods.fml.client.config.IConfigElement;
 import cpw.mods.fml.common.IFuelHandler;
 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.registry.GameData;
 import cpw.mods.fml.common.registry.GameRegistry;
-import net.doubledoordev.lib.DevPerks;
+import net.doubledoordev.d3core.util.ID3Mod;
 import net.minecraft.item.ItemStack;
-import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.common.config.ConfigElement;
 import net.minecraftforge.common.config.Configuration;
 import org.apache.logging.log4j.Logger;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 /**
  * @author Dries007
  */
 @Mod(modid = LetItBurn.MODID)
-public class LetItBurn
+public class LetItBurn implements ID3Mod
 {
     public static final String MODID = "LetItBurn";
     public static final Pattern PATTERN = Pattern.compile("(?<name>.+?):?(?<meta>[\\d]+)? ?= ?(?<time>\\d+)");
@@ -62,20 +64,15 @@ public class LetItBurn
     private boolean                       debug       = false;
     private HashMap<String, BurnTimeData> burnTimeMap = new HashMap<>();
     private Logger logger;
+    private Configuration configuration;
 
     @Mod.EventHandler
     public void preInit(FMLPreInitializationEvent event)
     {
         logger = event.getModLog();
 
-        Configuration configuration = new Configuration(event.getSuggestedConfigurationFile());
-        String comment = "List formatted like this:  'itemname = time' OR 'itemname;meta = time'  Include the modid (or minecraft:)!";
-        // public Property get(String category, String key, String[] defaultValues, String comment, Pattern validationPattern)
-        strings = configuration.get(MODID, "burntimes", strings, comment, PATTERN).getStringList();
-
-        debug = configuration.getBoolean("debug", MODID, debug, "Enable extra debug output.");
-        if (configuration.getBoolean("sillyness", MODID, true, "Disable sillyness only if you want to piss off the developers XD")) MinecraftForge.EVENT_BUS.register(new DevPerks(debug));
-        if (configuration.hasChanged()) configuration.save();
+        configuration = new Configuration(event.getSuggestedConfigurationFile());
+        syncConfig();
     }
 
     @Mod.EventHandler
@@ -120,6 +117,24 @@ public int getBurnTime(ItemStack fuel)
         });
     }
 
+    @Override
+    public void syncConfig()
+    {
+        configuration.setCategoryLanguageKey(MODID, "d3.letitburn.config.letitburn");
+        configuration.setCategoryRequiresMcRestart(MODID, true);
+
+        String comment = "List formatted like this:  'itemname = time' OR 'itemname;meta = time'  Include the modid (or minecraft:)!";
+        // public Property get(String category, String key, String[] defaultValues, String comment, Pattern validationPattern)
+        strings = configuration.get(MODID, "burntimes", strings, comment, PATTERN).getStringList();
+        if (configuration.hasChanged()) configuration.save();
+    }
+
+    @Override
+    public void addConfigElements(List<IConfigElement> configElements)
+    {
+        configElements.add(new ConfigElement(configuration.getCategory(MODID.toLowerCase())));
+    }
+
     public static final class BurnTimeData
     {
         public final String name;

diff --git a/src/main/java/net/doubledoordev/lib/DevPerks.java b/src/main/java/net/doubledoordev/lib/DevPerks.java
diff --git a/src/main/resources/assets/LetItBurn/lang/en_US.lang b/src/main/resources/assets/LetItBurn/lang/en_US.lang
@@ -0,0 +1,2 @@
+d3.letitburn.config.letitburn=Let It Burn
+d3.letitburn.config.letitburn.tooltip=Settings for Let It Burn
diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info
@@ -1,19 +1,21 @@
-[
-  {
+{
+  "modListVersion": 2,
+  "modList": [{
     "modid": "${modid}",
     "name": "${modid}",
     "description": "${description}",
     "version": "${version}",
     "mcversion": "${mcversion}",
     "url": "https://github.com/${githuborg}/${modid}",
     "updateUrl": "",
-    "authors": [
-      "Dries007",
-      "Doubledoor team"
-    ],
+    "authorList": [ "Dries007", "Doubledoor team" ],
     "credits": "",
     "logoFile": "",
     "screenshots": [],
-    "dependencies": []
-  }
-]
+    "parent": "D3Core",
+    "requiredMods": [ "Forge", "D3Core" ],
+    "dependencies": [ "D3Core" ],
+    "dependants": [ ],
+    "useDependencyInformation": true
+  }]
+}