From 101872931935db13be190881dddcc4667b3a5253 Mon Sep 17 00:00:00 2001 From: glowredman Date: Sat, 5 Feb 2022 01:35:56 +0100 Subject: [PATCH] The Beginning... of a mess https: //github.com/SpitefulFox/Avaritia/commit/b8922319104199b5e15e2b073bfbc0ea5c775fab Co-Authored-By: SpitefulFox <6055143+SpitefulFox@users.noreply.github.com> --- .../avaritia/blocks/LudicrousBlocks.java | 6 +-- .../spiteful/avaritia/crafting/Grinder.java | 4 +- .../tile/TileEntityAutoDireCrafting.java | 51 +++++++++++++++++- .../textures/gui/dire_autocrafting_gui.png | Bin 7444 -> 7539 bytes .../avaritia/textures/items/starfuel.png | Bin 0 -> 401 bytes 5 files changed, 54 insertions(+), 7 deletions(-) create mode 100644 src/main/resources/assets/avaritia/textures/items/starfuel.png 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 b07d885e9b4d8cd8fcea0bfe91307b6ac295d6aa..e1bc43b61401198556e0e775ef0db37e5b95a0fc 100644 GIT binary patch literal 7539 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 literal 7444 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