From 25ab0916a7f239f6775409b33ed314eec6c2e862 Mon Sep 17 00:00:00 2001 From: Glease <4586901+Glease@users.noreply.github.com> Date: Sat, 7 Oct 2023 10:59:40 +0800 Subject: [PATCH 1/2] add fluid pattern blame (#161) --- .../gui/container/base/FCContainerEncodeTerminal.java | 8 +++++++- .../com/glodblock/github/util/FluidPatternDetails.java | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/glodblock/github/client/gui/container/base/FCContainerEncodeTerminal.java b/src/main/java/com/glodblock/github/client/gui/container/base/FCContainerEncodeTerminal.java index 95153be8..f4a29123 100644 --- a/src/main/java/com/glodblock/github/client/gui/container/base/FCContainerEncodeTerminal.java +++ b/src/main/java/com/glodblock/github/client/gui/container/base/FCContainerEncodeTerminal.java @@ -257,13 +257,18 @@ public abstract class FCContainerEncodeTerminal extends ContainerItemMonitor return hasFluid && search; // search=false -> outputs were empty } + protected ItemStack stampAuthor(ItemStack patternStack) { + patternStack.stackTagCompound.setString("author", getPlayerInv().player.getCommandSenderName()); + return patternStack; + } + protected void encodeFluidPattern() { ItemStack patternStack = new ItemStack(ItemAndBlockHolder.PATTERN); FluidPatternDetails pattern = new FluidPatternDetails(patternStack); pattern.setInputs(collectInventory(this.craftingSlots)); pattern.setOutputs(collectInventory(this.outputSlots)); pattern.setCanBeSubstitute(this.beSubstitute ? 1 : 0); - patternSlotOUT.putStack(pattern.writeToStack()); + patternSlotOUT.putStack(stampAuthor(pattern.writeToStack())); } protected static IAEItemStack[] collectInventory(Slot[] slots) { @@ -440,6 +445,7 @@ public abstract class FCContainerEncodeTerminal extends ContainerItemMonitor encodedValue.setBoolean("beSubstitute", this.beSubstitute); encodedValue.setBoolean("prioritize", this.prioritize); output.setTagCompound(encodedValue); + stampAuthor(output); this.patternSlotOUT.putStack(output); } diff --git a/src/main/java/com/glodblock/github/util/FluidPatternDetails.java b/src/main/java/com/glodblock/github/util/FluidPatternDetails.java index b2aa3852..e3be4f7e 100644 --- a/src/main/java/com/glodblock/github/util/FluidPatternDetails.java +++ b/src/main/java/com/glodblock/github/util/FluidPatternDetails.java @@ -28,7 +28,13 @@ public class FluidPatternDetails implements ICraftingPatternDetails, Comparable< public FluidPatternDetails(ItemStack stack) { this.patternStack = stack; - this.patternStackAe = Objects.requireNonNull(AEItemStack.create(stack)); // s2g + if (stack.stackTagCompound.hasKey("author")) { + final ItemStack forComparison = this.patternStack.copy(); + forComparison.stackTagCompound.removeTag("author"); + this.patternStackAe = Objects.requireNonNull(AEItemStack.create(forComparison)); // s2g + } else { + this.patternStackAe = Objects.requireNonNull(AEItemStack.create(stack)); // s2g + } } public boolean canBeSubstitute() { From 81866539105bbb60c60fc0f4d23bb227111598b4 Mon Sep 17 00:00:00 2001 From: Dream-MasterXXL Date: Mon, 9 Oct 2023 22:49:23 +0200 Subject: [PATCH 2/2] update bs+deps --- build.gradle | 4 ++-- dependencies.gradle | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index 6a54d13b..621bc62f 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,4 @@ -//version: 1695474595 +//version: 1696265388 /* DO NOT CHANGE THIS FILE! Also, you may replace this file at any time if there is an update available. @@ -798,7 +798,7 @@ dependencies { java17Dependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}") } if (modId != 'hodgepodge') { - java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.3.5') + java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.3.7') } java17PatchDependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}:forgePatches") {transitive = false} diff --git a/dependencies.gradle b/dependencies.gradle index 6635daa3..91a63366 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -2,23 +2,23 @@ dependencies { api('com.github.GTNewHorizons:NotEnoughItems:2.4.3-GTNH:dev') - api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-259-GTNH:dev') + api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-261-GTNH:dev') api('curse.maven:cofh-core-69162:2388751') api('com.github.GTNewHorizons:waila:1.6.0:dev') compileOnly('com.github.GTNewHorizons:Baubles:1.0.1.16:dev') compileOnly('com.github.GTNewHorizons:ExtraCells2:2.5.34:dev') { transitive = false } - compileOnly("com.github.GTNewHorizons:WirelessCraftingTerminal:1.9.4:dev") + compileOnly("com.github.GTNewHorizons:WirelessCraftingTerminal:1.10.0:dev") compileOnly('com.github.GTNewHorizons:ForestryMC:4.6.14:dev') - compileOnly('com.github.GTNewHorizons:EnderIO:2.5.0:dev') - compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.44.27:dev') { + compileOnly('com.github.GTNewHorizons:EnderIO:2.5.2:dev') + compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.44.35:dev') { exclude group: 'com.github.GTNewHorizons', module: 'AE2FluidCraft-Rework' } compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') compileOnly('com.gregoriust.gregtech:gregtech_1.7.10:6.14.23:dev') { transitive = false } compileOnly('com.github.GTNewHorizons:OpenComputers:1.9.17-GTNH:dev') { transitive = false } compileOnly('com.github.GTNewHorizons:ThaumicEnergistics:1.4.13-GTNH:dev') { transitive = false } - compileOnly('com.github.GTNewHorizons:GTplusplus:1.10.11:dev') { transitive = false } - compileOnly("com.github.GTNewHorizons:Hodgepodge:2.3.7:dev") { transitive = false } + compileOnly('com.github.GTNewHorizons:GTplusplus:1.10.13:dev') { transitive = false } + compileOnly("com.github.GTNewHorizons:Hodgepodge:2.3.9:dev") { transitive = false } }