Skip to content

Commit ca6c868

Browse files
Optimizar Metodos
1 parent 4fb66c7 commit ca6c868

4 files changed

Lines changed: 15 additions & 6 deletions

File tree

Nukkit-MOT/src/main/java/org/CreadoresProgram/ViaBedrockDetect/NukkitMain.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import java.util.stream.Collectors;
77
public class NukkitMain extends PluginBase{
88
private static NukkitMain instance;
9+
private static String deviceModelVP = "ViaProxyBedrock";
910
public static NukkitMain getInstance(){
1011
return instance;
1112
}
@@ -17,7 +18,7 @@ public void onDisable(){
1718
this.getLogger().info("§cBye!");
1819
}
1920
public boolean isJavaPlayer(Player player){
20-
return player.isJavaClient() || player.getLoginChainData().getDeviceModel().equals("ViaProxyBedrock");
21+
return player.isJavaClient() || player.getLoginChainData().getDeviceModel().equals(deviceModelVP);
2122
}
2223
public List<Player> getJavaPlayers(){
2324
return this.getServer().getOnlinePlayers().values().stream().filter(player -> isJavaPlayer(player)).collect(Collectors.toList());

Nukkit/src/main/java/org/CreadoresProgram/ViaBedrockDetect/NukkitMain.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import java.util.stream.Collectors;
77
public class NukkitMain extends PluginBase{
88
private static NukkitMain instance;
9+
private static String deviceModelVP = "ViaProxyBedrock";
910
public static NukkitMain getInstance(){
1011
return instance;
1112
}
@@ -17,7 +18,7 @@ public void onDisable(){
1718
this.getLogger().info("§cBye!");
1819
}
1920
public boolean isJavaPlayer(Player player){
20-
return player.getLoginChainData().getDeviceModel().equals("ViaProxyBedrock");
21+
return player.getLoginChainData().getDeviceModel().equals(deviceModelVP);
2122
}
2223
public List<Player> getJavaPlayers(){
2324
return this.getServer().getOnlinePlayers().values().stream().filter(player -> isJavaPlayer(player)).collect(Collectors.toList());

Pocketmine/plugin/src/org/CreadoresProgram/ViaBedrockDetect/PocketmineMain.php

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55
use pocketmine\player\Player;
66
class PocketmineMain extends PluginBase{
77
private static ?self $instance = null;
8+
private static string $deviceModelVP = "ViaProxyBedrock";
9+
private static string $deviceModelP = "DeviceModel";
10+
private static string $deviceOSP = "DeviceOS";
11+
private static string $defDeviceModel = "";
812
public static function getInstance() : ?self{
913
return self::$instance;
1014
}
@@ -16,8 +20,8 @@ public function onDisable() : void{
1620
}
1721
public function isJavaPlayer(Player $player) : bool{
1822
$extraData = $player->getNetworkSession()->getPlayerInfo()->getExtraData();
19-
$deviceModel = $extraData["DeviceModel"] ?? "";
20-
return ($deviceModel == "ViaProxyBedrock");
23+
$deviceModel = $extraData[self::$deviceModelP] ?? self::$defDeviceModel;
24+
return ($deviceModel == self::$deviceModelVP);
2125
}
2226
public function getJavaPlayers() : array{
2327
return array_filter($this->getServer()->getOnlinePlayers(), fn($player) => $this->isJavaPlayer($player));

ViaProxy/src/main/java/org/CreadoresProgram/ViaBedrockDetect/ViaProxyMain.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010
import java.util.Map;
1111
public class ViaProxyMain extends ViaProxyPlugin{
1212
private String prefix = "[ViaBedrockDetect] ";
13+
private String DeviceOs = "DeviceOS";
14+
private String DeviceModel = "DeviceModel";
15+
private String DeviceModelVal = "ViaProxyBedrock";
1316
@Override
1417
public void onEnable(){
1518
System.out.println(prefix + "Loading ViaBedrockDetect...");
@@ -26,8 +29,8 @@ public void onViaLoading(ViaLoadingEvent event){
2629
@Override
2730
public Map<String, Object> getClientPlayerSkin(final UserConnection user){
2831
final Map<String, Object> claims = super.getClientPlayerSkin(user);
29-
claims.put("DeviceOS", BuildPlatform.UWP.getValue());
30-
claims.put("DeviceModel", "ViaProxyBedrock");
32+
claims.put(DeviceOs, BuildPlatform.UWP.getValue());
33+
claims.put(DeviceModel, DeviceModelVal);
3134
return claims;
3235
}
3336
});

0 commit comments

Comments
 (0)