diff --git a/src/main/java/makeo/gadomancy/common/CommonProxy.java b/src/main/java/makeo/gadomancy/common/CommonProxy.java index ba6f548..3f34f1c 100644 --- a/src/main/java/makeo/gadomancy/common/CommonProxy.java +++ b/src/main/java/makeo/gadomancy/common/CommonProxy.java @@ -75,8 +75,6 @@ public class CommonProxy implements IGuiHandler { FMLCommonHandler.instance().bus().register(worldEventHandler); MinecraftForge.EVENT_BUS.register(new EventHandlerEntity()); - RegisteredPotions.init(); - AuraEffects.AER.getTickInterval(); //initalize AuraEffects RegisteredRecipes.init(); @@ -91,6 +89,8 @@ public class CommonProxy implements IGuiHandler { } public void postInitalize() { + RegisteredPotions.init(); + RegisteredResearches.init(); RegisteredIntegrations.init(); diff --git a/src/main/java/makeo/gadomancy/common/data/config/ModConfig.java b/src/main/java/makeo/gadomancy/common/data/config/ModConfig.java index 795e5e6..3e59662 100644 --- a/src/main/java/makeo/gadomancy/common/data/config/ModConfig.java +++ b/src/main/java/makeo/gadomancy/common/data/config/ModConfig.java @@ -1,6 +1,7 @@ package makeo.gadomancy.common.data.config; import net.minecraftforge.common.config.Configuration; +import net.minecraftforge.common.config.Property; import java.io.File; @@ -65,5 +66,18 @@ public class ModConfig { renderParticleDistance = config.getInt("particleRenderDistance", "general", 100, 5, 1000, "Defines, how close a player has to be towards the particle origin to see the particles created by it."); enableAdditionalNodeTypes = config.getBoolean("enableAdditionalNodeTypes", "general", true, "Enables our custom node types. This might solve some compatibility issues (e.g. WitchingGadgets). You have to change this client- and server-side! Only change when you experience issues with special mods' features ONLY not working when using the mod together with Gadomancy."); + + config.addCustomCategoryComment("potions", "Use the following if you have problems with conflicting potion ids. If the entry is set to '-1' it will try to automatically find a free potion id."); + } + + public static int loadPotionId(String name) { + Property prop = config.get("potions", name, -1); + prop.setLanguageKey(name); + int result = prop.getInt(-1); + return result < -1 ? -1 : result; + } + + public static void save() { + config.save(); } } diff --git a/src/main/java/makeo/gadomancy/common/potions/PotionLetsGargamelItUp.java b/src/main/java/makeo/gadomancy/common/potions/PotionEldritch.java similarity index 79% rename from src/main/java/makeo/gadomancy/common/potions/PotionLetsGargamelItUp.java rename to src/main/java/makeo/gadomancy/common/potions/PotionEldritch.java index 20fdace..0b557fd 100644 --- a/src/main/java/makeo/gadomancy/common/potions/PotionLetsGargamelItUp.java +++ b/src/main/java/makeo/gadomancy/common/potions/PotionEldritch.java @@ -10,8 +10,8 @@ import thaumcraft.api.aspects.Aspect; *
* Created by makeo @ 11.12.2015 20:50 */ -public class PotionLetsGargamelItUp extends PotionCustomTexture { - public PotionLetsGargamelItUp(int id) { +public class PotionEldritch extends PotionCustomTexture { + public PotionEldritch(int id) { super(id, false, Aspect.ELDRITCH.getColor(), Aspect.ELDRITCH.getImage()); setPotionName("potion.eldritch"); } diff --git a/src/main/java/makeo/gadomancy/common/registration/RegisteredPotions.java b/src/main/java/makeo/gadomancy/common/registration/RegisteredPotions.java index a45ec6c..c1e2c49 100644 --- a/src/main/java/makeo/gadomancy/common/registration/RegisteredPotions.java +++ b/src/main/java/makeo/gadomancy/common/registration/RegisteredPotions.java @@ -1,10 +1,10 @@ package makeo.gadomancy.common.registration; -import makeo.gadomancy.common.potions.PotionAchromatic; -import makeo.gadomancy.common.potions.PotionBuffGolem; -import makeo.gadomancy.common.potions.PotionLetsGargamelItUp; -import makeo.gadomancy.common.potions.PotionMiningLuck; -import makeo.gadomancy.common.potions.PotionVisAffinity; +import cpw.mods.fml.common.FMLLog; +import makeo.gadomancy.common.Gadomancy; +import makeo.gadomancy.common.data.config.ModConfig; +import makeo.gadomancy.common.potions.*; +import makeo.gadomancy.common.potions.PotionEldritch; import makeo.gadomancy.common.utils.Injector; import net.minecraft.potion.Potion; @@ -21,22 +21,39 @@ public class RegisteredPotions { public static PotionMiningLuck POTION_LUCK; public static PotionBuffGolem BUFF_GOLEM; public static PotionAchromatic ACHROMATIC; - public static PotionLetsGargamelItUp ELDRITCH; + public static PotionEldritch ELDRITCH; public static PotionVisAffinity VIS_DISCOUNT; public static void init() { POTION_LUCK = registerPotion(PotionMiningLuck.class); BUFF_GOLEM = registerPotion(PotionBuffGolem.class); ACHROMATIC = registerPotion(PotionAchromatic.class); - ELDRITCH = registerPotion(PotionLetsGargamelItUp.class); + ELDRITCH = registerPotion(PotionEldritch.class); VIS_DISCOUNT = registerPotion(PotionVisAffinity.class); + + ModConfig.save(); } private static