Updates, and re added support

This commit is contained in:
modmuss50 2016-02-29 11:20:40 +00:00
parent 158f68c4a8
commit e680f3fb1f
5 changed files with 93 additions and 87 deletions

View file

@ -1,50 +0,0 @@
package techreborn.compat.recipes;
import net.minecraftforge.fml.common.event.FMLInitializationEvent;
import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
import net.minecraftforge.fml.common.event.FMLServerStartingEvent;
import ic2.api.item.IC2Items;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.oredict.OreDictionary;
import techreborn.api.recipe.RecipeHandler;
import techreborn.api.recipe.machines.IndustrialSawmillRecipe;
import techreborn.compat.ICompatModule;
import thaumcraft.api.ItemApi;
public class RecipesThaumcraft implements ICompatModule {
@Override
public void preInit(FMLPreInitializationEvent event) {
}
@Override
public void init(FMLInitializationEvent event) {
ItemStack pulpStack = OreDictionary.getOres("pulpWood").get(0);
ItemStack greatWoodStack = ItemApi.getBlock("blockWoodenDevice", 6);
greatWoodStack.stackSize = 6;
RecipeHandler.addRecipe(new IndustrialSawmillRecipe(ItemApi.getBlock("blockMagicalLog", 0), null, new FluidStack(FluidRegistry.WATER, 1000), greatWoodStack, pulpStack, null, 200, 30, false));
RecipeHandler.addRecipe(new IndustrialSawmillRecipe(ItemApi.getBlock("blockMagicalLog", 0), IC2Items.getItem("waterCell"), null, greatWoodStack, pulpStack, IC2Items.getItem("cell"), 200, 30, false));
RecipeHandler.addRecipe(new IndustrialSawmillRecipe(ItemApi.getBlock("blockMagicalLog", 0), new ItemStack(Items.water_bucket), null, greatWoodStack, pulpStack, new ItemStack(Items.bucket), 200, 30, false));
ItemStack silverWooodStack = ItemApi.getBlock("blockWoodenDevice", 7);
silverWooodStack.stackSize = 6;
RecipeHandler.addRecipe(new IndustrialSawmillRecipe(ItemApi.getBlock("blockMagicalLog", 1), null, new FluidStack(FluidRegistry.WATER, 1000), silverWooodStack, pulpStack, null, 200, 30, false));
RecipeHandler.addRecipe(new IndustrialSawmillRecipe(ItemApi.getBlock("blockMagicalLog", 1), IC2Items.getItem("waterCell"), null, silverWooodStack, pulpStack, IC2Items.getItem("cell"), 200, 30, false));
RecipeHandler.addRecipe(new IndustrialSawmillRecipe(ItemApi.getBlock("blockMagicalLog", 1), new ItemStack(Items.water_bucket), null, silverWooodStack, pulpStack, new ItemStack(Items.bucket), 200, 30, false));
}
@Override
public void postInit(FMLPostInitializationEvent event) {
}
@Override
public void serverStarting(FMLServerStartingEvent event) {
}
}

View file

