From b8dd2f9fd9397f255d7c8447cffbe33d9c41afe8 Mon Sep 17 00:00:00 2001 From: ZaykieT <108432213+ZaykieT@users.noreply.github.com> Date: Wed, 15 Jul 2026 07:25:41 +0200 Subject: [PATCH 1/3] Adjusted heart colors to be more distinct (#303) --- .../assets/tinker/textures/gui/newhearts.png | Bin 7484 -> 5231 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/src/main/resources/assets/tinker/textures/gui/newhearts.png b/src/main/resources/assets/tinker/textures/gui/newhearts.png index b8345cd227123e46270a1c0b8221632836660008..1d133c845c7c10c596dcd223af17937514a40a54 100644 GIT binary patch literal 5231 zcmeI0eIS#2|HrR+7}5^+(J59ZP0B(omG?4+nWPRLP|hYood(p{l2qn%SJEO+OQ z&12L&42wc)ndLN;hs4aYI?E=;WSH4(ziXS$>D<5jzW@FG^Ye%6`~7@BpU?Mly}z&P zy-9KV-Wj$Ez6t;U*x^G5JOBU!4k3Ux6ug`|UlOdCUGQ+;4^(z+_y7QFwjMt4o#&;2 zsa#xnZZx);&=vYyDtgsp)0;)MMNZw!mTj9oA69P1JhL^4;p?r^)G^=^CVb3pI{vI( zUqnpb&*6{5sg`S>=WMe@q^8{LmpX2CYC9V^;dvN@M>!#sq>_9xOi<c|={B9x4@H|1^qF~QdEL&(8=@nTaWY+pRL6jb2`=xO z@VyhZZ(3Zi!1XHJ?A@-QLf`>u8}MtN^V-xh1I;8>5TtR%0Xr84L)KZW0*Vf+qf?iM`(J={p*%?Bjxy|%Y$r)K|8xc513eE36 zOQWAj{CaPGSRuBS8jBz{fi?#D>ny~F-bJIA;Ln|{>D z+g@pg`C#+Ns@8>%(7HdWf+y4) z;Ry}1PWc#2RAULlOc?Jv52Mu&N&SuuI>R;+N5e4^RXEZZc_}E7S~^t(CA0~UEG$!X z&1d($%@98$*An1%)^v8yf;--sD}t*v8q#8l7g#-Q4hN1Q+;-#qyyi_jEp45%9_RC>E7OTnLdil zKc$Fw?BjN9v#y!!r*V`^{gGChMF>+uydZ5*XOn% z4~+~ww|8QIG>R$IO3qrYY})ayph3iEE}rkHLDDgW`fh=OCGJG^nRjtJ#Bak?{3K|f z2pq)*xz@|NLy#(9F53S%LH#BC<*0*Qw}OaTZXIb{mXXiMYocxuNQxh3=U>|pof~E? z6zr?6<)diT3QBUrHZ`S`3Kl!UUurc-uQ1=9?}@(GFMhG^C(*;KB?N(XSK8i0fh!pG zG9x(d#qr){US*q+WwU0+mi~6LAxiQOnIYyOCVKy%OrP3GR6wE&LNcsJCAzEuyl!hI z!B2v?P+HZ{?Nk+PCd`IuK}XKYvSGYjwCkw3DkZgovE}z9&g;v!SE&4qE)~2zeK83@ zpF{Qp@R)B_T-Qc5lg1&kO!>mZ9dYz~noLMDk4uujyYiO`aGF3)spLfuCKf4J zqRLNEQ#NKrEepF>P<)an!eLxrNo~*j$%%dj!w#9!7avxT(rk1#wkuXKxT(n(74M|T zLv3 zKhX+TBifz{ut)>@co=1ir}->pMU1_2?g$v-W3fSBhHb*fEn%8 zTjOJWkKRjJJrZs2bqsNdJwFFxm>&j)m*X$HDl$Kk+TQxIyPcZ^kePU(xMx{4kXGw9 z=>weNE~;&D%VP9oY0UYNj=|m)c!c1ArGQ~_Yw(LQU6uWeNC&p7?1xPq^->vEWm=R9 zG4ZbzgGw$V5_uC8RYB!YRgtPk^YeUxVL0Em+a(&fUMiXzJRTeztUSKGQZLY-xY<#b z>vu(juC{dcRhUTp0)Oiyn;P|LE*goC>aRX?M8PEJmt4ABCV9o@NBlnL<;B08sv8|q zAl6|+6#rlrKHN+i4!0IkoO+)SkWbk`+{|Vsw>^9PCu39BvvcEexhjYZaz)HL*!L<& zQrsm?wmAgJ9C;Mh9rS+T#X5hx`X-wB6VC1&TufjDvOINY9M2>S%Z&)-rC4$?U5eju`~IZLb^huy$SKeh^!< zVMG~&yN53xQ*_Ft)|Xr`rlu^^f4oZUz|zbIcy%MQcbI*%m%1_r7ZMjh&uKq?s>?85 zF!Jnn#^BRffh7@4x}ljy8cElvRo(QzOl6n}Z)KR_?bqtAW?l9cl_Zs#GzZZ$hjvaM4(xHs3zqiX#?!y>cRKgU+a zcmH#9_W?;8ZAk>q^6T#ffj1KCSF>{{L{x$Ev37mb8D(j=v0NPOxC0TpC6`oYr^Jfwr}8$e>j$NaRby5B)v9Rv7c=`$7MSQcwYtH+ zuNkwrrqNJZrt41{sVXad1}TElr{848LJ!WT-LGP>Y4ZnjzjFs&FL8Rnb!GH|?C@dr zjR6#9M(L4Uhd@zur?BwBEVRY!z7OWmp@_|naFjhd|g;y=HvPs)j0INq0 z&28DemhBFdkk?6=TXb|Zh#G^7>*Zm!#bpkIfcsFL0Aip`3MBf#rwz4d@M^2B!F z5x)tF_JVoAlJ*8B#HW@qoQ7EeyMSuU10Nu?{~9c*9A3T_@L4#mZbE@lG?VUN`+$}* z1_n}a#&{*oWz}~sKoBdS=Cigg{mzqyKj8lYc;ek*PDn!t8fnN1@Wg-IX`;Be!#xWYHjWfGIymtGj*DAGyIc zs#>MlEu-vx%H@K~ZQHU=u4G`&`8q=aY`WKfrp#7J=+{MmmW|9WiUuY9T&%2WLhsJ9 z|Dfc*SqylI@@X!CrvjJ0EMsgtQUMj}T?K{lzH3>D>?c3K%oj0Ml-9N#Ag+w#cyHI>M1~h$rvcuEu@>rrq|dMd6wp6l1ze#* zAA;U@r2=Y@fXreAagV3{o=I_{Ff{yO!63+*C;v-NvMq3L;fN8Ahr?5$7f27_F7Dl{ zz|F#*W30|dbLFs=@j=ISe_VkMh4IVBSk7+n7K_1gAvOVdf{pT!uxgGf)}Acr*qlaY z#kb{LbkI`t`cq$_uHugXH(UXWrPlZh_EEaK0^$D>O8rqKUwJKI<#-IBJ{=0lA8P;W z(Mbggz?UWXWVHds(*@t01W2j!1!@I8{?m*0Nu{fju!y2f-9sZ!&JD%Qiug6)*Xa{` zHW-GdZ{I-BjH9$Bn&f}|6*1WNducKGu&ADk&Is$(#eGbT$&+HSUbh?OycY#EMF#Rg z;)TBv_wwFj%gwW?k(OiO7O2hZ?HAKMf-t0uPTw9uRQuJ>d>MLX#u`LjAkN1AJtOSw zX!PkYGP!k{Cs{k)Bw>m!?DYZDBP^HScWpA86b;3exAfTb^GE6QmX@Wv*EW7*jcoVS zNW{zaX^U_yIC2d6P$#*AKL2g-*`Lvw`58Q^ff0Mm#;rAd_q5}J$HF{)Iwv4HZ3qv zd*&w+=_GHYN+ds_^V!R?Fxf2;6mwK~jkep$Mx$B;1x^0hyG(duI6;3#u;hHzp|^=P z?JIAY>9SDo3SX{tyN)ut?l&3x^ZvP3^qdd<+ckwpq0iY%zIPv-_Z6YQ)YmhyzI*m) zY-$Sm&RsXTWyafWQL!9=)JQ^JY9DvpUl2S8F?B;M-O?{H!XDD@Nk#ot1LI`8Mh#h{ zr;|+T()tO#l4feEkJT7QYBcKOcZ?AmtsMjUNgJX5FA>ROR~yeGpRI2ADMalREO`vG tWSFqE6I4zc{I}Kr|NP%Q0hxRjcb!G3u*B|5Q{2VjgWn&h+#hh|e*o?d$7cWl literal 7484 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 From 2123db72e159f351e592e60ca6e4909b9f4e9bf3 Mon Sep 17 00:00:00 2001 From: Caedis Date: Fri, 17 Jul 2026 11:14:05 -0500 Subject: [PATCH 2/3] perf(CraftingStation): cache last matched recipe (#304) --- .../inventory/CraftingStationContainer.java | 97 ++++++++++++++++--- .../tools/inventory/SlotCraftingStation.java | 16 ++- .../tools/logic/CraftingStationLogic.java | 12 ++- .../tools/logic/PartBuilderLogic.java | 4 +- .../tools/logic/StencilTableLogic.java | 4 +- .../tools/logic/ToolStationLogic.java | 4 +- 6 files changed, 119 insertions(+), 18 deletions(-) diff --git a/src/main/java/tconstruct/tools/inventory/CraftingStationContainer.java b/src/main/java/tconstruct/tools/inventory/CraftingStationContainer.java index 39e7f967..88ce6d05 100644 --- a/src/main/java/tconstruct/tools/inventory/CraftingStationContainer.java +++ b/src/main/java/tconstruct/tools/inventory/CraftingStationContainer.java @@ -1,6 +1,7 @@ package tconstruct.tools.inventory; import java.lang.ref.WeakReference; +import java.util.List; import javax.annotation.Nonnull; @@ -15,6 +16,7 @@ import net.minecraft.inventory.Slot; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; +import net.minecraft.item.crafting.IRecipe; import net.minecraft.world.World; import tconstruct.items.tools.Arrow; @@ -48,6 +50,12 @@ public class CraftingStationContainer extends Container { public CraftingStationLogic logic; EntityPlayer player; + /** Last matched recipe, tried first to avoid rescanning the whole recipe list on every matrix change. */ + private IRecipe lastRecipe; + + /** While true, matrix changes don't recompute the result. Batches ingredient consumption into one lookup. */ + private boolean suppressCraftingUpdates; + public CraftingStationContainer(InventoryPlayer inventoryplayer, CraftingStationLogic logic, int x, int y, int z) { this.worldObj = logic.getWorldObj(); this.player = inventoryplayer.player; @@ -74,6 +82,7 @@ public class CraftingStationContainer extends Container { // 0 - crafting slot this.addSlotToContainer( new SlotCraftingStation( + this, inventoryplayer.player, this.craftMatrix, this.craftResult, @@ -280,11 +289,74 @@ public class CraftingStationContainer extends Container { } public void onCraftMatrixChanged(IInventory par1IInventory) { + if (suppressCraftingUpdates) return; + ItemStack tool = modifyItem(); if (tool != null) this.craftResult.setInventorySlotContents(0, tool); - else this.craftResult.setInventorySlotContents( - 0, - CraftingManager.getInstance().findMatchingRecipe(this.craftMatrix, this.worldObj)); + else this.craftResult.setInventorySlotContents(0, findMatchingRecipeCached()); + } + + /** Like {@link CraftingManager#findMatchingRecipe} but tries the last matched recipe first. */ + private ItemStack findMatchingRecipeCached() { + // Vanilla's two-item tool repair takes precedence over the recipe list + if (isVanillaToolRepair()) { + return CraftingManager.getInstance().findMatchingRecipe(this.craftMatrix, this.worldObj); + } + + IRecipe cached = this.lastRecipe; + if (cached != null && cached.matches(this.craftMatrix, this.worldObj)) { + return cached.getCraftingResult(this.craftMatrix); + } + this.lastRecipe = null; + + @SuppressWarnings("unchecked") + List recipes = CraftingManager.getInstance().getRecipeList(); + for (int i = 0; i < recipes.size(); i++) { + IRecipe recipe = recipes.get(i); + if (recipe.matches(this.craftMatrix, this.worldObj)) { + this.lastRecipe = recipe; + return recipe.getCraftingResult(this.craftMatrix); + } + } + return null; + } + + /** + * Mirrors the repair check in {@link CraftingManager#findMatchingRecipe}: two size-1 stacks of one repairable item. + */ + private boolean isVanillaToolRepair() { + ItemStack first = null; + ItemStack second = null; + int found = 0; + + for (int i = 0; i < this.craftMatrix.getSizeInventory(); i++) { + ItemStack stack = this.craftMatrix.getStackInSlot(i); + if (stack == null) continue; + + found++; + if (found == 1) first = stack; + else if (found == 2) second = stack; + else return false; + } + + return found == 2 && first.getItem() == second.getItem() + && first.stackSize == 1 + && second.stackSize == 1 + && first.getItem().isRepairable(); + } + + /** + * Suppresses result updates until {@link #endBatchCraftingUpdate}; each consumed ingredient fires a lookup + * otherwise. + */ + void beginBatchCraftingUpdate() { + suppressCraftingUpdates = true; + } + + /** Re-enables result updates and recomputes once. */ + void endBatchCraftingUpdate() { + suppressCraftingUpdates = false; + this.onCraftMatrixChanged(this.craftMatrix); } @Override @@ -438,16 +510,19 @@ public class CraftingStationContainer extends Container { public void dumpCraftingGrid() { if (logic.slotCount == 0) return; - // 46 is the first slot index of the attached inventory - for (int i = 0; i < 9; i++) { - ItemStack stack = craftMatrix.getStackInSlot(i); - if (stack != null && stack.stackSize > 0) { - if (mergeItemStack(stack, 46, 46 + logic.slotCount, false)) { - craftMatrix.setInventorySlotContents(i, stack.stackSize > 0 ? stack : null); + beginBatchCraftingUpdate(); + try { + // 46 is the first slot index of the attached inventory + for (int i = 0; i < 9; i++) { + ItemStack stack = craftMatrix.getStackInSlot(i); + if (stack != null && stack.stackSize > 0) { + if (mergeItemStack(stack, 46, 46 + logic.slotCount, false)) { + craftMatrix.setInventorySlotContents(i, stack.stackSize > 0 ? stack : null); + } } } + } finally { + endBatchCraftingUpdate(); } - - this.onCraftMatrixChanged(this.craftMatrix); } } diff --git a/src/main/java/tconstruct/tools/inventory/SlotCraftingStation.java b/src/main/java/tconstruct/tools/inventory/SlotCraftingStation.java index ba787acb..37bf31e7 100644 --- a/src/main/java/tconstruct/tools/inventory/SlotCraftingStation.java +++ b/src/main/java/tconstruct/tools/inventory/SlotCraftingStation.java @@ -11,18 +11,30 @@ import tconstruct.library.tools.AbilityHelper; public class SlotCraftingStation extends SlotCrafting { + private final CraftingStationContainer container; private final IInventory matrix; private final EntityPlayer player; - public SlotCraftingStation(EntityPlayer par1EntityPlayer, IInventory par2IInventory, IInventory par3iInventory, - int par4, int par5, int par6) { + public SlotCraftingStation(CraftingStationContainer container, EntityPlayer par1EntityPlayer, + IInventory par2IInventory, IInventory par3iInventory, int par4, int par5, int par6) { super(par1EntityPlayer, par2IInventory, par3iInventory, par4, par5, par6); + this.container = container; this.matrix = par2IInventory; this.player = par1EntityPlayer; } @Override public void onPickupFromSlot(EntityPlayer player, ItemStack stack) { + // Batch ingredient consumption into a single recipe lookup + container.beginBatchCraftingUpdate(); + try { + consumeIngredients(player, stack); + } finally { + container.endBatchCraftingUpdate(); + } + } + + private void consumeIngredients(EntityPlayer player, ItemStack stack) { ItemStack tool = this.matrix.getStackInSlot(4); if (stack.getItem() instanceof IModifyable modifyable && tool != null && tool.getItem() instanceof IModifyable) { diff --git a/src/main/java/tconstruct/tools/logic/CraftingStationLogic.java b/src/main/java/tconstruct/tools/logic/CraftingStationLogic.java index 15e59dbc..0731c477 100644 --- a/src/main/java/tconstruct/tools/logic/CraftingStationLogic.java +++ b/src/main/java/tconstruct/tools/logic/CraftingStationLogic.java @@ -32,6 +32,12 @@ public class CraftingStationLogic extends InventoryLogic implements ISidedInvent public int invRows, invColumns, slotCount; + private static final int[] NO_SLOTS = new int[0]; + + /** Cached result of {@link #getInventories()}; rebuilt when the adjacent inventories are rescanned. */ + @SuppressWarnings("rawtypes") + private WeakReference[] inventories = new WeakReference[4]; + public CraftingStationLogic() { super(10); // 9 for crafting, 1 for output } @@ -115,6 +121,8 @@ public class CraftingStationLogic extends InventoryLogic implements ISidedInvent } } + this.inventories = new WeakReference[] { this.chest, this.doubleChest, this.patternChest, this.furnace }; + return new CraftingStationContainer(inventoryplayer, this, x, y, z); } @@ -168,12 +176,12 @@ public class CraftingStationLogic extends InventoryLogic implements ISidedInvent @SuppressWarnings("rawtypes") public WeakReference[] getInventories() { - return new WeakReference[] { this.chest, this.doubleChest, this.patternChest, this.furnace }; + return this.inventories; } @Override public int[] getAccessibleSlotsFromSide(int var1) { - return new int[] {}; + return NO_SLOTS; } @Override diff --git a/src/main/java/tconstruct/tools/logic/PartBuilderLogic.java b/src/main/java/tconstruct/tools/logic/PartBuilderLogic.java index 061f73ff..e4072048 100644 --- a/src/main/java/tconstruct/tools/logic/PartBuilderLogic.java +++ b/src/main/java/tconstruct/tools/logic/PartBuilderLogic.java @@ -16,6 +16,8 @@ import tconstruct.tools.inventory.PartCrafterContainer; public class PartBuilderLogic extends InventoryLogic implements ISidedInventory { + private static final int[] NO_SLOTS = new int[0]; + boolean craftedTop; boolean craftedBottom; @@ -138,7 +140,7 @@ public class PartBuilderLogic extends InventoryLogic implements ISidedInventory @Override public int[] getAccessibleSlotsFromSide(int side) { - return new int[0]; + return NO_SLOTS; } @Override diff --git a/src/main/java/tconstruct/tools/logic/StencilTableLogic.java b/src/main/java/tconstruct/tools/logic/StencilTableLogic.java index 5724389a..2aa79263 100644 --- a/src/main/java/tconstruct/tools/logic/StencilTableLogic.java +++ b/src/main/java/tconstruct/tools/logic/StencilTableLogic.java @@ -15,6 +15,8 @@ import tconstruct.tools.inventory.PatternShaperContainer; public class StencilTableLogic extends InventoryLogic implements ISidedInventory { + private static final int[] NO_SLOTS = new int[0]; + private ItemStack selectedStack; public StencilTableLogic() { @@ -119,7 +121,7 @@ public class StencilTableLogic extends InventoryLogic implements ISidedInventory @Override public int[] getAccessibleSlotsFromSide(int side) { - return new int[0]; + return NO_SLOTS; } @Override diff --git a/src/main/java/tconstruct/tools/logic/ToolStationLogic.java b/src/main/java/tconstruct/tools/logic/ToolStationLogic.java index 9a52bf1d..47ea0a64 100644 --- a/src/main/java/tconstruct/tools/logic/ToolStationLogic.java +++ b/src/main/java/tconstruct/tools/logic/ToolStationLogic.java @@ -20,6 +20,8 @@ import tconstruct.tools.inventory.ToolStationContainer; public class ToolStationLogic extends InventoryLogic implements ISidedInventory { + private static final int[] NO_SLOTS = new int[0]; + public ItemStack previousTool; public String toolName; @@ -158,7 +160,7 @@ public class ToolStationLogic extends InventoryLogic implements ISidedInventory @Override public int[] getAccessibleSlotsFromSide(int side) { - return new int[0]; + return NO_SLOTS; } @Override From 522e5806cafd5ae739da704c3c752a909e07f052 Mon Sep 17 00:00:00 2001 From: Ranzu <66495944+Ranzuu@users.noreply.github.com> Date: Mon, 20 Jul 2026 04:37:40 +0200 Subject: [PATCH 3/3] Extend ColorUtils and bump GTNHLib (#306) --- dependencies.gradle | 2 +- src/main/java/tconstruct/library/util/ColorUtils.java | 3 ++- src/main/java/tconstruct/plugins/nei/RecipeHandlerMelting.java | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 3b7c0dc9..3d81fe3a 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -5,7 +5,7 @@ dependencies { api("com.github.GTNewHorizons:Mantle:0.5.3:dev") api("com.github.GTNewHorizons:ForgeMultipart:1.7.10:dev") // gtnhlib is compileOnlyApi by us, but needed at runtime by nei, so require the correct version - api("com.github.GTNewHorizons:GTNHLib:0.11.16:dev") + api("com.github.GTNewHorizons:GTNHLib:0.11.30:dev") implementation("com.github.GTNewHorizons:NotEnoughItems:2.8.103-GTNH:dev") compileOnlyApi("curse.maven:cofh-core-69162:2388751") compileOnly("com.github.GTNewHorizons:inventory-tweaks:1.7.1:api") diff --git a/src/main/java/tconstruct/library/util/ColorUtils.java b/src/main/java/tconstruct/library/util/ColorUtils.java index 986de3d7..e2e04a59 100644 --- a/src/main/java/tconstruct/library/util/ColorUtils.java +++ b/src/main/java/tconstruct/library/util/ColorUtils.java @@ -23,6 +23,7 @@ public class ColorUtils { materialBowDrawSpeed = color.rgb("materialBowDrawSpeed", "0x404040"), materialBowFlightSpeedMax = color.rgb("materialBowFlightSpeedMax", "0x404040"), materialArrowMass = color.rgb("materialArrowMass", "0x404040"), - materialArrowBreakChance = color.rgb("materialArrowBreakChance", "0x404040"); + materialArrowBreakChance = color.rgb("materialArrowBreakChance", "0x404040"), + neiTemperature = color.rgb("neiTemperature", "0x808080"); // spotless:on } diff --git a/src/main/java/tconstruct/plugins/nei/RecipeHandlerMelting.java b/src/main/java/tconstruct/plugins/nei/RecipeHandlerMelting.java index 83c7e6ff..3139db9c 100644 --- a/src/main/java/tconstruct/plugins/nei/RecipeHandlerMelting.java +++ b/src/main/java/tconstruct/plugins/nei/RecipeHandlerMelting.java @@ -18,6 +18,7 @@ import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet; import it.unimi.dsi.fastutil.objects.ObjectSet; import mantle.utils.ItemMetaWrapper; import tconstruct.library.crafting.Smeltery; +import tconstruct.library.util.ColorUtils; public class RecipeHandlerMelting extends RecipeHandlerBase { @@ -91,7 +92,7 @@ public class RecipeHandlerMelting extends RecipeHandlerBase { @Override public void drawExtras(int recipe) { int temperature = ((CachedMeltingRecipe) this.arecipes.get(recipe)).temperature; - GuiDraw.drawStringC(temperature + " C", 81, 9, 0x808080, false); + GuiDraw.drawStringC(temperature + " C", 81, 9, ColorUtils.neiTemperature.getColor(), false); } @Override