Ellpeck/PrettyPipes
1
0
Fork 0
mirror of https://github.com/Ellpeck/PrettyPipes.git synced 2024-11-25 13:08:34 +01:00
Code Issues Projects Releases Wiki Activity

Compare commits

base: Ellpeck:0eaaa71092b44f9c6aaa2ed5fb9775e188f2edb4
Branches Tags
Ellpeck:main
Ellpeck:1.20
Ellpeck:1.18
Ellpeck:1.19
Ellpeck:1.16
Ellpeck:crafter
Ellpeck:1.15
Ellpeck:1.18.1
..
compare: Ellpeck:cb98ef5be13aaf1ca30b4a76b35fef9ddeccbe03
Branches Tags
Ellpeck:main
Ellpeck:1.20
Ellpeck:1.18
Ellpeck:1.19
Ellpeck:1.16
Ellpeck:crafter
Ellpeck:1.15
Ellpeck:1.18.1

No commits in common. "0eaaa71092b44f9c6aaa2ed5fb9775e188f2edb4" and "cb98ef5be13aaf1ca30b4a76b35fef9ddeccbe03" have entirely different histories.
0eaaa71092 ... cb98ef5be1

3 changed files with 3 additions and 4 deletions
Show stats Expand all files Collapse all files

2
build.gradle
View file

@ -13,7 +13,7 @@ apply plugin: 'net.minecraftforge.gradle'
apply plugin: 'eclipse' apply plugin: 'eclipse'
apply plugin: 'maven-publish' apply plugin: 'maven-publish'
version = '1.9.8' version = '1.9.7'
group = 'de.ellpeck.prettypipes' // http://maven.apache.org/guides/mini/guide-naming-conventions.html group = 'de.ellpeck.prettypipes' // http://maven.apache.org/guides/mini/guide-naming-conventions.html
archivesBaseName = 'PrettyPipes' archivesBaseName = 'PrettyPipes'

1
src/main/java/de/ellpeck/prettypipes/packets/PacketRequest.java
View file

@ -20,7 +20,6 @@ public class PacketRequest {
public PacketRequest(BlockPos pos, ItemStack stack, int amount) { public PacketRequest(BlockPos pos, ItemStack stack, int amount) {
this.pos = pos; this.pos = pos;
this.stack = stack; this.stack = stack;
if (stack.hasTag())
this.nbtHash = stack.getTag().hashCode(); this.nbtHash = stack.getTag().hashCode();
this.amount = amount; this.amount = amount;
} }

2
src/main/java/de/ellpeck/prettypipes/terminal/ItemTerminalTileEntity.java
View file

@ -163,7 +163,7 @@ public class ItemTerminalTileEntity extends TileEntity implements INamedContaine
stack = this.networkItems.values().stream() stack = this.networkItems.values().stream()
.map(NetworkItem::asStack) .map(NetworkItem::asStack)
// don't compare with nbt equality here or the whole hashing thing is pointless // don't compare with nbt equality here or the whole hashing thing is pointless
.filter(s -> ItemEquality.compareItems(s, filter) && s.hasTag() && s.getTag().hashCode() == nbtHash) .filter(s -> ItemEquality.compareItems(s, filter) && s.getTag().hashCode() == nbtHash)
.findFirst().orElse(filter); .findFirst().orElse(filter);
} }
int requested = this.requestItemImpl(stack, onItemUnavailable(player, false)); int requested = this.requestItemImpl(stack, onItemUnavailable(player, false));