@ -50,7 +50,7 @@ repositories {
}
ivy {
name = 'ThaumCraft 4 API'
artifactPattern 'https://dl.dropboxusercontent.com/u/47135879/[module]-1.8.8-[revision]-[classifier].[ext]'
artifactPattern 'https://dl.dropboxusercontent.com/u/47135879/[module]-1.8.9-[revision]-[classifier].[ext]'
}
ivy {
name "MineTweaker3"
@ -58,9 +58,13 @@ repositories {
artifactPattern "http://www.blamejared.com/content/[module]-[classifier]-Full-[revision].[ext]" //This is a forked version of it to allow 1.8.8 support.
}
ivy {
name "BuildCraft"
artifactPattern "https://github.com/AlexIIL/BuildCraft/releases/download/[revision]/[module]-[classifier].[ext]"
}
name "BuildCraft"
artifactPattern "https://github.com/AlexIIL/BuildCraft/releases/download/[revision]/[module]-[classifier].[ext]"
}
maven {
name = "Amadornes"
url "http://maven.amadornes.com/"
}
}
configurations {
@ -86,7 +90,20 @@ minecraft {
group = 'TechReborn'
def grabDep(name, url){
ant.get(src: url, dest: 'dep')
file("dep/" + url.substring(url.lastIndexOf("/"))).renameTo(file("dep/" + name + ".jar"))
}
dependencies {
def f = new File('dep/')
if(f.exists()){
f.delete()
}
f.mkdirs()
if(!f.exists()){
f.mkdir()
}
// compile 'net.industrial-craft:industrialcraft-2:2.2.796-experimental:dev'
// shade 'net.industrial-craft:industrialcraft-2:2.2.796-experimental:api'
// compile "codechicken:CodeChickenLib:1.7.10-1.1.3.140:dev"
@ -96,7 +113,6 @@ dependencies {
compile ("mcp.mobius.waila:Waila:1.6.0-B3_1.8.8:dev") {
exclude group: 'mcp.mobius.waila'
}
// compile name: 'buildcraft', version: 'mc1.8.8-alpha-11', classifier: "-0.11-alpha-dev", ext: 'jar'
// compile "qmunity:QmunityLib:0.2.+:deobf"
// compile "com.pahimar.ee3:EquivalentExchange3:1.7.10-0.3.507:dev"
// compile "net.sengir.forestry:forestry_1.7.10:4.2.0.47:dev"
@ -105,12 +121,18 @@ dependencies {
// compile "mods.natura:natura:1.7.10-107.779621d:deobf"
compile "slimeknights.mantle:Mantle:1.8.8-0.6.jenkins60:deobf"
compile "com.github.glitchfiend.biomesoplenty:BiomesOPlenty:1.8.9-3.0.0.1923:deobf"
//compile 'Azanor:Thaumcraft:5.0.3:deobf@jar'
compile "com.github.azanor:baubles:1.1.2.0:deobf@jar"
compile 'Azanor:Thaumcraft:5.1.6:deobf@jar'
compile "com.github.azanor:baubles:1.1.3.0:deobf@jar"
compile name: "CraftTweaker", version: "1.8.8-3.0.0", classifier: "Dev"
// shade 'IC2-Classic-API-STANDALONE:IC2-Classic-API-STANDALONE:1.1.0.19-5:api'
deobfCompile 'RebornCore:RebornCore-1.8.9:1.4.4.+:universal'
deobfCompile "mezz.jei:jei_1.8.9:2.27.+"
deobfCompile 'MCMultiPart:MCMultiPart:1.0.6:universal'
println("Downloading dependencies that have no maven :/")
//This is done becuase
grabDep('buildcraft-7.2.0-pre12', 'http://modmuss50.me/files/buildcraft-7.2.0-pre12-deobf.jar')
compile files("dep/buildcraft-7.2.0-pre12.jar")
}

View file

@ -5,6 +5,8 @@ import java.util.ArrayList;
import net.minecraftforge.fml.common.Loader;
import techreborn.compat.minetweaker.MinetweakerCompat;
import techreborn.compat.recipes.RecipesBiomesOPlenty;
import techreborn.compat.recipes.RecipesBuildcraft;
import techreborn.compat.recipes.RecipesThaumcraft;
import techreborn.compat.waila.CompatModuleWaila;
import techreborn.config.ConfigTechReborn;
@ -34,6 +36,8 @@ public class CompatManager {
registerCompact(CompatModuleWaila.class, "Waila");
registerCompact(MinetweakerCompat.class, "MineTweaker3");
registerCompact(RecipesBiomesOPlenty.class, "BiomesOPlenty");
registerCompact(RecipesBuildcraft.class, "BuildCraft|Builders");
registerCompact(RecipesThaumcraft.class, "Thaumcraft");
}
public void registerCompact(Class<?> moduleClass, Object... objs) {

View file

@ -1,23 +1,22 @@
package techreborn.compat.recipes;
import buildcraft.BuildCraftBuilders;
import buildcraft.api.fuels.IFuel;
import buildcraft.core.Version;
import net.minecraftforge.fml.common.Loader;
import net.minecraftforge.fml.common.event.FMLInitializationEvent;
import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
import net.minecraftforge.fml.common.event.FMLServerStartingEvent;
import ic2.api.item.IC2Items;
import net.minecraft.block.Block;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.oredict.OreDictionary;
import reborncore.api.fuel.FluidPowerManager;
import reborncore.common.powerSystem.PowerSystem;
import reborncore.common.util.CraftingHelper;
import reborncore.common.util.RecipeRemover;
import techreborn.Core;
import techreborn.api.TechRebornAPI;
import techreborn.compat.ICompatModule;
import techreborn.config.ConfigTechReborn;
public class RecipesBuildcraft implements ICompatModule {
@ -29,7 +28,7 @@ public class RecipesBuildcraft implements ICompatModule {
}
public static void addRecipies() {
Item drill = IC2Items.getItem("diamondDrill").getItem();
Item drill = TechRebornAPI.recipeCompact.getItem("diamondDrill").getItem();
ItemStack drillStack = new ItemStack(drill, 1, OreDictionary.WILDCARD_VALUE);
//Quarry
CraftingHelper.addShapedOreRecipe(new ItemStack(quarryBlock), new Object[]
@ -38,7 +37,7 @@ public class RecipesBuildcraft implements ICompatModule {
'I', "gearIron",
'G', "gearGold",
'D', "gearDiamond",
'A', IC2Items.getItem("advancedCircuit"),
'A', TechRebornAPI.recipeCompact.getItem("advancedCircuit"),
'E', drillStack
}
);
@ -57,33 +56,11 @@ public class RecipesBuildcraft implements ICompatModule {
@Override
public void postInit(FMLPostInitializationEvent event) {
Core.logHelper.info("Trying to change the quarry recipe");
try {
String itemClass = "buildcraft.BuildCraftBuilders";
if (!Version.getVersion().startsWith("7")) {//Buildcraft 6
if (Loader.isModLoaded("BuildCraft|Factory")) {
itemClass = "buildcraft.BuildCraftFactory";
}
} else if (!Version.getVersion().startsWith("7") && !Loader.isModLoaded("BuildCraft|Builders")) { //Buildcraft 7
Core.logHelper.info("Buildcraft not found");
return;
}
Object obj = Class.forName(itemClass).getField("quarryBlock").get(null);
if (obj instanceof Block) {
quarryBlock = (Block) obj;
Core.logHelper.info("Found Quarry Block from buildcraft at " + itemClass + ":quarryBlock");
} else {
Core.logHelper.fatal("Could not retrieve quarry block from Buildcraft! This is a fatal error!");
return;
}
} catch (Exception ex) {
Core.logHelper.fatal("Could not retrieve quarry block from Buildcraft! This is a fatal error!");
ex.printStackTrace();
return;
}
quarryBlock = BuildCraftBuilders.quarryBlock;
removeRecipes();
addRecipies();
for (IFuel fuel : buildcraft.energy.fuels.FuelManager.INSTANCE.getFuels()) {
FluidPowerManager.fluidPowerValues.put(fuel.getFluid(), (double) fuel.getPowerPerCycle() / ConfigTechReborn.euPerRF);
FluidPowerManager.fluidPowerValues.put(fuel.getFluid(), (double) fuel.getPowerPerCycle() / PowerSystem.euPerRF);
}
}

View file

@ -0,0 +1,53 @@
package techreborn.compat.recipes;
import net.minecraftforge.fml.common.event.FMLInitializationEvent;
import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
import net.minecraftforge.fml.common.event.FMLServerStartingEvent;
import ic2.api.item.IC2Items;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.oredict.OreDictionary;
import techreborn.api.recipe.RecipeHandler;
import techreborn.api.recipe.machines.IndustrialSawmillRecipe;
import techreborn.compat.ICompatModule;
import thaumcraft.api.blocks.BlocksTC;
public class RecipesThaumcraft implements ICompatModule {
@Override
public void preInit(FMLPreInitializationEvent event) {
}
@Override
public void init(FMLInitializationEvent event) {
ItemStack pulpStack = OreDictionary.getOres("pulpWood").get(0);
//ItemStack greatWoodStack = BlocksTC.getBlock("blockWoodenDevice", 6);
ItemStack greatWoodStack = null;
//SOMEONE WHO KNOWS TC FIX THIS
greatWoodStack.stackSize = 6;
RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(BlocksTC.log), null, new FluidStack(FluidRegistry.WATER, 1000), greatWoodStack, pulpStack, null, 200, 30, false));
RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(BlocksTC.log), IC2Items.getItem("waterCell"), null, greatWoodStack, pulpStack, IC2Items.getItem("cell"), 200, 30, false));
RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(BlocksTC.log), new ItemStack(Items.water_bucket), null, greatWoodStack, pulpStack, new ItemStack(Items.bucket), 200, 30, false));
//ItemStack silverWoodStack = ItemApi.getBlock("blockWoodenDevice", 7);
ItemStack silverWoodStack = null;
silverWoodStack.stackSize = 6;
RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(BlocksTC.log, 1), null, new FluidStack(FluidRegistry.WATER, 1000), silverWoodStack, pulpStack, null, 200, 30, false));
RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(BlocksTC.log, 1), IC2Items.getItem("waterCell"), null, silverWoodStack, pulpStack, IC2Items.getItem("cell"), 200, 30, false));
RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(BlocksTC.log, 1), new ItemStack(Items.water_bucket), null, silverWoodStack, pulpStack, new ItemStack(Items.bucket), 200, 30, false));
}
@Override
public void postInit(FMLPostInitializationEvent event) {
}
@Override
public void serverStarting(FMLServerStartingEvent event) {
}
}