From 7ceca51008162c67a877ad27c8f8f2f9d317a985 Mon Sep 17 00:00:00 2001
From: dries007 <admin@dries007.net>
Date: Mon, 18 Aug 2014 19:11:45 +0200
Subject: [PATCH] update for core

---
 build.gradle                                  |  13 +-
 .../doubledoordev/letitburn/LetItBurn.java    |  37 +++--
 .../java/net/doubledoordev/lib/DevPerks.java  | 147 ------------------
 .../assets/LetItBurn/lang/en_US.lang          |   2 +
 src/main/resources/mcmod.info                 |  20 +--
 5 files changed, 51 insertions(+), 168 deletions(-)
 delete mode 100644 src/main/java/net/doubledoordev/lib/DevPerks.java
 create mode 100644 src/main/resources/assets/LetItBurn/lang/en_US.lang

diff --git a/build.gradle b/build.gradle
index a1424e3..f0e9bc1 100644
--- 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
index 6ce2eb0..29ef19e 100644
--- a/src/main/java/net/doubledoordev/letitburn/LetItBurn.java
+++ b/src/main/java/net/doubledoordev/letitburn/LetItBurn.java
@@ -30,19 +30,21 @@
 
 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;
 
@@ -50,7 +52,7 @@
  * @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
deleted file mode 100644
index 7089c91..0000000
--- a/src/main/java/net/doubledoordev/lib/DevPerks.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * Copyright (c) 2014, DoubleDoorDevelopment
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- *  Neither the name of the project nor the names of its
- *   contributors may be used to endorse or promote products derived from
- *   this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package net.doubledoordev.lib;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-import cpw.mods.fml.common.eventhandler.EventPriority;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import cpw.mods.fml.common.registry.GameData;
-import net.minecraft.entity.item.EntityItem;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.event.entity.player.PlayerDropsEvent;
-import net.minecraftforge.event.entity.player.PlayerEvent;
-import org.apache.commons.io.IOUtils;
-
-import java.net.URL;
-import java.nio.charset.Charset;
-
-/**
- * Something other than capes for once
- *
- * @author Dries007
- */
-public class DevPerks
-{
-    private static final String PERKS_URL = "http://doubledoordev.net/perks.json";
-    private JsonObject  perks = new JsonObject();
-    private boolean debug;
-
-    public DevPerks(boolean debug)
-    {
-        this.debug = debug;
-        try
-        {
-            perks = new JsonParser().parse(IOUtils.toString(new URL(PERKS_URL), Charset.forName("UTF-8"))).getAsJsonObject();
-        }
-        catch (Exception e)
-        {
-            if (debug) e.printStackTrace();
-        }
-    }
-
-    /**
-     * Something other than capes for once
-     */
-    @SubscribeEvent
-    public void nameFormatEvent(PlayerEvent.NameFormat event)
-    {
-        try
-        {
-            if (debug) perks = new JsonParser().parse(IOUtils.toString(new URL(PERKS_URL), Charset.forName("UTF-8"))).getAsJsonObject();
-            if (perks.has(event.username))
-            {
-                JsonObject perk = perks.getAsJsonObject(event.username);
-                if (perk.has("displayname")) event.displayname = perk.get("displayname").getAsString();
-                if (perk.has("hat") && (event.entityPlayer.inventory.armorInventory[3] == null || event.entityPlayer.inventory.armorInventory[3].stackSize == 0))
-                {
-                    JsonObject hat = perk.getAsJsonObject("hat");
-                    String name = hat.get("name").getAsString();
-                    int meta = hat.has("meta") ? hat.get("meta").getAsInt() : 0;
-                    event.entityPlayer.inventory.armorInventory[3] = new ItemStack(GameData.getItemRegistry().getObject(name), 0, meta);
-                }
-            }
-        }
-        catch (Exception e)
-        {
-            if (debug) e.printStackTrace();
-        }
-    }
-
-    @SubscribeEvent
-    public void nameFormatEvent(PlayerEvent.Clone event)
-    {
-        try
-        {
-            if (debug) perks = new JsonParser().parse(IOUtils.toString(new URL(PERKS_URL), Charset.forName("UTF-8"))).getAsJsonObject();
-            if (perks.has(event.original.getCommandSenderName()))
-            {
-                JsonObject perk = perks.getAsJsonObject(event.original.getCommandSenderName());
-                if (perk.has("hat") && (event.entityPlayer.inventory.armorInventory[3] == null || event.entityPlayer.inventory.armorInventory[3].stackSize == 0))
-                {
-                    JsonObject hat = perk.getAsJsonObject("hat");
-                    String name = hat.get("name").getAsString();
-                    int meta = hat.has("meta") ? hat.get("meta").getAsInt() : 0;
-                    event.entityPlayer.inventory.armorInventory[3] = new ItemStack(GameData.getItemRegistry().getObject(name), 0, meta);
-                }
-            }
-        }
-        catch (Exception e)
-        {
-            if (debug) e.printStackTrace();
-        }
-    }
-
-    @SubscribeEvent(priority = EventPriority.HIGHEST)
-    public void deathEvent(PlayerDropsEvent event)
-    {
-        try
-        {
-            if (debug) perks = new JsonParser().parse(IOUtils.toString(new URL(PERKS_URL), Charset.forName("UTF-8"))).getAsJsonObject();
-            if (perks.has(event.entityPlayer.getCommandSenderName()))
-            {
-                JsonObject perk = perks.getAsJsonObject(event.entityPlayer.getCommandSenderName());
-                if (perk.has("drop"))
-                {
-                    JsonObject drop = perk.getAsJsonObject("drop");
-                    String name = drop.get("name").getAsString();
-                    int meta = drop.has("meta") ? drop.get("meta").getAsInt() : 0;
-                    int size = drop.has("size") ? drop.get("size").getAsInt() : 1;
-                    event.drops.add(new EntityItem(event.entityPlayer.getEntityWorld(), event.entityPlayer.posX, event.entityPlayer.posY, event.entityPlayer.posZ, new ItemStack(GameData.getItemRegistry().getObject(name), size, meta)));
-                }
-            }
-        }
-        catch (Exception e)
-        {
-            if (debug) e.printStackTrace();
-        }
-    }
-}
diff --git a/src/main/resources/assets/LetItBurn/lang/en_US.lang b/src/main/resources/assets/LetItBurn/lang/en_US.lang
new file mode 100644
index 0000000..38c12ea
--- /dev/null
+++ 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
index 6cdc547..4560074 100644
--- a/src/main/resources/mcmod.info
+++ b/src/main/resources/mcmod.info
@@ -1,5 +1,6 @@
-[
-  {
+{
+  "modListVersion": 2,
+  "modList": [{
     "modid": "${modid}",
     "name": "${modid}",
     "description": "${description}",
@@ -7,13 +8,14 @@
     "mcversion": "${mcversion}",
     "url": "https://github.com/${githuborg}/${modid}",
     "updateUrl": "",
-    "authors": [
-      "Dries007",
-      "Doubledoor team"
-    ],
+    "authorList": [ "Dries007", "Doubledoor team" ],
     "credits": "",
     "logoFile": "",
     "screenshots": [],
-    "dependencies": []
-  }
-]
\ No newline at end of file
+    "parent": "D3Core",
+    "requiredMods": [ "Forge", "D3Core" ],
+    "dependencies": [ "D3Core" ],
+    "dependants": [ ],
+    "useDependencyInformation": true
+  }]
+}
\ No newline at end of file