From 8f96e5114253bfa455dc03550bcce07de9af5d7b Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Sat, 23 Apr 2016 17:44:14 -0400 Subject: [PATCH] Reduced Formulaic Assemblicator CPU usage by a factor of 10 --- .../content/assemblicator/RecipeFormula.java | 36 ++++++------------ .../TileEntityFormulaicAssemblicator.java | 8 ++-- .../assets/mekanism/gui/elements/GuiSlot.png | Bin 17640 -> 3149 bytes 3 files changed, 16 insertions(+), 28 deletions(-) diff --git a/src/main/java/mekanism/common/content/assemblicator/RecipeFormula.java b/src/main/java/mekanism/common/content/assemblicator/RecipeFormula.java index 4f7ac2d6f..5c73d99bf 100644 --- a/src/main/java/mekanism/common/content/assemblicator/RecipeFormula.java +++ b/src/main/java/mekanism/common/content/assemblicator/RecipeFormula.java @@ -14,17 +14,22 @@ public class RecipeFormula public ItemStack[] input = new ItemStack[9]; - public RecipeFormula(ItemStack[] inv) + public IRecipe recipe = null; + + public RecipeFormula(World world, ItemStack[] inv) { - this(inv, 0); + this(world, inv, 0); } - public RecipeFormula(ItemStack[] inv, int start) + public RecipeFormula(World world, ItemStack[] inv, int start) { for(int i = 0; i < 9; i++) { input[i] = StackUtils.size(inv[start+i], 1); } + + resetToRecipe(); + recipe = RecipeUtils.getRecipeFromGrid(dummy, world); } private void resetToRecipe() @@ -37,44 +42,29 @@ public class RecipeFormula public boolean matches(World world, ItemStack[] newInput, int start) { - resetToRecipe(); - - IRecipe origRecipe = RecipeUtils.getRecipeFromGrid(dummy, world); - for(int i = 0; i < 9; i++) { dummy.setInventorySlotContents(i, newInput[start+i]); } - IRecipe newRecipe = RecipeUtils.getRecipeFromGrid(dummy, world); - - return origRecipe == newRecipe; + return recipe.matches(dummy, world); } public boolean isIngredientInPos(World world, ItemStack stack, int i) { resetToRecipe(); - - IRecipe origRecipe = RecipeUtils.getRecipeFromGrid(dummy, world); dummy.setInventorySlotContents(i, stack); - IRecipe newRecipe = RecipeUtils.getRecipeFromGrid(dummy, world); - return origRecipe == newRecipe; + return recipe.matches(dummy, world); } public boolean isIngredient(World world, ItemStack stack) { - resetToRecipe(); - - IRecipe origRecipe = RecipeUtils.getRecipeFromGrid(dummy, world); - for(int i = 0; i < 9; i++) { dummy.setInventorySlotContents(i, stack); - IRecipe newRecipe = RecipeUtils.getRecipeFromGrid(dummy, world); - - if(origRecipe == newRecipe) + if(recipe.matches(dummy, world)) { return true; } @@ -92,9 +82,7 @@ public class RecipeFormula public IRecipe getRecipe(World world) { - resetToRecipe(); - - return RecipeUtils.getRecipeFromGrid(dummy, world); + return recipe; } public boolean isFormulaEqual(World world, RecipeFormula formula) diff --git a/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java b/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java index 065919d7e..6e52271ee 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java +++ b/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java @@ -108,7 +108,7 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im if(item.getInventory(inventory[2]) != null && !item.isInvalid(inventory[2])) { - RecipeFormula itemFormula = new RecipeFormula(item.getInventory(inventory[2])); + RecipeFormula itemFormula = new RecipeFormula(worldObj, item.getInventory(inventory[2])); if(itemFormula.isValidFormula(worldObj)) { @@ -144,7 +144,7 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im { boolean canOperate = true; - if(!formula.matches(worldObj, inventory, 27)) + if(!isRecipe) { canOperate = moveItemsToGrid(); } @@ -456,7 +456,7 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im if(item.getInventory(inventory[2]) == null) { - RecipeFormula formula = new RecipeFormula(inventory, 27); + RecipeFormula formula = new RecipeFormula(worldObj, inventory, 27); if(formula.isValidFormula(worldObj)) { @@ -592,7 +592,7 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im } } - formula = new RecipeFormula(inv); + formula = new RecipeFormula(worldObj, inv); } else { formula = null; diff --git a/src/main/resources/assets/mekanism/gui/elements/GuiSlot.png b/src/main/resources/assets/mekanism/gui/elements/GuiSlot.png index 4c395c5f563dd5e756b6f48e54b0523260bea9df..a022df7db24770f203c0dbd01652a1a44048bd19 100644 GIT binary patch literal 3149 zcmeHKc{J1u8~)8OW67Y#UM_`@L8%7m8hcT8gJjE=!B{KFFkD2kWZ%uW-B7kBTZPH4 zl+le!b|a0o$&AJ_V|@Pp{Rn@C`-hblYx)wW$s6)N+Yf@2l20d6l0c z6Z%b>d4fvgqw*^HOr#lNFZ_lk;l) zR(&8P6ZE4B{q`2<&Q6vbYT4yCme*qIDT7|kJJ095KleoF$EIWaz9Oh2DG;=MKuUpV z=DWTvGa>e=r=L8CmH{hI78m~XD!DmDB!$wiaS7Ni|0E{1r)s!}pr1&;=E_z(t3;c# z?Y;CQn_$M_rv_qUT8_+4JfHFRvD_4}`O^_T>!P!t&YTx6x51oSpWli>#P% zg6`T9ZjqUoug=GLRFIn>-kXquuP`%Y(WqR~q=hJtbb!o)IbI|Cq3~7Bc{gn3;_xLQ zN$pX&OA;$P@pi;Llg9huaSd0XHMVK#*5m3gmRGiI`zVq)0xk(z6OSju8U-LKg(s6c z1TCF;4*IAVKxZVz{2wO>L$$=}#H3R_D*Pl5(>l*H&NUScb&t5GG}FlX@QPKrJlEB-j+4k68;b^hcI01jn;=ekrw}ub6ylZ=Qxo0)VIU*7*gN4pZ{P?@5?_QrQGi?2< zlZaVt{+l9N!-m`WD02)f56fj2CG(mS??ShY_{cvxh$>jT(w1H&)&vV!>>V?8nE!&+L{zcu&WGuZ)}vUV#mXM_&4n z<0aF8Jdt0#yqHogb@%n<41fFNajeT>2z`1ZbE8D7O$2^b<3cH0sFRFZUuA1hGn#<> zBXRKq3c*stgM8Bv9cJSAvxzR*tc$nLh?GQ5=5 zee!E;`)0@R5W8G&X>wwEd3pKT>rx~V*}X;&_B9ijd&JbddntO@cR;so!)T1nE?d>1 zQQ8lG-(%gpRl2ay+C5T*@*R+tB-ZSvz4e}C6w(s-w4>)gHMX~R+D)1wW=k;<5vM1~ z;c7V698LFH_q=wb@mTaBid$Q;IE}iw>0S7vtNC*y6@hyBAq3D4ZYPLekKD9-1^U`A zU0~wGmM$20zHn+-G&tkx5JQ-kkvt)s-E;uVJIL=3__~@Z*(Ak5ZTc|Tit$=t83So2 zTLFioM36&Rv7$LKZ9mnIb^xRIx#-g4=7&@ih@jjs@jL_ZeXe+wdG`O?=BXF~B1)$X zmr;Ap?`$%!LsLbVDVt21)%vyH)?>Mos`~BJFS{!*vVyE0wbB(dp}a&7Bu*wqA+*)6vg7nahX8uL4L&3IOx+(<(Ufjdw?S>>g*ZMH8u>? z;Wjrn!%@cc)z#aBK`>>zj4BIaBlIbmJgqsqwzl^8z)fG@1*z$-F2lm6Eqe{su_oQ2 z6IO#gdhzv;bAf;^pTvc|E8_Tf3KF;z)1_3oX=MMA@`8xT79|@OVk-2c;L!|Dn1vkd zc!!{rc;nahdb0KVkFgdm_om7^Uqc_54OE^P&j^1=6`};ft1uhZPP`*HUjK9T*-XN& zwa)g8vVVcM6B|>I-fY#dUl2O}!SZ3uU`-3vIx1Q@bez`=8HZGeDB+P#%Q542MPa>! z+{Z=SVWV1%R$a3d(ZT|Qycr%F4s+)wX=bmab97HpTeY{z3BaH*8wAt!Dp$Kz^9G9# zw;EG(s8PxWL_>LG+*W{d5E2CDMwr(bJ=s>5@5_U@7koliJqPZMbDb z%D+QR&XP!M0_^Be2`WK| zA5po#15wo-C-4PJ&%J7a%Zwt_sd9%!W%WxF(aHv%6fjBPa)}Xwu@x{LJISbAd#C(w x3jQxD|Kj|!3xDbJOP_x|RsU_0co_&6LRofJhl>MC`)>kZZfa#xZ{+#Me*p4Uos9qh literal 17640 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 Q2)xo#GaPSEnEld!0cXa98UO$Q