Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -169,9 +169,7 @@ public ItemStack onItemRightClick(ItemStack itemStack, World world, EntityPlayer
}

// Re-clicking the saved source cycles its reagents, never tries to self-link.
if (dimension == world.provider.dimensionId && coords.x() == x
&& coords.y() == y
&& coords.z() == z) {
if (dimension == world.provider.dimensionId && coords.x() == x && coords.y() == y && coords.z() == z) {
List<Reagent> reagentList = collectReagents(relay);
if (reagentList.size() <= 1) {
player.addChatComponentMessage(
Expand Down Expand Up @@ -199,21 +197,18 @@ public ItemStack onItemRightClick(ItemStack itemStack, World world, EntityPlayer
if (!(pastTile instanceof TEReagentConduit pastRelay)) {
// Saved source is gone — clear it so the player can start over without a manual reset.
this.setHasSavedCoordinates(itemStack, false);
player.addChatComponentMessage(
new ChatComponentTranslation("message.attunedcrystal.error.cannotfind"));
player.addChatComponentMessage(new ChatComponentTranslation("message.attunedcrystal.error.cannotfind"));
return itemStack;
}

Reagent reagent = this.getReagent(itemStack);
if (reagent == null) {
player.addChatComponentMessage(
new ChatComponentTranslation("message.attunedcrystal.error.noreagent"));
player.addChatComponentMessage(new ChatComponentTranslation("message.attunedcrystal.error.noreagent"));
return itemStack;
}

if (pastRelay.hasReagentDestination(reagent, x, y, z)) {
player.addChatComponentMessage(
new ChatComponentTranslation("message.attunedcrystal.error.duplicate"));
player.addChatComponentMessage(new ChatComponentTranslation("message.attunedcrystal.error.duplicate"));
} else if (pastRelay.addReagentDestinationViaActual(reagent, x, y, z)) {
int used = pastRelay.getTotalConnections();
int max = pastRelay.maxConnextions;
Expand All @@ -232,16 +227,14 @@ public ItemStack onItemRightClick(ItemStack itemStack, World world, EntityPlayer

// No saved source — this click saves one and (when useful) copies its reagent.
if (tile instanceof TEReagentConduit conduit && conduit.getTotalConnections() >= conduit.maxConnextions) {
player.addChatComponentMessage(
new ChatComponentTranslation("message.attunedcrystal.error.sourcefull"));
player.addChatComponentMessage(new ChatComponentTranslation("message.attunedcrystal.error.sourcefull"));
return itemStack;
}

List<Reagent> reagentList = collectReagents(relay);
Reagent currentReagent = this.getReagent(itemStack);
if (reagentList.isEmpty() && currentReagent == null) {
player.addChatComponentMessage(
new ChatComponentTranslation("message.attunedcrystal.error.nothingtocopy"));
player.addChatComponentMessage(new ChatComponentTranslation("message.attunedcrystal.error.nothingtocopy"));
return itemStack;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,7 @@ private static int clearIncomingConnections(World world, int x, int y, int z) {
Iterator<Int3> it = coords.iterator();
while (it.hasNext()) {
Int3 off = it.next();
if (src.xCoord + off.x() == x && src.yCoord + off.y() == y
&& src.zCoord + off.z() == z) {
if (src.xCoord + off.x() == x && src.yCoord + off.y() == y && src.zCoord + off.z() == z) {
it.remove();
changed = true;
totalRemoved++;
Expand Down