Changed texture stuffs
|
@ -60,7 +60,7 @@ public class BlockAlloySmelter extends BlockMachineBase {
|
|||
{
|
||||
this.blockIcon = icon.registerIcon("techreborn:machine/machine_side");
|
||||
this.iconFront = icon
|
||||
.registerIcon("techreborn:machine/industrial_blast_furnace_front_off");
|
||||
.registerIcon("techreborn:machine/electric_alloy_furnace_front_off");
|
||||
this.iconTop = icon.registerIcon("techreborn:machine/machine_side");
|
||||
this.iconBottom = icon.registerIcon("techreborn:machine/machine_side");
|
||||
}
|
||||
|
|
|
@ -56,9 +56,9 @@ public class BlockCentrifuge extends BlockMachineBase {
|
|||
{
|
||||
this.blockIcon = icon.registerIcon("techreborn:machine/machine_side");
|
||||
this.iconFront = icon
|
||||
.registerIcon("techreborn:machine/industrial_blast_furnace_front_off");
|
||||
.registerIcon("techreborn:machine/centrifuge_front_off");
|
||||
this.iconTop = icon
|
||||
.registerIcon("techreborn:machine/industrial_grinder_top_on");
|
||||
.registerIcon("techreborn:machine/machine_side");
|
||||
this.iconBottom = icon.registerIcon("techreborn:machine/machine_side");
|
||||
}
|
||||
|
||||
|
|
|
@ -56,8 +56,8 @@ public class BlockGrinder extends BlockMachineBase{
|
|||
public void registerBlockIcons(IIconRegister icon)
|
||||
{
|
||||
this.blockIcon = icon.registerIcon("techreborn:machine/machine_side");
|
||||
this.iconFront = icon.registerIcon("techreborn:machine/grinder_front");
|
||||
this.iconTop = icon.registerIcon("techreborn:machine/grinder_top");
|
||||
this.iconFront = icon.registerIcon("techreborn:machine/industrial_grinder_front_off");
|
||||
this.iconTop = icon.registerIcon("techreborn:machine/industrial_grinder_top_off");
|
||||
this.iconBottom = icon.registerIcon("techreborn:machine/machine_side");
|
||||
}
|
||||
|
||||
|
|
|
@ -56,8 +56,8 @@ public class BlockImplosionCompressor extends BlockMachineBase{
|
|||
public void registerBlockIcons(IIconRegister icon)
|
||||
{
|
||||
this.blockIcon = icon.registerIcon("techreborn:machine/machine_side");
|
||||
this.iconFront = icon.registerIcon("techreborn:machine/implosioncompressor_front_off");
|
||||
this.iconTop = icon.registerIcon("techreborn:machine/implosioncompressor_top");
|
||||
this.iconFront = icon.registerIcon("techreborn:machine/implosion_compressor_front_off");
|
||||
this.iconTop = icon.registerIcon("techreborn:machine/machine_side");
|
||||
this.iconBottom = icon.registerIcon("techreborn:machine/machine_side");
|
||||
}
|
||||
|
||||
|
|
|
@ -57,7 +57,7 @@ public class BlockMatterFabricator extends BlockMachineBase{
|
|||
{
|
||||
this.blockIcon = icon.registerIcon("techreborn:machine/machine_side");
|
||||
this.iconFront = icon.registerIcon("techreborn:machine/matterfabricator_front_off");
|
||||
this.iconTop = icon.registerIcon("techreborn:machine/matterfabricator_top");
|
||||
this.iconTop = icon.registerIcon("techreborn:machine/machine_side");
|
||||
this.iconBottom = icon.registerIcon("techreborn:machine/machine_side");
|
||||
}
|
||||
|
||||
|
|
|
@ -4,6 +4,7 @@ import techreborn.compat.waila.CompatModuleWaila;
|
|||
import cpw.mods.fml.common.Loader;
|
||||
import cpw.mods.fml.common.event.FMLInitializationEvent;
|
||||
import techreborn.init.ModParts;
|
||||
import techreborn.util.LogHelper;
|
||||
|
||||
public class CompatManager {
|
||||
|
||||
|
@ -12,6 +13,7 @@ public class CompatManager {
|
|||
if (Loader.isModLoaded("Waila"))
|
||||
{
|
||||
new CompatModuleWaila().init(event);
|
||||
LogHelper.info("Waila Compat Loaded");
|
||||
}
|
||||
if(Loader.isModLoaded("qmunitylib")){
|
||||
// Register Multiparts
|
||||
|
|
|
@ -1,14 +1,31 @@
|
|||
package techreborn.compat.recipes;
|
||||
|
||||
import techreborn.util.LogHelper;
|
||||
import cpw.mods.fml.common.Loader;
|
||||
|
||||
public class RecipeManager {
|
||||
|
||||
public static void init()
|
||||
{
|
||||
if (Loader.isModLoaded("IC2"))
|
||||
{
|
||||
RecipesIC2.init();
|
||||
|
||||
LogHelper.info("IC2 Compat Loaded");
|
||||
}
|
||||
|
||||
if (Loader.isModLoaded("BuildCraft|Factory"))
|
||||
{
|
||||
RecipesBuildcraft.init();
|
||||
|
||||
LogHelper.info("Buildcraft Compat Loaded");
|
||||
}
|
||||
|
||||
if (Loader.isModLoaded("ThermalExpansion"))
|
||||
{
|
||||
RecipesThermalExpansion.init();
|
||||
|
||||
LogHelper.info("ThermalExpansion Compat Loaded");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
154
src/main/java/techreborn/compat/recipes/RecipesIC2.java
Normal file
|
@ -0,0 +1,154 @@
|
|||
package techreborn.compat.recipes;
|
||||
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import ic2.api.item.IC2Items;
|
||||
import techreborn.config.ConfigTechReborn;
|
||||
import techreborn.init.ModBlocks;
|
||||
import techreborn.init.ModItems;
|
||||
import techreborn.util.CraftingHelper;
|
||||
import techreborn.util.LogHelper;
|
||||
import techreborn.util.RecipeRemover;
|
||||
|
||||
public class RecipesIC2 {
|
||||
public static ConfigTechReborn config;
|
||||
|
||||
public static void init()
|
||||
{
|
||||
removeIc2Recipes();
|
||||
addShappedIc2Recipes();
|
||||
}
|
||||
|
||||
public static void removeIc2Recipes()
|
||||
{
|
||||
if (config.ExpensiveMacerator);
|
||||
RecipeRemover.removeAnyRecipe(IC2Items.getItem("macerator"));
|
||||
if (config.ExpensiveDrill);
|
||||
RecipeRemover.removeAnyRecipe(IC2Items.getItem("miningDrill"));
|
||||
if (config.ExpensiveDiamondDrill);
|
||||
RecipeRemover.removeAnyRecipe(IC2Items.getItem("diamondDrill"));
|
||||
if (config.ExpensiveSolar);
|
||||
RecipeRemover.removeAnyRecipe(IC2Items.getItem("solarPanel"));
|
||||
|
||||
LogHelper.info("IC2 Recipes Removed");
|
||||
}
|
||||
|
||||
public static void addShappedIc2Recipes()
|
||||
{
|
||||
if (config.ExpensiveMacerator);
|
||||
CraftingHelper.addShapedOreRecipe(IC2Items.getItem("macerator"),
|
||||
new Object[]
|
||||
{ "FDF", "DMD", "FCF",
|
||||
'F', Items.flint,
|
||||
'D', Items.diamond,
|
||||
'M', IC2Items.getItem("machine"),
|
||||
'C',IC2Items.getItem("electronicCircuit") });
|
||||
|
||||
if (config.ExpensiveDrill);
|
||||
CraftingHelper.addShapedOreRecipe(IC2Items.getItem("miningDrill"),
|
||||
new Object[]
|
||||
{ " S ", "SCS", "SBS",
|
||||
'S', "ingotSteel",
|
||||
'B',IC2Items.getItem("reBattery"),
|
||||
'C',IC2Items.getItem("electronicCircuit") });
|
||||
|
||||
if (config.ExpensiveDiamondDrill);
|
||||
CraftingHelper.addShapedOreRecipe(IC2Items.getItem("diamondDrill"),
|
||||
new Object[]
|
||||
{ " D ", "DBD", "TCT",
|
||||
'D', "gemDiamond",
|
||||
'T', "ingotTitanium",
|
||||
'B', IC2Items.getItem("miningDrill"),
|
||||
'C',IC2Items.getItem("advancedCircuit") });
|
||||
|
||||
if (config.ExpensiveSolar);
|
||||
CraftingHelper.addShapedOreRecipe(IC2Items.getItem("solarPanel"),
|
||||
new Object[]
|
||||
{ "PPP", "SZS", "CGC",
|
||||
'P', "paneGlass",
|
||||
'S', new ItemStack(ModItems.parts, 1, 1),
|
||||
'Z', IC2Items.getItem("carbonPlate"),
|
||||
'G', IC2Items.getItem("generator"),
|
||||
'C',IC2Items.getItem("electronicCircuit") });
|
||||
|
||||
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.thermalGenerator),
|
||||
new Object[]
|
||||
{ "III", "IHI", "CGC",
|
||||
'I', "ingotInvar",
|
||||
'H', IC2Items.getItem("reinforcedGlass"),
|
||||
'C', IC2Items.getItem("electronicCircuit"),
|
||||
'G', IC2Items.getItem("geothermalGenerator") });
|
||||
|
||||
LogHelper.info("Added Expensive IC2 Recipes");
|
||||
}
|
||||
|
||||
public static void addTechreboenRecipes()
|
||||
{
|
||||
CraftingHelper.addShapedOreRecipe(new ItemStack(ModItems.parts, 4, 6),
|
||||
new Object[]
|
||||
{ "EEE", "EAE", "EEE",
|
||||
'E', "gemEmerald",
|
||||
'A', IC2Items.getItem("electronicCircuit") });
|
||||
|
||||
CraftingHelper.addShapedOreRecipe(new ItemStack(ModItems.parts, 1, 7),
|
||||
new Object[]
|
||||
{ "AGA", "RPB", "ASA",
|
||||
'A', "ingotAluminium",
|
||||
'G', "dyeGreen",
|
||||
'R', "dyeRed",
|
||||
'P', "paneGlass",
|
||||
'B', "dyeBlue",
|
||||
'S',Items.glowstone_dust, });
|
||||
|
||||
CraftingHelper.addShapedOreRecipe(new ItemStack(ModItems.parts, 4, 8),
|
||||
new Object[]
|
||||
{ "DSD", "S S", "DSD",
|
||||
'D', "dustDiamond",
|
||||
'S', "ingotSteel" });
|
||||
|
||||
CraftingHelper.addShapedOreRecipe(
|
||||
new ItemStack(ModItems.parts, 16, 13),
|
||||
new Object[]
|
||||
{ "CSC", "SCS", "CSC",
|
||||
'S', "ingotSteel",
|
||||
'C',IC2Items.getItem("electronicCircuit") });
|
||||
|
||||
CraftingHelper.addShapedOreRecipe(new ItemStack(ModItems.parts, 2, 14),
|
||||
new Object[]
|
||||
{ "TST", "SBS", "TST",
|
||||
'S', "ingotSteel",
|
||||
'T', "ingotTungsten",
|
||||
'B', "blockSteel" });
|
||||
|
||||
CraftingHelper.addShapedOreRecipe(new ItemStack(ModItems.parts, 1, 15),
|
||||
new Object[]
|
||||
{ "AAA", "AMA", "AAA",
|
||||
'A', "ingotAluminium",
|
||||
'M', new ItemStack(ModItems.parts, 1, 13) });
|
||||
|
||||
CraftingHelper.addShapedOreRecipe(new ItemStack(ModItems.parts, 1, 16),
|
||||
new Object[]
|
||||
{ "AAA", "AMA", "AAA",
|
||||
'A', "ingotBronze",
|
||||
'M', new ItemStack(ModItems.parts, 1, 13) });
|
||||
|
||||
CraftingHelper.addShapedOreRecipe(new ItemStack(ModItems.parts, 1, 17),
|
||||
new Object[]
|
||||
{ "AAA", "AMA", "AAA",
|
||||
'A', "ingotSteel",
|
||||
'M', new ItemStack(ModItems.parts, 1, 13) });
|
||||
|
||||
CraftingHelper.addShapedOreRecipe(new ItemStack(ModItems.parts, 1, 18),
|
||||
new Object[]
|
||||
{ "AAA", "AMA", "AAA",
|
||||
'A', "ingotTitanium",
|
||||
'M', new ItemStack(ModItems.parts, 1, 13) });
|
||||
|
||||
CraftingHelper.addShapedOreRecipe(new ItemStack(ModItems.parts, 1, 19),
|
||||
new Object[]
|
||||
{ "AAA", "AMA", "AAA",
|
||||
'A', "ingotBrass",
|
||||
'M', new ItemStack(ModItems.parts, 1, 13) });
|
||||
}
|
||||
|
||||
}
|
|
@ -1,7 +1,10 @@
|
|||
package techreborn.compat.recipes;
|
||||
|
||||
public class RecipesThermalExpansion {
|
||||
// TODO remove basic machine frame recipe
|
||||
// TODO replace iron in recipe to steel
|
||||
|
||||
public static void init()
|
||||
{
|
||||
// TODO remove basic machine frame recipe
|
||||
// TODO replace iron in recipe to steel
|
||||
}
|
||||
}
|
||||
|
|
|
@ -19,7 +19,6 @@ public class ModRecipes {
|
|||
|
||||
public static void init()
|
||||
{
|
||||
removeIc2Recipes();
|
||||
addShaplessRecipes();
|
||||
addShappedRecipes();
|
||||
addSmeltingRecipes();
|
||||
|
@ -27,135 +26,8 @@ public class ModRecipes {
|
|||
addUUrecipes();
|
||||
}
|
||||
|
||||
public static void removeIc2Recipes()
|
||||
{
|
||||
if (config.ExpensiveMacerator);
|
||||
RecipeRemover.removeAnyRecipe(IC2Items.getItem("macerator"));
|
||||
if (config.ExpensiveDrill);
|
||||
RecipeRemover.removeAnyRecipe(IC2Items.getItem("miningDrill"));
|
||||
if (config.ExpensiveDiamondDrill);
|
||||
RecipeRemover.removeAnyRecipe(IC2Items.getItem("diamondDrill"));
|
||||
if (config.ExpensiveSolar);
|
||||
RecipeRemover.removeAnyRecipe(IC2Items.getItem("solarPanel"));
|
||||
|
||||
LogHelper.info("IC2 Recipes Removed");
|
||||
}
|
||||
|
||||
public static void addShappedRecipes()
|
||||
{
|
||||
|
||||
// IC2 Recipes
|
||||
if (config.ExpensiveMacerator);
|
||||
CraftingHelper.addShapedOreRecipe(IC2Items.getItem("macerator"),
|
||||
new Object[]
|
||||
{ "FDF", "DMD", "FCF",
|
||||
'F', Items.flint,
|
||||
'D', Items.diamond,
|
||||
'M', IC2Items.getItem("machine"),
|
||||
'C',IC2Items.getItem("electronicCircuit") });
|
||||
|
||||
if (config.ExpensiveDrill);
|
||||
CraftingHelper.addShapedOreRecipe(IC2Items.getItem("miningDrill"),
|
||||
new Object[]
|
||||
{ " S ", "SCS", "SBS",
|
||||
'S', "ingotSteel",
|
||||
'B',IC2Items.getItem("reBattery"),
|
||||
'C',IC2Items.getItem("electronicCircuit") });
|
||||
|
||||
if (config.ExpensiveDiamondDrill);
|
||||
CraftingHelper.addShapedOreRecipe(IC2Items.getItem("diamondDrill"),
|
||||
new Object[]
|
||||
{ " D ", "DBD", "TCT",
|
||||
'D', "gemDiamond",
|
||||
'T', "ingotTitanium",
|
||||
'B', IC2Items.getItem("miningDrill"),
|
||||
'C',IC2Items.getItem("advancedCircuit") });
|
||||
|
||||
if (config.ExpensiveSolar);
|
||||
CraftingHelper.addShapedOreRecipe(IC2Items.getItem("solarPanel"),
|
||||
new Object[]
|
||||
{ "PPP", "SZS", "CGC",
|
||||
'P', "paneGlass",
|
||||
'S', new ItemStack(ModItems.parts, 1, 1),
|
||||
'Z', IC2Items.getItem("carbonPlate"),
|
||||
'G', IC2Items.getItem("generator"),
|
||||
'C',IC2Items.getItem("electronicCircuit") });
|
||||
|
||||
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.thermalGenerator),
|
||||
new Object[]
|
||||
{ "III", "IHI", "CGC",
|
||||
'I', "ingotInvar",
|
||||
'H', IC2Items.getItem("reinforcedGlass"),
|
||||
'C', IC2Items.getItem("electronicCircuit"),
|
||||
'G', IC2Items.getItem("geothermalGenerator") });
|
||||
|
||||
// TechReborn Recipes
|
||||
CraftingHelper.addShapedOreRecipe(new ItemStack(ModItems.parts, 4, 6),
|
||||
new Object[]
|
||||
{ "EEE", "EAE", "EEE",
|
||||
'E', "gemEmerald",
|
||||
'A', IC2Items.getItem("electronicCircuit") });
|
||||
|
||||
CraftingHelper.addShapedOreRecipe(new ItemStack(ModItems.parts, 1, 7),
|
||||
new Object[]
|
||||
{ "AGA", "RPB", "ASA",
|
||||
'A', "ingotAluminium",
|
||||
'G', "dyeGreen",
|
||||
'R', "dyeRed",
|
||||
'P', "paneGlass",
|
||||
'B', "dyeBlue",
|
||||
'S',Items.glowstone_dust, });
|
||||
|
||||
CraftingHelper.addShapedOreRecipe(new ItemStack(ModItems.parts, 4, 8),
|
||||
new Object[]
|
||||
{ "DSD", "S S", "DSD",
|
||||
'D', "dustDiamond",
|
||||
'S', "ingotSteel" });
|
||||
|
||||
CraftingHelper.addShapedOreRecipe(
|
||||
new ItemStack(ModItems.parts, 16, 13),
|
||||
new Object[]
|
||||
{ "CSC", "SCS", "CSC",
|
||||
'S', "ingotSteel",
|
||||
'C',IC2Items.getItem("electronicCircuit") });
|
||||
|
||||
CraftingHelper.addShapedOreRecipe(new ItemStack(ModItems.parts, 2, 14),
|
||||
new Object[]
|
||||
{ "TST", "SBS", "TST",
|
||||
'S', "ingotSteel",
|
||||
'T', "ingotTungsten",
|
||||
'B', "blockSteel" });
|
||||
|
||||
CraftingHelper.addShapedOreRecipe(new ItemStack(ModItems.parts, 1, 15),
|
||||
new Object[]
|
||||
{ "AAA", "AMA", "AAA",
|
||||
'A', "ingotAluminium",
|
||||
'M', new ItemStack(ModItems.parts, 1, 13) });
|
||||
|
||||
CraftingHelper.addShapedOreRecipe(new ItemStack(ModItems.parts, 1, 16),
|
||||
new Object[]
|
||||
{ "AAA", "AMA", "AAA",
|
||||
'A', "ingotBronze",
|
||||
'M', new ItemStack(ModItems.parts, 1, 13) });
|
||||
|
||||
CraftingHelper.addShapedOreRecipe(new ItemStack(ModItems.parts, 1, 17),
|
||||
new Object[]
|
||||
{ "AAA", "AMA", "AAA",
|
||||
'A', "ingotSteel",
|
||||
'M', new ItemStack(ModItems.parts, 1, 13) });
|
||||
|
||||
CraftingHelper.addShapedOreRecipe(new ItemStack(ModItems.parts, 1, 18),
|
||||
new Object[]
|
||||
{ "AAA", "AMA", "AAA",
|
||||
'A', "ingotTitanium",
|
||||
'M', new ItemStack(ModItems.parts, 1, 13) });
|
||||
|
||||
CraftingHelper.addShapedOreRecipe(new ItemStack(ModItems.parts, 1, 19),
|
||||
new Object[]
|
||||
{ "AAA", "AMA", "AAA",
|
||||
'A', "ingotBrass",
|
||||
'M', new ItemStack(ModItems.parts, 1, 13) });
|
||||
|
||||
// Storage Blocks
|
||||
CraftingHelper.addShapedOreRecipe(
|
||||
new ItemStack(ModBlocks.storage, 1, 0),
|
||||
|
|
Before Width: | Height: | Size: 472 B |
Before Width: | Height: | Size: 574 B |
Before Width: | Height: | Size: 601 B |
Before Width: | Height: | Size: 427 B |
Before Width: | Height: | Size: 412 B |
Before Width: | Height: | Size: 609 B |
Before Width: | Height: | Size: 611 B |
Before Width: | Height: | Size: 652 B After Width: | Height: | Size: 652 B |
Before Width: | Height: | Size: 653 B After Width: | Height: | Size: 653 B |
Before Width: | Height: | Size: 660 B |
Before Width: | Height: | Size: 645 B |
Before Width: | Height: | Size: 657 B |
Before Width: | Height: | Size: 632 B |