From 5bb6862a53b4a27cafb1ca7dcd4b0bbe0cf1d750 Mon Sep 17 00:00:00 2001 From: altrisi Date: Sun, 22 Nov 2020 12:07:07 +0100 Subject: [PATCH 1/4] Make extension's rules get properly synced with clients --- .../carpet/network/ClientNetworkHandler.java | 48 ++++++++++++++----- .../carpet/network/ServerNetworkHandler.java | 10 +++- 2 files changed, 45 insertions(+), 13 deletions(-) diff --git a/src/main/java/carpet/network/ClientNetworkHandler.java b/src/main/java/carpet/network/ClientNetworkHandler.java index 8d77dc5b..b97ce84a 100644 --- a/src/main/java/carpet/network/ClientNetworkHandler.java +++ b/src/main/java/carpet/network/ClientNetworkHandler.java @@ -1,9 +1,11 @@ package carpet.network; import carpet.CarpetServer; +import carpet.CarpetExtension; import carpet.CarpetSettings; import carpet.helpers.TickSpeed; import carpet.settings.ParsedRule; +import carpet.settings.SettingsManager; import io.netty.buffer.Unpooled; import net.minecraft.client.network.ClientPlayerEntity; import net.minecraft.nbt.AbstractNumberTag; @@ -19,36 +21,58 @@ import java.util.function.BiConsumer; public class ClientNetworkHandler { - private static Map> dataHandlers = new HashMap>(){{ - put("Rules", (p, t) -> { + private static Map> dataHandlers = new HashMap>(); + static + { + dataHandlers.put("Rules", (p, t) -> { CompoundTag ruleset = (CompoundTag)t; - for (String ruleName: ruleset.getKeys()) + for (String fullRuleName: ruleset.getKeys()) { - ParsedRule rule = CarpetServer.settingsManager.getRule(ruleName); + int separatorPos = fullRuleName.indexOf(':'); + SettingsManager manager = null; + String ruleName; + if (separatorPos > -1) + { + String identifier = fullRuleName.substring(0,separatorPos); + ruleName = fullRuleName.substring(separatorPos + 1); + for (CarpetExtension extension:CarpetServer.extensions) { + SettingsManager eManager = extension.customSettingsManager(); + if (eManager != null && identifier.equals(eManager.getIdentifier())) + { + manager = eManager; + break; + } + } + } + else + { + ruleName = fullRuleName; + manager = CarpetServer.settingsManager; + } + ParsedRule rule = (manager != null) ? manager.getRule(ruleName) : null; if (rule == null) - CarpetSettings.LOG.error("Received unknown rule: "+ruleName); + CarpetSettings.LOG.error("Received unknown rule: "+fullRuleName); else { - CompoundTag ruleNBT = (CompoundTag) ruleset.get(ruleName); + CompoundTag ruleNBT = (CompoundTag) ruleset.get(fullRuleName); String value = ruleNBT.getString("Value"); rule.set(null, value); } } }); - put("TickRate", (p, t) -> TickSpeed.tickrate(((AbstractNumberTag)t).getFloat(), false)); - put("scShape", (p, t) -> { // deprecated + dataHandlers.put("TickRate", (p, t) -> TickSpeed.tickrate(((AbstractNumberTag)t).getFloat(), false)); + dataHandlers.put("scShape", (p, t) -> { // deprecated if (CarpetClient.shapes != null) CarpetClient.shapes.addShape((CompoundTag)t); }); - put("scShapes", (p, t) -> { + dataHandlers.put("scShapes", (p, t) -> { if (CarpetClient.shapes != null) CarpetClient.shapes.addShapes((ListTag) t); }); - put("clientCommand", (p, t) -> { + dataHandlers.put("clientCommand", (p, t) -> { CarpetClient.onClientCommand(t); }); - }}; - + }; public static void handleData(PacketByteBuf data, ClientPlayerEntity player) { diff --git a/src/main/java/carpet/network/ServerNetworkHandler.java b/src/main/java/carpet/network/ServerNetworkHandler.java index 8af2e19d..fc15c575 100644 --- a/src/main/java/carpet/network/ServerNetworkHandler.java +++ b/src/main/java/carpet/network/ServerNetworkHandler.java @@ -4,6 +4,7 @@ import carpet.CarpetServer; import carpet.CarpetSettings; import carpet.helpers.TickSpeed; import carpet.settings.ParsedRule; +import carpet.settings.SettingsManager; import io.netty.buffer.Unpooled; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.ListTag; @@ -78,6 +79,12 @@ public class ServerNetworkHandler CarpetSettings.LOG.warn("Player "+playerEntity.getName().getString()+" joined with another carpet version: "+clientVersion); DataBuilder data = DataBuilder.create().withTickRate(); CarpetServer.settingsManager.getRules().forEach(data::withRule); + CarpetServer.extensions.forEach(e -> { + SettingsManager eManager = e.customSettingsManager(); + if (eManager != null) { + eManager.getRules().forEach(data::withRule); + } + }); playerEntity.networkHandler.sendPacket(new CustomPayloadS2CPacket(CarpetClient.CARPET_CHANNEL, data.build() )); } @@ -234,9 +241,10 @@ public class ServerNetworkHandler rules = new CompoundTag(); tag.put("Rules", rules); } + String identifier = (rule.settingsManager != CarpetServer.settingsManager) ? rule.settingsManager.getIdentifier()+":" : ""; CompoundTag ruleNBT = new CompoundTag(); ruleNBT.putString("Value", rule.getAsString()); - rules.put(rule.name, ruleNBT); + rules.put(identifier+rule.name, ruleNBT); return this; } From 39bfb5199222d5315af0262fbb6ba4a121013627 Mon Sep 17 00:00:00 2001 From: altrisi Date: Sun, 22 Nov 2020 12:22:56 +0100 Subject: [PATCH 2/4] The tabs to spaces... yet again --- .../carpet/network/ClientNetworkHandler.java | 44 +++++++++---------- .../carpet/network/ServerNetworkHandler.java | 8 ++-- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/main/java/carpet/network/ClientNetworkHandler.java b/src/main/java/carpet/network/ClientNetworkHandler.java index b97ce84a..fe8f1532 100644 --- a/src/main/java/carpet/network/ClientNetworkHandler.java +++ b/src/main/java/carpet/network/ClientNetworkHandler.java @@ -28,30 +28,30 @@ public class ClientNetworkHandler CompoundTag ruleset = (CompoundTag)t; for (String fullRuleName: ruleset.getKeys()) { - int separatorPos = fullRuleName.indexOf(':'); - SettingsManager manager = null; - String ruleName; - if (separatorPos > -1) - { - String identifier = fullRuleName.substring(0,separatorPos); - ruleName = fullRuleName.substring(separatorPos + 1); - for (CarpetExtension extension:CarpetServer.extensions) { - SettingsManager eManager = extension.customSettingsManager(); - if (eManager != null && identifier.equals(eManager.getIdentifier())) - { - manager = eManager; - break; - } - } - } - else - { - ruleName = fullRuleName; - manager = CarpetServer.settingsManager; - } + int separatorPos = fullRuleName.indexOf(':'); + SettingsManager manager = null; + String ruleName; + if (separatorPos > -1) + { + String identifier = fullRuleName.substring(0, separatorPos); + ruleName = fullRuleName.substring(separatorPos + 1); + for (CarpetExtension extension: CarpetServer.extensions) { + SettingsManager eManager = extension.customSettingsManager(); + if (eManager != null && identifier.equals(eManager.getIdentifier())) + { + manager = eManager; + break; + } + } + } + else + { + ruleName = fullRuleName; + manager = CarpetServer.settingsManager; + } ParsedRule rule = (manager != null) ? manager.getRule(ruleName) : null; if (rule == null) - CarpetSettings.LOG.error("Received unknown rule: "+fullRuleName); + CarpetSettings.LOG.error("Received unknown rule: " + fullRuleName); else { CompoundTag ruleNBT = (CompoundTag) ruleset.get(fullRuleName); diff --git a/src/main/java/carpet/network/ServerNetworkHandler.java b/src/main/java/carpet/network/ServerNetworkHandler.java index fc15c575..140e6dfd 100644 --- a/src/main/java/carpet/network/ServerNetworkHandler.java +++ b/src/main/java/carpet/network/ServerNetworkHandler.java @@ -80,10 +80,10 @@ public class ServerNetworkHandler DataBuilder data = DataBuilder.create().withTickRate(); CarpetServer.settingsManager.getRules().forEach(data::withRule); CarpetServer.extensions.forEach(e -> { - SettingsManager eManager = e.customSettingsManager(); - if (eManager != null) { - eManager.getRules().forEach(data::withRule); - } + SettingsManager eManager = e.customSettingsManager(); + if (eManager != null) { + eManager.getRules().forEach(data::withRule); + } }); playerEntity.networkHandler.sendPacket(new CustomPayloadS2CPacket(CarpetClient.CARPET_CHANNEL, data.build() )); } From b4ac2c85e4e87bd493d0d9e0380f40546e06642e Mon Sep 17 00:00:00 2001 From: altrisi Date: Sun, 29 Nov 2020 02:51:01 +0100 Subject: [PATCH 3/4] Reimplement extension sync according to suggestions --- .../carpet/network/ClientNetworkHandler.java | 38 ++++++++++--------- .../carpet/network/ServerNetworkHandler.java | 8 +++- 2 files changed, 27 insertions(+), 19 deletions(-) diff --git a/src/main/java/carpet/network/ClientNetworkHandler.java b/src/main/java/carpet/network/ClientNetworkHandler.java index fe8f1532..478d7a68 100644 --- a/src/main/java/carpet/network/ClientNetworkHandler.java +++ b/src/main/java/carpet/network/ClientNetworkHandler.java @@ -26,35 +26,39 @@ public class ClientNetworkHandler { dataHandlers.put("Rules", (p, t) -> { CompoundTag ruleset = (CompoundTag)t; - for (String fullRuleName: ruleset.getKeys()) + for (String ruleKey: ruleset.getKeys()) { - int separatorPos = fullRuleName.indexOf(':'); + CompoundTag ruleNBT = (CompoundTag) ruleset.get(ruleKey); SettingsManager manager = null; String ruleName; - if (separatorPos > -1) + if (ruleNBT.contains("Manager")) { - String identifier = fullRuleName.substring(0, separatorPos); - ruleName = fullRuleName.substring(separatorPos + 1); - for (CarpetExtension extension: CarpetServer.extensions) { - SettingsManager eManager = extension.customSettingsManager(); - if (eManager != null && identifier.equals(eManager.getIdentifier())) - { - manager = eManager; - break; + ruleName = ruleNBT.getString("Rule"); + String managerName = ruleNBT.getString("Manager"); + if (managerName == "carpet") + { + manager = CarpetServer.settingsManager; + } + else + { + for (CarpetExtension extension: CarpetServer.extensions) { + SettingsManager eManager = extension.customSettingsManager(); + if (eManager != null && managerName.equals(eManager.getIdentifier())) + { + manager = eManager; + break; + } } } } - else + else // Backwards compatibility { - ruleName = fullRuleName; manager = CarpetServer.settingsManager; + ruleName = ruleKey; } ParsedRule rule = (manager != null) ? manager.getRule(ruleName) : null; - if (rule == null) - CarpetSettings.LOG.error("Received unknown rule: " + fullRuleName); - else + if (rule != null) { - CompoundTag ruleNBT = (CompoundTag) ruleset.get(fullRuleName); String value = ruleNBT.getString("Value"); rule.set(null, value); } diff --git a/src/main/java/carpet/network/ServerNetworkHandler.java b/src/main/java/carpet/network/ServerNetworkHandler.java index 140e6dfd..5971e93d 100644 --- a/src/main/java/carpet/network/ServerNetworkHandler.java +++ b/src/main/java/carpet/network/ServerNetworkHandler.java @@ -241,10 +241,14 @@ public class ServerNetworkHandler rules = new CompoundTag(); tag.put("Rules", rules); } - String identifier = (rule.settingsManager != CarpetServer.settingsManager) ? rule.settingsManager.getIdentifier()+":" : ""; + String identifier = rule.settingsManager.getIdentifier(); + String key = rule.name; + while (rules.contains(key)) { key = key+"2";} CompoundTag ruleNBT = new CompoundTag(); ruleNBT.putString("Value", rule.getAsString()); - rules.put(identifier+rule.name, ruleNBT); + ruleNBT.putString("Manager",identifier); + ruleNBT.putString("Rule",rule.name); + rules.put(key, ruleNBT); return this; } From 29dfae0e570a047e568433d6f37a5b587dfb20e5 Mon Sep 17 00:00:00 2001 From: altrisi Date: Sun, 29 Nov 2020 03:45:03 +0100 Subject: [PATCH 4/4] Fix being unable to identify own manager --- src/main/java/carpet/network/ClientNetworkHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/carpet/network/ClientNetworkHandler.java b/src/main/java/carpet/network/ClientNetworkHandler.java index 478d7a68..4d3cc1ad 100644 --- a/src/main/java/carpet/network/ClientNetworkHandler.java +++ b/src/main/java/carpet/network/ClientNetworkHandler.java @@ -35,7 +35,7 @@ public class ClientNetworkHandler { ruleName = ruleNBT.getString("Rule"); String managerName = ruleNBT.getString("Manager"); - if (managerName == "carpet") + if (managerName.equals("carpet")) { manager = CarpetServer.settingsManager; }