More Logging rework

This commit is contained in:
Zixxl committed 2015-07-09 11:28:40 +02:00
1 parent ece7dca426
commit 2dd8e910f4
60 files changed
+464 -322

No files matched your search

@@ -8,7 +8,7 @@ import minetweaker.MineTweakerAPI;
import minetweaker.MineTweakerImplementationAPI;
import minetweaker.api.player.IPlayer;
import minetweaker.api.server.ICommandFunction;
import modtweaker2.helpers.InputHelper;
import modtweaker2.helpers.LogHelper;
import modtweaker2.helpers.ReflectionHelper;
import modtweaker2.helpers.StringHelper;
import modtweaker2.mods.factorization.FactorizationHelper;
@@ -36,9 +36,9 @@ public class FactorizationLogger implements ICommandFunction {
if(args.isEmpty() || args.contains("crystallizer")) {
for(Object recipe : FactorizationHelper.crystallizer) {
MineTweakerAPI.logCommand(String.format("mods.factorization.Crystallizer.addRecipe(%s, %s, %s, %s);",
InputHelper.getStackDescription(ReflectionHelper.<ItemStack>getObject(recipe, "input")),
InputHelper.getStackDescription(ReflectionHelper.<ItemStack>getObject(recipe, "output")),
InputHelper.getStackDescription(ReflectionHelper.<ItemStack>getObject(recipe, "solution")),
LogHelper.getStackDescription(ReflectionHelper.<ItemStack>getObject(recipe, "input")),
LogHelper.getStackDescription(ReflectionHelper.<ItemStack>getObject(recipe, "output")),
LogHelper.getStackDescription(ReflectionHelper.<ItemStack>getObject(recipe, "solution")),
ReflectionHelper.<Float>getObject(recipe, "output_count")));
}
}
@@ -47,9 +47,9 @@ public class FactorizationLogger implements ICommandFunction {
for(Object recipe : FactorizationHelper.lacerator) {
MineTweakerAPI.logCommand(String.format("mods.factorization.Lacerator.addRecipe(%s, %s, %s);",
ReflectionHelper.<String>getObject(recipe, "oreName") != null ?
InputHelper.getStackDescription(ReflectionHelper.<String>getObject(recipe, "oreName")) :
InputHelper.getStackDescription(ReflectionHelper.<ItemStack>getObject(recipe, "itemstack")),
InputHelper.getStackDescription(ReflectionHelper.<ItemStack>getObject(recipe, "output")),
LogHelper.getStackDescription(ReflectionHelper.<String>getObject(recipe, "oreName")) :
LogHelper.getStackDescription(ReflectionHelper.<ItemStack>getObject(recipe, "itemstack")),
LogHelper.getStackDescription(ReflectionHelper.<ItemStack>getObject(recipe, "output")),
ReflectionHelper.<Float>getObject(recipe, "probability")));
}
}
@@ -57,10 +57,10 @@ public class FactorizationLogger implements ICommandFunction {
if(args.isEmpty() || args.contains("slagfurnace")) {
for(Object recipe : FactorizationHelper.slag) {
MineTweakerAPI.logCommand(String.format("mods.factorization.SlagFurnace.addRecipe(%s, %s, %s, %s, %s);",
InputHelper.getStackDescription(ReflectionHelper.<ItemStack>getObject(recipe, "input")),
InputHelper.getStackDescription(ReflectionHelper.<ItemStack>getObject(recipe, "output2")),
LogHelper.getStackDescription(ReflectionHelper.<ItemStack>getObject(recipe, "input")),
LogHelper.getStackDescription(ReflectionHelper.<ItemStack>getObject(recipe, "output2")),
ReflectionHelper.<Float>getObject(recipe, "prob2"),
InputHelper.getStackDescription(ReflectionHelper.<ItemStack>getObject(recipe, "output1")),
LogHelper.getStackDescription(ReflectionHelper.<ItemStack>getObject(recipe, "output1")),
ReflectionHelper.<Float>getObject(recipe, "prob1")));
}
}
@@ -10,7 +10,6 @@ import java.util.List;
import minetweaker.MineTweakerAPI;
import minetweaker.api.item.IIngredient;
import minetweaker.api.item.IItemStack;
import modtweaker2.helpers.InputHelper;
import modtweaker2.helpers.LogHelper;
import modtweaker2.helpers.ReflectionHelper;
import modtweaker2.mods.factorization.FactorizationHelper;
@@ -43,7 +42,7 @@ public class Crystallizer {
@Override
public String getRecipeInfo(Object recipe) {
return InputHelper.getStackDescription((ItemStack)ReflectionHelper.getObject(recipe, "output"));
return LogHelper.getStackDescription((ItemStack)ReflectionHelper.getObject(recipe, "output"));
}
}
@@ -77,7 +76,7 @@ public class Crystallizer {
@Override
public String getRecipeInfo(Object recipe) {
return InputHelper.getStackDescription((ItemStack)ReflectionHelper.getObject(recipe, "output"));
return LogHelper.getStackDescription((ItemStack)ReflectionHelper.getObject(recipe, "output"));
}
}
}
@@ -11,7 +11,6 @@ import java.util.List;
import minetweaker.MineTweakerAPI;
import minetweaker.api.item.IIngredient;
import minetweaker.api.item.IItemStack;
import modtweaker2.helpers.InputHelper;
import modtweaker2.helpers.LogHelper;
import modtweaker2.helpers.ReflectionHelper;
import modtweaker2.mods.factorization.FactorizationHelper;
@@ -43,7 +42,7 @@ public class Lacerator {
@Override
public String getRecipeInfo(Object recipe) {
return InputHelper.getStackDescription((ItemStack) ReflectionHelper.getObject(recipe, "output"));
return LogHelper.getStackDescription((ItemStack) ReflectionHelper.getObject(recipe, "output"));
}
}
@@ -76,7 +75,7 @@ public class Lacerator {
@Override
public String getRecipeInfo(Object recipe) {
return InputHelper.getStackDescription((ItemStack) ReflectionHelper.getObject(recipe, "output"));
return LogHelper.getStackDescription((ItemStack) ReflectionHelper.getObject(recipe, "output"));
}
}
}
@@ -10,7 +10,6 @@ import java.util.List;
import minetweaker.MineTweakerAPI;
import minetweaker.api.item.IIngredient;
import minetweaker.api.item.IItemStack;
import modtweaker2.helpers.InputHelper;
import modtweaker2.helpers.LogHelper;
import modtweaker2.helpers.ReflectionHelper;
import modtweaker2.mods.factorization.FactorizationHelper;
@@ -42,7 +41,7 @@ public class SlagFurnace {
@Override
public String getRecipeInfo(Object recipe) {
return InputHelper.getStackDescription((ItemStack) ReflectionHelper.getObject(recipe, "input"));
return LogHelper.getStackDescription((ItemStack) ReflectionHelper.getObject(recipe, "input"));
}
}
@@ -77,7 +76,7 @@ public class SlagFurnace {
@Override
public String getRecipeInfo(Object recipe) {
return InputHelper.getStackDescription((ItemStack) ReflectionHelper.getObject(recipe, "input"));
return LogHelper.getStackDescription((ItemStack) ReflectionHelper.getObject(recipe, "input"));
}
}
}