Merge branch 'Alch3mist-master'
Merge basic gear, redstone conductor and machine chassi into a single meta item.
No files matched your search
@@ -41,6 +41,7 @@ import crazypants.enderio.machine.reservoir.TileReservoir;
|
||||
import crazypants.enderio.material.BlockFusedQuartz;
|
||||
import crazypants.enderio.material.FusedQuartzFrameRenderer;
|
||||
import crazypants.enderio.material.FusedQuartzRenderer;
|
||||
import crazypants.enderio.material.MachinePartRenderer;
|
||||
|
||||
public class ClientProxy extends CommonProxy {
|
||||
|
||||
@@ -116,6 +117,9 @@ public class ClientProxy extends CommonProxy {
|
||||
MinecraftForgeClient.registerItemRenderer(EnderIO.blockCustomStair.blockID, pir);
|
||||
MinecraftForgeClient.registerItemRenderer(EnderIO.blockCustomSlab.blockID, pir);
|
||||
|
||||
|
||||
MinecraftForgeClient.registerItemRenderer(EnderIO.itemMachinePart.itemID, new MachinePartRenderer());
|
||||
|
||||
MinecraftForgeClient.registerItemRenderer(EnderIO.itemConduitFacade.itemID, new FacadeRenderer());
|
||||
|
||||
ClientRegistry.bindTileEntitySpecialRenderer(TileConduitBundle.class, cbr);
|
||||
|
||||
@@ -51,6 +51,8 @@ import crazypants.enderio.material.ItemAlloy;
|
||||
import crazypants.enderio.material.ItemCapacitor;
|
||||
import crazypants.enderio.material.ItemFusedQuartzFrame;
|
||||
import crazypants.enderio.material.ItemIndustrialBinder;
|
||||
import crazypants.enderio.material.ItemMJReader;
|
||||
import crazypants.enderio.material.ItemMachinePart;
|
||||
import crazypants.enderio.material.ItemYetaWrench;
|
||||
import crazypants.enderio.material.MaterialRecipes;
|
||||
|
||||
@@ -72,6 +74,7 @@ public class EnderIO {
|
||||
public static ItemAlloy itemAlloy;
|
||||
public static BlockFusedQuartz blockFusedQuartz;
|
||||
public static ItemFusedQuartzFrame itemFusedQuartzFrame;
|
||||
public static ItemMachinePart itemMachinePart;
|
||||
|
||||
// Enderface
|
||||
public static BlockEnderIO blockEnderIo;
|
||||
@@ -107,6 +110,7 @@ public class EnderIO {
|
||||
public static BlockLightNode blockLightNode;
|
||||
|
||||
public static ItemYetaWrench itemYetaWench;
|
||||
public static ItemMJReader itemMJReader;
|
||||
|
||||
@EventHandler
|
||||
public void preInit(FMLPreInitializationEvent event) {
|
||||
@@ -129,7 +133,8 @@ public class EnderIO {
|
||||
itemBasicCapacitor = ItemCapacitor.create();
|
||||
itemAlloy = ItemAlloy.create();
|
||||
blockFusedQuartz = BlockFusedQuartz.create();
|
||||
itemFusedQuartzFrame = ItemFusedQuartzFrame.create();
|
||||
itemFusedQuartzFrame = ItemFusedQuartzFrame.create();
|
||||
itemMachinePart = ItemMachinePart.create();
|
||||
|
||||
blockEnderIo = BlockEnderIO.create();
|
||||
itemEnderface = ItemEnderface.create();
|
||||
@@ -165,6 +170,7 @@ public class EnderIO {
|
||||
blockLightNode = BlockLightNode.create();
|
||||
|
||||
itemYetaWench = ItemYetaWrench.create();
|
||||
itemMJReader = ItemMJReader.create();
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
|
||||
@@ -16,7 +16,7 @@ public enum ModObject {
|
||||
itemRedstoneConduit(++Config.IID, CATEGORY_ITEM, "Redstone Conduit"),
|
||||
|
||||
// Power
|
||||
itemPowerConduit(++Config.IID, CATEGORY_ITEM, "Power Conduit"),
|
||||
itemPowerConduit(++Config.IID, CATEGORY_ITEM, "Energy Conduit"),
|
||||
|
||||
// Liquid
|
||||
itemLiquidConduit(++Config.IID, CATEGORY_ITEM, "Liquid Conduit"),
|
||||
@@ -55,7 +55,11 @@ public enum ModObject {
|
||||
|
||||
blockCrusher(++Config.BID, CATEGORY_BLOCK,"SAG Mill"),
|
||||
|
||||
blockHyperCube(++Config.BID, CATEGORY_BLOCK,"Hyper Cube");
|
||||
blockHyperCube(++Config.BID, CATEGORY_BLOCK,"Tesseract"),
|
||||
|
||||
itemMachinePart(++Config.IID, CATEGORY_ITEM, "Machine Parts"),
|
||||
|
||||
itemMJReader(++Config.IID, CATEGORY_ITEM, "MJ Reader (WIP)");
|
||||
|
||||
public final String unlocalisedName;
|
||||
public final String name;
|
||||
|
||||
@@ -1,22 +1,22 @@
|
||||
package crazypants.enderio.machine;
|
||||
|
||||
import static crazypants.enderio.ModObject.blockAlloySmelter;
|
||||
import static crazypants.enderio.ModObject.blockCapacitorBank;
|
||||
import static crazypants.enderio.ModObject.blockCrusher;
|
||||
import static crazypants.enderio.ModObject.blockElectricLight;
|
||||
import static crazypants.enderio.ModObject.blockPainter;
|
||||
import static crazypants.enderio.ModObject.blockReservoir;
|
||||
import static crazypants.enderio.ModObject.blockCrusher;
|
||||
import static crazypants.enderio.ModObject.blockSolarPanel;
|
||||
import static crazypants.enderio.ModObject.blockStirlingGenerator;
|
||||
import static crazypants.enderio.ModObject.itemBasicCapacitor;
|
||||
import static crazypants.enderio.ModObject.itemIndustrialBinder;
|
||||
import static crazypants.enderio.ModObject.blockCapacitorBank;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import crazypants.enderio.ModObject;
|
||||
import crazypants.enderio.material.Alloy;
|
||||
import crazypants.enderio.material.ItemCapacitor;
|
||||
import crazypants.enderio.material.MachinePart;
|
||||
import crazypants.enderio.power.Capacitors;
|
||||
|
||||
public class MachineRecipes {
|
||||
@@ -24,9 +24,11 @@ public class MachineRecipes {
|
||||
public static void addRecipes() {
|
||||
ItemStack industialBinder = new ItemStack(itemIndustrialBinder.actualId, 1, 0);
|
||||
ItemStack capacitor = new ItemStack(itemBasicCapacitor.actualId, 1, 0);
|
||||
|
||||
ItemStack machineChassi = new ItemStack(ModObject.itemMachinePart.actualId, 1, MachinePart.MACHINE_CHASSI.ordinal());
|
||||
ItemStack stirlingGen = new ItemStack(blockStirlingGenerator.actualId, 1, 0);
|
||||
GameRegistry.addShapedRecipe(stirlingGen, "bbb", "bfb", "bcb", 'b', industialBinder, 'f', Block.furnaceIdle, 'c', capacitor);
|
||||
ItemStack basicGear = new ItemStack(ModObject.itemMachinePart.actualId, 1, MachinePart.BASIC_GEAR.ordinal());
|
||||
|
||||
GameRegistry.addShapedRecipe(stirlingGen, " s ", "sfs", "gpg", 's', Block.stone, 'f', Block.furnaceIdle, 'p', Block.pistonBase, 'g', basicGear);
|
||||
|
||||
ItemStack painter = new ItemStack(blockPainter.actualId, 1, 0);
|
||||
ItemStack red = new ItemStack(Item.dyePowder, 1, 1);
|
||||
@@ -43,15 +45,15 @@ public class MachineRecipes {
|
||||
GameRegistry.addShapedRecipe(alloySmelter, "bbb", "CfC", "bcb", 'b', industialBinder, 'f', Block.furnaceIdle, 'c', capacitor, 'C', Item.cauldron);
|
||||
|
||||
ItemStack crusher = new ItemStack(blockCrusher.actualId, 1, 0);
|
||||
GameRegistry.addShapedRecipe(crusher, "iii", "ipi", "ici", 'i', Item.ingotIron, 'c', capacitor, 'p', Block.pistonBase);
|
||||
GameRegistry.addShapedRecipe(crusher, "f f", "imi", "ipi", 'i', Item.ingotIron, 'm', machineChassi, 'f', Item.flint, 'p', Block.pistonBase);
|
||||
|
||||
ItemStack solarPanel = new ItemStack(blockSolarPanel.actualId, 1, 0);
|
||||
ItemStack activatedIron = new ItemStack(ModObject.itemAlloy.actualId, 1, Alloy.ACTIVATED_IRON.ordinal());
|
||||
ItemStack activatedGold = new ItemStack(ModObject.itemAlloy.actualId, 1, Alloy.ACTIVATED_GOLD.ordinal());
|
||||
ItemStack fusedQuartz = new ItemStack(ModObject.blockFusedQuartz.actualId, 1, 0);
|
||||
ItemStack redstoneInductor = new ItemStack(ModObject.itemMachinePart.actualId, 1, MachinePart.REDSTONE_INDUCTOR.ordinal());
|
||||
|
||||
GameRegistry.addShapedRecipe(solarPanel, "qqq", "gig", "bcb", 'q', fusedQuartz, 'g', activatedGold, 'i', activatedIron, 'b', industialBinder, 'c',
|
||||
capacitor);
|
||||
GameRegistry.addShapedRecipe(solarPanel, "fff", "fdf", "cic", 'd', Block.daylightSensor, 'f', fusedQuartz, 'c', Item.coal, 'i', redstoneInductor);
|
||||
|
||||
ItemStack electricLight = new ItemStack(blockElectricLight.actualId, 1, 0);
|
||||
ItemStack glowstone = new ItemStack(Item.glowstone);
|
||||
@@ -61,7 +63,8 @@ public class MachineRecipes {
|
||||
ItemStack capacitorBank = new ItemStack(blockCapacitorBank.actualId,1,0);
|
||||
GameRegistry.addShapedRecipe(capacitorBank , "bab", "aca", "bab", 'a', activtedCapacitor,'b', industialBinder, 'c', capacitor);
|
||||
|
||||
|
||||
//To-do: Sort this class
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@@ -73,8 +73,8 @@ public class BlockHyperCube extends Block implements ITileEntityProvider, IGuiHa
|
||||
@Override
|
||||
public void registerIcons(IconRegister iconRegister) {
|
||||
blockIcon = iconRegister.registerIcon("enderio:solarPanelTop");
|
||||
addIcon = iconRegister.registerIcon("enderio:add");
|
||||
lockIcon = iconRegister.registerIcon("enderio:lock");
|
||||
addIcon = iconRegister.registerIcon("enderio:icons/add");
|
||||
lockIcon = iconRegister.registerIcon("enderio:icons/public");
|
||||
}
|
||||
|
||||
// @Override
|
||||
|
||||
@@ -0,0 +1,38 @@
|
||||
package crazypants.enderio.material;
|
||||
|
||||
import net.minecraft.client.renderer.texture.IconRegister;
|
||||
import net.minecraft.item.Item;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import cpw.mods.fml.common.registry.LanguageRegistry;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import crazypants.enderio.EnderIOTab;
|
||||
import crazypants.enderio.ModObject;
|
||||
|
||||
public class ItemMJReader extends Item {
|
||||
|
||||
public static ItemMJReader create() {
|
||||
ItemMJReader result = new ItemMJReader();
|
||||
result.init();
|
||||
return result;
|
||||
}
|
||||
|
||||
protected ItemMJReader() {
|
||||
super(ModObject.itemMJReader.id);
|
||||
setCreativeTab(EnderIOTab.tabEnderIO);
|
||||
setUnlocalizedName(ModObject.itemMJReader.unlocalisedName);
|
||||
setMaxStackSize(64);
|
||||
}
|
||||
|
||||
protected void init() {
|
||||
LanguageRegistry.addName(this, ModObject.itemMJReader.name);
|
||||
GameRegistry.registerItem(this, ModObject.itemMJReader.unlocalisedName);
|
||||
}
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void registerIcons(IconRegister iconRegister) {
|
||||
itemIcon = iconRegister.registerIcon("enderio:mJReader");
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,73 @@
|
||||
package crazypants.enderio.material;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.client.renderer.texture.IconRegister;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.Icon;
|
||||
import net.minecraft.util.MathHelper;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import cpw.mods.fml.common.registry.LanguageRegistry;
|
||||
import crazypants.enderio.EnderIOTab;
|
||||
import crazypants.enderio.ModObject;
|
||||
|
||||
public class ItemMachinePart extends Item {
|
||||
|
||||
private final Icon[] icons;
|
||||
|
||||
public static ItemMachinePart create() {
|
||||
ItemMachinePart mp = new ItemMachinePart();
|
||||
mp.init();
|
||||
return mp;
|
||||
}
|
||||
|
||||
private ItemMachinePart() {
|
||||
super(ModObject.itemMachinePart.id);
|
||||
setHasSubtypes(true);
|
||||
setMaxDamage(0);
|
||||
setCreativeTab(EnderIOTab.tabEnderIO);
|
||||
setUnlocalizedName(ModObject.itemMachinePart.unlocalisedName);
|
||||
|
||||
icons = new Icon[MachinePart.values().length];
|
||||
}
|
||||
|
||||
private void init() {
|
||||
LanguageRegistry.addName(this, ModObject.itemMachinePart.name);
|
||||
GameRegistry.registerItem(this, ModObject.itemMachinePart.unlocalisedName);
|
||||
for (int i = 0; i < MachinePart.values().length; i++) {
|
||||
LanguageRegistry.instance().addStringLocalization(getUnlocalizedName() + "." + MachinePart.values()[i].unlocalisedName + ".name",
|
||||
MachinePart.values()[i].uiName);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public Icon getIconFromDamage(int damage) {
|
||||
damage = MathHelper.clamp_int(damage, 0, MachinePart.values().length);
|
||||
return icons[damage];
|
||||
}
|
||||
|
||||
@Override
|
||||
public void registerIcons(IconRegister iconRegister) {
|
||||
int numParts = MachinePart.values().length;
|
||||
for (int i = 0; i < numParts; i++) {
|
||||
icons[i] = iconRegister.registerIcon(MachinePart.values()[i].iconKey);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getUnlocalizedName(ItemStack par1ItemStack) {
|
||||
int i = MathHelper.clamp_int(par1ItemStack.getItemDamage(), 0, MachinePart.values().length);
|
||||
return super.getUnlocalizedName() + "." + MachinePart.values()[i].unlocalisedName;
|
||||
}
|
||||
|
||||
@Override
|
||||
@SuppressWarnings({ "rawtypes", "unchecked" })
|
||||
public void getSubItems(int par1, CreativeTabs par2CreativeTabs, List par3List) {
|
||||
for (int j = 0; j < MachinePart.values().length; ++j) {
|
||||
par3List.add(new ItemStack(par1, 1, j));
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,20 @@
|
||||
package crazypants.enderio.material;
|
||||
|
||||
public enum MachinePart {
|
||||
|
||||
MACHINE_CHASSI("machineChassi","Machine Chassi","machineChassi"),
|
||||
BASIC_GEAR("basicGear", "Basic Gear", "basicGear"),
|
||||
REDSTONE_INDUCTOR("redstoneInductor", "Redstone Inductor", "redstoneInductor");
|
||||
|
||||
public final String unlocalisedName;
|
||||
public final String uiName;
|
||||
public final String iconKey;
|
||||
|
||||
private MachinePart(String unlocalisedName, String uiName, String iconKey) {
|
||||
this.unlocalisedName = unlocalisedName;
|
||||
this.uiName = uiName;
|
||||
this.iconKey = "enderio:" + iconKey;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,81 @@
|
||||
package crazypants.enderio.material;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.ItemRenderer;
|
||||
import net.minecraft.client.renderer.RenderBlocks;
|
||||
import net.minecraft.client.renderer.Tessellator;
|
||||
import net.minecraft.client.renderer.entity.RenderItem;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraftforge.client.ForgeHooksClient;
|
||||
import net.minecraftforge.client.IItemRenderer;
|
||||
import net.minecraftforge.client.IItemRenderer.ItemRenderType;
|
||||
import net.minecraftforge.client.IItemRenderer.ItemRendererHelper;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import cpw.mods.fml.common.FMLLog;
|
||||
|
||||
import crazypants.enderio.EnderIO;
|
||||
import crazypants.enderio.machine.painter.PainterUtil;
|
||||
import crazypants.render.BoundingBox;
|
||||
import crazypants.render.CubeRenderer;
|
||||
import crazypants.render.RenderUtil;
|
||||
|
||||
public class MachinePartRenderer implements IItemRenderer {
|
||||
|
||||
private ItemRenderer itemRenderer = new ItemRenderer(Minecraft.getMinecraft());
|
||||
private RenderItem renderItem = new RenderItem();
|
||||
|
||||
public MachinePartRenderer() {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean handleRenderType(ItemStack item, ItemRenderType type) {
|
||||
if (item != null && item.getItemDamage() == MachinePart.MACHINE_CHASSI.ordinal()) {
|
||||
return type == ItemRenderType.ENTITY || type == ItemRenderType.EQUIPPED || type == ItemRenderType.INVENTORY
|
||||
|| type == ItemRenderType.EQUIPPED_FIRST_PERSON;
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void renderItem(ItemRenderType type, ItemStack item, Object... data) {
|
||||
if (type == ItemRenderType.INVENTORY) {
|
||||
RenderBlocks renderBlocks = (RenderBlocks) data[0];
|
||||
renderToInventory(item, renderBlocks);
|
||||
} else if (type == ItemRenderType.EQUIPPED || type == ItemRenderType.EQUIPPED_FIRST_PERSON) {
|
||||
renderEquipped(item, (RenderBlocks) data[0]);
|
||||
} else if (type == ItemRenderType.ENTITY) {
|
||||
renderEntity(item, (RenderBlocks) data[0]);
|
||||
} else {
|
||||
FMLLog.warning("MachinePartRenderer.renderItem: Unsupported render type");
|
||||
}
|
||||
}
|
||||
|
||||
private void renderEntity(ItemStack item, RenderBlocks renderBlocks) {
|
||||
GL11.glPushMatrix();
|
||||
GL11.glScalef(0.5f, 0.5f, 0.5f);
|
||||
renderToInventory(item, renderBlocks);
|
||||
GL11.glPopMatrix();
|
||||
}
|
||||
|
||||
private void renderEquipped(ItemStack item, RenderBlocks renderBlocks) {
|
||||
GL11.glPushMatrix();
|
||||
GL11.glTranslatef(0.5F, 0.5F, 0.5F);
|
||||
renderToInventory(item, renderBlocks);
|
||||
GL11.glPopMatrix();
|
||||
}
|
||||
|
||||
private void renderToInventory(ItemStack item, RenderBlocks renderBlocks) {
|
||||
renderBlocks.setOverrideBlockTexture(EnderIO.itemMachinePart.getIconFromDamage(item.getItemDamage()));
|
||||
renderBlocks.renderBlockAsItem(Block.stone, 0, 1.0F);
|
||||
renderBlocks.clearOverrideBlockTexture();
|
||||
}
|
||||
}
|
||||
@@ -15,7 +15,8 @@ import crazypants.enderio.machine.alloy.VanillaSmeltingRecipe;
|
||||
|
||||
public class MaterialRecipes {
|
||||
|
||||
public static void addRecipes() {
|
||||
|
||||
public static void addRecipes() {
|
||||
|
||||
ItemStack industialBinder;
|
||||
if(Config.useAlternateBinderRecipe) {
|
||||
@@ -26,30 +27,36 @@ public class MaterialRecipes {
|
||||
industialBinder = new ItemStack(itemIndustrialBinder.actualId, 4, 0);
|
||||
GameRegistry.addSmelting(Block.gravel.blockID, industialBinder, 0);
|
||||
}
|
||||
|
||||
industialBinder = new ItemStack(itemIndustrialBinder.actualId, 1, 0);
|
||||
|
||||
ItemStack redstoneInductor = new ItemStack(ModObject.itemMachinePart.actualId, 1, MachinePart.REDSTONE_INDUCTOR.ordinal());
|
||||
ItemStack basicGear = new ItemStack(ModObject.itemMachinePart.actualId, 1, MachinePart.BASIC_GEAR.ordinal());
|
||||
ItemStack IndustrialBinder = new ItemStack(ModObject.itemIndustrialBinder.actualId, 1, 0);
|
||||
ItemStack basicCapacitor = new ItemStack(itemBasicCapacitor.actualId, 1, 0);
|
||||
GameRegistry.addShapedRecipe(basicCapacitor, " ", "gwi", "RbR", 'b', industialBinder, 'g', new ItemStack(Item.ingotGold), 'i', new ItemStack(
|
||||
Item.ingotIron), 'R', new ItemStack(Item.redstoneRepeater), 'w', Block.cloth);
|
||||
|
||||
ItemStack wrench = new ItemStack(ModObject.itemYetaWrench.actualId,1,0);
|
||||
ItemStack blueSteel = new ItemStack(ModObject.itemAlloy.actualId, 1, Alloy.BLUE_STEEL.ordinal());
|
||||
|
||||
ItemStack activatedCapacitor = new ItemStack(itemBasicCapacitor.actualId, 1, 1);
|
||||
ItemStack enderCapacitor = new ItemStack(itemBasicCapacitor.actualId, 1, 2);
|
||||
ItemStack fusedQuartzFrame = new ItemStack(ModObject.itemFusedQuartzFrame.actualId, 1, 0);
|
||||
ItemStack machineChassi = new ItemStack(ModObject.itemMachinePart.actualId, 1, MachinePart.MACHINE_CHASSI.ordinal());
|
||||
ItemStack mJReader = new ItemStack(ModObject.itemMJReader.actualId, 1, 0);
|
||||
|
||||
//Basic Capacitor
|
||||
GameRegistry.addShapedRecipe(basicCapacitor, " ", "rpr", " ", 'r', redstoneInductor, 'p', Item.paper);
|
||||
|
||||
//Activated Capacitor
|
||||
GameRegistry.addShapedRecipe(activatedCapacitor, " ", "gwi", "RbR", 'b', blueSteel, 'g', new ItemStack(ModObject.itemAlloy.actualId, 1,
|
||||
Alloy.ACTIVATED_GOLD.ordinal()), 'i',
|
||||
new ItemStack(ModObject.itemAlloy.actualId, 1, Alloy.ACTIVATED_IRON.ordinal()), 'R', new ItemStack(Item.redstoneRepeater), 'w', Block.cloth);
|
||||
|
||||
ItemStack enderCapacitor = new ItemStack(itemBasicCapacitor.actualId, 1, 2);
|
||||
//Ender Capacitor
|
||||
GameRegistry.addShapedRecipe(enderCapacitor, " ", "gwi", "RbR", 'b', blueSteel, 'g',
|
||||
new ItemStack(ModObject.itemAlloy.actualId, 1, Alloy.ENDER_GOLD.ordinal()), 'i',
|
||||
new ItemStack(ModObject.itemAlloy.actualId, 1, Alloy.ENDER_IRON.ordinal()), 'R', new ItemStack(Item.redstoneRepeater), 'w', Block.cloth);
|
||||
|
||||
|
||||
int meta = 0;
|
||||
for (Alloy alloy : Alloy.values()) {
|
||||
ItemStack ingot = new ItemStack(ModObject.itemAlloy.actualId, 1, meta);
|
||||
IMachineRecipe recipe = new BasicAlloyRecipe(ingot, alloy.unlocalisedName, alloy.ingrediants);
|
||||
|
||||
ItemStack nugget = new ItemStack(ModObject.itemAlloy.actualId, 9, meta + Alloy.values().length);
|
||||
GameRegistry.addShapelessRecipe(nugget, ingot);
|
||||
nugget = nugget.copy();
|
||||
@@ -63,12 +70,25 @@ public class MaterialRecipes {
|
||||
MachineRecipeRegistry.instance.registerRecipe(ModObject.blockAlloySmelter.unlocalisedName, new FusedQuartzRecipe());
|
||||
MachineRecipeRegistry.instance.registerRecipe(ModObject.blockAlloySmelter.unlocalisedName, new VanillaSmeltingRecipe());
|
||||
|
||||
ItemStack fusedQuartzFrame = new ItemStack(ModObject.itemFusedQuartzFrame.actualId, 1, 0);
|
||||
|
||||
//Industrial Binder - will be removed!
|
||||
GameRegistry.addShapedRecipe(fusedQuartzFrame, "bsb", "s s", "bsb", 'b', industialBinder, 's', new ItemStack(Item.stick));
|
||||
|
||||
ItemStack wrench = new ItemStack(ModObject.itemYetaWrench.actualId,1,0);
|
||||
//Wrench
|
||||
GameRegistry.addShapedRecipe(wrench, "i i", " b ", " i ", 'b', industialBinder, 'i', new ItemStack(Item.ingotIron));
|
||||
|
||||
//Machine Chassi
|
||||
GameRegistry.addShapedRecipe(machineChassi, "fff", "iri", "fff", 'f', Block.fenceIron, 'i', Item.ingotIron, 'r', redstoneInductor);
|
||||
|
||||
//Redstone Inductor
|
||||
GameRegistry.addShapedRecipe(redstoneInductor, "grg", "gig", "grg", 'r', Item.redstone, 'g', Item.goldNugget, 'i', Item.ingotIron);
|
||||
|
||||
//Basic Gear
|
||||
GameRegistry.addShapedRecipe(basicGear, "scs", "c c", "scs", 's', Item.stick, 'c', Block.cobblestone);
|
||||
|
||||
//MJ Reader
|
||||
GameRegistry.addShapedRecipe(mJReader, "r r", "rir", "gxg", 'r', Item.redstone, 'i', Item.ingotIron, 'g', basicGear, 'x', redstoneInductor);
|
||||
//TO-DO: Sort this class!
|
||||
}
|
||||
|
||||
}
|
||||
@@ -11,11 +11,11 @@ public enum Capacitors {
|
||||
|
||||
ACTIVATED_CAPACITOR(
|
||||
new BasicCapacitor(40, 20000, 6),
|
||||
"Activated Capacitor", "activatedCapacitor"),
|
||||
"D-L Capacitor", "activatedCapacitor"),
|
||||
|
||||
ENDER_CAPACITOR(
|
||||
new BasicCapacitor(100, 100000, 10),
|
||||
"Ender Capacitor", "enderCapacitor");
|
||||
"Hybrid Capacitor", "enderCapacitor");
|
||||
|
||||
public final ICapacitor capacitor;
|
||||
public final String unlocalisedName;
|
||||
|
||||
|
Before Width: | Height: | Size: 333 B |
|
Before Width: | Height: | Size: 678 B After Width: | Height: | Size: 777 B |
@@ -0,0 +1,13 @@
|
||||
{
|
||||
"animation": {
|
||||
"frametime": 3,
|
||||
"frames": [
|
||||
0,
|
||||
1,
|
||||
2,
|
||||
3,
|
||||
2,
|
||||
1,
|
||||
]
|
||||
}
|
||||
}
|
||||
|
Before Width: | Height: | Size: 622 B After Width: | Height: | Size: 642 B |
|
Before Width: | Height: | Size: 527 B After Width: | Height: | Size: 672 B |
|
After Width: | Height: | Size: 434 B |
|
After Width: | Height: | Size: 499 B |
|
After Width: | Height: | Size: 549 B |
|
After Width: | Height: | Size: 548 B |
|
After Width: | Height: | Size: 255 B |
|
After Width: | Height: | Size: 555 B |
|
Before Width: | Height: | Size: 667 B After Width: | Height: | Size: 650 B |
|
After Width: | Height: | Size: 647 B |
|
Before Width: | Height: | Size: 2.5 KiB After Width: | Height: | Size: 2.6 KiB |
|
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 1.8 KiB |
|
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 2.4 KiB |
|
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 1.7 KiB |
|
Before Width: | Height: | Size: 2.4 KiB After Width: | Height: | Size: 2.6 KiB |
|
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 2.1 KiB |
|
After Width: | Height: | Size: 431 B |
|
After Width: | Height: | Size: 530 B |
|
After Width: | Height: | Size: 611 B |
|
After Width: | Height: | Size: 443 B |
|
After Width: | Height: | Size: 565 B |
|
After Width: | Height: | Size: 461 B |
|
Before Width: | Height: | Size: 780 B After Width: | Height: | Size: 780 B |
|
After Width: | Height: | Size: 412 B |
|
After Width: | Height: | Size: 351 B |
|
After Width: | Height: | Size: 407 B |
|
After Width: | Height: | Size: 415 B |
|
After Width: | Height: | Size: 446 B |
|
After Width: | Height: | Size: 333 B |
|
After Width: | Height: | Size: 412 B |
|
After Width: | Height: | Size: 445 B |
|
After Width: | Height: | Size: 250 B |
|
After Width: | Height: | Size: 281 B |
|
After Width: | Height: | Size: 335 B |
|
After Width: | Height: | Size: 333 B |
|
After Width: | Height: | Size: 343 B |