Use new file server, add more checks to recipes

This commit is contained in:
modmuss50 2016-05-25 11:07:42 +01:00
parent 6156591b0e
commit 1ab33a9473
3 changed files with 34 additions and 23 deletions

View file

@ -10,6 +10,7 @@ import net.minecraft.item.crafting.ShapelessRecipes;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapedOreRecipe;
import net.minecraftforge.oredict.ShapelessOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe;
import org.apache.commons.lang3.Validate;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
@ -21,10 +22,20 @@ public class RollingMachineRecipe {
private final List<IRecipe> recipes = new ArrayList<>(); private final List<IRecipe> recipes = new ArrayList<>();
public void addShapedOreRecipe(ItemStack outputItemStack, Object... objectInputs) { public void addShapedOreRecipe(ItemStack outputItemStack, Object... objectInputs) {
Validate.notNull(outputItemStack);
Validate.notNull(outputItemStack.getItem());
if(objectInputs.length == 0){
Validate.notNull(null); //Quick way to crash
}
recipes.add(new ShapedOreRecipe(outputItemStack, objectInputs)); recipes.add(new ShapedOreRecipe(outputItemStack, objectInputs));
} }
public void addShapelessOreRecipe(ItemStack outputItemStack, Object... objectInputs) { public void addShapelessOreRecipe(ItemStack outputItemStack, Object... objectInputs) {
Validate.notNull(outputItemStack);
Validate.notNull(outputItemStack.getItem());
if(objectInputs.length == 0){
Validate.notNull(null); //Quick way to crash
}
recipes.add(new ShapelessOreRecipe(outputItemStack, objectInputs)); recipes.add(new ShapelessOreRecipe(outputItemStack, objectInputs));
} }

View file

@ -10,7 +10,6 @@ import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.UniversalBucket; import net.minecraftforge.fluids.UniversalBucket;
import net.minecraftforge.fml.common.registry.GameRegistry;
import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.OreDictionary;
import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.ArrayUtils;
import reborncore.api.recipe.RecipeHandler; import reborncore.api.recipe.RecipeHandler;
@ -906,14 +905,14 @@ public class ModRecipes
continue; continue;
} }
GameRegistry CraftingHelper
.addShapelessRecipe(BlockStorage.getStorageBlockByName(name), item, item, item, item, item, item, .addShapelessRecipe(BlockStorage.getStorageBlockByName(name), item, item, item, item, item, item,
item, item, item); item, item, item);
GameRegistry.addShapelessRecipe(item, BlockStorage.getStorageBlockByName(name, 9)); CraftingHelper.addShapelessRecipe(item, BlockStorage.getStorageBlockByName(name, 9));
} }
GameRegistry.addShapelessRecipe(new ItemStack(ModBlocks.rubberPlanks, 4), ModBlocks.rubberLog); CraftingHelper.addShapelessRecipe(new ItemStack(ModBlocks.rubberPlanks, 4), ModBlocks.rubberLog);
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.frequencyTransmitter), CraftingHelper.addShapelessRecipe(new ItemStack(ModItems.frequencyTransmitter),
ItemStandaloneCables.getCableByName("insulatedcopper"), ItemParts.getPartByName("electronicCircuit")); ItemStandaloneCables.getCableByName("insulatedcopper"), ItemParts.getPartByName("electronicCircuit"));
for (String name : ItemDustsSmall.types) for (String name : ItemDustsSmall.types)
@ -921,8 +920,8 @@ public class ModRecipes
if(name.equals(ModItems.META_PLACEHOLDER)){ if(name.equals(ModItems.META_PLACEHOLDER)){
continue; continue;
} }
GameRegistry.addShapelessRecipe(ItemDustsSmall.getSmallDustByName(name, 4), ItemDusts.getDustByName(name)); CraftingHelper.addShapelessRecipe(ItemDustsSmall.getSmallDustByName(name, 4), ItemDusts.getDustByName(name));
GameRegistry.addShapelessRecipe(ItemDusts.getDustByName(name, 1), ItemDustsSmall.getSmallDustByName(name), CraftingHelper.addShapelessRecipe(ItemDusts.getDustByName(name, 1), ItemDustsSmall.getSmallDustByName(name),
ItemDustsSmall.getSmallDustByName(name), ItemDustsSmall.getSmallDustByName(name), ItemDustsSmall.getSmallDustByName(name), ItemDustsSmall.getSmallDustByName(name),
ItemDustsSmall.getSmallDustByName(name)); ItemDustsSmall.getSmallDustByName(name));
} }
@ -964,15 +963,15 @@ public class ModRecipes
static void addSmeltingRecipes() static void addSmeltingRecipes()
{ {
GameRegistry.addSmelting(ItemDusts.getDustByName("iron", 1), new ItemStack(Items.IRON_INGOT), 1F); CraftingHelper.addSmelting(ItemDusts.getDustByName("iron", 1), new ItemStack(Items.IRON_INGOT), 1F);
GameRegistry.addSmelting(ItemDusts.getDustByName("gold", 1), new ItemStack(Items.GOLD_INGOT), 1F); CraftingHelper.addSmelting(ItemDusts.getDustByName("gold", 1), new ItemStack(Items.GOLD_INGOT), 1F);
GameRegistry.addSmelting(ItemParts.getPartByName("rubberSap"), ItemParts.getPartByName("rubber"), 1F); CraftingHelper.addSmelting(ItemParts.getPartByName("rubberSap"), ItemParts.getPartByName("rubber"), 1F);
GameRegistry.addSmelting(new ItemStack(Items.IRON_INGOT), ItemIngots.getIngotByName("refinediron"), 1F); CraftingHelper.addSmelting(new ItemStack(Items.IRON_INGOT), ItemIngots.getIngotByName("refinediron"), 1F);
GameRegistry.addSmelting(BlockOre2.getOreByName("copper"), ItemIngots.getIngotByName("copper"), 1F); CraftingHelper.addSmelting(BlockOre2.getOreByName("copper"), ItemIngots.getIngotByName("copper"), 1F);
GameRegistry.addSmelting(BlockOre2.getOreByName("tin"), ItemIngots.getIngotByName("tin"), 1F); CraftingHelper.addSmelting(BlockOre2.getOreByName("tin"), ItemIngots.getIngotByName("tin"), 1F);
GameRegistry.addSmelting(BlockOre.getOreByName("Silver"), ItemIngots.getIngotByName("silver"), 1F); CraftingHelper.addSmelting(BlockOre.getOreByName("Silver"), ItemIngots.getIngotByName("silver"), 1F);
GameRegistry.addSmelting(BlockOre.getOreByName("Lead"), ItemIngots.getIngotByName("lead"), 1F); CraftingHelper.addSmelting(BlockOre.getOreByName("Lead"), ItemIngots.getIngotByName("lead"), 1F);
GameRegistry.addSmelting(ItemIngots.getIngotByName("mixedMetal"), ItemIngots.getIngotByName("advancedAlloy"), 1F); CraftingHelper.addSmelting(ItemIngots.getIngotByName("mixedMetal"), ItemIngots.getIngotByName("advancedAlloy"), 1F);
Core.logHelper.info("Smelting Recipes Added"); Core.logHelper.info("Smelting Recipes Added");
} }
@ -2266,17 +2265,17 @@ public class ModRecipes
ItemParts.getPartByName("energyFlowCircuit")); ItemParts.getPartByName("energyFlowCircuit"));
// Smetling // Smetling
GameRegistry CraftingHelper
.addSmelting(ItemDusts.getDustByName("copper", 1), TechRebornAPI.recipeCompact.getItem("copperIngot"), .addSmelting(ItemDusts.getDustByName("copper", 1), TechRebornAPI.recipeCompact.getItem("copperIngot"),
1F); 1F);
GameRegistry CraftingHelper
.addSmelting(ItemDusts.getDustByName("tin", 1), TechRebornAPI.recipeCompact.getItem("tinIngot"), 1F); .addSmelting(ItemDusts.getDustByName("tin", 1), TechRebornAPI.recipeCompact.getItem("tinIngot"), 1F);
GameRegistry CraftingHelper
.addSmelting(ItemDusts.getDustByName("bronze", 1), TechRebornAPI.recipeCompact.getItem("bronzeIngot"), .addSmelting(ItemDusts.getDustByName("bronze", 1), TechRebornAPI.recipeCompact.getItem("bronzeIngot"),
1F); 1F);
GameRegistry CraftingHelper
.addSmelting(ItemDusts.getDustByName("lead", 1), TechRebornAPI.recipeCompact.getItem("leadIngot"), 1F); .addSmelting(ItemDusts.getDustByName("lead", 1), TechRebornAPI.recipeCompact.getItem("leadIngot"), 1F);
GameRegistry CraftingHelper
.addSmelting(ItemDusts.getDustByName("silver", 1), TechRebornAPI.recipeCompact.getItem("silverIngot"), .addSmelting(ItemDusts.getDustByName("silver", 1), TechRebornAPI.recipeCompact.getItem("silverIngot"),
1F); 1F);

