Merge branch 'master' into fix_interface_term

This commit is contained in:
Martin Robertz authored and GitHub committed 2023-10-13 12:48:47 +02:00
commit dbc5f413eb
4 files changed
+8 -5

No files matched your search

+2 -2
View File
@@ -1,4 +1,4 @@
//version: 1696265388
//version: 1696952014
/*
DO NOT CHANGE THIS FILE!
Also, you may replace this file at any time if there is an update available.
@@ -793,7 +793,7 @@ ext.java17PatchDependenciesCfg = configurations.create("java17PatchDependencies"
}
dependencies {
def lwjgl3ifyVersion = '1.5.0'
def lwjgl3ifyVersion = '1.5.1'
if (modId != 'lwjgl3ify') {
java17Dependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}")
}
+2 -2
View File
@@ -12,13 +12,13 @@ dependencies {
compileOnly('com.github.GTNewHorizons:ForestryMC:4.6.14:dev')
compileOnly('com.github.GTNewHorizons:EnderIO:2.5.2:dev')
compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.44.35:dev') {
compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.44.36: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.13:dev') { transitive = false }
compileOnly('com.github.GTNewHorizons:GTplusplus:1.10.17:dev') { transitive = false }
compileOnly("com.github.GTNewHorizons:Hodgepodge:2.3.9:dev") { transitive = false }
}
@@ -258,6 +258,9 @@ public abstract class FCContainerEncodeTerminal extends ContainerItemMonitor
}
protected ItemStack stampAuthor(ItemStack patternStack) {
if (patternStack.stackTagCompound == null) {
patternStack.stackTagCompound = new NBTTagCompound();
}
patternStack.stackTagCompound.setString("author", getPlayerInv().player.getCommandSenderName());
return patternStack;
}
@@ -28,7 +28,7 @@ public class FluidPatternDetails implements ICraftingPatternDetails, Comparable<
public FluidPatternDetails(ItemStack stack) {
this.patternStack = stack;
if (stack.stackTagCompound.hasKey("author")) {
if (stack.stackTagCompound != null && stack.stackTagCompound.hasKey("author")) {
final ItemStack forComparison = this.patternStack.copy();
forComparison.stackTagCompound.removeTag("author");
this.patternStackAe = Objects.requireNonNull(AEItemStack.create(forComparison)); // s2g