diff --git a/src/main/java/fox/spiteful/avaritia/blocks/LudicrousBlocks.java b/src/main/java/fox/spiteful/avaritia/blocks/LudicrousBlocks.java index 4bbe234..8fcda6f 100644 --- a/src/main/java/fox/spiteful/avaritia/blocks/LudicrousBlocks.java +++ b/src/main/java/fox/spiteful/avaritia/blocks/LudicrousBlocks.java @@ -21,7 +21,7 @@ public class LudicrousBlocks { */ public static Block resource_block; public static Block dire_crafting; - //public static Block auto_dire_crafting; + public static Block auto_dire_crafting; public static Block neutron_collector; public static Block compressor; @@ -31,8 +31,8 @@ public class LudicrousBlocks { double_craft = GameRegistry.registerBlock(new BlockDoubleCraft(), "Double_Craft"); triple_craft = GameRegistry.registerBlock(new BlockTripleCraft(), "Triple_Craft"); dire_crafting = GameRegistry.registerBlock(new BlockDireCrafting(), "Dire_Crafting"); - //auto_dire_crafting =GameRegistry.registerBlock(new BlockAutoDireCrafting(), "Auto_Dire_Crafting"); - //GameRegistry.registerTileEntity(TileEntityDireCrafting.class, "Avaritia_Dire_Craft"); + auto_dire_crafting =GameRegistry.registerBlock(new BlockAutoDireCrafting(), "Auto_Dire_Crafting"); + GameRegistry.registerTileEntity(TileEntityDireCrafting.class, "Avaritia_Dire_Craft"); if(Config.craftingOnly) return; diff --git a/src/main/java/fox/spiteful/avaritia/crafting/Grinder.java b/src/main/java/fox/spiteful/avaritia/crafting/Grinder.java index 72f5a8a..d491ec9 100644 --- a/src/main/java/fox/spiteful/avaritia/crafting/Grinder.java +++ b/src/main/java/fox/spiteful/avaritia/crafting/Grinder.java @@ -50,8 +50,8 @@ public class Grinder { GameRegistry.addShapedRecipe(new ItemStack(LudicrousBlocks.resource_block, 1, 1), "CCC", "CCC", "CCC", 'C', new ItemStack(LudicrousItems.resource, 1, 6)); GameRegistry.addShapedRecipe(new ItemStack(LudicrousItems.resource, 9, 6), "C", 'C', new ItemStack(LudicrousBlocks.resource_block, 1, 1)); - //GameRegistry.addShapedRecipe(new ItemStack(LudicrousItems.resource, 13, 8), "CCC", "CIC", "CCC", 'C', new ItemStack(Blocks.coal_block, 1), 'I', new ItemStack(LudicrousItems.resource, 1, 1)); - //GameRegistry.addShapedRecipe(new ItemStack(LudicrousItems.resource, 1, 9), " I ", "ISI", " I ", 'I', new ItemStack(LudicrousItems.resource, 1, 4), 'S', new ItemStack(Items.stick)); + GameRegistry.addShapedRecipe(new ItemStack(LudicrousItems.resource, 13, 8), "CCC", "CIC", "CCC", 'C', new ItemStack(Blocks.coal_block, 1), 'I', new ItemStack(LudicrousItems.resource, 1, 1)); + GameRegistry.addShapedRecipe(new ItemStack(LudicrousItems.resource, 1, 9), " I ", "ISI", " I ", 'I', new ItemStack(LudicrousItems.resource, 1, 4), 'S', new ItemStack(Items.stick)); ExtremeCraftingManager.getInstance().addRecipe(new ItemStack(LudicrousBlocks.neutron_collector, 1), "IIQQQQQII", diff --git a/src/main/java/fox/spiteful/avaritia/tile/TileEntityAutoDireCrafting.java b/src/main/java/fox/spiteful/avaritia/tile/TileEntityAutoDireCrafting.java index e0d0460..45bf5dd 100644 --- a/src/main/java/fox/spiteful/avaritia/tile/TileEntityAutoDireCrafting.java +++ b/src/main/java/fox/spiteful/avaritia/tile/TileEntityAutoDireCrafting.java @@ -1,8 +1,10 @@ package fox.spiteful.avaritia.tile; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; +import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -10,6 +12,9 @@ public class TileEntityAutoDireCrafting extends TileLudicrous implements IInvent private ItemStack result; private ItemStack[] matrix = new ItemStack[81]; + private ItemStack[] storage = new ItemStack[81]; + + private boolean recipeChanged = true; @Override public boolean canUpdate() @@ -58,8 +63,8 @@ public class TileEntityAutoDireCrafting extends TileLudicrous implements IInvent public ItemStack getStackInSlot(int slot){ if(slot == 0) return result; - else if(slot <= matrix.length) - return matrix[slot - 1]; + else if(slot <= storage.length) + return storage[slot - 1]; else return null; } @@ -167,5 +172,47 @@ public class TileEntityAutoDireCrafting extends TileLudicrous implements IInvent public boolean canExtractItem(int slot, ItemStack item, int side){ return false; } + public class ExtremeCraftingMatrix extends InventoryCrafting + { + public ExtremeCraftingMatrix() + { + super(new Container() + { + @Override + public boolean canInteractWith(final EntityPlayer entityPlayer) + { + return false; + } + }, 9, 9); + } + + @Override + public ItemStack getStackInSlot(final int slot) + { + return matrix[slot]; + } + + @Override + public void setInventorySlotContents(final int slot, final ItemStack itemStack) + { + recipeChanged = true; + matrix[slot] = itemStack; + markDirty(); + } + + @Override + public ItemStack decrStackSize(int slot, final int howMuch) + { + if (matrix[slot] == null) + return null; + final ItemStack itemStack = matrix[slot].copy(); + if ((matrix[slot].stackSize -= howMuch) == 0) + matrix[slot] = null; + itemStack.stackSize = howMuch; + markDirty(); + return itemStack; + } + } + } diff --git a/src/main/resources/assets/avaritia/textures/gui/dire_autocrafting_gui.png b/src/main/resources/assets/avaritia/textures/gui/dire_autocrafting_gui.png index b07d885..e1bc43b 100644 Binary files a/src/main/resources/assets/avaritia/textures/gui/dire_autocrafting_gui.png and b/src/main/resources/assets/avaritia/textures/gui/dire_autocrafting_gui.png differ diff --git a/src/main/resources/assets/avaritia/textures/items/starfuel.png b/src/main/resources/assets/avaritia/textures/items/starfuel.png new file mode 100644 index 0000000..1d789d2 Binary files /dev/null and b/src/main/resources/assets/avaritia/textures/items/starfuel.png differ