diff --git a/dependencies.gradle b/dependencies.gradle index 0723160..30424dc 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -4,15 +4,15 @@ dependencies { compile("com.github.GTNewHorizons:CodeChickenCore:1.1.3:dev") compile("com.github.GTNewHorizons:NotEnoughItems:2.1.22-GTNH:dev") - compileOnly("com.github.GTNewHorizons:Avaritiaddons:1.5.2-GTNH:dev") {transitive = false} - compileOnly("com.github.GTNewHorizons:BuildCraftCompat:7.1.9:dev") {transitive = false} - compileOnly("com.github.GTNewHorizons:EnderIO:2.3.1.27:dev") {transitive = false} - compileOnly("com.github.GTNewHorizons:ForestryMC:4.4.4:dev") {transitive = false} - compileOnly("com.github.GTNewHorizons:GT5-Unofficial:5.09.40.18:dev") {transitive = false} - compileOnly("com.github.GTNewHorizons:GTplusplus:1.7.24:dev") {transitive = false} - compileOnly("com.github.GTNewHorizons:ThaumicEnergistics:1.3.16-GTNH:dev") {transitive = false} - compileOnly("com.github.GTNewHorizons:WirelessCraftingTerminal:1.8.8.3:dev") {transitive = false} - compileOnly("com.gregoriust.gregtech:gregtech_1.7.10:6.14.23:dev") {transitive = false} - compileOnly("curse.maven:thaumcraft-nei-plugin-225095:2241913") {transitive = false} - compileOnly("curse.maven:thermal-expansion-69163:2388759") {transitive = false} + compileOnly("com.github.GTNewHorizons:Avaritiaddons:1.5.2-GTNH:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:BuildCraftCompat:7.1.9:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:EnderIO:2.3.1.27:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:ForestryMC:4.4.4:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:GT5-Unofficial:5.09.40.18:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:GTplusplus:1.7.24:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:ThaumicEnergistics:1.3.16-GTNH:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:WirelessCraftingTerminal:1.8.8.3:dev") { transitive = false } + compileOnly("com.gregoriust.gregtech:gregtech_1.7.10:6.14.23:dev") { transitive = false } + compileOnly("curse.maven:thaumcraft-nei-plugin-225095:2241913") { transitive = false } + compileOnly("curse.maven:thermal-expansion-69163:2388759") { transitive = false } } diff --git a/src/main/java/com/github/vfyjxf/nee/block/tile/TilePatternInterface.java b/src/main/java/com/github/vfyjxf/nee/block/tile/TilePatternInterface.java index 9be7edc..1b24126 100644 --- a/src/main/java/com/github/vfyjxf/nee/block/tile/TilePatternInterface.java +++ b/src/main/java/com/github/vfyjxf/nee/block/tile/TilePatternInterface.java @@ -70,7 +70,8 @@ public class TilePatternInterface extends AENetworkInvTile implements IGridTicka private final boolean[] workStarted = new boolean[9]; public TilePatternInterface() { - this.gridInv = new AppEngInternalInventory(this, 9 + 1, 1); + this.gridInv = new AppEngInternalInventory(this, 9 + 1 ); + this.gridInv.setMaxStackSize(1); this.patterns = new AppEngInternalInventory(this, 9); this.ejectInv = new AppEngInternalInventory(this, 9); this.craftingList = new ArrayList<>(); diff --git a/src/main/java/com/github/vfyjxf/nee/proxy/ClientProxy.java b/src/main/java/com/github/vfyjxf/nee/proxy/ClientProxy.java index 6a7c649..4af0e84 100644 --- a/src/main/java/com/github/vfyjxf/nee/proxy/ClientProxy.java +++ b/src/main/java/com/github/vfyjxf/nee/proxy/ClientProxy.java @@ -14,6 +14,7 @@ import net.minecraftforge.common.MinecraftForge; public class ClientProxy extends CommonProxy { @Override public void init(FMLInitializationEvent event) { + super.init(event); ClientCommandHandler.instance.registerCommand(new NEECommands()); FMLCommonHandler.instance().bus().register(GuiEventHandler.instance); MinecraftForge.EVENT_BUS.register(GuiEventHandler.instance); diff --git a/src/main/java/com/github/vfyjxf/nee/proxy/CommonProxy.java b/src/main/java/com/github/vfyjxf/nee/proxy/CommonProxy.java index dc63a33..96b16bc 100644 --- a/src/main/java/com/github/vfyjxf/nee/proxy/CommonProxy.java +++ b/src/main/java/com/github/vfyjxf/nee/proxy/CommonProxy.java @@ -1,5 +1,11 @@ package com.github.vfyjxf.nee.proxy; +import appeng.api.AEApi; +import appeng.api.definitions.IBlocks; +import appeng.api.definitions.IDefinitions; +import appeng.api.definitions.IMaterials; +import appeng.api.definitions.IParts; +import appeng.api.util.AEColor; import appeng.core.features.ActivityState; import appeng.core.features.BlockStackSrc; import appeng.tile.AEBaseTile; @@ -9,15 +15,20 @@ import com.github.vfyjxf.nee.block.tile.TilePatternInterface; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.ShapedOreRecipe; + +import static com.github.vfyjxf.nee.block.BlockPatternInterface.BLOCK_INSTANCE; public class CommonProxy { public void init(FMLInitializationEvent event) { AEBaseTile.registerTileItem(TilePatternInterface.class, - new BlockStackSrc(BlockPatternInterface.BLOCK_INSTANCE, 0, ActivityState.Enabled)); + new BlockStackSrc(BLOCK_INSTANCE, 0, ActivityState.Enabled)); + registerRecipe(); } - public void preInit(FMLPreInitializationEvent event){ + public void preInit(FMLPreInitializationEvent event) { registerBlocks(); registerItems(); registerTileEntities(); @@ -28,11 +39,46 @@ public class CommonProxy { } public void registerBlocks() { - GameRegistry.registerBlock(BlockPatternInterface.BLOCK_INSTANCE, null,"tile.pattern_interface"); + GameRegistry.registerBlock(BLOCK_INSTANCE, null, "tile.pattern_interface"); } public void registerTileEntities() { GameRegistry.registerTileEntity(TilePatternInterface.class, NotEnoughEnergistics.MODID + "." + "tile.pattern_interface"); } + public void registerRecipe() { + final IDefinitions definitions = AEApi.instance().definitions(); + final IMaterials materials = definitions.materials(); + final IParts parts = definitions.parts(); + final IBlocks blocks = definitions.blocks(); + + ItemStack blankPattern = null; + ItemStack patternTerm = null; + ItemStack meInterface = null; + ItemStack monitor = null; + ItemStack cableSmart = parts.cableSmart().stack(AEColor.Transparent, 1); + if (materials.blankPattern().maybeStack(1).isPresent()) { + blankPattern = materials.blankPattern().maybeStack(1).get(); + } + if (parts.patternTerminal().maybeStack(1).isPresent()) { + patternTerm = parts.patternTerminal().maybeStack(1).get(); + } + if (blocks.iface().maybeStack(1).isPresent()) { + meInterface = blocks.iface().maybeStack(1).get(); + } + if (blocks.craftingMonitor().maybeStack(1).isPresent()) { + monitor = blocks.craftingMonitor().maybeStack(1).get(); + } + + GameRegistry.addRecipe(new ShapedOreRecipe(BLOCK_INSTANCE, + "aba", "cdc", "eee", + 'a', blankPattern, + 'b', patternTerm, + 'c', meInterface, + 'd', monitor, + 'e', cableSmart + )); + + } + } diff --git a/src/main/java/com/github/vfyjxf/nee/proxy/ServerProxy.java b/src/main/java/com/github/vfyjxf/nee/proxy/ServerProxy.java index ee54955..73018ad 100644 --- a/src/main/java/com/github/vfyjxf/nee/proxy/ServerProxy.java +++ b/src/main/java/com/github/vfyjxf/nee/proxy/ServerProxy.java @@ -5,6 +5,6 @@ import cpw.mods.fml.common.event.FMLInitializationEvent; public class ServerProxy extends CommonProxy { @Override public void init(FMLInitializationEvent event) { - // NO-OP + super.init(event); } }