From 747f67f16f07cecd6eb161016d82a27221f70306 Mon Sep 17 00:00:00 2001 From: Pahimar Date: Wed, 25 May 2016 10:20:04 -0400 Subject: [PATCH] When a player blacklists an object by setting its emc value to 0, also update other players that the item is now blacklisted --- .../java/com/pahimar/ee3/command/CommandSetEnergyValue.java | 4 +++- .../pahimar/ee3/command/CommandSetEnergyValueCurrentItem.java | 3 +++ .../com/pahimar/ee3/command/CommandSetItemNotLearnable.java | 2 +- .../com/pahimar/ee3/command/CommandSetItemNotRecoverable.java | 2 +- .../pahimar/ee3/network/message/MessageSetBlacklistEntry.java | 4 ++++ 5 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/pahimar/ee3/command/CommandSetEnergyValue.java b/src/main/java/com/pahimar/ee3/command/CommandSetEnergyValue.java index 9efd2c2c..57bac02c 100644 --- a/src/main/java/com/pahimar/ee3/command/CommandSetEnergyValue.java +++ b/src/main/java/com/pahimar/ee3/command/CommandSetEnergyValue.java @@ -6,6 +6,7 @@ import com.pahimar.ee3.api.exchange.EnergyValueRegistryProxy; import com.pahimar.ee3.exchange.EnergyValueRegistry; import com.pahimar.ee3.exchange.WrappedStack; import com.pahimar.ee3.network.PacketHandler; +import com.pahimar.ee3.network.message.MessageSetBlacklistEntry; import com.pahimar.ee3.network.message.MessageSetEnergyValue; import com.pahimar.ee3.reference.Messages; import com.pahimar.ee3.reference.Names; @@ -114,7 +115,8 @@ public class CommandSetEnergyValue extends CommandBase BlacklistRegistryProxy.setAsNotLearnable(wrappedStack); BlacklistRegistryProxy.setAsNotExchangeable(wrappedStack); // TODO Remove energy value from EnergyValueRegistry - // TODO Sync change with client + PacketHandler.INSTANCE.sendToAll(new MessageSetBlacklistEntry(itemStack, BlacklistRegistryProxy.Blacklist.KNOWLEDGE)); + PacketHandler.INSTANCE.sendToAll(new MessageSetBlacklistEntry(itemStack, BlacklistRegistryProxy.Blacklist.EXCHANGE)); func_152373_a(commandSender, this, "%s set %s as not learnable and not exchangeable", new Object[]{commandSender.getCommandSenderName(), itemStack.func_151000_E()}); } } diff --git a/src/main/java/com/pahimar/ee3/command/CommandSetEnergyValueCurrentItem.java b/src/main/java/com/pahimar/ee3/command/CommandSetEnergyValueCurrentItem.java index 868a4e8a..0512b6ce 100644 --- a/src/main/java/com/pahimar/ee3/command/CommandSetEnergyValueCurrentItem.java +++ b/src/main/java/com/pahimar/ee3/command/CommandSetEnergyValueCurrentItem.java @@ -6,6 +6,7 @@ import com.pahimar.ee3.api.exchange.EnergyValueRegistryProxy; import com.pahimar.ee3.exchange.EnergyValueRegistry; import com.pahimar.ee3.exchange.WrappedStack; import com.pahimar.ee3.network.PacketHandler; +import com.pahimar.ee3.network.message.MessageSetBlacklistEntry; import com.pahimar.ee3.network.message.MessageSetEnergyValue; import com.pahimar.ee3.reference.Messages; import com.pahimar.ee3.reference.Names; @@ -84,6 +85,8 @@ public class CommandSetEnergyValueCurrentItem extends CommandBase BlacklistRegistryProxy.setAsNotExchangeable(wrappedStack); // TODO Remove energy value from EnergyValueRegistry // TODO Sync change with client + PacketHandler.INSTANCE.sendToAll(new MessageSetBlacklistEntry(itemStack, BlacklistRegistryProxy.Blacklist.KNOWLEDGE)); + PacketHandler.INSTANCE.sendToAll(new MessageSetBlacklistEntry(itemStack, BlacklistRegistryProxy.Blacklist.EXCHANGE)); func_152373_a(commandSender, this, "%s set %s as not learnable and not exchangeable", new Object[]{commandSender.getCommandSenderName(), itemStack.func_151000_E()}); } } diff --git a/src/main/java/com/pahimar/ee3/command/CommandSetItemNotLearnable.java b/src/main/java/com/pahimar/ee3/command/CommandSetItemNotLearnable.java index 53f150a8..42f3b9a9 100644 --- a/src/main/java/com/pahimar/ee3/command/CommandSetItemNotLearnable.java +++ b/src/main/java/com/pahimar/ee3/command/CommandSetItemNotLearnable.java @@ -79,7 +79,7 @@ public class CommandSetItemNotLearnable extends CommandBase } BlacklistRegistryProxy.addToBlacklist(itemStack, BlacklistRegistryProxy.Blacklist.KNOWLEDGE); - PacketHandler.INSTANCE.sendToAll(new MessageSetBlacklistEntry(itemStack, BlacklistRegistryProxy.Blacklist.KNOWLEDGE, true)); + PacketHandler.INSTANCE.sendToAll(new MessageSetBlacklistEntry(itemStack, BlacklistRegistryProxy.Blacklist.KNOWLEDGE)); func_152373_a(commandSender, this, Messages.Commands.SET_ITEM_NOT_LEARNABLE_SUCCESS, new Object[]{commandSender.getCommandSenderName(), itemStack.func_151000_E()}); } } diff --git a/src/main/java/com/pahimar/ee3/command/CommandSetItemNotRecoverable.java b/src/main/java/com/pahimar/ee3/command/CommandSetItemNotRecoverable.java index 4321c07f..0d5f918f 100644 --- a/src/main/java/com/pahimar/ee3/command/CommandSetItemNotRecoverable.java +++ b/src/main/java/com/pahimar/ee3/command/CommandSetItemNotRecoverable.java @@ -79,7 +79,7 @@ public class CommandSetItemNotRecoverable extends CommandBase } BlacklistRegistryProxy.addToBlacklist(itemStack, BlacklistRegistryProxy.Blacklist.EXCHANGE); - PacketHandler.INSTANCE.sendToAll(new MessageSetBlacklistEntry(itemStack, BlacklistRegistryProxy.Blacklist.EXCHANGE, true)); + PacketHandler.INSTANCE.sendToAll(new MessageSetBlacklistEntry(itemStack, BlacklistRegistryProxy.Blacklist.EXCHANGE)); func_152373_a(commandSender, this, Messages.Commands.SET_ITEM_NOT_RECOVERABLE_SUCCESS, new Object[]{commandSender.getCommandSenderName(), itemStack.func_151000_E()}); } } diff --git a/src/main/java/com/pahimar/ee3/network/message/MessageSetBlacklistEntry.java b/src/main/java/com/pahimar/ee3/network/message/MessageSetBlacklistEntry.java index a1a35327..a35a96a9 100644 --- a/src/main/java/com/pahimar/ee3/network/message/MessageSetBlacklistEntry.java +++ b/src/main/java/com/pahimar/ee3/network/message/MessageSetBlacklistEntry.java @@ -23,6 +23,10 @@ public class MessageSetBlacklistEntry implements IMessage, IMessageHandler