Merge branch 'master' into fix_interface_term

This commit is contained in:
Martin Robertz authored and GitHub committed 2023-10-12 11:54:08 +02:00
commit 11fd470613
4 files changed
+21 -9

No files matched your search

+2 -2
View File
@@ -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}
+5 -5
View File
@@ -8,17 +8,17 @@ dependencies {
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 }
}
@@ -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);
}
@@ -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() {