diff --git a/build.gradle b/build.gradle index 5cd0749..7e78962 100644 --- a/build.gradle +++ b/build.gradle @@ -24,7 +24,7 @@ apply plugin: 'forge' sourceCompatibility = 1.8 targetCompatibility = 1.8 -version = "1.2.5" +version = "1.2.6" group = "xamora.gp_dbc" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = "gp_dbc" diff --git a/src/main/java/xamora/gp_dbc/gui/CriminalTracker/GuiButtonCriminalTracker.java b/src/main/java/xamora/gp_dbc/gui/CriminalTracker/GuiButtonCriminalTracker.java index 2449be6..6ca6e56 100644 --- a/src/main/java/xamora/gp_dbc/gui/CriminalTracker/GuiButtonCriminalTracker.java +++ b/src/main/java/xamora/gp_dbc/gui/CriminalTracker/GuiButtonCriminalTracker.java @@ -69,13 +69,13 @@ public class GuiButtonCriminalTracker extends GuiButton { Criminal criminal = criminals.get(-(id) - 1); GL11.glPushMatrix(); - GL11.glScissor(displayGuiX , displayGuiY + 12 * ratioHeight, newWidth, (int) (newHeight - 47 * ratioHeight)); + GL11.glScissor(displayGuiX , displayGuiY + 12 * ratioHeight, newWidth, (newHeight - 47 * ratioHeight)); GL11.glEnable(GL11.GL_SCISSOR_TEST); Pos pos = criminal.getLastPos(); - long rate = criminal.getRate(); - int ratio = (int)((double)rate / MAX_RATE_CRIMINAL * 255); + long rate = (long) (criminal.getRate()); + int ratio = (int)(rate / MAX_RATE_CRIMINAL * 255); //int color = (0xff << 24) | (Math.min(ratio * 10, 255) << 16) | (Math.max(255 - ratio * 3, 0) << 8) | 0x00; //drawRect(xPosition, yPosition, xPosition + width, yPosition + height, color); GL11.glPushMatrix(); diff --git a/src/main/java/xamora/gp_dbc/gui/JailManager/GuiJailManager.java b/src/main/java/xamora/gp_dbc/gui/JailManager/GuiJailManager.java index ddb5cdb..0c4921c 100644 --- a/src/main/java/xamora/gp_dbc/gui/JailManager/GuiJailManager.java +++ b/src/main/java/xamora/gp_dbc/gui/JailManager/GuiJailManager.java @@ -141,7 +141,7 @@ public class GuiJailManager extends GuiScreen { cell_selected = -1; else cell_selected = cell.getId(); - System.out.println("id:" + cell.getId()); +// System.out.println("id:" + cell.getId()); } super.actionPerformed(button); } diff --git a/src/main/java/xamora/gp_dbc/system/Criminal.java b/src/main/java/xamora/gp_dbc/system/Criminal.java index 812cb02..c1302c5 100644 --- a/src/main/java/xamora/gp_dbc/system/Criminal.java +++ b/src/main/java/xamora/gp_dbc/system/Criminal.java @@ -19,7 +19,7 @@ public class Criminal { private String name; private UUID uuid; - private long rate; + private double rate; private long last_time_pos; private Pos last_pos; @@ -29,15 +29,15 @@ public class Criminal { this(player, 0); } - public Criminal(EntityPlayer player, long rate) { + public Criminal(EntityPlayer player, double rate) { this(player.getUniqueID(), ConfigManager.NICKNAME_FOR_CRIMINAL ? ModuleChat.getPlayerNickname(player) : player.getDisplayName(), rate, null); } - public Criminal(UUID uuid, String name, long rate, Pos pos) { + public Criminal(UUID uuid, String name, double rate, Pos pos) { this(uuid, name, rate, 0, pos); } - public Criminal(UUID uuid, String name, long rate, long last_time_pos, Pos pos) { + public Criminal(UUID uuid, String name, double rate, long last_time_pos, Pos pos) { this.uuid = uuid; setRate(rate); this.name = name; @@ -87,9 +87,9 @@ public class Criminal { return uuid; } public String getName() { return name; } - public long getRate() { return rate; } + public double getRate() { return rate; } - public void setRate(long rate) { + public void setRate(double rate) { this.rate = Math.min(rate, ConfigManager.MAX_RATE_CRIMINAL); } diff --git a/src/main/java/xamora/gp_dbc/system/Criminals.java b/src/main/java/xamora/gp_dbc/system/Criminals.java index 3112938..23fbc31 100644 --- a/src/main/java/xamora/gp_dbc/system/Criminals.java +++ b/src/main/java/xamora/gp_dbc/system/Criminals.java @@ -96,7 +96,7 @@ public class Criminals { } - public Criminal addCriminal(EntityPlayer player, long rate) { + public Criminal addCriminal(EntityPlayer player, double rate) { if (gp.isInGalacticPatrol(player)) return null; @@ -139,8 +139,8 @@ public class Criminals { if (player == null) return criminal.getLastPos(); - long rate = criminal.getRate(); - long next_time_pos = (long) (ConfigManager.MAX_TIME_BETWEEN_EACH_POSITION - ((double)rate / ConfigManager.MAX_RATE_CRIMINAL) * (ConfigManager.MAX_TIME_BETWEEN_EACH_POSITION - ConfigManager.MIN_TIME_BETWEEN_EACH_POSITION)); + double rate = criminal.getRate(); + long next_time_pos = (long) (ConfigManager.MAX_TIME_BETWEEN_EACH_POSITION - (rate / ConfigManager.MAX_RATE_CRIMINAL) * (ConfigManager.MAX_TIME_BETWEEN_EACH_POSITION - ConfigManager.MIN_TIME_BETWEEN_EACH_POSITION)); long last_time = criminal.getLastPosTime(); if (System.currentTimeMillis() - last_time <= next_time_pos)