From df641b87d7fb4dd7d867bc8b1a5734209a5081ed Mon Sep 17 00:00:00 2001 From: Matthias Mann Date: Mon, 20 Apr 2015 02:43:39 +0200 Subject: [PATCH] added recipes, first part of new textures --- resources/assets/enderio/lang/en_US.lang | 6 +++ .../textures/blocks/invPanelFrontOff.png | Bin 0 -> 703 bytes .../textures/blocks/invPanelFrontOn.png | Bin 1032 -> 850 bytes .../enderio/machine/MachineRecipes.java | 8 ++++ .../machine/invpanel/BlockInventoryPanel.java | 35 +++++++++++++++--- .../machine/soul/SoulBinderRecipeManager.java | 1 + .../soul/SoulBinderSentientRecipe.java | 26 +++++++++++++ .../enderio/material/FrankenSkull.java | 3 +- 8 files changed, 73 insertions(+), 6 deletions(-) create mode 100755 resources/assets/enderio/textures/blocks/invPanelFrontOff.png create mode 100644 src/main/java/crazypants/enderio/machine/soul/SoulBinderSentientRecipe.java diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index 4fb27eb7..511ae3c7 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -477,6 +477,11 @@ tile.blockBuffer.omni.name=Omni Buffer tile.blockBuffer.creative.name=Creative Buffer tile.blockInventoryPanel.name=Inventory Panel +tile.blockInventoryPanel.tooltip.basic.line1=Remote access and crafting +tile.blockInventoryPanel.tooltip.detailed.line1=Allows remote access to inventories via +tile.blockInventoryPanel.tooltip.detailed.line2=Remote Awareness Upgrades in item conduits. +tile.blockInventoryPanel.tooltip.detailed.line3=Uses Nutrient Distillation for power. +tile.blockInventoryPanel.tooltip.detailed.line4=Offers a persistent crafting grid. enderio.gui.inventorypanel.header.crafting=Crafting grid enderio.gui.inventorypanel.header.return=Return area enderio.gui.inventorypanel.info.filter= @@ -630,6 +635,7 @@ skullZombieElectrode.name=Zombie Electrode skullZombieController.name=Z-Logic Controller skullZombieFrankenstien.name=Frank'N'Zombie skullEnderResonator.name=Ender Resonator +skullSentientEnder.name=Sentient Ender item.itemSpawnEggEnderIO.name=Spawn diff --git a/resources/assets/enderio/textures/blocks/invPanelFrontOff.png b/resources/assets/enderio/textures/blocks/invPanelFrontOff.png new file mode 100755 index 0000000000000000000000000000000000000000..778c03c9b39f9c14516ed8e591fe5a6be70f2557 GIT binary patch literal 703 zcmV;w0zmzVP)K$sP)nnTgg%|!+qljO2uFM<#cVy*D*++Y-)BXYDF@o zafmEFuDQA{!xyX0PjRpa?s63wN+<;Fm)YF4bgqxw}Nf zcOu`%ShQtg=VfKbTg)(v0sH2kD<1Uq-CaZJejc|*#Q)tZ(Vro zLewj+NJ#Nt41U~b1VB5y14=0!Q5kg{9Wo@@h9t)@zq+rI-FDFrXW-$$%luE*-NxL; zDd%JE?5YcG>?I)9)unKM2!q;czd6&r6!tFb?iaepop%QNd4!|~F)*tMyW>ji9>MOP z@eE3>>~H2=nZMZ)a!swZ?G)dh!P)-M(QRsuDi7J-I7OV+NPWgL2em%v3;?FX)YaS= z-0MGMwudjMEw@82$d36Y3`Sv_djQAd5%~4@4?rswvpThMD3~N^jsneO#=80v7Aj_w zLL!K{DJDfR6TF1JE=%m5yz^Bd$rW-X8povoGuBlhVG_s4&tYPbR>=@%asDcA%RB>L z+`D$IwXSa}URwjQw=nuA)z9243q2(OERRX@zx51yB%P*KumAu68FWQhbW?9;ba!EL lWdK2BZ(?O2No`?gWm08fWO;GPWjp`?002ovPDHLkV1n44LRA0& literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/invPanelFrontOn.png b/resources/assets/enderio/textures/blocks/invPanelFrontOn.png index 46de5d0309fcb551102d4ae5186adbdcc5b5f2ae..2bbc4e6b16156737e770ab0af653081684d91472 100644 GIT binary patch delta 838 zcmV-M1G)T&2+{_S8Gix*008_L?V|ty0`y5lK~zY`y_QXmBt;B`KgVBI_jC(5&g^G6 z1}nB8Hn4zU18Q*q#08L$xZG%jTHRBX5w=;lGApMf*ubP$sZd75d(Y1f%ga}2LS6z?L;1mQ9cOOID{oUKQKv|ecF1byITyjncaQDjv!vL2!-vGCNxWLgd{CLuF z{-Fp0l#<#seg4zez;L^wIY|Ptq|KoQ98v*pQvs@E;K@4h$F~pj@mOlTx-htLCF!}(dT7ljN@aEx1Ag3%6 zn(g4CP*X$@?otJ07*Nl+I?&yKxzE7V+KT;98!*NIZrcR>rKd=^#F=|Ah+;HTH;cLr zP2bNmP--|N{R{SRM{tc$Q&Y`5F^G!oW6XU-KE8bO4S(>cGmFy`!iSy-?6s8G3)E6q zu4f+ZyD*sNBLD^#)p#_$!XCJ8YTMu~SKm4Y&}8Yd?zR&H3?P?7sfYVqSM7p9_RxrA@%r@lc}|goBEITANnVu=tpo2(YggEPTpGBIp+ik| z7Y5rdeSeb*@NOJ|+fsqg%3)pE>K=8z?N`x@g15PwyYIw6!nx|0KU)Xxb7S$(i&R-$ z6kOvi4D6x%i#DzK2p8p?OFl#Y_zY4y&k$xF_n$Todc3g_fqm=!t*>e=z|jVvszXh3 z-YEwFwX~9QC_cLavgtw*-~IgkX4_>wGI#Dm5Py2OJ7yOK?xver>OY36`Z86@%h#`g z`@6eb@^o{^rG&D%7QmxbjhI#e=3%hRpz46Q0x1SHGadT){H$XY0zrTNP0GrJk z0J8=_tpuUhcU%vq$t@`{?>b91#F1g?y zmD*#PeZRZ00I)sU0&sP81;ERfFZ#OG>X{&rQ)h4T`{m^&0Jp;s^!2RpSi9#EG4>#@ zvS*RAJoek<+<*7IxB%eumoEzgo*scWW}yynb`ezt?myKDPBWW+5r#)O5K1?A-lo;2BT+`0HHP7?ZzuvH)QDp( zs4As6XRPBU&TQ2lnz0m0t&_+1l`=nUpX@#IP^juO?$73kbyQGA)e(9Ofnm7ye@}WA zlzpts8h@=8%na4kSzc-%r-0s-ur)W#jjlZ_n8LxLTDC(FXtmLtG$uO5)@FhCsfdA$Y^TCG@XXwK*?kK-Wqejp5qgU$cOp)7RfARP!nin41? zKvDHHwSJ(PYf={0NAa)RvEHb4jz~3KxQ?lJ|L%W|#Pw3t5?QO4$ zC%fHZJV|j#Vq@WPz4t{F3K!My+t;rE>`r>M9fBif&jf+d)8%uN-RXlNFJc*WJo)_I rQ(1f?1_y#W)qBA`k}R_5$r1PuAnsXy(_q5y00000NkvXXu0mjfDNFqo diff --git a/src/main/java/crazypants/enderio/machine/MachineRecipes.java b/src/main/java/crazypants/enderio/machine/MachineRecipes.java index 3a11bd40..1631dcfd 100644 --- a/src/main/java/crazypants/enderio/machine/MachineRecipes.java +++ b/src/main/java/crazypants/enderio/machine/MachineRecipes.java @@ -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() { diff --git a/src/main/java/crazypants/enderio/machine/invpanel/BlockInventoryPanel.java b/src/main/java/crazypants/enderio/machine/invpanel/BlockInventoryPanel.java index a7864d25..aa7d195b 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/BlockInventoryPanel.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/BlockInventoryPanel.java @@ -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 { + 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