Skip to content

Commit

Permalink
Debug Mode Flag Modify
Browse files Browse the repository at this point in the history
  • Loading branch information
@kumaisu
kumaisu committed Dec 25, 2019
1 parent 3028f89 commit 4418740
Show file tree
Hide file tree
Showing 4 changed files with 37 additions and 35 deletions.
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.mycompany</groupId>
<artifactId>Citizenship</artifactId>
<version>0.9.6</version>
<version>1.0.0</version>
<description>Citizenship Control Manager plugins</description>
<packaging>jar</packaging>
<properties>
Expand Down
13 changes: 6 additions & 7 deletions src/main/java/com/mycompany/citizenship/Citizenship.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,16 @@
import org.bukkit.event.player.PlayerQuitEvent;
import org.bukkit.event.player.PlayerCommandPreprocessEvent;
import com.mycompany.kumaisulibraries.Tools;
import com.mycompany.citizenship.config.Config;
import com.mycompany.citizenship.config.ConfigManager;
import com.mycompany.citizenship.command.RankCommand;
import com.mycompany.citizenship.command.JailCommand;
import com.mycompany.citizenship.command.YellowCommand;
import com.mycompany.citizenship.config.Config;
import com.mycompany.citizenship.config.ConfigManager;
import com.mycompany.citizenship.database.Database;
import com.mycompany.citizenship.database.MySQLControl;
import com.mycompany.citizenship.database.PlayerData;
import com.mycompany.citizenship.database.ReasonData;
import com.mycompany.citizenship.database.YellowData;
import static com.mycompany.citizenship.config.Config.programCode;

