einsteinsci
/
betterbeginnings
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moved smelter ore recipes to be 100% on config.

master
sealedinterface 2016-05-20 17:42:00 -07:00
parent f61d34b90a
commit 8bb72c3add
3 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/net/einsteinsci/betterbeginnings/config/json/KilnConfig.java
View File

@ -14,7 +14,10 @@ public class KilnConfig implements IJsonConfig
{
public static final KilnConfig INSTANCE = new KilnConfig();
private static JsonKilnRecipeHandler initialRecipes = new JsonKilnRecipeHandler();
private JsonKilnRecipeHandler mainRecipes = new JsonKilnRecipeHandler();
private JsonKilnRecipeHandler customRecipes = new JsonKilnRecipeHandler();
private List<JsonKilnRecipeHandler> includes = new ArrayList<>();
@ -31,7 +34,8 @@ public class KilnConfig implements IJsonConfig
String json = FileUtil.readAllText(mainf);
if (json == null)
{
json = "{}";
// Kind of inefficient, but it's easiest this way.
json = BBJsonLoader.serializeObject(initialRecipes);
}
return json;

18
src/main/java/net/einsteinsci/betterbeginnings/register/RegisterHelper.java
View File

@ -1,5 +1,6 @@
package net.einsteinsci.betterbeginnings.register;
import net.einsteinsci.betterbeginnings.config.json.SmelterConfig;
import net.einsteinsci.betterbeginnings.register.recipe.SmelterRecipeHandler;
import net.minecraft.block.Block;
import net.minecraft.item.Item;
@ -23,15 +24,26 @@ public class RegisterHelper
RegisterBlocks.allBlocks.add(block);
}
public static void registerSmelterOreRecipe(String input, String output, float experience, int gravel, int bonus)
public static void registerSmelterOreRecipe(String input, String output, float experience, int boosters, int bonus)
{
for (ItemStack stack : OreDictionary.getOres(input))
{
List<ItemStack> valid = OreDictionary.getOres(output);
if (!valid.isEmpty())
{
SmelterRecipeHandler.addRecipe(stack, OreDictionary.getOres(output).get(0),
experience, gravel, bonus);
SmelterRecipeHandler.addRecipe(stack, valid.get(0), experience, boosters, bonus);
}
}
}
public static void registerSmelterConfigOreRecipe(String input, String output, float experience, int boosters, int bonus)
{
for (ItemStack stack : OreDictionary.getOres(input))
{
List<ItemStack> valid = OreDictionary.getOres(output);
if (!valid.isEmpty())
{
SmelterConfig.addRecipe(stack, valid.get(0), experience, boosters, bonus);
}
}
}

20
src/main/java/net/einsteinsci/betterbeginnings/register/RegisterRecipes.java
View File

@ -144,13 +144,13 @@ public class RegisterRecipes
SmelterConfig.addRecipe("oreGold", new ItemStack(Items.gold_ingot), 1.0f, 2, 1);
// Modded Ore Recipes
RegisterHelper.registerSmelterOreRecipe("oreCopper", "ingotCopper", 0.6f, 1, 1);
RegisterHelper.registerSmelterOreRecipe("oreTin", "ingotTin", 0.6f, 1, 1);
RegisterHelper.registerSmelterOreRecipe("oreAluminum", "ingotAluminum", 0.8f, 1, 1);
RegisterHelper.registerSmelterOreRecipe("oreSilver", "ingotSilver", 1.0f, 1, 1);
RegisterHelper.registerSmelterOreRecipe("oreLead", "ingotLead", 0.6f, 1, 1);
RegisterHelper.registerSmelterOreRecipe("orePlatinum", "ingotPlatinum", 1.0f, 2, 1);
RegisterHelper.registerSmelterOreRecipe("oreNickel", "ingotNickel", 0.8f, 1, 1);
RegisterHelper.registerSmelterConfigOreRecipe("oreCopper", "ingotCopper", 0.6f, 1, 1);
RegisterHelper.registerSmelterConfigOreRecipe("oreTin", "ingotTin", 0.6f, 1, 1);
RegisterHelper.registerSmelterConfigOreRecipe("oreAluminum", "ingotAluminum", 0.8f, 1, 1);
RegisterHelper.registerSmelterConfigOreRecipe("oreSilver", "ingotSilver", 1.0f, 1, 1);
RegisterHelper.registerSmelterConfigOreRecipe("oreLead", "ingotLead", 0.6f, 1, 1);
RegisterHelper.registerSmelterConfigOreRecipe("orePlatinum", "ingotPlatinum", 1.0f, 2, 1);
RegisterHelper.registerSmelterConfigOreRecipe("oreNickel", "ingotNickel", 0.8f, 1, 1);
// Recipes that might be better suited in Kiln only
if (BBConfig.canSmelterDoKilnStuff)
@ -180,9 +180,9 @@ public class RegisterRecipes
SmelterConfig.addRecipe("oreEmerald", new ItemStack(Items.emerald, 1), 1.0f, 3, 1);
// Silk touch recipes (modded)
RegisterHelper.registerSmelterOreRecipe("oreRuby", "gemRuby", 0.8f, 2, 1);
RegisterHelper.registerSmelterOreRecipe("oreSapphire", "gemSapphire", 0.8f, 2, 1);
RegisterHelper.registerSmelterOreRecipe("oreOlivine", "gemOlivine", 0.8f, 2, 1);
RegisterHelper.registerSmelterConfigOreRecipe("oreRuby", "gemRuby", 0.8f, 2, 1);
RegisterHelper.registerSmelterConfigOreRecipe("oreSapphire", "gemSapphire", 0.8f, 2, 1);
RegisterHelper.registerSmelterConfigOreRecipe("oreOlivine", "gemOlivine", 0.8f, 2, 1);
}
private static void addCampfireRecipes()