View file

@ -16,6 +16,7 @@ import org.apache.commons.io.IOUtils;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken; import com.google.gson.reflect.TypeToken;
import reborncore.RebornCore;
import reborncore.common.util.Unzip; import reborncore.common.util.Unzip;
import techreborn.manual.PageCollection; import techreborn.manual.PageCollection;
import techreborn.manual.Reference; import techreborn.manual.Reference;
@ -45,7 +46,7 @@ public class ManualLoader {
manualdir.mkdir(); manualdir.mkdir();
} }
URL url = new URL("http://modmuss50.me/techreborn/manual/versions.json"); URL url = new URL(RebornCore.WEB_URL + "techreborn/manual/versions.json");
URLConnection con = url.openConnection(); URLConnection con = url.openConnection();
InputStream in = con.getInputStream(); InputStream in = con.getInputStream();
String encoding = con.getContentEncoding(); String encoding = con.getContentEncoding();
@ -76,7 +77,7 @@ public class ManualLoader {
hasIntactZip = true; hasIntactZip = true;
} }
} else { } else {
FileUtils.copyURLToFile(new URL("http://modmuss50.me/techreborn/manual/packages/" + downloadablePackageInfo.fileName), zipLocation); FileUtils.copyURLToFile(new URL(RebornCore.WEB_URL + "techreborn/manual/packages/" + downloadablePackageInfo.fileName), zipLocation);
String md5 = getMD5(zipLocation); String md5 = getMD5(zipLocation);
if(md5.equals(downloadablePackageInfo.md5)){ if(md5.equals(downloadablePackageInfo.md5)){
//ok the downloaded file is valid //ok the downloaded file is valid