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; }