The Great Refactor of 2017 - Remove old Plate Cutting Machine stuff, move UU matter and cable recipes over, fix industrial grinder eu usage, clean up EnumStandaloneCableType, move Fluid Generator, Rolling Machine, Scrapbox, and Smelting recipes over. Add some alternative rolling recipes for metal recipes that are more efficient.

This commit is contained in:
ProfessorProspector 2017-01-04 14:19:41 -08:00
parent 1215c47fc2
commit 2ad33bd6a9
12 changed files with 496 additions and 588 deletions

View file

@ -12,7 +12,7 @@ public class IndustrialGrinderRecipe extends BaseRecipe {
public IndustrialGrinderRecipe(ItemStack input1, FluidStack fluidStack, ItemStack output1,
ItemStack output2, ItemStack output3, ItemStack output4, int tickTime, int euPerTick) {
super(Reference.industrialGrinderRecipe, tickTime, (int) (euPerTick / 2.5)); // Buff energy usage to be more in line with other machines
super(Reference.industrialGrinderRecipe, tickTime, euPerTick);
if (input1 != null)
addInput(input1);
if (output1 != null)

View file

@ -1,21 +0,0 @@
package techreborn.api.recipe.machines;
import net.minecraft.item.ItemStack;
import techreborn.api.Reference;
import techreborn.api.recipe.BaseRecipe;
public class PlateCuttingMachineRecipe extends BaseRecipe {
public PlateCuttingMachineRecipe(ItemStack input1, ItemStack output1, int tickTime, int euPerTick) {
super(Reference.plateCuttingMachineRecipe, tickTime, euPerTick);
if (input1 != null)
addInput(input1);
if (output1 != null)
addOutput(output1);
}
@Override
public String getUserFreindlyName() {
return "Plate Cutting Machine";
}
}

View file

@ -1,36 +0,0 @@
package techreborn.compat.minetweaker;
import minetweaker.MineTweakerAPI;
import minetweaker.api.item.IIngredient;
import minetweaker.api.item.IItemStack;
import net.minecraft.item.ItemStack;
import stanhebben.zenscript.annotations.ZenClass;
import stanhebben.zenscript.annotations.ZenMethod;
import techreborn.api.Reference;
import techreborn.api.recipe.machines.PlateCuttingMachineRecipe;
@ZenClass("mods.techreborn.plateCuttingMachine")
public class MTPlateCuttingMachine extends MTGeneric {
@ZenMethod
public static void addRecipe(IItemStack output, IIngredient input1, int ticktime, int euTick) {
ItemStack oInput1 = (ItemStack) MinetweakerCompat.toObject(input1);
PlateCuttingMachineRecipe r = new PlateCuttingMachineRecipe(oInput1, MinetweakerCompat.toStack(output), ticktime, euTick);
addRecipe(r);
}
@ZenMethod
public static void removeInputRecipe(IIngredient iIngredient) {
MineTweakerAPI.apply(new RemoveInput(iIngredient, getMachineName()));
}
@ZenMethod
public static void removeRecipe(IItemStack output) {
MineTweakerAPI.apply(new Remove(MinetweakerCompat.toStack(output), getMachineName()));
}
public static String getMachineName() {
return Reference.plateCuttingMachineRecipe;
}
}

View file

@ -19,40 +19,6 @@ import static minetweaker.api.minecraft.MineTweakerMC.getItemStack;
import static minetweaker.api.minecraft.MineTweakerMC.getLiquidStack;
public class MinetweakerCompat implements ICompatModule {
@Override
public void preInit(FMLPreInitializationEvent event) {
}
@Override
public void init(FMLInitializationEvent event) {
}
@Override
public void postInit(FMLPostInitializationEvent event) {
MineTweakerAPI.registerClass(MTAlloySmelter.class);
MineTweakerAPI.registerClass(MTAssemblingMachine.class);
MineTweakerAPI.registerClass(MTBlastFurnace.class);
MineTweakerAPI.registerClass(MTCentrifuge.class);
MineTweakerAPI.registerClass(MTChemicalReactor.class);
MineTweakerAPI.registerClass(MTCompressor.class);
MineTweakerAPI.registerClass(MTIndustrialGrinder.class);
MineTweakerAPI.registerClass(MTImplosionCompressor.class);
MineTweakerAPI.registerClass(MTIndustrialElectrolyzer.class);
MineTweakerAPI.registerClass(MTIndustrialSawmill.class);
MineTweakerAPI.registerClass(MTPlateCuttingMachine.class);
MineTweakerAPI.registerClass(MTFusionReactor.class);
MineTweakerAPI.registerClass(MTVacuumFreezer.class);
MineTweakerAPI.registerClass(MTGenerator.class);
MineTweakerAPI.registerClass(MTRollingMachine.class);
}
@Override
public void serverStarting(FMLServerStartingEvent event) {
}
public static ItemStack toStack(IItemStack iStack) {
return getItemStack(iStack);
}
@ -77,4 +43,37 @@ public class MinetweakerCompat implements ICompatModule {
return getLiquidStack(iStack);
}
@Override
public void preInit(FMLPreInitializationEvent event) {
}
@Override
public void init(FMLInitializationEvent event) {
}
@Override
public void postInit(FMLPostInitializationEvent event) {
MineTweakerAPI.registerClass(MTAlloySmelter.class);
MineTweakerAPI.registerClass(MTAssemblingMachine.class);
MineTweakerAPI.registerClass(MTBlastFurnace.class);
MineTweakerAPI.registerClass(MTCentrifuge.class);
MineTweakerAPI.registerClass(MTChemicalReactor.class);
MineTweakerAPI.registerClass(MTCompressor.class);
MineTweakerAPI.registerClass(MTIndustrialGrinder.class);
MineTweakerAPI.registerClass(MTImplosionCompressor.class);
MineTweakerAPI.registerClass(MTIndustrialElectrolyzer.class);
MineTweakerAPI.registerClass(MTIndustrialSawmill.class);
MineTweakerAPI.registerClass(MTFusionReactor.class);
MineTweakerAPI.registerClass(MTVacuumFreezer.class);
MineTweakerAPI.registerClass(MTGenerator.class);
MineTweakerAPI.registerClass(MTRollingMachine.class);
}
@Override
public void serverStarting(FMLServerStartingEvent event) {
}
}

View file

@ -1,15 +1,10 @@
package techreborn.init;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import net.minecraft.block.Block;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.common.ForgeModContainer;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.UniversalBucket;
import net.minecraftforge.fml.common.Loader;
import net.minecraftforge.oredict.OreDictionary;
@ -18,28 +13,15 @@ import reborncore.common.util.CraftingHelper;
import reborncore.common.util.OreUtil;
import reborncore.common.util.StringUtils;
import techreborn.Core;
import techreborn.api.ScrapboxList;
import techreborn.api.TechRebornAPI;
import techreborn.api.generator.EFluidGenerator;
import techreborn.api.generator.GeneratorRecipeHelper;
import techreborn.api.reactor.FusionReactorRecipe;
import techreborn.api.reactor.FusionReactorRecipeHelper;
import techreborn.api.recipe.RecyclerRecipe;
import techreborn.api.recipe.ScrapboxRecipe;
import techreborn.api.recipe.machines.*;
import techreborn.blocks.BlockMachineFrame;
import techreborn.blocks.BlockOre;
import techreborn.blocks.BlockOre2;
import techreborn.compat.CompatManager;
import techreborn.config.ConfigTechReborn;
import techreborn.init.recipes.*;
import techreborn.items.*;
import techreborn.parts.powerCables.ItemStandaloneCables;
import techreborn.utils.StackWIPHandler;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import static techreborn.utils.OreDictUtils.getDictData;
import static techreborn.utils.OreDictUtils.getDictOreOrEmpty;
@ -60,20 +42,20 @@ public class ModRecipes {
CompatManager.isQuantumStorageLoaded = Loader.isModLoaded("quantumstorage");
CraftingTableRecipes.init();
SmeltingRecipes.init();
ExtractorRecipes.init();
RollingMachineRecipes.init();
FluidGeneratorRecipes.init();
IndustrialGrinderRecipes.init();
IndustrialCentrifugeRecipes.init();
IndustrialElectrolyzerRecipes.init();
ImplosionCompressorRecipes.init();
ScrapboxRecipes.init();
addGeneralShapedRecipes();
addMachineRecipes();
addSmeltingRecipes();
addUUrecipes();
addAlloySmelterRecipes();
addPlateCuttingMachineRecipes();
addChemicalReactorRecipes();
addBlastFurnaceRecipes();
@ -83,265 +65,6 @@ public class ModRecipes {
addIc2Recipes();
addGrinderRecipes();
addCompressorRecipes();
if (!IC2Duplicates.deduplicate()) {
addWireRecipes();
}
addScrapBoxloot();
addFluidGeneratorRecipes();
}
static void addScrapBoxloot() {
ScrapboxList.addItemStackToList(new ItemStack(Items.DIAMOND));
ScrapboxList.addItemStackToList(new ItemStack(Items.STICK));
ScrapboxList.addItemStackToList(new ItemStack(Items.COAL));
ScrapboxList.addItemStackToList(new ItemStack(Items.APPLE));
ScrapboxList.addItemStackToList(new ItemStack(Items.BAKED_POTATO));
ScrapboxList.addItemStackToList(new ItemStack(Items.BLAZE_POWDER));
ScrapboxList.addItemStackToList(new ItemStack(Items.WHEAT));
ScrapboxList.addItemStackToList(new ItemStack(Items.CARROT));
ScrapboxList.addItemStackToList(new ItemStack(Items.BOAT));
ScrapboxList.addItemStackToList(new ItemStack(Items.ACACIA_BOAT));
ScrapboxList.addItemStackToList(new ItemStack(Items.BIRCH_BOAT));
ScrapboxList.addItemStackToList(new ItemStack(Items.DARK_OAK_BOAT));
ScrapboxList.addItemStackToList(new ItemStack(Items.JUNGLE_BOAT));
ScrapboxList.addItemStackToList(new ItemStack(Items.SPRUCE_BOAT));
ScrapboxList.addItemStackToList(new ItemStack(Items.BLAZE_ROD));
ScrapboxList.addItemStackToList(new ItemStack(Items.COMPASS));
ScrapboxList.addItemStackToList(new ItemStack(Items.MAP));
ScrapboxList.addItemStackToList(new ItemStack(Items.LEATHER_LEGGINGS));
ScrapboxList.addItemStackToList(new ItemStack(Items.BOW));
ScrapboxList.addItemStackToList(new ItemStack(Items.COOKED_CHICKEN));
ScrapboxList.addItemStackToList(new ItemStack(Items.CAKE));
ScrapboxList.addItemStackToList(new ItemStack(Items.ACACIA_DOOR));
ScrapboxList.addItemStackToList(new ItemStack(Items.DARK_OAK_DOOR));
ScrapboxList.addItemStackToList(new ItemStack(Items.BIRCH_DOOR));
ScrapboxList.addItemStackToList(new ItemStack(Items.JUNGLE_DOOR));
ScrapboxList.addItemStackToList(new ItemStack(Items.OAK_DOOR));
ScrapboxList.addItemStackToList(new ItemStack(Items.SPRUCE_DOOR));
ScrapboxList.addItemStackToList(new ItemStack(Items.WOODEN_AXE));
ScrapboxList.addItemStackToList(new ItemStack(Items.WOODEN_HOE));
ScrapboxList.addItemStackToList(new ItemStack(Items.WOODEN_PICKAXE));
ScrapboxList.addItemStackToList(new ItemStack(Items.WOODEN_SHOVEL));
ScrapboxList.addItemStackToList(new ItemStack(Items.WOODEN_SWORD));
ScrapboxList.addItemStackToList(new ItemStack(Items.BED));
ScrapboxList.addItemStackToList(new ItemStack(Items.SKULL, 1, 0));
ScrapboxList.addItemStackToList(new ItemStack(Items.SKULL, 1, 2));
ScrapboxList.addItemStackToList(new ItemStack(Items.SKULL, 1, 4));
for (int i = 0; i < StackWIPHandler.devHeads.size(); i++)
ScrapboxList.addItemStackToList(StackWIPHandler.devHeads.get(i));
ScrapboxList.addItemStackToList(new ItemStack(Items.DYE, 1, 3));
ScrapboxList.addItemStackToList(new ItemStack(Items.GLOWSTONE_DUST));
ScrapboxList.addItemStackToList(new ItemStack(Items.STRING));
ScrapboxList.addItemStackToList(new ItemStack(Items.MINECART));
ScrapboxList.addItemStackToList(new ItemStack(Items.CHEST_MINECART));
ScrapboxList.addItemStackToList(new ItemStack(Items.HOPPER_MINECART));
ScrapboxList.addItemStackToList(new ItemStack(Items.PRISMARINE_SHARD));
ScrapboxList.addItemStackToList(new ItemStack(Items.SHEARS));
ScrapboxList.addItemStackToList(new ItemStack(Items.EXPERIENCE_BOTTLE));
ScrapboxList.addItemStackToList(new ItemStack(Items.BONE));
ScrapboxList.addItemStackToList(new ItemStack(Items.BOWL));
ScrapboxList.addItemStackToList(new ItemStack(Items.BRICK));
ScrapboxList.addItemStackToList(new ItemStack(Items.FISHING_ROD));
ScrapboxList.addItemStackToList(new ItemStack(Items.BOOK));
ScrapboxList.addItemStackToList(new ItemStack(Items.PAPER));
ScrapboxList.addItemStackToList(new ItemStack(Items.SUGAR));
ScrapboxList.addItemStackToList(new ItemStack(Items.REEDS));
ScrapboxList.addItemStackToList(new ItemStack(Items.SPIDER_EYE));
ScrapboxList.addItemStackToList(new ItemStack(Items.SLIME_BALL));
ScrapboxList.addItemStackToList(new ItemStack(Items.ROTTEN_FLESH));
ScrapboxList.addItemStackToList(new ItemStack(Items.SIGN));
ScrapboxList.addItemStackToList(new ItemStack(Items.WRITABLE_BOOK));
ScrapboxList.addItemStackToList(new ItemStack(Items.COOKED_BEEF));
ScrapboxList.addItemStackToList(new ItemStack(Items.NAME_TAG));
ScrapboxList.addItemStackToList(new ItemStack(Items.SADDLE));
ScrapboxList.addItemStackToList(new ItemStack(Items.REDSTONE));
ScrapboxList.addItemStackToList(new ItemStack(Items.GUNPOWDER));
ScrapboxList.addItemStackToList(new ItemStack(Items.RABBIT_HIDE));
ScrapboxList.addItemStackToList(new ItemStack(Items.RABBIT_FOOT));
ScrapboxList.addItemStackToList(new ItemStack(Items.APPLE));
ScrapboxList.addItemStackToList(new ItemStack(Items.GOLDEN_APPLE));
ScrapboxList.addItemStackToList(new ItemStack(Items.GOLD_NUGGET));
ScrapboxList.addItemStackToList(ItemCells.getCellByName("empty"));
ScrapboxList.addItemStackToList(ItemCells.getCellByName("water"));
ScrapboxList.addItemStackToList(ItemParts.getPartByName("scrap"));
ScrapboxList.addItemStackToList(ItemParts.getPartByName("rubber"));
ScrapboxList.addItemStackToList(new ItemStack(Blocks.TRAPDOOR));
ScrapboxList.addItemStackToList(new ItemStack(Blocks.STONE_BUTTON));
ScrapboxList.addItemStackToList(new ItemStack(Blocks.WOODEN_BUTTON));
ScrapboxList.addItemStackToList(new ItemStack(Blocks.ACACIA_FENCE));
ScrapboxList.addItemStackToList(new ItemStack(Blocks.ACACIA_FENCE_GATE));
ScrapboxList.addItemStackToList(new ItemStack(Blocks.BIRCH_FENCE));
ScrapboxList.addItemStackToList(new ItemStack(Blocks.BIRCH_FENCE_GATE));
ScrapboxList.addItemStackToList(new ItemStack(Blocks.DARK_OAK_FENCE));
ScrapboxList.addItemStackToList(new ItemStack(Blocks.DARK_OAK_FENCE_GATE));
ScrapboxList.addItemStackToList(new ItemStack(Blocks.JUNGLE_FENCE));
ScrapboxList.addItemStackToList(new ItemStack(Blocks.JUNGLE_FENCE_GATE));
ScrapboxList.addItemStackToList(new ItemStack(Blocks.NETHER_BRICK_FENCE));
ScrapboxList.addItemStackToList(new ItemStack(Blocks.OAK_FENCE));
ScrapboxList.addItemStackToList(new ItemStack(Blocks.OAK_FENCE_GATE));
ScrapboxList.addItemStackToList(new ItemStack(Blocks.SPRUCE_FENCE));
ScrapboxList.addItemStackToList(new ItemStack(Blocks.SPRUCE_FENCE_GATE));
ScrapboxList.addItemStackToList(new ItemStack(Blocks.BRICK_BLOCK));
ScrapboxList.addItemStackToList(new ItemStack(Blocks.CRAFTING_TABLE));
ScrapboxList.addItemStackToList(new ItemStack(Blocks.PUMPKIN));
ScrapboxList.addItemStackToList(new ItemStack(Blocks.NETHERRACK));
ScrapboxList.addItemStackToList(new ItemStack(Blocks.GRASS));
ScrapboxList.addItemStackToList(new ItemStack(Blocks.DIRT, 1, 0));
ScrapboxList.addItemStackToList(new ItemStack(Blocks.DIRT, 1, 1));
ScrapboxList.addItemStackToList(new ItemStack(Blocks.SAND, 1, 0));
ScrapboxList.addItemStackToList(new ItemStack(Blocks.SAND, 1, 1));
ScrapboxList.addItemStackToList(new ItemStack(Blocks.GLOWSTONE));
ScrapboxList.addItemStackToList(new ItemStack(Blocks.GRAVEL));
ScrapboxList.addItemStackToList(new ItemStack(Blocks.HARDENED_CLAY));
ScrapboxList.addItemStackToList(new ItemStack(Blocks.GLASS));
ScrapboxList.addItemStackToList(new ItemStack(Blocks.GLASS_PANE));
ScrapboxList.addItemStackToList(new ItemStack(Blocks.CACTUS));
ScrapboxList.addItemStackToList(new ItemStack(Blocks.TALLGRASS, 1, 0));
ScrapboxList.addItemStackToList(new ItemStack(Blocks.TALLGRASS, 1, 1));
ScrapboxList.addItemStackToList(new ItemStack(Blocks.DEADBUSH));
ScrapboxList.addItemStackToList(new ItemStack(Blocks.CHEST));
ScrapboxList.addItemStackToList(new ItemStack(Blocks.TNT));
ScrapboxList.addItemStackToList(new ItemStack(Blocks.RAIL));
ScrapboxList.addItemStackToList(new ItemStack(Blocks.DETECTOR_RAIL));
ScrapboxList.addItemStackToList(new ItemStack(Blocks.GOLDEN_RAIL));
ScrapboxList.addItemStackToList(new ItemStack(Blocks.ACTIVATOR_RAIL));
ScrapboxList.addItemStackToList(new ItemStack(Blocks.YELLOW_FLOWER));
ScrapboxList.addItemStackToList(new ItemStack(Blocks.RED_FLOWER, 1, 0));
ScrapboxList.addItemStackToList(new ItemStack(Blocks.RED_FLOWER, 1, 1));
ScrapboxList.addItemStackToList(new ItemStack(Blocks.RED_FLOWER, 1, 2));
ScrapboxList.addItemStackToList(new ItemStack(Blocks.RED_FLOWER, 1, 3));
ScrapboxList.addItemStackToList(new ItemStack(Blocks.RED_FLOWER, 1, 4));
ScrapboxList.addItemStackToList(new ItemStack(Blocks.RED_FLOWER, 1, 5));
ScrapboxList.addItemStackToList(new ItemStack(Blocks.RED_FLOWER, 1, 6));
ScrapboxList.addItemStackToList(new ItemStack(Blocks.RED_FLOWER, 1, 7));
ScrapboxList.addItemStackToList(new ItemStack(Blocks.RED_FLOWER, 1, 8));
ScrapboxList.addItemStackToList(new ItemStack(Blocks.BROWN_MUSHROOM));
ScrapboxList.addItemStackToList(new ItemStack(Blocks.RED_MUSHROOM));
ScrapboxList.addItemStackToList(new ItemStack(Blocks.BROWN_MUSHROOM_BLOCK));
ScrapboxList.addItemStackToList(new ItemStack(Blocks.RED_MUSHROOM_BLOCK));
ScrapboxList.addItemStackToList(new ItemStack(Blocks.SAPLING, 1, 0));
ScrapboxList.addItemStackToList(new ItemStack(Blocks.SAPLING, 1, 1));
ScrapboxList.addItemStackToList(new ItemStack(Blocks.SAPLING, 1, 2));
ScrapboxList.addItemStackToList(new ItemStack(Blocks.SAPLING, 1, 3));
ScrapboxList.addItemStackToList(new ItemStack(Blocks.SAPLING, 1, 4));
ScrapboxList.addItemStackToList(new ItemStack(Blocks.SAPLING, 1, 5));
ScrapboxList.addItemStackToList(new ItemStack(Blocks.LEAVES, 1, 0));
ScrapboxList.addItemStackToList(new ItemStack(Blocks.LEAVES, 1, 1));
ScrapboxList.addItemStackToList(new ItemStack(Blocks.LEAVES, 1, 2));
ScrapboxList.addItemStackToList(new ItemStack(Blocks.LEAVES, 1, 3));
ScrapboxList.addItemStackToList(new ItemStack(Blocks.LEAVES2, 1, 0));
ScrapboxList.addItemStackToList(new ItemStack(Blocks.LEAVES2, 1, 1));
ScrapboxList.addItemStackToList(new ItemStack(ModBlocks.RUBBER_SAPLING));
for (String i : ItemDusts.types) {
if (!i.equals(ModItems.META_PLACEHOLDER)) {
ScrapboxList.addItemStackToList(ItemDusts.getDustByName(i));
}
}
for (String i : ItemNuggets.types) {
if (!i.equals(ModItems.META_PLACEHOLDER)) {
ScrapboxList.addItemStackToList(ItemNuggets.getNuggetByName(i));
}
}
for (String i : ItemGems.types) {
if (!i.equals(ModItems.META_PLACEHOLDER)) {
ScrapboxList.addItemStackToList(ItemGems.getGemByName(i));
}
}
registerDyable(Blocks.CARPET);
registerDyable(Blocks.STAINED_GLASS);
registerDyable(Blocks.STAINED_GLASS_PANE);
registerDyable(Blocks.STAINED_HARDENED_CLAY);
for (int i = 0; i < ScrapboxList.stacks.size(); i++) {
RecipeHandler.addRecipe(new ScrapboxRecipe(ScrapboxList.stacks.get(i)));
}
boolean showAllItems = false;
if (showAllItems) {
//This is bad, laggy and slow
List<Item> items = Lists
.newArrayList(Iterables.filter(Item.REGISTRY, item -> item.getRegistryName() != null));
Collections.sort(items,
(i1, i2) -> i1.getRegistryName().toString().compareTo(i2.getRegistryName().toString()));
for (Item item : items) {
List<ItemStack> stacks = new ArrayList<>();
if (item.getHasSubtypes()) {
for (int i = 0; i < item.getMaxDamage(); i++) {
stacks.add(new ItemStack(item, 1, i));
}
} else {
stacks.add(new ItemStack(item, 1, 0));
}
for (ItemStack stack : stacks) {
RecipeHandler.addRecipe(new RecyclerRecipe(stack));
}
}
} else {
for (int i = 0; i < ScrapboxList.stacks.size(); i++) {
RecipeHandler.addRecipe(new RecyclerRecipe(ScrapboxList.stacks.get(i)));
}
}
}
static void registerMetadataItem(ItemStack item) {
for (int i = 0; i < item.getItem().getMaxDamage(); i++) {
ScrapboxList.addItemStackToList(new ItemStack(item.getItem(), 1, i));
}
}
static void registerDyable(Block block) {
for (int i = 0; i < 16; i++)
ScrapboxList.stacks.add(new ItemStack(block, 1, i));
}
static void addWireRecipes() {
CraftingHelper.addShapedOreRecipe(ItemStandaloneCables.getCableByName("copper", 6), "CCC", 'C', "ingotCopper");
CraftingHelper.addShapedOreRecipe(ItemStandaloneCables.getCableByName("tin", 9), "CCC", 'C', "ingotTin");
CraftingHelper.addShapedOreRecipe(ItemStandaloneCables.getCableByName("gold", 12), "CCC", 'C', "ingotGold");
CraftingHelper
.addShapedOreRecipe(ItemStandaloneCables.getCableByName("hv", 12), "CCC", 'C', IC2Duplicates.REFINED_IRON.getStackBasedOnConfig());
CraftingHelper
.addShapedOreRecipe(ItemStandaloneCables.getCableByName("glassfiber", 4), "GGG", "SDS", "GGG", 'G',
"blockGlass", 'S', "dustRedstone", 'D', "gemDiamond");
CraftingHelper
.addShapedOreRecipe(ItemStandaloneCables.getCableByName("glassfiber", 6), "GGG", "SDS", "GGG", 'G',
"blockGlass", 'S', "dustRedstone", 'D', "gemRuby");
CraftingHelper
.addShapedOreRecipe(ItemStandaloneCables.getCableByName("glassfiber", 6), "GGG", "SDS", "GGG", 'G',
"blockGlass", 'S', "ingotSilver", 'D', "gemDiamond");
CraftingHelper
.addShapedOreRecipe(ItemStandaloneCables.getCableByName("glassfiber", 8), "GGG", "SDS", "GGG", 'G',
"blockGlass", 'S', "ingotElectrum", 'D', "gemDiamond");
CraftingHelper.addShapelessOreRecipe(IC2Duplicates.CABLE_ICOPPER.getStackBasedOnConfig(), "itemRubber",
ItemStandaloneCables.getCableByName("copper"));
CraftingHelper.addShapelessOreRecipe(IC2Duplicates.CABLE_IGOLD.getStackBasedOnConfig(), "itemRubber",
"itemRubber", ItemStandaloneCables.getCableByName("gold"));
CraftingHelper.addShapelessOreRecipe(IC2Duplicates.CABLE_IHV.getStackBasedOnConfig(), "itemRubber",
"itemRubber", ItemStandaloneCables.getCableByName("hv"));
CraftingHelper
.addShapedOreRecipe(ItemStandaloneCables.getCableByName("insulatedcopper", 6), "RRR", "III", "RRR", 'R',
"itemRubber", 'I', "ingotCopper");
CraftingHelper
.addShapedOreRecipe(ItemStandaloneCables.getCableByName("insulatedgold", 4), "RRR", "RIR", "RRR", 'R',
"itemRubber", 'I', "ingotGold");
CraftingHelper
.addShapedOreRecipe(IC2Duplicates.CABLE_IHV.getStackBasedOnConfig(), "RRR", "RIR", "RRR", 'R',
"itemRubber", 'I', "ingotRefinedIron");
}
private static void addCompressorRecipes() {
@ -642,12 +365,6 @@ public class ModRecipes {
}
}
CraftingHelper.addShapedOreRecipe(ItemParts.getPartByName("nichromeHeatingCoil"), " N ", "NCN", " N ", 'N',
"ingotNickel", 'C', "ingotChrome");
CraftingHelper.addShapedOreRecipe(ItemParts.getPartByName("kanthalHeatingCoil"), "III", "CAA", "AAA", 'I',
"ingotSteel", 'C', "ingotChrome", 'A', "ingotAluminum");
CraftingHelper.addShapedOreRecipe(ItemParts.getPartByName("heliumCoolantSimple"), " T ", "TCT", " T ", 'T',
"ingotTin", 'C', ItemCells.getCellByName("helium", 1));
@ -794,10 +511,6 @@ public class ModRecipes {
.addShapedOreRecipe(new ItemStack(ModBlocks.LSU_STORAGE_BLOCK), "LLL", "LCL", "LLL", 'L', "blockLapis", 'C',
"circuitBasic");
TechRebornAPI
.addRollingOreMachinceRecipe(ItemParts.getPartByName("cupronickelHeatingCoil", 3), "NCN", "C C", "NCN",
'N', "ingotNickel", 'C', "ingotCopper");
RecipeHandler.addRecipe(new VacuumFreezerRecipe(ItemIngots.getIngotByName("hot_tungstensteel"),
ItemIngots.getIngotByName("tungstensteel"), 440, 128));
@ -833,26 +546,6 @@ public class ModRecipes {
60, 87));
}
static void addSmeltingRecipes() {
CraftingHelper.addSmelting(ItemDusts.getDustByName("iron", 1), new ItemStack(Items.IRON_INGOT), 1F);
CraftingHelper.addSmelting(ItemDusts.getDustByName("gold", 1), new ItemStack(Items.GOLD_INGOT), 1F);
CraftingHelper.addSmelting(ItemParts.getPartByName("rubberSap"), ItemParts.getPartByName("rubber"), 1F);
if (!IC2Duplicates.deduplicate()) {
CraftingHelper.addSmelting(new ItemStack(Items.IRON_INGOT), ItemIngots.getIngotByName("refined_iron"), 1F);
}
CraftingHelper.addSmelting(BlockOre2.getOreByName("copper"), ItemIngots.getIngotByName("copper"), 1F);
CraftingHelper.addSmelting(BlockOre2.getOreByName("tin"), ItemIngots.getIngotByName("tin"), 1F);
CraftingHelper.addSmelting(BlockOre.getOreByName("Silver"), ItemIngots.getIngotByName("silver"), 1F);
CraftingHelper.addSmelting(BlockOre.getOreByName("Lead"), ItemIngots.getIngotByName("lead"), 1F);
CraftingHelper.addSmelting(BlockOre.getOreByName("Sheldonite"), ItemIngots.getIngotByName("platinum"), 1F);
CraftingHelper
.addSmelting(IC2Duplicates.MIXED_METAL.getStackBasedOnConfig(), ItemIngots.getIngotByName("advancedAlloy"), 1F);
CraftingHelper.addSmelting(ItemDusts.getDustByName("nickel", 1), ItemIngots.getIngotByName("nickel"), 1F);
CraftingHelper.addSmelting(ItemDusts.getDustByName("platinum", 1), ItemIngots.getIngotByName("platinum"), 1F);
CraftingHelper.addSmelting(ItemDusts.getDustByName("zinc", 1), ItemIngots.getIngotByName("zinc"), 1F);
Core.logHelper.info("Smelting Recipes Added");
}
static void addAlloySmelterRecipes() {
// Bronze
@ -1032,22 +725,6 @@ public class ModRecipes {
}
static void addPlateCuttingMachineRecipes() {
for (String ore : OreUtil.oreNames) {
if (OreUtil.hasBlock(ore) && OreUtil.hasPlate(ore)) {
RecipeHandler.addRecipe(new PlateCuttingMachineRecipe(
OreUtil.getStackFromName("block" + StringUtils.toFirstCapital(ore)),
OreUtil.getStackFromName("plate" + StringUtils.toFirstCapital(ore), 9), 200, 16));
}
}
// Obsidian
RecipeHandler.addRecipe(
new PlateCuttingMachineRecipe(new ItemStack(Blocks.OBSIDIAN), ItemPlates.getPlateByName("obsidian", 9),
100, 4));
}
static void addBlastFurnaceRecipes() {
RecipeHandler.addRecipe(
new BlastFurnaceRecipe(ItemDusts.getDustByName("titanium"), null, ItemIngots.getIngotByName("titanium"),
@ -1097,144 +774,6 @@ public class ModRecipes {
new ItemStack(Items.IRON_INGOT, 2), ItemDusts.getDustByName("dark_ashes"), 140, 120, 1000));
}
static void addUUrecipes() {
if (ConfigTechReborn.UUrecipesWood)
CraftingHelper
.addShapedOreRecipe(new ItemStack(Blocks.LOG, 8), " U ", " ", " ", 'U', ModItems.UU_MATTER);
if (ConfigTechReborn.UUrecipesStone)
CraftingHelper
.addShapedOreRecipe(new ItemStack(Blocks.STONE, 16), " ", " U ", " ", 'U', ModItems.UU_MATTER);
if (ConfigTechReborn.UUrecipesSnowBlock)
CraftingHelper
.addShapedOreRecipe(new ItemStack(Blocks.SNOW, 16), "U U", " ", " ", 'U', ModItems.UU_MATTER);
if (ConfigTechReborn.UUrecipesGrass)
CraftingHelper
.addShapedOreRecipe(new ItemStack(Blocks.GRASS, 16), " ", "U ", "U ", 'U', ModItems.UU_MATTER);
if (ConfigTechReborn.UUrecipesObsidian)
CraftingHelper.addShapedOreRecipe(new ItemStack(Blocks.OBSIDIAN, 12), "U U", "U U", " ", 'U',
ModItems.UU_MATTER);
if (ConfigTechReborn.UUrecipesGlass)
CraftingHelper
.addShapedOreRecipe(new ItemStack(Blocks.GLASS, 32), " U ", "U U", " U ", 'U', ModItems.UU_MATTER);
if (ConfigTechReborn.UUrecipesCocoa)
CraftingHelper
.addShapedOreRecipe(new ItemStack(Items.DYE, 32, 3), "UU ", " U", "UU ", 'U', ModItems.UU_MATTER);
if (ConfigTechReborn.UUrecipesGlowstoneBlock)
CraftingHelper.addShapedOreRecipe(new ItemStack(Blocks.GLOWSTONE, 8), " U ", "U U", "UUU", 'U',
ModItems.UU_MATTER);
if (ConfigTechReborn.UUrecipesCactus)
CraftingHelper
.addShapedOreRecipe(new ItemStack(Blocks.CACTUS, 48), " U ", "UUU", "U U", 'U', ModItems.UU_MATTER);
if (ConfigTechReborn.UUrecipesSugarCane)
CraftingHelper
.addShapedOreRecipe(new ItemStack(Items.REEDS, 48), "U U", "U U", "U U", 'U', ModItems.UU_MATTER);
if (ConfigTechReborn.UUrecipesVine)
CraftingHelper
.addShapedOreRecipe(new ItemStack(Blocks.VINE, 24), "U ", "U ", "U ", 'U', ModItems.UU_MATTER);
if (ConfigTechReborn.UUrecipesSnowBall)
CraftingHelper
.addShapedOreRecipe(new ItemStack(Items.SNOWBALL, 16), " ", " ", "UUU", 'U', ModItems.UU_MATTER);
CraftingHelper
.addShapedOreRecipe(new ItemStack(Items.CLAY_BALL, 48), "UU ", "U ", "UU ", 'U', ModItems.UU_MATTER);
if (ConfigTechReborn.UUrecipeslilypad)
CraftingHelper.addShapedOreRecipe(new ItemStack(Blocks.WATERLILY, 64), "U U", " U ", " U ", 'U',
ModItems.UU_MATTER);
if (ConfigTechReborn.UUrecipesGunpowder)
CraftingHelper.addShapedOreRecipe(new ItemStack(Items.GUNPOWDER, 15), "UUU", "U ", "UUU", 'U',
ModItems.UU_MATTER);
if (ConfigTechReborn.UUrecipesBone)
CraftingHelper
.addShapedOreRecipe(new ItemStack(Items.BONE, 32), "U ", "UU ", "U ", 'U', ModItems.UU_MATTER);
if (ConfigTechReborn.UUrecipesFeather)
CraftingHelper
.addShapedOreRecipe(new ItemStack(Items.FEATHER, 32), " U ", " U ", "U U", 'U', ModItems.UU_MATTER);
if (ConfigTechReborn.UUrecipesInk)
CraftingHelper
.addShapedOreRecipe(new ItemStack(Items.DYE, 48), " UU", " UU", " U ", 'U', ModItems.UU_MATTER);
if (ConfigTechReborn.UUrecipesEnderPearl)
CraftingHelper.addShapedOreRecipe(new ItemStack(Items.ENDER_PEARL, 1), "UUU", "U U", " U ", 'U',
ModItems.UU_MATTER);
if (ConfigTechReborn.UUrecipesCoal)
CraftingHelper
.addShapedOreRecipe(new ItemStack(Items.COAL, 5), " U", "U ", " U", 'U', ModItems.UU_MATTER);
if (ConfigTechReborn.UUrecipesIronOre)
CraftingHelper
.addShapedOreRecipe(new ItemStack(Blocks.IRON_ORE, 2), "U U", " U ", "U U", 'U', ModItems.UU_MATTER);
if (ConfigTechReborn.UUrecipesGoldOre)
CraftingHelper
.addShapedOreRecipe(new ItemStack(Blocks.GOLD_ORE, 2), " U ", "UUU", " U ", 'U', ModItems.UU_MATTER);
if (ConfigTechReborn.UUrecipesRedStone)
CraftingHelper
.addShapedOreRecipe(new ItemStack(Items.REDSTONE, 24), " ", " U ", "UUU", 'U', ModItems.UU_MATTER);
if (ConfigTechReborn.UUrecipesLapis)
CraftingHelper
.addShapedOreRecipe(new ItemStack(Items.DYE, 9, 4), " U ", " U ", " UU", 'U', ModItems.UU_MATTER);
if (ConfigTechReborn.UUrecipesEmeraldOre)
CraftingHelper.addShapedOreRecipe(new ItemStack(Blocks.EMERALD_ORE, 1), "UU ", "U U", " UU", 'U',
ModItems.UU_MATTER);
if (ConfigTechReborn.UUrecipesEmerald)
CraftingHelper
.addShapedOreRecipe(new ItemStack(Items.EMERALD, 2), "UUU", "UUU", " U ", 'U', ModItems.UU_MATTER);
if (ConfigTechReborn.UUrecipesDiamond)
CraftingHelper
.addShapedOreRecipe(new ItemStack(Items.DIAMOND, 1), "UUU", "UUU", "UUU", 'U', ModItems.UU_MATTER);
if (ConfigTechReborn.UUrecipesTinDust)
CraftingHelper.addShapedOreRecipe(new ItemStack(ModItems.DUSTS, 10, 77), " ", "U U", " U", 'U',
ModItems.UU_MATTER);
if (ConfigTechReborn.UUrecipesCopperDust)
CraftingHelper.addShapedOreRecipe(new ItemStack(ModItems.DUSTS, 10, 21), " U", "U U", " ", 'U',
ModItems.UU_MATTER);
if (ConfigTechReborn.UUrecipesLeadDust)
CraftingHelper.addShapedOreRecipe(new ItemStack(ModItems.DUSTS, 14, 42), "UUU", "UUU", "U ", 'U',
ModItems.UU_MATTER);
if (ConfigTechReborn.UUrecipesPlatinumDust)
CraftingHelper.addShapedOreRecipe(new ItemStack(ModItems.DUSTS, 1, 58), " U", "UUU", "UUU", 'U',
ModItems.UU_MATTER);
if (ConfigTechReborn.UUrecipesTungstenDust)
CraftingHelper.addShapedOreRecipe(new ItemStack(ModItems.DUSTS, 1, 79), "U ", "UUU", "UUU", 'U',
ModItems.UU_MATTER);
if (ConfigTechReborn.UUrecipesTitaniumDust)
CraftingHelper.addShapedOreRecipe(new ItemStack(ModItems.DUSTS, 2, 78), "UUU", " U ", " U ", 'U',
ModItems.UU_MATTER);
if (ConfigTechReborn.UUrecipesAluminumDust)
CraftingHelper.addShapedOreRecipe(new ItemStack(ModItems.DUSTS, 16, 2), " U ", " U ", "UUU", 'U',
ModItems.UU_MATTER);
}
static void addChemicalReactorRecipes() {
RecipeHandler.addRecipe(
new ChemicalReactorRecipe(ItemCells.getCellByName("calcium", 1), ItemCells.getCellByName("carbon", 1),
@ -1542,23 +1081,6 @@ public class ModRecipes {
"ingotIridium", 'P', new ItemStack(ModItems.LITHIUM_BATTERY_PACK));
}
static void addFluidGeneratorRecipes() {
GeneratorRecipeHelper.registerFluidRecipe(EFluidGenerator.DIESEL, ModFluids.NITROFUEL, 24);
GeneratorRecipeHelper.registerFluidRecipe(EFluidGenerator.DIESEL, ModFluids.NITROCOAL_FUEL, 48);
GeneratorRecipeHelper.registerFluidRecipe(EFluidGenerator.DIESEL, ModFluids.LITHIUM, 24);
GeneratorRecipeHelper.registerFluidRecipe(EFluidGenerator.DIESEL, ModFluids.NITRO_DIESEL, 36);
GeneratorRecipeHelper.registerFluidRecipe(EFluidGenerator.DIESEL, ModFluids.OIL, 16);
GeneratorRecipeHelper.registerFluidRecipe(EFluidGenerator.SEMIFLUID, ModFluids.OIL, 64);
GeneratorRecipeHelper.registerFluidRecipe(EFluidGenerator.SEMIFLUID, ModFluids.SODIUM, 30);
GeneratorRecipeHelper.registerFluidRecipe(EFluidGenerator.SEMIFLUID, ModFluids.LITHIUM, 60);
GeneratorRecipeHelper.registerFluidRecipe(EFluidGenerator.THERMAL, FluidRegistry.LAVA, 60);
GeneratorRecipeHelper.registerFluidRecipe(EFluidGenerator.GAS, ModFluids.HYDROGEN, 15);
GeneratorRecipeHelper.registerFluidRecipe(EFluidGenerator.GAS, ModFluids.METHANE, 45);
}
public static ItemStack getBucketWithFluid(Fluid fluid) {
return UniversalBucket.getFilledBucket(ForgeModContainer.getInstance().universalBucket, fluid);
}

View file

@ -71,6 +71,134 @@ public class CraftingTableRecipes extends RecipeMethods {
new ItemStack(ModItems.BRONZE_BOOTS), "ingotBronze");
}
if (!IC2Duplicates.deduplicate()) {
registerShaped(getMaterial("copper", 6, Type.CABLE), "CCC", 'C', "ingotCopper");
registerShaped(getMaterial("tin", 9, Type.CABLE), "TTT", 'T', "ingotTin");
registerShaped(getMaterial("gold", 12, Type.CABLE), "GGG", 'G', "ingotGold");
registerShaped(getMaterial("hv", 12, Type.CABLE), "RRR", 'R', "ingotRefinedIron");
registerShaped(getMaterial("insulatedcopper", 6, Type.CABLE), "RRR", "CCC", "RRR", 'R', "itemRubber", 'C', "ingotCopper");
registerShaped(getMaterial("insulatedcopper", 6, Type.CABLE), "CRC", "CRC", "CRC", 'R', "itemRubber", 'C', "ingotCopper");
registerShapeless(getMaterial("insulatedcopper", Type.CABLE), "itemRubber", getMaterial("copper", Type.CABLE));
registerShaped(getMaterial("insulatedgold", 4, Type.CABLE), "RRR", "RGR", "RRR", 'R', "itemRubber", 'G', "ingotGold");
registerShapeless(getMaterial("insulatedgold", Type.CABLE), "itemRubber", "itemRubber", getMaterial("gold", Type.CABLE));
registerShaped(getMaterial("insulatedhv", 4, Type.CABLE), "RRR", "RIR", "RRR", 'R', "itemRubber", 'I', "ingotRefinedIron");
registerShapeless(getMaterial("insulatedhv", Type.CABLE), "itemRubber", "itemRubber", getMaterial("hv", Type.CABLE));
registerShaped(getMaterial("glassfiber", 4, Type.CABLE), "GGG", "RDR", "GGG", 'R', "dustRedstone", 'D', "gemDiamond", 'G', "blockGlass");
registerShaped(getMaterial("glassfiber", 4, Type.CABLE), "GGG", "RDR", "GGG", 'R', "dustRedstone", 'D', "dustDiamond", 'G', "blockGlass");
registerShaped(getMaterial("glassfiber", 3, Type.CABLE), "GGG", "RDR", "GGG", 'R', "dustRedstone", 'D', "gemRuby", 'G', "blockGlass");
registerShaped(getMaterial("glassfiber", 3, Type.CABLE), "GGG", "RDR", "GGG", 'R', "dustRedstone", 'D', "dustRuby", 'G', "blockGlass");
registerShaped(getMaterial("glassfiber", 6, Type.CABLE), "GGG", "RDR", "GGG", 'R', "ingotSilver", 'D', "gemDiamond", 'G', "blockGlass");
registerShaped(getMaterial("glassfiber", 6, Type.CABLE), "GGG", "RDR", "GGG", 'R', "ingotSilver", 'D', "dustDiamond", 'G', "blockGlass");
registerShaped(getMaterial("glassfiber", 8, Type.CABLE), "GGG", "RDR", "GGG", 'R', "ingotElectrum", 'D', "gemDiamond", 'G', "blockGlass");
registerShaped(getMaterial("glassfiber", 8, Type.CABLE), "GGG", "RDR", "GGG", 'R', "ingotElectrum", 'D', "dustDiamond", 'G', "blockGlass");
}
if (ConfigTechReborn.UUrecipesWood)
registerShaped(new ItemStack(Blocks.LOG, 8), " U ", " ", " ", 'U', ModItems.UU_MATTER);
if (ConfigTechReborn.UUrecipesStone)
registerShaped(new ItemStack(Blocks.STONE, 16), " ", " U ", " ", 'U', ModItems.UU_MATTER);
if (ConfigTechReborn.UUrecipesSnowBlock)
registerShaped(new ItemStack(Blocks.SNOW, 16), "U U", " ", " ", 'U', ModItems.UU_MATTER);
if (ConfigTechReborn.UUrecipesGrass)
registerShaped(new ItemStack(Blocks.GRASS, 16), " ", "U ", "U ", 'U', ModItems.UU_MATTER);
if (ConfigTechReborn.UUrecipesObsidian)
registerShaped(new ItemStack(Blocks.OBSIDIAN, 12), "U U", "U U", " ", 'U', ModItems.UU_MATTER);
if (ConfigTechReborn.UUrecipesGlass)
registerShaped(new ItemStack(Blocks.GLASS, 32), " U ", "U U", " U ", 'U', ModItems.UU_MATTER);
if (ConfigTechReborn.UUrecipesCocoa)
registerShaped(new ItemStack(Items.DYE, 32, 3), "UU ", " U", "UU ", 'U', ModItems.UU_MATTER);
if (ConfigTechReborn.UUrecipesGlowstoneBlock)
registerShaped(new ItemStack(Blocks.GLOWSTONE, 8), " U ", "U U", "UUU", 'U', ModItems.UU_MATTER);
if (ConfigTechReborn.UUrecipesCactus)
registerShaped(new ItemStack(Blocks.CACTUS, 48), " U ", "UUU", "U U", 'U', ModItems.UU_MATTER);
if (ConfigTechReborn.UUrecipesSugarCane)
registerShaped(new ItemStack(Items.REEDS, 48), "U U", "U U", "U U", 'U', ModItems.UU_MATTER);
if (ConfigTechReborn.UUrecipesVine)
registerShaped(new ItemStack(Blocks.VINE, 24), "U ", "U ", "U ", 'U', ModItems.UU_MATTER);
if (ConfigTechReborn.UUrecipesSnowBall)
registerShaped(new ItemStack(Items.SNOWBALL, 16), " ", " ", "UUU", 'U', ModItems.UU_MATTER);
registerShaped(new ItemStack(Items.CLAY_BALL, 48), "UU ", "U ", "UU ", 'U', ModItems.UU_MATTER);
if (ConfigTechReborn.UUrecipeslilypad)
registerShaped(new ItemStack(Blocks.WATERLILY, 64), "U U", " U ", " U ", 'U', ModItems.UU_MATTER);
if (ConfigTechReborn.UUrecipesGunpowder)
registerShaped(new ItemStack(Items.GUNPOWDER, 15), "UUU", "U ", "UUU", 'U', ModItems.UU_MATTER);
if (ConfigTechReborn.UUrecipesBone)
registerShaped(new ItemStack(Items.BONE, 32), "U ", "UU ", "U ", 'U', ModItems.UU_MATTER);
if (ConfigTechReborn.UUrecipesFeather)
registerShaped(new ItemStack(Items.FEATHER, 32), " U ", " U ", "U U", 'U', ModItems.UU_MATTER);
if (ConfigTechReborn.UUrecipesInk)
registerShaped(new ItemStack(Items.DYE, 48), " UU", " UU", " U ", 'U', ModItems.UU_MATTER);
if (ConfigTechReborn.UUrecipesEnderPearl)
registerShaped(new ItemStack(Items.ENDER_PEARL, 1), "UUU", "U U", " U ", 'U', ModItems.UU_MATTER);
if (ConfigTechReborn.UUrecipesCoal)
registerShaped(new ItemStack(Items.COAL, 5), " U", "U ", " U", 'U', ModItems.UU_MATTER);
if (ConfigTechReborn.UUrecipesIronOre)
registerShaped(new ItemStack(Blocks.IRON_ORE, 2), "U U", " U ", "U U", 'U', ModItems.UU_MATTER);
if (ConfigTechReborn.UUrecipesGoldOre)
registerShaped(new ItemStack(Blocks.GOLD_ORE, 2), " U ", "UUU", " U ", 'U', ModItems.UU_MATTER);
if (ConfigTechReborn.UUrecipesRedStone)
registerShaped(new ItemStack(Items.REDSTONE, 24), " ", " U ", "UUU", 'U', ModItems.UU_MATTER);
if (ConfigTechReborn.UUrecipesLapis)
registerShaped(new ItemStack(Items.DYE, 9, 4), " U ", " U ", " UU", 'U', ModItems.UU_MATTER);
if (ConfigTechReborn.UUrecipesEmeraldOre)
registerShaped(new ItemStack(Blocks.EMERALD_ORE, 1), "UU ", "U U", " UU", 'U', ModItems.UU_MATTER);
if (ConfigTechReborn.UUrecipesEmerald)
registerShaped(new ItemStack(Items.EMERALD, 2), "UUU", "UUU", " U ", 'U', ModItems.UU_MATTER);
if (ConfigTechReborn.UUrecipesDiamond)
registerShaped(new ItemStack(Items.DIAMOND, 1), "UUU", "UUU", "UUU", 'U', ModItems.UU_MATTER);
if (ConfigTechReborn.UUrecipesTinDust)
registerShaped(getMaterial("tin", 10, Type.DUST), " ", "U U", " U", 'U', ModItems.UU_MATTER);
if (ConfigTechReborn.UUrecipesCopperDust)
registerShaped(getMaterial("copper", 10, Type.DUST), " U", "U U", " ", 'U', ModItems.UU_MATTER);
if (ConfigTechReborn.UUrecipesLeadDust)
registerShaped(getMaterial("lead", 14, Type.DUST), "UUU", "UUU", "U ", 'U', ModItems.UU_MATTER);
if (ConfigTechReborn.UUrecipesPlatinumDust)
registerShaped(getMaterial("platinum", Type.DUST), " U", "UUU", "UUU", 'U', ModItems.UU_MATTER);
if (ConfigTechReborn.UUrecipesTungstenDust)
registerShaped(getMaterial("tungsten", Type.DUST), "U ", "UUU", "UUU", 'U', ModItems.UU_MATTER);
if (ConfigTechReborn.UUrecipesTitaniumDust)
registerShaped(getMaterial("titanium", 2, Type.DUST), "UUU", " U ", " U ", 'U', ModItems.UU_MATTER);
if (ConfigTechReborn.UUrecipesAluminumDust)
registerShaped(getMaterial("aluminum", 16, Type.DUST), " U ", " U ", "UUU", 'U', ModItems.UU_MATTER);
}
static void registerCompressionRecipes() {

View file

@ -0,0 +1,33 @@
package techreborn.init.recipes;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidRegistry;
import techreborn.api.generator.EFluidGenerator;
import techreborn.api.generator.GeneratorRecipeHelper;
import techreborn.init.ModFluids;
/**
* Created by Prospector
*/
public class FluidGeneratorRecipes extends RecipeMethods {
public static void init() {
register(EFluidGenerator.DIESEL, ModFluids.NITROFUEL, 24);
register(EFluidGenerator.DIESEL, ModFluids.NITROCOAL_FUEL, 48);
register(EFluidGenerator.DIESEL, ModFluids.LITHIUM, 24);
register(EFluidGenerator.DIESEL, ModFluids.NITRO_DIESEL, 36);
register(EFluidGenerator.DIESEL, ModFluids.OIL, 16);
register(EFluidGenerator.SEMIFLUID, ModFluids.OIL, 64);
register(EFluidGenerator.SEMIFLUID, ModFluids.SODIUM, 30);
register(EFluidGenerator.SEMIFLUID, ModFluids.LITHIUM, 60);
register(EFluidGenerator.THERMAL, FluidRegistry.LAVA, 60);
register(EFluidGenerator.GAS, ModFluids.HYDROGEN, 15);
register(EFluidGenerator.GAS, ModFluids.METHANE, 45);
}
static void register(EFluidGenerator generator, Fluid fluid, int euPerMB) {
GeneratorRecipeHelper.registerFluidRecipe(generator, fluid, euPerMB);
}
}

View file

@ -4,6 +4,7 @@ import net.minecraft.item.ItemStack;
import net.minecraftforge.oredict.OreDictionary;
import reborncore.common.util.OreUtil;
import techreborn.items.*;
import techreborn.parts.powerCables.ItemStandaloneCables;
/**
* Created by Prospector
@ -26,6 +27,8 @@ public abstract class RecipeMethods {
return ItemCells.getCellByName(name, count);
} else if (type == Type.PART) {
return ItemParts.getPartByName(name, count);
} else if (type == Type.CABLE) {
return ItemStandaloneCables.getCableByName(name, count);
} else {
}
@ -54,6 +57,6 @@ public abstract class RecipeMethods {
}
enum Type {
DUST, SMALL_DUST, INGOT, NUGGET, PLATE, GEM, CELL, PART
DUST, SMALL_DUST, INGOT, NUGGET, PLATE, GEM, CELL, PART, CABLE
}
}

View file

@ -0,0 +1,37 @@
package techreborn.init.recipes;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import techreborn.api.TechRebornAPI;
/**
* Created by Prospector
*/
public class RollingMachineRecipes extends RecipeMethods {
public static void init() {
register(getMaterial("cupronickel_heating_coil", 3, Type.PART), "NCN", "C C", "NCN", 'N', "ingotNickel", 'C', "ingotCopper");
register(getMaterial("nichrome_heating_coil", 2, Type.PART), " N ", "NCN", " N ", 'N', "ingotNickel", 'C', "ingotChrome");
if (oresExist("ingotAluminum")) {
register(getMaterial("kanthal_heating_coil", 3, Type.PART), "RRR", "CAA", "CCA", 'R', "ingotRefinedIron", 'C', "ingotChrome", 'A', "ingotAluminum");
}
if (oresExist("ingotAluminum")) {
register(getMaterial("kanthal_heating_coil", 3, Type.PART), "RRR", "CAA", "CCA", 'R', "ingotRefinedIron", 'C', "ingotChrome", 'A', "ingotAluminium");
}
register(new ItemStack(Blocks.RAIL, 24), "I I", "ISI", "I I", 'I', "ingotIron", 'S', "stickWood");
register(new ItemStack(Blocks.GOLDEN_RAIL, 8), "I I", "ISI", "IRI", 'I', "ingotIron", 'S', "stickWood", 'R', "dustRedstone");
register(new ItemStack(Blocks.DETECTOR_RAIL, 8), "I I", "IPI", "IRI", 'I', "ingotIron", 'P', new ItemStack(Blocks.STONE_PRESSURE_PLATE), 'R', "dustRedstone");
register(new ItemStack(Blocks.ACTIVATOR_RAIL, 8), "ISI", "IRI", "ISI", 'I', "ingotIron", 'S', "stickWood", 'R', new ItemStack(Blocks.REDSTONE_TORCH));
register(new ItemStack(Blocks.IRON_BARS, 24), "III", "III", 'I', "ingotIron");
register(new ItemStack(Items.IRON_DOOR, 4), "II ", "II ", "II ", 'I', "ingotIron");
register(new ItemStack(Items.MINECART, 2), "I I", "III", 'I', "ingotIron");
register(new ItemStack(Items.BUCKET, 2), "I I", "I I", " I ", 'I', "ingotIron");
register(new ItemStack(Blocks.TRIPWIRE_HOOK, 4), " I ", " S ", " W ", 'I', "ingotIron", 'S', "stickWood", 'W', "plankWood");
register(new ItemStack(Blocks.HEAVY_WEIGHTED_PRESSURE_PLATE, 2), "II ", 'I', "ingotIron");
register(new ItemStack(Blocks.LIGHT_WEIGHTED_PRESSURE_PLATE, 2), "GG ", 'G', "ingotGold");
}
static void register(ItemStack output, Object... componentsObjects) {
TechRebornAPI.addRollingOreMachinceRecipe(output, componentsObjects);
}
}

View file

@ -0,0 +1,212 @@
package techreborn.init.recipes;
import net.minecraft.block.Block;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import reborncore.api.recipe.RecipeHandler;
import techreborn.api.ScrapboxList;
import techreborn.api.recipe.ScrapboxRecipe;
import techreborn.init.ModBlocks;
import techreborn.init.ModItems;
import techreborn.items.DynamicCell;
import techreborn.items.ItemDusts;
import techreborn.items.ItemGems;
import techreborn.items.ItemNuggets;
import techreborn.utils.StackWIPHandler;
/**
* Created by Prospector
*/
public class ScrapboxRecipes extends RecipeMethods {
public static void init() {
register(new ItemStack(Items.DIAMOND));
register(new ItemStack(Items.STICK));
register(new ItemStack(Items.COAL));
register(new ItemStack(Items.APPLE));
register(new ItemStack(Items.BAKED_POTATO));
register(new ItemStack(Items.BLAZE_POWDER));
register(new ItemStack(Items.WHEAT));
register(new ItemStack(Items.CARROT));
register(new ItemStack(Items.BOAT));
register(new ItemStack(Items.ACACIA_BOAT));
register(new ItemStack(Items.BIRCH_BOAT));
register(new ItemStack(Items.DARK_OAK_BOAT));
register(new ItemStack(Items.JUNGLE_BOAT));
register(new ItemStack(Items.SPRUCE_BOAT));
register(new ItemStack(Items.BLAZE_ROD));
register(new ItemStack(Items.COMPASS));
register(new ItemStack(Items.MAP));
register(new ItemStack(Items.LEATHER_LEGGINGS));
register(new ItemStack(Items.BOW));
register(new ItemStack(Items.COOKED_CHICKEN));
register(new ItemStack(Items.CAKE));
register(new ItemStack(Items.ACACIA_DOOR));
register(new ItemStack(Items.DARK_OAK_DOOR));
register(new ItemStack(Items.BIRCH_DOOR));
register(new ItemStack(Items.JUNGLE_DOOR));
register(new ItemStack(Items.OAK_DOOR));
register(new ItemStack(Items.SPRUCE_DOOR));
register(new ItemStack(Items.WOODEN_AXE));
register(new ItemStack(Items.WOODEN_HOE));
register(new ItemStack(Items.WOODEN_PICKAXE));
register(new ItemStack(Items.WOODEN_SHOVEL));
register(new ItemStack(Items.WOODEN_SWORD));
register(new ItemStack(Items.BED));
register(new ItemStack(Items.SKULL, 1, 0));
register(new ItemStack(Items.SKULL, 1, 2));
register(new ItemStack(Items.SKULL, 1, 4));
for (int i = 0; i < StackWIPHandler.devHeads.size(); i++)
register(StackWIPHandler.devHeads.get(i));
register(new ItemStack(Items.GLOWSTONE_DUST));
register(new ItemStack(Items.STRING));
register(new ItemStack(Items.MINECART));
register(new ItemStack(Items.CHEST_MINECART));
register(new ItemStack(Items.HOPPER_MINECART));
register(new ItemStack(Items.PRISMARINE_SHARD));
register(new ItemStack(Items.SHEARS));
register(new ItemStack(Items.EXPERIENCE_BOTTLE));
register(new ItemStack(Items.BONE));
register(new ItemStack(Items.BOWL));
register(new ItemStack(Items.BRICK));
register(new ItemStack(Items.FISHING_ROD));
register(new ItemStack(Items.BOOK));
register(new ItemStack(Items.PAPER));
register(new ItemStack(Items.SUGAR));
register(new ItemStack(Items.REEDS));
register(new ItemStack(Items.SPIDER_EYE));
register(new ItemStack(Items.SLIME_BALL));
register(new ItemStack(Items.ROTTEN_FLESH));
register(new ItemStack(Items.SIGN));
register(new ItemStack(Items.WRITABLE_BOOK));
register(new ItemStack(Items.COOKED_BEEF));
register(new ItemStack(Items.NAME_TAG));
register(new ItemStack(Items.SADDLE));
register(new ItemStack(Items.REDSTONE));
register(new ItemStack(Items.GUNPOWDER));
register(new ItemStack(Items.RABBIT_HIDE));
register(new ItemStack(Items.RABBIT_FOOT));
register(new ItemStack(Items.APPLE));
register(new ItemStack(Items.GOLDEN_APPLE));
register(new ItemStack(Items.GOLD_NUGGET));
register(new ItemStack(Items.SHULKER_SHELL));
register(DynamicCell.getEmptyCell(1));
register(getMaterial("water", Type.CELL));
register(getMaterial("compressedair", Type.CELL));
register(getMaterial("sap", Type.PART));
register(getMaterial("rubber", Type.PART));
register(new ItemStack(Blocks.TRAPDOOR));
register(new ItemStack(Blocks.STONE_BUTTON));
register(new ItemStack(Blocks.WOODEN_BUTTON));
register(new ItemStack(Blocks.ACACIA_FENCE));
register(new ItemStack(Blocks.ACACIA_FENCE_GATE));
register(new ItemStack(Blocks.BIRCH_FENCE));
register(new ItemStack(Blocks.BIRCH_FENCE_GATE));
register(new ItemStack(Blocks.DARK_OAK_FENCE));
register(new ItemStack(Blocks.DARK_OAK_FENCE_GATE));
register(new ItemStack(Blocks.JUNGLE_FENCE));
register(new ItemStack(Blocks.JUNGLE_FENCE_GATE));
register(new ItemStack(Blocks.NETHER_BRICK_FENCE));
register(new ItemStack(Blocks.OAK_FENCE));
register(new ItemStack(Blocks.OAK_FENCE_GATE));
register(new ItemStack(Blocks.SPRUCE_FENCE));
register(new ItemStack(Blocks.SPRUCE_FENCE_GATE));
register(new ItemStack(Blocks.BRICK_BLOCK));
register(new ItemStack(Blocks.CRAFTING_TABLE));
register(new ItemStack(Blocks.PUMPKIN));
register(new ItemStack(Blocks.NETHERRACK));
register(new ItemStack(Blocks.GRASS));
register(new ItemStack(Blocks.DIRT, 1, 0));
register(new ItemStack(Blocks.DIRT, 1, 1));
register(new ItemStack(Blocks.SAND, 1, 0));
register(new ItemStack(Blocks.SAND, 1, 1));
register(new ItemStack(Blocks.GLOWSTONE));
register(new ItemStack(Blocks.GRAVEL));
register(new ItemStack(Blocks.HARDENED_CLAY));
register(new ItemStack(Blocks.GLASS));
register(new ItemStack(Blocks.GLASS_PANE));
register(new ItemStack(Blocks.CACTUS));
register(new ItemStack(Blocks.TALLGRASS, 1, 0));
register(new ItemStack(Blocks.TALLGRASS, 1, 1));
register(new ItemStack(Blocks.DEADBUSH));
register(new ItemStack(Blocks.CHEST));
register(new ItemStack(Blocks.TNT));
register(new ItemStack(Blocks.RAIL));
register(new ItemStack(Blocks.DETECTOR_RAIL));
register(new ItemStack(Blocks.GOLDEN_RAIL));
register(new ItemStack(Blocks.ACTIVATOR_RAIL));
register(new ItemStack(Blocks.YELLOW_FLOWER));
register(new ItemStack(Blocks.RED_FLOWER, 1, 0));
register(new ItemStack(Blocks.RED_FLOWER, 1, 1));
register(new ItemStack(Blocks.RED_FLOWER, 1, 2));
register(new ItemStack(Blocks.RED_FLOWER, 1, 3));
register(new ItemStack(Blocks.RED_FLOWER, 1, 4));
register(new ItemStack(Blocks.RED_FLOWER, 1, 5));
register(new ItemStack(Blocks.RED_FLOWER, 1, 6));
register(new ItemStack(Blocks.RED_FLOWER, 1, 7));
register(new ItemStack(Blocks.RED_FLOWER, 1, 8));
register(new ItemStack(Blocks.BROWN_MUSHROOM));
register(new ItemStack(Blocks.RED_MUSHROOM));
register(new ItemStack(Blocks.BROWN_MUSHROOM_BLOCK));
register(new ItemStack(Blocks.RED_MUSHROOM_BLOCK));
register(new ItemStack(Blocks.SAPLING, 1, 0));
register(new ItemStack(Blocks.SAPLING, 1, 1));
register(new ItemStack(Blocks.SAPLING, 1, 2));
register(new ItemStack(Blocks.SAPLING, 1, 3));
register(new ItemStack(Blocks.SAPLING, 1, 4));
register(new ItemStack(Blocks.SAPLING, 1, 5));
register(new ItemStack(Blocks.LEAVES, 1, 0));
register(new ItemStack(Blocks.LEAVES, 1, 1));
register(new ItemStack(Blocks.LEAVES, 1, 2));
register(new ItemStack(Blocks.LEAVES, 1, 3));
register(new ItemStack(Blocks.LEAVES2, 1, 0));
register(new ItemStack(Blocks.LEAVES2, 1, 1));
register(new ItemStack(ModBlocks.RUBBER_SAPLING));
for (String i : ItemDusts.types) {
if (!i.equals(ModItems.META_PLACEHOLDER)) {
register(ItemDusts.getDustByName(i));
}
}
for (String i : ItemNuggets.types) {
if (!i.equals(ModItems.META_PLACEHOLDER)) {
register(ItemNuggets.getNuggetByName(i));
}
}
for (String i : ItemGems.types) {
if (!i.equals(ModItems.META_PLACEHOLDER)) {
register(ItemGems.getGemByName(i));
}
}
registerDyable(Items.DYE);
registerDyable(Blocks.WOOL);
registerDyable(Blocks.CARPET);
registerDyable(Blocks.STAINED_GLASS);
registerDyable(Blocks.STAINED_GLASS_PANE);
registerDyable(Blocks.STAINED_HARDENED_CLAY);
for (int i = 0; i < ScrapboxList.stacks.size(); i++) {
RecipeHandler.addRecipe(new ScrapboxRecipe(ScrapboxList.stacks.get(i)));
}
}
static void register(ItemStack stack) {
ScrapboxList.stacks.add(stack);
}
static void registerDyable(Item item) {
for (int i = 0; i < 16; i++)
register(new ItemStack(item, 1, i));
}
static void registerDyable(Block block) {
registerDyable(Item.getItemFromBlock(block));
}
}

View file

@ -0,0 +1,35 @@
package techreborn.init.recipes;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import reborncore.common.util.CraftingHelper;
import techreborn.blocks.BlockOre;
import techreborn.blocks.BlockOre2;
import techreborn.init.IC2Duplicates;
/**
* Created by Prospector
*/
public class SmeltingRecipes extends RecipeMethods {
public static void init() {
register(getMaterial("iron", Type.DUST), new ItemStack(Items.IRON_INGOT));
register(getMaterial("gold", Type.DUST), new ItemStack(Items.GOLD_INGOT));
register(getMaterial("sap", Type.PART), getMaterial("rubber", Type.PART));
if (!IC2Duplicates.deduplicate()) {
register(new ItemStack(Items.IRON_INGOT), getMaterial("refined_iron", Type.INGOT));
}
register(BlockOre2.getOreByName("copper"), getMaterial("copper", Type.INGOT));
register(BlockOre2.getOreByName("tin"), getMaterial("tin", Type.INGOT));
register(BlockOre.getOreByName("silver"), getMaterial("silver", Type.INGOT));
register(BlockOre.getOreByName("lead"), getMaterial("lead", Type.INGOT));
register(BlockOre.getOreByName("sheldonite"), getMaterial("platinum", Type.INGOT));
register(IC2Duplicates.MIXED_METAL.getStackBasedOnConfig(), getMaterial("advanced_alloy", Type.INGOT));
register(getMaterial("nickel", Type.DUST), getMaterial("nickel", Type.INGOT));
register(getMaterial("platinum", Type.DUST), getMaterial("platinum", Type.INGOT));
register(getMaterial("zinc", Type.DUST), getMaterial("zinc", Type.INGOT));
}
static void register(ItemStack input, ItemStack output) {
CraftingHelper.addSmelting(input, output);
}
}

View file

@ -5,18 +5,14 @@ import net.minecraft.util.IStringSerializable;
import reborncore.api.power.EnumPowerTier;
public enum EnumStandaloneCableType implements IStringSerializable {
COPPER("copper", "techreborn:blocks/cables/copper_cable", 128, 12.0, true, EnumPowerTier.LOW), TIN("tin",
"techreborn:blocks/cables/tin_cable", 32, 12.0, true, EnumPowerTier.MEDIUM), GOLD("gold",
"techreborn:blocks/cables/gold_cable", 512, 12.0, true, EnumPowerTier.MEDIUM), HV("hv",
"techreborn:blocks/cables/hv_cable", 2048, 12.0, true,
EnumPowerTier.HIGH), GLASSFIBER("glassfiber", "techreborn:blocks/cables/glass_fiber_cable",
8192, 12.0, false, EnumPowerTier.HIGH), ICOPPER("insulatedcopper",
"techreborn:blocks/cables/copper_insulated_cable", 128, 10.0, false,
EnumPowerTier.LOW), IGOLD("insulatedgold",
"techreborn:blocks/cables/gold_insulated_cable", 512, 10.0, false,
EnumPowerTier.MEDIUM), IHV("insulatedhv",
"techreborn:blocks/cables/hv_insulated_cable", 2048, 10.0,
false, EnumPowerTier.HIGH);
COPPER("copper", "techreborn:blocks/cables/copper_cable", 128, 12.0, true, EnumPowerTier.LOW),
TIN("tin", "techreborn:blocks/cables/tin_cable", 32, 12.0, true, EnumPowerTier.MEDIUM),
GOLD("gold", "techreborn:blocks/cables/gold_cable", 512, 12.0, true, EnumPowerTier.MEDIUM),
HV("hv", "techreborn:blocks/cables/hv_cable", 2048, 12.0, true, EnumPowerTier.HIGH),
GLASSFIBER("glassfiber", "techreborn:blocks/cables/glass_fiber_cable", 8192, 12.0, false, EnumPowerTier.HIGH),
ICOPPER("insulatedcopper", "techreborn:blocks/cables/copper_insulated_cable", 128, 10.0, false, EnumPowerTier.LOW),
IGOLD("insulatedgold", "techreborn:blocks/cables/gold_insulated_cable", 512, 10.0, false, EnumPowerTier.MEDIUM),
IHV("insulatedhv", "techreborn:blocks/cables/hv_insulated_cable", 2048, 10.0, false, EnumPowerTier.HIGH);
public String textureName = "minecraft:blocks/iron_block";
public int transferRate = 128;