zhdev/oblak
1
0
Fork 0
Code Issues Pull requests Activity

✨ Add keyed values to CommandContext and do some cleanup

Browse source
This commit is contained in:
Alexander Söderberg 2021-01-05 11:05:39 +01:00 • committed by Alexander Söderberg
parent 591f2750c5
commit 9276a919d3
14 changed files with 544 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cloud-minecraft/cloud-bungee/src/main/java/cloud/commandframework/bungee/BungeeCommandPreprocessor.java
View file

@ -49,7 +49,7 @@ final class BungeeCommandPreprocessor<C> implements CommandPreprocessor<C> {
@Override
public void accept(final @NonNull CommandPreprocessingContext<C> context) {
context.getCommandContext().store("ProxyServer", mgr.getOwningPlugin().getProxy());
context.getCommandContext().store(BungeeContextKeys.PROXY_SERVER_KEY, mgr.getOwningPlugin().getProxy());
}
}

50
cloud-minecraft/cloud-bungee/src/main/java/cloud/commandframework/bungee/BungeeContextKeys.java Normal file
View file

@ -0,0 +1,50 @@
//
// MIT License
//
// Copyright (c) 2020 Alexander Söderberg & Contributors
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in all
// copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
// SOFTWARE.
//
package cloud.commandframework.bungee;
import cloud.commandframework.keys.CloudKey;
import cloud.commandframework.keys.SimpleCloudKey;
import io.leangen.geantyref.TypeToken;
import net.md_5.bungee.api.ProxyServer;
/**
* BungeeCord related {@link cloud.commandframework.context.CommandContext} keys
*
* @since 1.4.0
*/
public final class BungeeContextKeys {
/**
* The {@link ProxyServer} instance is stored in the {@link cloud.commandframework.context.CommandContext}
* in {@link BungeeCommandPreprocessor}
*/
public static final CloudKey<ProxyServer> PROXY_SERVER_KEY = SimpleCloudKey.of(
"ProxyServer",
TypeToken.get(ProxyServer.class)
);
private BungeeContextKeys() {
}
}

5
cloud-minecraft/cloud-velocity/src/main/java/cloud/commandframework/velocity/VelocityCommandPreprocessor.java
View file

@ -49,7 +49,10 @@ final class VelocityCommandPreprocessor<C> implements CommandPreprocessor<C> {
@Override
public void accept(final @NonNull CommandPreprocessingContext<C> context) {
context.getCommandContext().store("ProxyServer", mgr.getProxyServer());
context.getCommandContext().store(
VelocityContextKeys.PROXY_SERVER_KEY,
mgr.getProxyServer()
);
}
}

50
cloud-minecraft/cloud-velocity/src/main/java/cloud/commandframework/velocity/VelocityContextKeys.java Normal file
View file

@ -0,0 +1,50 @@
//
// MIT License
//
// Copyright (c) 2020 Alexander Söderberg & Contributors
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in all
// copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
// SOFTWARE.
//
package cloud.commandframework.velocity;
import cloud.commandframework.keys.CloudKey;
import cloud.commandframework.keys.SimpleCloudKey;
import com.velocitypowered.api.proxy.ProxyServer;
import io.leangen.geantyref.TypeToken;
/**
* Velocity related {@link cloud.commandframework.context.CommandContext} keys
*
* @since 1.4.0
*/
public final class VelocityContextKeys {
/**
* The {@link ProxyServer} instance is stored in the {@link cloud.commandframework.context.CommandContext}
* in {@link VelocityCommandPreprocessor}
*/
public static final CloudKey<ProxyServer> PROXY_SERVER_KEY = SimpleCloudKey.of(
"ProxyServer",
TypeToken.get(ProxyServer.class)
);
private VelocityContextKeys() {
}
}