icybear/fabric-carpet
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

The tabs to spaces... yet again

Browse Source
This commit is contained in:
altrisi committed 2020-11-22 12:22:56 +01:00
1 parent 5bb6862a53
commit 39bfb51992
2 files changed
+26 -26
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/carpet/network/ClientNetworkHandler.java
+22 -22
View File
@@ -28,30 +28,30 @@ public class ClientNetworkHandler
CompoundTag ruleset = (CompoundTag)t; CompoundTag ruleset = (CompoundTag)t;
for (String fullRuleName: ruleset.getKeys()) for (String fullRuleName: ruleset.getKeys())
{ {
int separatorPos = fullRuleName.indexOf(':'); int separatorPos = fullRuleName.indexOf(':');
SettingsManager manager = null; SettingsManager manager = null;
String ruleName; String ruleName;
if (separatorPos > -1) if (separatorPos > -1)
{ {
String identifier = fullRuleName.substring(0,separatorPos); String identifier = fullRuleName.substring(0, separatorPos);
ruleName = fullRuleName.substring(separatorPos + 1); ruleName = fullRuleName.substring(separatorPos + 1);
for (CarpetExtension extension:CarpetServer.extensions) { for (CarpetExtension extension: CarpetServer.extensions) {
SettingsManager eManager = extension.customSettingsManager(); SettingsManager eManager = extension.customSettingsManager();
if (eManager != null && identifier.equals(eManager.getIdentifier())) if (eManager != null && identifier.equals(eManager.getIdentifier()))
{ {
manager = eManager; manager = eManager;
break; break;
} }
} }
} }
else else
{ {
ruleName = fullRuleName; ruleName = fullRuleName;
manager = CarpetServer.settingsManager; manager = CarpetServer.settingsManager;
} }
ParsedRule<?> rule = (manager != null) ? manager.getRule(ruleName) : null; ParsedRule<?> rule = (manager != null) ? manager.getRule(ruleName) : null;
if (rule == null) if (rule == null)
CarpetSettings.LOG.error("Received unknown rule: "+fullRuleName); CarpetSettings.LOG.error("Received unknown rule: " + fullRuleName);
else else
{ {
CompoundTag ruleNBT = (CompoundTag) ruleset.get(fullRuleName); CompoundTag ruleNBT = (CompoundTag) ruleset.get(fullRuleName);
src/main/java/carpet/network/ServerNetworkHandler.java
+4 -4
View File
@@ -80,10 +80,10 @@ public class ServerNetworkHandler
DataBuilder data = DataBuilder.create().withTickRate(); DataBuilder data = DataBuilder.create().withTickRate();
CarpetServer.settingsManager.getRules().forEach(data::withRule); CarpetServer.settingsManager.getRules().forEach(data::withRule);
CarpetServer.extensions.forEach(e -> { CarpetServer.extensions.forEach(e -> {
SettingsManager eManager = e.customSettingsManager(); SettingsManager eManager = e.customSettingsManager();
if (eManager != null) { if (eManager != null) {
eManager.getRules().forEach(data::withRule); eManager.getRules().forEach(data::withRule);
} }
}); });
playerEntity.networkHandler.sendPacket(new CustomPayloadS2CPacket(CarpetClient.CARPET_CHANNEL, data.build() )); playerEntity.networkHandler.sendPacket(new CustomPayloadS2CPacket(CarpetClient.CARPET_CHANNEL, data.build() ));
} }