added recipes, first part of new textures

This commit is contained in:
Matthias Mann committed 2015-04-20 05:05:43 +02:00
1 parent 17a7be0a63
commit df641b87d7
8 files changed
+73 -6

No files matched your search

@@ -9,6 +9,7 @@ import net.minecraftforge.oredict.ShapedOreRecipe;
import net.minecraftforge.oredict.ShapelessOreRecipe;
import cpw.mods.fml.common.registry.GameRegistry;
import crazypants.enderio.EnderIO;
import crazypants.enderio.conduit.item.FunctionUpgrade;
import crazypants.enderio.config.Config;
import crazypants.enderio.item.skull.BlockEndermanSkull;
import crazypants.enderio.machine.buffer.BlockItemBuffer.Type;
@@ -50,6 +51,7 @@ public class MachineRecipes {
ItemStack zombieController = new ItemStack(EnderIO.itemFrankenSkull, 1, FrankenSkull.ZOMBIE_CONTROLLER.ordinal());
ItemStack frankenZombie = new ItemStack(EnderIO.itemFrankenSkull, 1, FrankenSkull.FRANKEN_ZOMBIE.ordinal());
ItemStack enderRes = new ItemStack(EnderIO.itemFrankenSkull, 1, FrankenSkull.ENDER_RESONATOR.ordinal());
ItemStack sentientEnder = new ItemStack(EnderIO.itemFrankenSkull, 1, FrankenSkull.SENTIENT_ENDER.ordinal());
ItemStack obsidian = new ItemStack(Blocks.obsidian);
//stirling gen
@@ -265,6 +267,12 @@ public class MachineRecipes {
GameRegistry.addShapelessRecipe(wirelessLamp, wirelessLampInv, Blocks.redstone_torch);
GameRegistry.addShapelessRecipe(wirelessLampInv, poweredLampInv, enderRes);
GameRegistry.addShapelessRecipe(wirelessLampInv, wirelessLamp, Blocks.redstone_torch);
//inventory panel
ItemStack awareness = new ItemStack(EnderIO.itemFunctionUpgrade, 1, FunctionUpgrade.INVENTORY_PANEL.ordinal());
GameRegistry.addRecipe(new ShapedOreRecipe(awareness, "bsb", "ses", "bib", 'b', conduitBinder, 's', silicon, 'e', Items.ender_eye, 'i', electricSteel));
ItemStack invPanel = new ItemStack(EnderIO.blockInventoryPanel);
GameRegistry.addShapedRecipe(invPanel, "dad", "psp", "dtd", 'd', darkSteel, 'a', awareness, 'p', pulCry, 's', sentientEnder, 't', basicTank);
}
public static void addOreDictionaryRecipes() {
@@ -10,11 +10,14 @@ import crazypants.enderio.network.PacketHandler;
import java.util.Random;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
public class BlockInventoryPanel extends AbstractMachineBlock<TileInventoryPanel> {
private static final float BLOCK_SIZE = 3.0f / 16.0f;
public static BlockInventoryPanel create() {
PacketHandler.INSTANCE.registerMessage(PacketItemInfo.class, PacketItemInfo.class, PacketHandler.nextID(), Side.CLIENT);
PacketHandler.INSTANCE.registerMessage(PacketItemList.class, PacketItemList.class, PacketHandler.nextID(), Side.CLIENT);
@@ -32,6 +35,11 @@ public class BlockInventoryPanel extends AbstractMachineBlock<TileInventoryPanel
super(ModObject.blockInventoryPanel, TileInventoryPanel.class);
}
@Override
public int getRenderType() {
return 0;
}
@Override
@SideOnly(Side.CLIENT)
public boolean isBlockSolid(IBlockAccess world, int x, int y, int z, int blockSide) {
@@ -56,7 +64,7 @@ public class BlockInventoryPanel extends AbstractMachineBlock<TileInventoryPanel
@Override
public void setBlockBoundsForItemRender() {
setBlockBounds(0.0f, 0.0f, 0.4f, 1.0f, 1.0f, 0.6f);
setBlockBounds(0.0f, 0.0f, 0.5f-BLOCK_SIZE/2, 1.0f, 1.0f, 0.5f+BLOCK_SIZE/2);
}
@Override
@@ -64,16 +72,16 @@ public class BlockInventoryPanel extends AbstractMachineBlock<TileInventoryPanel
int facing = getFacing(world, x, y, z);
switch (facing) {
case 2:
setBlockBounds(0.0f, 0.0f, 0.8f, 1.0f, 1.0f, 1.0f);
setBlockBounds(0.0f, 0.0f, 1.0f-BLOCK_SIZE, 1.0f, 1.0f, 1.0f);
break;
case 3:
setBlockBounds(0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 0.2f);
setBlockBounds(0.0f, 0.0f, 0.0f, 1.0f, 1.0f, BLOCK_SIZE);
break;
case 4:
setBlockBounds(0.8f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f);
setBlockBounds(1.0f-BLOCK_SIZE, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f);
break;
case 5:
setBlockBounds(0.0f, 0.0f, 0.0f, 0.2f, 1.0f, 1.0f);
setBlockBounds(0.0f, 0.0f, 0.0f, BLOCK_SIZE, 1.0f, 1.0f);
break;
default:
setBlockBounds(0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f);
@@ -107,6 +115,23 @@ public class BlockInventoryPanel extends AbstractMachineBlock<TileInventoryPanel
return "enderio:invPanelFrontOff";
}
// @Override
// protected String getTopIconKey(boolean active) {
// return "enderio:invPanelSide";
// }
//
// @Override
// protected String getSideIconKey(boolean active) {
// return "enderio:invPanelSide";
// }
@Override
@SideOnly(Side.CLIENT)
public IIcon getIcon(int blockSide, int blockMeta) {
// This is used to render the block as an item
return iconBuffer[0][blockSide+6];
}
@Override
public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) {
// The server needs the container as it manages the adding and removing of
@@ -27,6 +27,7 @@ public class SoulBinderRecipeManager {
public void addDefaultRecipes() {
MachineRecipeRegistry.instance.registerRecipe(ModObject.blockSoulBinder.unlocalisedName, SoulBinderSpawnerRecipe.instance);
MachineRecipeRegistry.instance.registerRecipe(ModObject.blockSoulBinder.unlocalisedName, SoulBinderReanimationRecipe.instance);
MachineRecipeRegistry.instance.registerRecipe(ModObject.blockSoulBinder.unlocalisedName, SoulBinderSentientRecipe.instance);
MachineRecipeRegistry.instance.registerRecipe(ModObject.blockSoulBinder.unlocalisedName, SoulBinderEnderCystalRecipe.instance);
MachineRecipeRegistry.instance.registerRecipe(ModObject.blockSoulBinder.unlocalisedName, SoulBinderAttractorCystalRecipe.instance);
@@ -0,0 +1,26 @@
package crazypants.enderio.machine.soul;
import net.minecraft.item.ItemStack;
import crazypants.enderio.EnderIO;
import crazypants.enderio.config.Config;
import crazypants.enderio.material.FrankenSkull;
public class SoulBinderSentientRecipe extends AbstractSoulBinderRecipe {
public static SoulBinderSentientRecipe instance = new SoulBinderSentientRecipe();
private SoulBinderSentientRecipe() {
super(Config.soulBinderReanimationRF, Config.soulBinderReanimationLevels, "SoulBinderSentientRecipe", "Witch", "enderzoo.WitherWitch");
}
@Override
public ItemStack getInputStack() {
return new ItemStack(EnderIO.itemFrankenSkull, 1, FrankenSkull.ENDER_RESONATOR.ordinal());
}
@Override
public ItemStack getOutputStack() {
return new ItemStack(EnderIO.itemFrankenSkull, 1, FrankenSkull.SENTIENT_ENDER.ordinal());
}
}
@@ -5,7 +5,8 @@ public enum FrankenSkull {
ZOMBIE_ELECTRODE("skullZombieElectrode", false),
ZOMBIE_CONTROLLER("skullZombieController", false),
FRANKEN_ZOMBIE("skullZombieFrankenstien", "enderio:skullZombieController", true),
ENDER_RESONATOR("skullEnderResonator", "enderio:skullEnderResonator", false);
ENDER_RESONATOR("skullEnderResonator", "enderio:skullEnderResonator", false),
SENTIENT_ENDER("skullSentientEnder", "enderio:skullEnderResonator", true);
public final String unlocalisedName;
public final String iconKey;