/**
*
Expand Down Expand Up @@ -68,7 +67,7 @@ public void onLoad() {
@EventHandler( priority = EventPriority.LOWEST )
public void onPlayerLogin( PlayerJoinEvent event ) throws UnknownHostException {
Player player = event.getPlayer();
Tools.Prt( "onPlayerLogin process", Tools.consoleMode.max, programCode );
Tools.Prt( "onPlayerLogin process", Tools.consoleMode.max, Config.programCode );
RanksControl.CheckRank( player );
if ( player.hasPermission( "citizenship.yellow" ) ) {
YellowData.CardLog( player, Database.logout );
Expand Down Expand Up @@ -113,14 +112,14 @@ public boolean onPreprocess( PlayerCommandPreprocessEvent event ) {
0, 300, 0
);
String msgLog = ChatColor.YELLOW + "Command Aleart : " + ChatColor.RED + player.getName() + " " + message;
Tools.Prt( msgLog, Tools.consoleMode.full, programCode );
Bukkit.getOnlinePlayers().stream().filter( ( p ) -> ( p.hasPermission( "citizenship.admin" ) || p.isOp() ) ).forEachOrdered( ( p ) -> {
Tools.Prt( msgLog, Tools.consoleMode.normal, Config.programCode );
Bukkit.getOnlinePlayers().stream().filter( ( p ) -> ( p.hasPermission( "citizenship.admin" ) ) ).forEachOrdered( ( p ) -> {
p.sendMessage( msgLog );
} );

if ( Config.Imprisonment ) {
if ( ( Config.AutoJail > 0 ) && ( Database.yellow >= Config.AutoJail ) ) {
Tools.Prt( player, ChatColor.RED + "Auto Jail to " + player.getName(), Tools.consoleMode.normal, programCode );
Tools.Prt( player, ChatColor.RED + "Auto Jail to " + player.getName(), Tools.consoleMode.normal, Config.programCode );
String reason = "Exceeded the specified number of times";
int ReasonID = ReasonData.AddReason( player.getUniqueId(), reason, "Auto Jail" );
PlayerData.SetReasonID( player.getUniqueId(), ReasonID );
Expand Down
55 changes: 29 additions & 26 deletions src/main/java/com/mycompany/citizenship/RanksControl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,20 +34,20 @@ public class RanksControl {
* @return
*/
public static boolean Promotion( Player player, Player target ) {
Tools.Prt( "Promotion Process", Tools.consoleMode.full, programCode );
Tools.Prt( "Promotion Process", Tools.consoleMode.max, programCode );
if ( target == null ) target = player;
String baseGroup = getGroup( target );

if ( baseGroup.equals( "" ) || baseGroup == null ) {
Tools.Prt( player, "グループ設定がありません", Tools.consoleMode.full, programCode );
Tools.Prt( player, "グループ設定がありません", Tools.consoleMode.max, programCode );
return false;
}
if ( Config.rankName.contains( baseGroup ) == false ) {
Tools.Prt( player, ChatColor.BLUE + "ランク制御対象外グループです", Tools.consoleMode.full, programCode );
Tools.Prt( player, ChatColor.BLUE + "ランク制御対象外グループです", Tools.consoleMode.max, programCode );
return false;
}
if ( Config.rankTime.get( baseGroup ).get( "E" ) != null ) {
Tools.Prt( player, ChatColor.LIGHT_PURPLE + "これ以上の昇格はできません", Tools.consoleMode.full, programCode );
Tools.Prt( player, ChatColor.LIGHT_PURPLE + "これ以上の昇格はできません", Tools.consoleMode.max, programCode );
return false;
}

Expand Down Expand Up @@ -84,21 +84,21 @@ public static boolean Promotion( Player player, Player target ) {
* @return
*/
public static boolean Demotion( Player player, Player target ){
Tools.Prt( "Demotion Process", Tools.consoleMode.full, programCode );
Tools.Prt( "Demotion Process", Tools.consoleMode.max, programCode );
if ( target == null ) target = player;
String baseGroup = getGroup( target );

if ( baseGroup.equals( "" ) || baseGroup == null ) {
Tools.Prt( player, "グループ設定がありません", Tools.consoleMode.full, programCode );
Tools.Prt( player, "グループ設定がありません", Tools.consoleMode.max, programCode );
return false;
}
if ( Config.rankName.contains( baseGroup ) == false ) {
Tools.Prt( player, "ランク制御対象外グループです", Tools.consoleMode.full, programCode );
Tools.Prt( player, "ランク制御対象外グループです", Tools.consoleMode.max, programCode );
return false;
}
if ( Config.rankName.indexOf( baseGroup ) == 0 ) {
if ( player != target ) {
Tools.Prt( player, "これ以下へ降格はできません", Tools.consoleMode.full, programCode );
Tools.Prt( player, "これ以下へ降格はできません", Tools.consoleMode.max, programCode );
}
return false;
}
Expand Down Expand Up @@ -150,7 +150,7 @@ public static String getGroup( Player player ) {
for ( String StrItem1 : perm.getPlayerGroups( player ) ) Tools.Prt( "Have Gr. {" + StrItem1 + "}", Tools.consoleMode.max, programCode );

String NowGroup = perm.getPlayerGroups( player )[0];
Tools.Prt( "NowGroup [" + NowGroup + "]", Tools.consoleMode.full, programCode );
Tools.Prt( "NowGroup [" + NowGroup + "]", Tools.consoleMode.max, programCode );
return NowGroup;
}

Expand Down Expand Up @@ -180,9 +180,8 @@ public static boolean setGroup( Player player, String newGroup ) {
* 具体的に、昇格・降格を判断処理するメソッド
*
* @param player
* @return
*/
public static boolean CheckRank( Player player ) {
public static void CheckRank( Player player ) {
int BaseTick = TickTime.get( player );
int allTime = ( int ) Math.round( BaseTick * 0.05 / 60 /60 );
Tools.Prt( "PlayTime = " + Float.toString( ( float ) BaseTick ), Tools.consoleMode.full, programCode );
Expand All @@ -208,24 +207,36 @@ public static boolean CheckRank( Player player ) {
if ( Database.jail == 1 ) {
PlayerControl.toJail( player, Database.ReasonID );
PlayerData.SetJailToSQL( player.getUniqueId(), 0 );
return true;
return;
}

int progress = Utility.dateDiff( Database.logout, new Date() );
int checkHour = ( int ) Math.round( ( BaseTick - Database.offset ) * 0.05 / 60 / 60 );

String NowGroup = getGroup( player );

//
// グループ表示 => コンソールへ
//
Tools.Prt( ChatColor.GREEN + player.getName() + " [" + NowGroup + "] Login", Tools.consoleMode.normal, programCode );

//
// 経過時間によるユーザーの昇格処理
//
if ( NowGroup.equals( "" ) || Config.rankTime.get( NowGroup ) == null ) {
Tools.Prt( ChatColor.GOLD + "チェック対象グループではありません", Tools.consoleMode.full, programCode );
return;
}

//
// ペナルティユーザーに対する処理
//
if ( Database.ReasonID != 0 ) {
if ( ( Config.Penalty > 0 ) && ( progress > Config.Penalty ) ) {
return PlayerControl.outJail( player );
PlayerControl.outJail( player );
} else {
ReasonData.GetReason( Database.ReasonID );
Tools.Prt( player, ChatColor.RED + "投獄理由 : " + Database.Reason + " By." + Database.enforcer, Tools.consoleMode.normal, programCode );
return false;
}
}

Expand All @@ -234,23 +245,18 @@ public static boolean CheckRank( Player player ) {
//
if ( Config.demotion ) {
Tools.Prt( "Logout date = " + Database.logout.toString(), Tools.consoleMode.full, programCode);
Tools.Prt( "Diff Date : " + progress + " 日", Tools.consoleMode.full, programCode );
Tools.Prt( "Elapsed Date : " + progress + " 日", Tools.consoleMode.max, programCode );
int days = ( Config.demot.get( NowGroup ) == null ? Config.demotionDefault : Config.demot.get( NowGroup ) );
Tools.Prt( "CheckDate : " + days + " 日", Tools.consoleMode.full, programCode );
Tools.Prt( "Config Date : " + days + " 日", Tools.consoleMode.max, programCode );
if ( ( days > 0 ) && ( progress > days ) ) {
Demotion( player, null );
return true;
return;
} else Tools.Prt( ChatColor.YELLOW + "No demotion process", Tools.consoleMode.full, programCode );
}

//
// 経過時間によるユーザーの昇格処理
// 昇格判定
//
if ( NowGroup.equals( "" ) || Config.rankTime.get( NowGroup ) == null ) {
Tools.Prt( ChatColor.GOLD + "チェック対象グループではありません", Tools.consoleMode.full, programCode );
return false;
}

if ( Config.rankTime.get( NowGroup ).get( "E" ) == null ) {
boolean UpCheck = false;
if ( Config.rankTime.get( NowGroup ).get( "H" ) != null ) {
Expand All @@ -265,10 +271,7 @@ public static boolean CheckRank( Player player ) {
if ( UpCheck ) {
Tools.Prt( ChatColor.YELLOW + "Player promotion!!", Tools.consoleMode.full, programCode);
Promotion( player, null );
return true;
}
} else Tools.Prt( ChatColor.AQUA + "This player is Last Group", Tools.consoleMode.full, programCode );

return false;
}
}
2 changes: 1 addition & 1 deletion src/main/resources/plugin.yml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
main: com.mycompany.citizenship.Citizenship
name: Citizenship
version: 0.9.6
version: 1.0.0
description: Citizen Ship Auto Control plugin
author: Kumaisu
database: true
Expand Down

0 comments on commit 4418740

Please sign in to comment.