From a653c47a7295914b38fad1236d93115ed9a80d10 Mon Sep 17 00:00:00 2001 From: Pahimar Date: Thu, 7 May 2015 14:47:54 -0400 Subject: [PATCH 1/2] Set API version to a build property, and add in some prelim logging of what mods set what values when in the energy value registry --- build.gradle | 23 +++++++++- build.properties | 1 + .../com/pahimar/ee3/EquivalentExchange3.java | 2 +- .../pahimar/ee3/api/array/package-info.java | 2 +- .../pahimar/ee3/api/event/package-info.java | 2 +- .../ee3/api/exchange/package-info.java | 2 +- .../ee3/api/knowledge/package-info.java | 2 +- .../com/pahimar/ee3/api/package-info.java | 2 +- .../pahimar/ee3/api/recipe/package-info.java | 2 +- .../pahimar/ee3/api/util/package-info.java | 2 +- .../ee3/exchange/EnergyValueRegistry.java | 7 ++- .../java/com/pahimar/ee3/nei/NEIConfig.java | 2 +- .../com/pahimar/ee3/reference/Reference.java | 2 +- .../com/pahimar/ee3/util/LoaderHelper.java | 43 +++++++++++++++++++ 14 files changed, 82 insertions(+), 12 deletions(-) create mode 100644 src/main/java/com/pahimar/ee3/util/LoaderHelper.java diff --git a/build.gradle b/build.gradle index 82b9faec..28937bce 100644 --- a/build.gradle +++ b/build.gradle @@ -50,10 +50,31 @@ minecraft { version = config.minecraft_version + "-" + config.forge_version replaceIn "reference/Reference.java" - replace "@VERSION@", "${config.mod_version}.${System.getenv("BUILD_NUMBER") ?: 0}" + replace "@MOD_VERSION@", "${config.mod_version}.${System.getenv("BUILD_NUMBER") ?: 0}" if (project.hasProperty("ee3_sha1_signature")) { replace "@FINGERPRINT@", project.ee3_sha1_signature } + + replaceIn "api/package-info.java" + replace "@API_VERSION@", config.api_version + + replaceIn "api/array/package-info.java" + replace "@API_VERSION@", config.api_version + + replaceIn "api/event/package-info.java" + replace "@API_VERSION@", config.api_version + + replaceIn "api/exchange/package-info.java" + replace "@API_VERSION@", config.api_version + + replaceIn "api/knowledge/package-info.java" + replace "@API_VERSION@", config.api_version + + replaceIn "api/recipe/package-info.java" + replace "@API_VERSION@", config.api_version + + replaceIn "api/util/package-info.java" + replace "@API_VERSION@", config.api_version } version = "${config.minecraft_version}-${config.mod_version}.${System.getenv("BUILD_NUMBER") ?: 0}" diff --git a/build.properties b/build.properties index 9bcf1b8d..dbb08e31 100644 --- a/build.properties +++ b/build.properties @@ -3,4 +3,5 @@ minecraft_version = 1.7.10 forge_version = 10.13.3.1399-1.7.10 mod_version = 0.3 +api_version = 1.2 release_type = beta diff --git a/src/main/java/com/pahimar/ee3/EquivalentExchange3.java b/src/main/java/com/pahimar/ee3/EquivalentExchange3.java index f3ec59c4..566efcca 100644 --- a/src/main/java/com/pahimar/ee3/EquivalentExchange3.java +++ b/src/main/java/com/pahimar/ee3/EquivalentExchange3.java @@ -30,7 +30,7 @@ import cpw.mods.fml.common.registry.GameRegistry; import java.io.File; -@Mod(modid = Reference.MOD_ID, name = Reference.MOD_NAME, certificateFingerprint = Reference.FINGERPRINT, version = Reference.VERSION, dependencies = Reference.DEPENDENCIES, guiFactory = Reference.GUI_FACTORY_CLASS) +@Mod(modid = Reference.MOD_ID, name = Reference.MOD_NAME, certificateFingerprint = Reference.FINGERPRINT, version = Reference.MOD_VERSION, dependencies = Reference.DEPENDENCIES, guiFactory = Reference.GUI_FACTORY_CLASS) public class EquivalentExchange3 { @Instance(Reference.MOD_ID) diff --git a/src/main/java/com/pahimar/ee3/api/array/package-info.java b/src/main/java/com/pahimar/ee3/api/array/package-info.java index 601c8009..bbf831ae 100644 --- a/src/main/java/com/pahimar/ee3/api/array/package-info.java +++ b/src/main/java/com/pahimar/ee3/api/array/package-info.java @@ -1,3 +1,3 @@ -@API(owner = "EE3", apiVersion = "1.2", provides = "EE3-API|array") package com.pahimar.ee3.api.array; +@API(owner = "EE3", apiVersion = "@API_VERSION@", provides = "EE3-API|array") package com.pahimar.ee3.api.array; import cpw.mods.fml.common.API; \ No newline at end of file diff --git a/src/main/java/com/pahimar/ee3/api/event/package-info.java b/src/main/java/com/pahimar/ee3/api/event/package-info.java index 0c36df44..3e79a038 100644 --- a/src/main/java/com/pahimar/ee3/api/event/package-info.java +++ b/src/main/java/com/pahimar/ee3/api/event/package-info.java @@ -1,3 +1,3 @@ -@API(owner = "EE3", apiVersion = "1.2", provides = "EE3-API|event") package com.pahimar.ee3.api.event; +@API(owner = "EE3", apiVersion = "@API_VERSION@", provides = "EE3-API|event") package com.pahimar.ee3.api.event; import cpw.mods.fml.common.API; \ No newline at end of file diff --git a/src/main/java/com/pahimar/ee3/api/exchange/package-info.java b/src/main/java/com/pahimar/ee3/api/exchange/package-info.java index 990fd3ed..109de40e 100644 --- a/src/main/java/com/pahimar/ee3/api/exchange/package-info.java +++ b/src/main/java/com/pahimar/ee3/api/exchange/package-info.java @@ -1,3 +1,3 @@ -@API(owner = "EE3", apiVersion = "1.2", provides = "EE3-API|exchange") package com.pahimar.ee3.api.exchange; +@API(owner = "EE3", apiVersion = "@API_VERSION@", provides = "EE3-API|exchange") package com.pahimar.ee3.api.exchange; import cpw.mods.fml.common.API; \ No newline at end of file diff --git a/src/main/java/com/pahimar/ee3/api/knowledge/package-info.java b/src/main/java/com/pahimar/ee3/api/knowledge/package-info.java index cabae84f..259ded8e 100644 --- a/src/main/java/com/pahimar/ee3/api/knowledge/package-info.java +++ b/src/main/java/com/pahimar/ee3/api/knowledge/package-info.java @@ -1,3 +1,3 @@ -@API(owner = "EE3", apiVersion = "1.2", provides = "EE3-API|knowledge") package com.pahimar.ee3.api.knowledge; +@API(owner = "EE3", apiVersion = "@API_VERSION@", provides = "EE3-API|knowledge") package com.pahimar.ee3.api.knowledge; import cpw.mods.fml.common.API; \ No newline at end of file diff --git a/src/main/java/com/pahimar/ee3/api/package-info.java b/src/main/java/com/pahimar/ee3/api/package-info.java index 5233b6ab..8025d45f 100644 --- a/src/main/java/com/pahimar/ee3/api/package-info.java +++ b/src/main/java/com/pahimar/ee3/api/package-info.java @@ -1,3 +1,3 @@ -@API(owner = "EE3", apiVersion = "1.2", provides = "EE3-API|core") package com.pahimar.ee3.api; +@API(owner = "EE3", apiVersion = "@API_VERSION@", provides = "EE3-API|core") package com.pahimar.ee3.api; import cpw.mods.fml.common.API; \ No newline at end of file diff --git a/src/main/java/com/pahimar/ee3/api/recipe/package-info.java b/src/main/java/com/pahimar/ee3/api/recipe/package-info.java index 1af79aae..5329382e 100644 --- a/src/main/java/com/pahimar/ee3/api/recipe/package-info.java +++ b/src/main/java/com/pahimar/ee3/api/recipe/package-info.java @@ -1,3 +1,3 @@ -@API(owner = "EE3", apiVersion = "1.2", provides = "EE3-API|recipe") package com.pahimar.ee3.api.recipe; +@API(owner = "EE3", apiVersion = "@API_VERSION@", provides = "EE3-API|recipe") package com.pahimar.ee3.api.recipe; import cpw.mods.fml.common.API; \ No newline at end of file diff --git a/src/main/java/com/pahimar/ee3/api/util/package-info.java b/src/main/java/com/pahimar/ee3/api/util/package-info.java index 4fb372d0..ec96fb40 100644 --- a/src/main/java/com/pahimar/ee3/api/util/package-info.java +++ b/src/main/java/com/pahimar/ee3/api/util/package-info.java @@ -1,3 +1,3 @@ -@API(owner = "EE3", apiVersion = "1.2", provides = "EE3-API|util") package com.pahimar.ee3.api.util; +@API(owner = "EE3", apiVersion = "@API_VERSION@", provides = "EE3-API|util") package com.pahimar.ee3.api.util; import cpw.mods.fml.common.API; \ No newline at end of file diff --git a/src/main/java/com/pahimar/ee3/exchange/EnergyValueRegistry.java b/src/main/java/com/pahimar/ee3/exchange/EnergyValueRegistry.java index 5014ffcf..258d979b 100644 --- a/src/main/java/com/pahimar/ee3/exchange/EnergyValueRegistry.java +++ b/src/main/java/com/pahimar/ee3/exchange/EnergyValueRegistry.java @@ -11,9 +11,11 @@ import com.pahimar.ee3.reference.Files; import com.pahimar.ee3.reference.Reference; import com.pahimar.ee3.reference.Settings; import com.pahimar.ee3.util.EnergyValueHelper; +import com.pahimar.ee3.util.LoaderHelper; import com.pahimar.ee3.util.LogHelper; import com.pahimar.ee3.util.SerializationHelper; import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.Loader; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; @@ -74,11 +76,13 @@ public class EnergyValueRegistry implements JsonSerializer, { if (factoredEnergyValue.compareTo(preAssignedMappings.get(factoredWrappedStack)) < 0) { + LogHelper.trace(String.format("Mod with ID '%s' added a pre-assignment energy value of %s for object %s during %s", Loader.instance().activeModContainer().getModId(), energyValue, wrappedStack, LoaderHelper.getLoaderState())); // TODO Localize? preAssignedMappings.put(factoredWrappedStack, factoredEnergyValue); } } else { + LogHelper.trace(String.format("Mod with ID '%s' added a pre-assignment energy value of %s for object %s during %s", Loader.instance().activeModContainer().getModId(), energyValue, wrappedStack, LoaderHelper.getLoaderState())); // TODO Localize? preAssignedMappings.put(factoredWrappedStack, factoredEnergyValue); } } @@ -106,7 +110,8 @@ public class EnergyValueRegistry implements JsonSerializer, WrappedStack factoredWrappedStack = WrappedStack.wrap(wrappedStack, 1); EnergyValue factoredEnergyValue = EnergyValueHelper.factorEnergyValue(energyValue, wrappedStack.getStackSize()); - postAssignedMappings.put(factoredWrappedStack, factoredEnergyValue); + LogHelper.trace(String.format("Mod with ID '%s' added a post-assignment energy value of %s for object %s during %s", Loader.instance().activeModContainer().getModId(), energyValue, wrappedStack, LoaderHelper.getLoaderState())); + postAssignedMappings.put(factoredWrappedStack, factoredEnergyValue); // TODO Localize? } } } diff --git a/src/main/java/com/pahimar/ee3/nei/NEIConfig.java b/src/main/java/com/pahimar/ee3/nei/NEIConfig.java index 7c22a104..dd4744b9 100644 --- a/src/main/java/com/pahimar/ee3/nei/NEIConfig.java +++ b/src/main/java/com/pahimar/ee3/nei/NEIConfig.java @@ -17,7 +17,7 @@ public class NEIConfig implements IConfigureNEI @Override public String getVersion() { - return Reference.VERSION; + return Reference.MOD_VERSION; } @Override diff --git a/src/main/java/com/pahimar/ee3/reference/Reference.java b/src/main/java/com/pahimar/ee3/reference/Reference.java index c9313185..d3fc973e 100644 --- a/src/main/java/com/pahimar/ee3/reference/Reference.java +++ b/src/main/java/com/pahimar/ee3/reference/Reference.java @@ -6,7 +6,7 @@ public class Reference public static final String LOWERCASE_MOD_ID = MOD_ID.toLowerCase(); public static final String MOD_NAME = "Equivalent Exchange 3"; public static final String FINGERPRINT = "@FINGERPRINT@"; - public static final String VERSION = "@VERSION@"; + public static final String MOD_VERSION = "@MOD_VERSION@"; public static final String DEPENDENCIES = "required-after:Forge@[10.13.3,)"; public static final String SERVER_PROXY_CLASS = "com.pahimar.ee3.proxy.ServerProxy"; public static final String CLIENT_PROXY_CLASS = "com.pahimar.ee3.proxy.ClientProxy"; diff --git a/src/main/java/com/pahimar/ee3/util/LoaderHelper.java b/src/main/java/com/pahimar/ee3/util/LoaderHelper.java new file mode 100644 index 00000000..5a3b3754 --- /dev/null +++ b/src/main/java/com/pahimar/ee3/util/LoaderHelper.java @@ -0,0 +1,43 @@ +package com.pahimar.ee3.util; + +import cpw.mods.fml.common.Loader; +import cpw.mods.fml.common.LoaderState; + +public class LoaderHelper +{ + public static LoaderState getLoaderState() + { + if (Loader.instance().isInState(LoaderState.SERVER_STARTED)) + { + return LoaderState.SERVER_STARTED; + } + else if (Loader.instance().isInState(LoaderState.SERVER_STARTING)) + { + return LoaderState.SERVER_STARTING; + } + else if (Loader.instance().isInState(LoaderState.SERVER_ABOUT_TO_START)) + { + return LoaderState.SERVER_ABOUT_TO_START; + } + else if (Loader.instance().isInState(LoaderState.AVAILABLE)) + { + return LoaderState.AVAILABLE; + } + else if (Loader.instance().isInState(LoaderState.POSTINITIALIZATION)) + { + return LoaderState.POSTINITIALIZATION; + } + else if (Loader.instance().isInState(LoaderState.INITIALIZATION)) + { + return LoaderState.INITIALIZATION; + } + else if (Loader.instance().isInState(LoaderState.PREINITIALIZATION)) + { + return LoaderState.PREINITIALIZATION; + } + else + { + return null; + } + } +} From 61ebb7d15f3fb305aa141d05eadc8efc22de2e68 Mon Sep 17 00:00:00 2001 From: Pahimar Date: Thu, 7 May 2015 15:11:23 -0400 Subject: [PATCH 2/2] Setting up some accountability in who does what with the various systems (the API now logs what mod does what when for most of the major systems). Enable TRACE level logging to see --- .../ee3/array/AlchemyArrayRegistry.java | 4 +++ .../ee3/exchange/EnergyValueRegistry.java | 8 ++--- .../ee3/knowledge/AbilityRegistry.java | 34 ++++++++++++++++--- .../ee3/recipe/AludelRecipeManager.java | 4 +++ .../pahimar/ee3/recipe/RecipeRegistry.java | 6 ++++ 5 files changed, 48 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/pahimar/ee3/array/AlchemyArrayRegistry.java b/src/main/java/com/pahimar/ee3/array/AlchemyArrayRegistry.java index 57acf4ca..c417f702 100644 --- a/src/main/java/com/pahimar/ee3/array/AlchemyArrayRegistry.java +++ b/src/main/java/com/pahimar/ee3/array/AlchemyArrayRegistry.java @@ -2,6 +2,9 @@ package com.pahimar.ee3.array; import com.google.common.collect.ImmutableSortedSet; import com.pahimar.ee3.api.array.AlchemyArray; +import com.pahimar.ee3.util.LoaderHelper; +import com.pahimar.ee3.util.LogHelper; +import cpw.mods.fml.common.Loader; import java.util.SortedSet; import java.util.TreeSet; @@ -56,6 +59,7 @@ public class AlchemyArrayRegistry { if (!registeredAlchemyArrays.contains(alchemyArray)) { + LogHelper.trace(String.format("AbilityRegistry[%s]: Mod with ID '%s' added alchemy array %s", LoaderHelper.getLoaderState(), Loader.instance().activeModContainer().getModId(), alchemyArray)); return registeredAlchemyArrays.add(alchemyArray); } diff --git a/src/main/java/com/pahimar/ee3/exchange/EnergyValueRegistry.java b/src/main/java/com/pahimar/ee3/exchange/EnergyValueRegistry.java index 258d979b..e5d822bd 100644 --- a/src/main/java/com/pahimar/ee3/exchange/EnergyValueRegistry.java +++ b/src/main/java/com/pahimar/ee3/exchange/EnergyValueRegistry.java @@ -76,13 +76,13 @@ public class EnergyValueRegistry implements JsonSerializer, { if (factoredEnergyValue.compareTo(preAssignedMappings.get(factoredWrappedStack)) < 0) { - LogHelper.trace(String.format("Mod with ID '%s' added a pre-assignment energy value of %s for object %s during %s", Loader.instance().activeModContainer().getModId(), energyValue, wrappedStack, LoaderHelper.getLoaderState())); // TODO Localize? + LogHelper.trace(String.format("EnergyValueRegistry[%s]: Mod with ID '%s' added a pre-assignment energy value of %s for object %s", LoaderHelper.getLoaderState(), Loader.instance().activeModContainer().getModId(), energyValue, wrappedStack)); preAssignedMappings.put(factoredWrappedStack, factoredEnergyValue); } } else { - LogHelper.trace(String.format("Mod with ID '%s' added a pre-assignment energy value of %s for object %s during %s", Loader.instance().activeModContainer().getModId(), energyValue, wrappedStack, LoaderHelper.getLoaderState())); // TODO Localize? + LogHelper.trace(String.format("EnergyValueRegistry[%s]: Mod with ID '%s' added a pre-assignment energy value of %s for object %s", LoaderHelper.getLoaderState(), Loader.instance().activeModContainer().getModId(), energyValue, wrappedStack)); preAssignedMappings.put(factoredWrappedStack, factoredEnergyValue); } } @@ -110,8 +110,8 @@ public class EnergyValueRegistry implements JsonSerializer, WrappedStack factoredWrappedStack = WrappedStack.wrap(wrappedStack, 1); EnergyValue factoredEnergyValue = EnergyValueHelper.factorEnergyValue(energyValue, wrappedStack.getStackSize()); - LogHelper.trace(String.format("Mod with ID '%s' added a post-assignment energy value of %s for object %s during %s", Loader.instance().activeModContainer().getModId(), energyValue, wrappedStack, LoaderHelper.getLoaderState())); - postAssignedMappings.put(factoredWrappedStack, factoredEnergyValue); // TODO Localize? + LogHelper.trace(String.format("EnergyValueRegistry[%s]: Mod with ID '%s' added a post-assignment energy value of %s for object %s", LoaderHelper.getLoaderState(), Loader.instance().activeModContainer().getModId(), energyValue, wrappedStack)); + postAssignedMappings.put(factoredWrappedStack, factoredEnergyValue); } } } diff --git a/src/main/java/com/pahimar/ee3/knowledge/AbilityRegistry.java b/src/main/java/com/pahimar/ee3/knowledge/AbilityRegistry.java index 1017fc82..84d38ebd 100644 --- a/src/main/java/com/pahimar/ee3/knowledge/AbilityRegistry.java +++ b/src/main/java/com/pahimar/ee3/knowledge/AbilityRegistry.java @@ -9,8 +9,10 @@ import com.pahimar.ee3.exchange.OreStack; import com.pahimar.ee3.exchange.WrappedStack; import com.pahimar.ee3.reference.Comparators; import com.pahimar.ee3.reference.Files; +import com.pahimar.ee3.util.LoaderHelper; import com.pahimar.ee3.util.LogHelper; import com.pahimar.ee3.util.SerializationHelper; +import cpw.mods.fml.common.Loader; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; @@ -103,7 +105,13 @@ public class AbilityRegistry implements JsonSerializer, JsonDes { if (WrappedStack.canBeWrapped(object)) { - hasBeenModified = notLearnableSet.remove(WrappedStack.wrap(object)); + WrappedStack wrappedStack = WrappedStack.wrap(object); + + if (wrappedStack != null && notLearnableSet.remove(wrappedStack)) + { + hasBeenModified = true; + LogHelper.trace(String.format("AbilityRegistry[%s]: Mod with ID '%s' set object %s as LEARNABLE", LoaderHelper.getLoaderState(), Loader.instance().activeModContainer().getModId(), wrappedStack)); + } } } @@ -111,7 +119,13 @@ public class AbilityRegistry implements JsonSerializer, JsonDes { if (WrappedStack.canBeWrapped(object)) { - hasBeenModified = notLearnableSet.add(WrappedStack.wrap(object)); + WrappedStack wrappedStack = WrappedStack.wrap(object); + + if (wrappedStack != null && notLearnableSet.add(wrappedStack)) + { + hasBeenModified = true; + LogHelper.trace(String.format("AbilityRegistry[%s]: Mod with ID '%s' set object %s as NOT LEARNABLE", LoaderHelper.getLoaderState(), Loader.instance().activeModContainer().getModId(), wrappedStack)); + } } } @@ -135,7 +149,13 @@ public class AbilityRegistry implements JsonSerializer, JsonDes { if (WrappedStack.canBeWrapped(object)) { - hasBeenModified = notRecoverableSet.remove(WrappedStack.wrap(object)); + WrappedStack wrappedStack = WrappedStack.wrap(object); + + if (wrappedStack != null && notRecoverableSet.remove(wrappedStack)) + { + hasBeenModified = true; + LogHelper.trace(String.format("AbilityRegistry[%s]: Mod with ID '%s' set object %s as RECOVERABLE", LoaderHelper.getLoaderState(), Loader.instance().activeModContainer().getModId(), wrappedStack)); + } } } @@ -143,7 +163,13 @@ public class AbilityRegistry implements JsonSerializer, JsonDes { if (WrappedStack.canBeWrapped(object)) { - hasBeenModified = notRecoverableSet.add(WrappedStack.wrap(object)); + WrappedStack wrappedStack = WrappedStack.wrap(object); + + if (wrappedStack != null && notRecoverableSet.add(wrappedStack)) + { + hasBeenModified = true; + LogHelper.trace(String.format("AbilityRegistry[%s]: Mod with ID '%s' set object %s as NOT RECOVERABLE", LoaderHelper.getLoaderState(), Loader.instance().activeModContainer().getModId(), wrappedStack)); + } } } diff --git a/src/main/java/com/pahimar/ee3/recipe/AludelRecipeManager.java b/src/main/java/com/pahimar/ee3/recipe/AludelRecipeManager.java index c76a9aa3..a9f5e366 100644 --- a/src/main/java/com/pahimar/ee3/recipe/AludelRecipeManager.java +++ b/src/main/java/com/pahimar/ee3/recipe/AludelRecipeManager.java @@ -3,6 +3,9 @@ package com.pahimar.ee3.recipe; import com.google.common.collect.ImmutableList; import com.pahimar.ee3.api.exchange.RecipeRegistryProxy; import com.pahimar.ee3.item.crafting.RecipeAludel; +import com.pahimar.ee3.util.LoaderHelper; +import com.pahimar.ee3.util.LogHelper; +import cpw.mods.fml.common.Loader; import net.minecraft.item.ItemStack; import java.util.ArrayList; @@ -38,6 +41,7 @@ public class AludelRecipeManager { if (!aludelRecipes.contains(recipeAludel)) { + LogHelper.trace(String.format("AludelRecipeManager[%s]: Mod with ID '%s' added Aludel recipe '%s'", LoaderHelper.getLoaderState(), Loader.instance().activeModContainer().getModId(), recipeAludel)); aludelRecipes.add(recipeAludel); } } diff --git a/src/main/java/com/pahimar/ee3/recipe/RecipeRegistry.java b/src/main/java/com/pahimar/ee3/recipe/RecipeRegistry.java index 4773020a..9f56247e 100644 --- a/src/main/java/com/pahimar/ee3/recipe/RecipeRegistry.java +++ b/src/main/java/com/pahimar/ee3/recipe/RecipeRegistry.java @@ -4,7 +4,9 @@ import com.google.common.collect.HashMultimap; import com.google.common.collect.ImmutableMultimap; import com.google.common.collect.Multimap; import com.pahimar.ee3.exchange.WrappedStack; +import com.pahimar.ee3.util.LoaderHelper; import com.pahimar.ee3.util.LogHelper; +import cpw.mods.fml.common.Loader; import java.util.ArrayList; import java.util.List; @@ -41,12 +43,15 @@ public class RecipeRegistry } List wrappedRecipeInputList = new ArrayList(); + StringBuilder stringBuilder = new StringBuilder(); for (Object recipeInputObject : recipeInputList) { WrappedStack wrappedInputObject = WrappedStack.wrap(recipeInputObject); if (wrappedInputObject != null) { wrappedRecipeInputList.add(wrappedInputObject); + stringBuilder.append(wrappedInputObject); + stringBuilder.append(" "); } else { @@ -57,6 +62,7 @@ public class RecipeRegistry // Add the recipe mapping only if we don't already have it if (!recipeMap.get(wrappedRecipeOutput).contains(wrappedRecipeInputList)) { + LogHelper.trace(String.format("RecipeRegistry[%s]: Mod with ID '%s' added recipe (Output: %s, Inputs: %s)", LoaderHelper.getLoaderState(), Loader.instance().activeModContainer().getModId(), wrappedRecipeOutput, stringBuilder.toString().trim())); recipeMap.put(wrappedRecipeOutput, wrappedRecipeInputList); } }