diff --git a/build.gradle b/build.gradle index 46eb87501..b6f2d2b30 100644 --- a/build.gradle +++ b/build.gradle @@ -64,6 +64,10 @@ repositories { name 'CB Repo' url "http://chickenbones.net/maven/" } + maven { + name 'Covers' + url "http://maven.covers1624.net/" + } ivy { name "BuildCraft" artifactPattern "http://www.mod-buildcraft.com/releases/BuildCraft/[revision]/[module]-[revision].[ext]" @@ -83,7 +87,7 @@ if (ENV.BUILD_NUMBER) { } minecraft { - version = "1.12-14.21.0.2382" + version = "1.12-14.21.1.2397" mappings = "snapshot_20170624" replace "@MODVERSION@", project.version useDepAts = true @@ -110,10 +114,12 @@ dependencies { //1.11 updates //deobfCompile "slimeknights:TConstruct:1.10.2-2.5.3.jenkins384" //deobfCompile "slimeknights.mantle:Mantle:1.10.2-1.0.0.jenkins170" - deobfCompile "mcjty.theoneprobe:TheOneProbe:1.11-1.3.3-46" + deobfCompile "mcjty.theoneprobe:TheOneProbe-1.12:1.12-1.4.11-5" compile "CraftTweaker2:CraftTweaker2-MC1120-Main:1.12-4.0.0.5" - deobfCompile 'net.industrial-craft:industrialcraft-2:2.8.2-ex112' - compile name: 'buildcraft', version: '7.99.4', ext: 'jar' + deobfCompile 'net.industrial-craft:industrialcraft-2:2.8.7-ex112' + //compile name: 'buildcraft', version: '7.99.4', ext: 'jar' + deobfCompile 'cofh:ThermalDynamics:1.12-2.3.1.6:universal' + deobfCompile 'cofh:ThermalExpansion:1.12-5.3.1.6:universal' } diff --git a/src/main/java/techreborn/compat/CompatManager.java b/src/main/java/techreborn/compat/CompatManager.java index 753f3eecb..63441532a 100644 --- a/src/main/java/techreborn/compat/CompatManager.java +++ b/src/main/java/techreborn/compat/CompatManager.java @@ -32,6 +32,7 @@ import techreborn.compat.buildcraft.BuildcraftCompat; import techreborn.compat.crafttweaker.CraftTweakerCompat; import techreborn.compat.ic2.RecipesIC2; import techreborn.compat.theoneprobe.TheOneProbeCompat; +import techreborn.compat.thermalexpansion.RecipeThermalExpansion; import techreborn.compat.tinkers.CompatModuleTinkers; import java.util.ArrayList; @@ -53,6 +54,7 @@ public class CompatManager { register(RecipesIC2.class, "ic2"); register(BuildcraftBuildersCompat.class, "buildcraftbuilders"); register(BuildcraftCompat.class, "buildcraftcore"); + register(RecipeThermalExpansion.class, "thermalexpansion"); } public void register(Class moduleClass, Object... objs) { diff --git a/src/main/java/techreborn/compat/buildcraft/BuildcraftBuildersCompat.java b/src/main/java/techreborn/compat/buildcraft/BuildcraftBuildersCompat.java index 93d33206e..2a2c83aa5 100644 --- a/src/main/java/techreborn/compat/buildcraft/BuildcraftBuildersCompat.java +++ b/src/main/java/techreborn/compat/buildcraft/BuildcraftBuildersCompat.java @@ -24,18 +24,11 @@ package techreborn.compat.buildcraft; -import buildcraft.builders.BCBuildersBlocks; -import net.minecraft.item.ItemStack; 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 reborncore.common.util.RebornCraftingHelper; -import reborncore.common.util.RecipeRemover; import techreborn.compat.ICompatModule; -import techreborn.init.ModItems; - -import static techreborn.compat.CompatConfigs.expensiveQuarry; /** * Created by Mark on 02/06/2017. @@ -54,16 +47,16 @@ public class BuildcraftBuildersCompat implements ICompatModule { @Override public void postInit(FMLPostInitializationEvent event) { - if (expensiveQuarry) { - RecipeRemover.removeAnyRecipe(new ItemStack(BCBuildersBlocks.quarry)); - RebornCraftingHelper.addShapedOreRecipe(new ItemStack(BCBuildersBlocks.quarry), - "IAI", "GIG", "DED", - 'I', "gearIron", - 'G', "gearGold", - 'D', "gearDiamond", - 'A', "circuitAdvanced", - 'E', new ItemStack(ModItems.DIAMOND_DRILL)); - } +// if (expensiveQuarry) { +// RecipeRemover.removeAnyRecipe(new ItemStack(BCBuildersBlocks.quarry)); +// RebornCraftingHelper.addShapedOreRecipe(new ItemStack(BCBuildersBlocks.quarry), +// "IAI", "GIG", "DED", +// 'I', "gearIron", +// 'G', "gearGold", +// 'D', "gearDiamond", +// 'A', "circuitAdvanced", +// 'E', new ItemStack(ModItems.DIAMOND_DRILL)); +// } } @Override diff --git a/src/main/java/techreborn/compat/buildcraft/BuildcraftCompat.java b/src/main/java/techreborn/compat/buildcraft/BuildcraftCompat.java index 53a054120..120605d75 100644 --- a/src/main/java/techreborn/compat/buildcraft/BuildcraftCompat.java +++ b/src/main/java/techreborn/compat/buildcraft/BuildcraftCompat.java @@ -24,18 +24,12 @@ package techreborn.compat.buildcraft; -import buildcraft.api.fuels.IFuel; -import buildcraft.lib.fluid.FuelRegistry; 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 reborncore.api.fuel.FluidPowerManager; -import reborncore.common.RebornCoreConfig; import techreborn.compat.ICompatModule; -import static techreborn.compat.CompatConfigs.allowBCFuels; - /** * Created by Mark on 02/06/2017. */ @@ -53,11 +47,11 @@ public class BuildcraftCompat implements ICompatModule { @Override public void postInit(FMLPostInitializationEvent event) { - if (allowBCFuels) { - for (IFuel fuel : FuelRegistry.INSTANCE.getFuels()) { - FluidPowerManager.fluidPowerValues.put(fuel.getFluid(), (double) fuel.getPowerPerCycle() / RebornCoreConfig.euPerFU); - } - } +// if (allowBCFuels) { +// for (IFuel fuel : FuelRegistry.INSTANCE.getFuels()) { +// FluidPowerManager.fluidPowerValues.put(fuel.getFluid(), (double) fuel.getPowerPerCycle() / RebornCoreConfig.euPerFU); +// } +// } } @Override diff --git a/src/main/java/techreborn/compat/thermalexpansion/RecipeThermalExpansion.java b/src/main/java/techreborn/compat/thermalexpansion/RecipeThermalExpansion.java new file mode 100644 index 000000000..141f2a25b --- /dev/null +++ b/src/main/java/techreborn/compat/thermalexpansion/RecipeThermalExpansion.java @@ -0,0 +1,63 @@ +package techreborn.compat.thermalexpansion; + +import cofh.api.util.ThermalExpansionHelper; +import cofh.thermalfoundation.item.ItemMaterial; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +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 techreborn.compat.ICompatModule; +import techreborn.init.ModItems; +import techreborn.init.recipes.RecipeMethods; +import techreborn.items.ItemDusts; +import techreborn.items.ItemPlates; + +/** + * Created by modmuss50 on 06/07/2017. + */ +public class RecipeThermalExpansion implements ICompatModule { + @Override + public void preInit(FMLPreInitializationEvent event) { + + } + + @Override + public void init(FMLInitializationEvent event) { + ThermalExpansionHelper.addPulverizerRecipe(2000, new ItemStack(Items.ENDER_PEARL), RecipeMethods.getMaterial("ender_pearl", 1, RecipeMethods.Type.DUST)); + ThermalExpansionHelper.addPulverizerRecipe(3000, new ItemStack(Items.ENDER_EYE), RecipeMethods.getMaterial("ender_eye", 2, RecipeMethods.Type.DUST)); + ThermalExpansionHelper.addPulverizerRecipe(3000, new ItemStack(Items.FLINT), RecipeMethods.getMaterial("flint", 2, RecipeMethods.Type.SMALL_DUST), RecipeMethods.getMaterial("flint", 2, RecipeMethods.Type.DUST), 10); + ThermalExpansionHelper.addPulverizerRecipe(2500, new ItemStack(ModItems.CELL), RecipeMethods.getMaterial("tin", 4, RecipeMethods.Type.SMALL_DUST)); + ThermalExpansionHelper.addPulverizerRecipe(2500, new ItemStack(Blocks.END_STONE), RecipeMethods.getMaterial("endstone", 1, RecipeMethods.Type.DUST), RecipeMethods.getMaterial("endstone", 1, RecipeMethods.Type.DUST), 10); + ThermalExpansionHelper.addPulverizerRecipe(3000, RecipeMethods.getMaterial("galena", 1, RecipeMethods.Type.ORE), RecipeMethods.getMaterial("galena", 1, RecipeMethods.Type.DUST), RecipeMethods.getMaterial("sulfur", 1, RecipeMethods.Type.DUST), 50); + ThermalExpansionHelper.addPulverizerRecipe(3000, RecipeMethods.getMaterial("ruby", 1, RecipeMethods.Type.ORE), RecipeMethods.getMaterial("ruby", 2, RecipeMethods.Type.DUST), RecipeMethods.getMaterial("red_garnet", 1, RecipeMethods.Type.DUST), 10); + ThermalExpansionHelper.addPulverizerRecipe(3000, RecipeMethods.getMaterial("sapphire", 1, RecipeMethods.Type.ORE), RecipeMethods.getMaterial("sapphire", 2, RecipeMethods.Type.DUST), RecipeMethods.getMaterial("sphalerite", 1, RecipeMethods.Type.DUST), 10); + ThermalExpansionHelper.addPulverizerRecipe(3000, RecipeMethods.getMaterial("bauxite", 1, RecipeMethods.Type.ORE), RecipeMethods.getMaterial("bauxite", 2, RecipeMethods.Type.DUST), RecipeMethods.getMaterial("aluminum", 1, RecipeMethods.Type.DUST), 10); + ThermalExpansionHelper.addPulverizerRecipe(3000, RecipeMethods.getMaterial("pyrite", 1, RecipeMethods.Type.ORE), RecipeMethods.getMaterial("pyrite", 5, RecipeMethods.Type.DUST), RecipeMethods.getMaterial("iron", 1, RecipeMethods.Type.DUST), 10); + ThermalExpansionHelper.addPulverizerRecipe(3000, RecipeMethods.getMaterial("cinnabar", 1, RecipeMethods.Type.ORE), RecipeMethods.getMaterial("cinnabar", 3, RecipeMethods.Type.DUST), new ItemStack(Items.REDSTONE), 10); + ThermalExpansionHelper.addPulverizerRecipe(4000, RecipeMethods.getMaterial("sphalerite", 1, RecipeMethods.Type.ORE), RecipeMethods.getMaterial("sphalerite", 4, RecipeMethods.Type.DUST), RecipeMethods.getMaterial("zinc", 1, RecipeMethods.Type.DUST), 10); + ThermalExpansionHelper.addPulverizerRecipe(5000, RecipeMethods.getMaterial("tungsten", 1, RecipeMethods.Type.ORE), RecipeMethods.getMaterial("tungsten", 2, RecipeMethods.Type.DUST), RecipeMethods.getMaterial("manganese", 1, RecipeMethods.Type.DUST), 10); + ThermalExpansionHelper.addPulverizerRecipe(3000, RecipeMethods.getMaterial("peridot", 1, RecipeMethods.Type.ORE), RecipeMethods.getMaterial("peridot", 2, RecipeMethods.Type.DUST), RecipeMethods.getMaterial("emerald", 1, RecipeMethods.Type.DUST), 10); + ThermalExpansionHelper.addPulverizerRecipe(3000, RecipeMethods.getMaterial("sodalite", 1, RecipeMethods.Type.ORE), RecipeMethods.getMaterial("sodalite", 12, RecipeMethods.Type.DUST), RecipeMethods.getMaterial("aluminum", 1, RecipeMethods.Type.DUST), 10); + + for(String plate : ItemPlates.types){ + if(!plate.equals(ModItems.META_PLACEHOLDER) && ItemDusts.hasDust(plate)){ + ThermalExpansionHelper.addPulverizerRecipe(5000, RecipeMethods.getMaterial(plate, 1, RecipeMethods.Type.PLATE), RecipeMethods.getMaterial(plate, 9, RecipeMethods.Type.DUST)); + } + } + + ThermalExpansionHelper.addSmelterRecipe(4000, new ItemStack(Items.IRON_INGOT, 2), new ItemStack(Blocks.SAND), RecipeMethods.getMaterial("refined_iron", 2, RecipeMethods.Type.INGOT), ItemMaterial.crystalSlag.copy(), 25); + } + + @Override + public void postInit(FMLPostInitializationEvent event) { + + } + + @Override + public void serverStarting(FMLServerStartingEvent event) { + + } +} diff --git a/src/main/java/techreborn/init/recipes/RecipeMethods.java b/src/main/java/techreborn/init/recipes/RecipeMethods.java index 91b4dd5f2..28f997224 100644 --- a/src/main/java/techreborn/init/recipes/RecipeMethods.java +++ b/src/main/java/techreborn/init/recipes/RecipeMethods.java @@ -32,6 +32,7 @@ import reborncore.common.util.OreUtil; import reborncore.common.util.StringUtils; import techreborn.blocks.BlockMachineCasing; import techreborn.blocks.BlockMachineFrames; +import techreborn.blocks.BlockOre; import techreborn.blocks.cable.BlockCable; import techreborn.init.IC2Duplicates; import techreborn.items.*; @@ -40,7 +41,7 @@ import techreborn.items.*; * Created by Prospector */ public abstract class RecipeMethods { - static ItemStack getMaterial(String name, int count, Type type) { + public static ItemStack getMaterial(String name, int count, Type type) { if (type == Type.DUST) { return ItemDusts.getDustByName(name, count); } else if (type == Type.SMALL_DUST) { @@ -65,6 +66,8 @@ public abstract class RecipeMethods { return BlockMachineCasing.getStackByName(name, count); } else if (type == Type.UPGRADE) { return ItemUpgrades.getUpgradeByName(name, count); + } else if (type == Type.ORE) { + return BlockOre.getOreByName(name, count); } return ItemStack.EMPTY; } @@ -83,6 +86,8 @@ public abstract class RecipeMethods { object = "plate" + StringUtils.toFirstCapital(name); } else if (type == Type.NUGGET) { object = "nugget" + StringUtils.toFirstCapital(name); + }else if (type == Type.ORE) { + object = "ore" + StringUtils.toFirstCapital(name); } if (object != null) { if (object instanceof String) { @@ -96,82 +101,82 @@ public abstract class RecipeMethods { return getMaterial(name, type); } - static ItemStack getMaterial(String name, Type type) { + public static ItemStack getMaterial(String name, Type type) { return getMaterial(name, 1, type); } - static Object getMaterialObject(String name, Type type) { + public static Object getMaterialObject(String name, Type type) { return getMaterialObjectFromType(name, type); } - static ItemStack getOre(String name, int count) { + public static ItemStack getOre(String name, int count) { return OreUtil.getStackFromName(name, count).copy(); } - static ItemStack getOre(String name) { + public static ItemStack getOre(String name) { return getOre(name, 1); } - static boolean oresExist(String... names) { + public static boolean oresExist(String... names) { for (String name : names) { - if (OreDictionary.getOres(name).isEmpty()) { + if (!OreDictionary.doesOreNameExist(name)) { return false; } } return true; } - static ItemStack getStack(Item item) { + public static ItemStack getStack(Item item) { return getStack(item, 1); } - static ItemStack getStack(Item item, int count) { + public static ItemStack getStack(Item item, int count) { return getStack(item, count, 0); } - static ItemStack getStack(Item item, boolean wildcard) { + public static ItemStack getStack(Item item, boolean wildcard) { return getStack(item, 1, wildcard); } - static ItemStack getStack(Item item, int count, boolean wildcard) { + public static ItemStack getStack(Item item, int count, boolean wildcard) { return getStack(item, count, wildcard ? OreDictionary.WILDCARD_VALUE : 0); } - static ItemStack getStack(Item item, int count, int metadata) { + public static ItemStack getStack(Item item, int count, int metadata) { return new ItemStack(item, count, metadata); } - static ItemStack getStack(Block block) { + public static ItemStack getStack(Block block) { return getStack(block, 1); } - static ItemStack getStack(Block block, int count) { + public static ItemStack getStack(Block block, int count) { return getStack(block, count, 0); } - static ItemStack getStack(Block block, boolean wildcard) { + public static ItemStack getStack(Block block, boolean wildcard) { return getStack(block, 1, true); } - static ItemStack getStack(Block block, int count, boolean wildcard) { + public static ItemStack getStack(Block block, int count, boolean wildcard) { return getStack(block, count, wildcard ? OreDictionary.WILDCARD_VALUE : 0); } - static ItemStack getStack(Block block, int count, int metadata) { + public static ItemStack getStack(Block block, int count, int metadata) { return getStack(Item.getItemFromBlock(block), count, metadata); } - static ItemStack getStack(IC2Duplicates ic2Duplicates) { + public static ItemStack getStack(IC2Duplicates ic2Duplicates) { return getStack(ic2Duplicates, 1); } - static ItemStack getStack(IC2Duplicates ic2Duplicates, int count) { + public static ItemStack getStack(IC2Duplicates ic2Duplicates, int count) { ItemStack stack = ic2Duplicates.getStackBasedOnConfig(); stack.setCount(count); return stack; } - enum Type { - DUST, SMALL_DUST, INGOT, NUGGET, PLATE, GEM, CELL, PART, CABLE, MACHINE_FRAME, MACHINE_CASING, UPGRADE + public enum Type { + DUST, SMALL_DUST, INGOT, NUGGET, PLATE, GEM, CELL, PART, CABLE, MACHINE_FRAME, MACHINE_CASING, UPGRADE, ORE } } diff --git a/src/main/java/techreborn/items/ItemDusts.java b/src/main/java/techreborn/items/ItemDusts.java index a93088469..a6a59a691 100644 --- a/src/main/java/techreborn/items/ItemDusts.java +++ b/src/main/java/techreborn/items/ItemDusts.java @@ -79,6 +79,16 @@ public class ItemDusts extends ItemTR { return getDustByName(name, 1); } + public static boolean hasDust(String name){ + for(String type : types){ + if(type.equals(name)){ + return true; + } + } + return false; + } + + @Override // gets Unlocalized Name depending on meta data public String getUnlocalizedName(ItemStack itemStack) {