From 4b2c8703e63cb5bef485fa201bae966af6871383 Mon Sep 17 00:00:00 2001 From: Xamora64 <49618907+Xamora64@users.noreply.github.com> Date: Tue, 10 Sep 2024 22:31:01 +0200 Subject: [PATCH] mod done for 1.0.0 --- build.gradle | 2 +- .../java/xamora/gp_dbc/commands/CommandGP.java | 2 +- .../CriminalTracker/GuiButtonCriminalTracker.java | 4 +--- .../gui/CriminalTracker/GuiCriminalTracker.java | 9 ++++++++- .../xamora/gp_dbc/items/ItemCriminalTracker.java | 4 +++- .../java/xamora/gp_dbc/items/ItemGPHandcuff.java | 1 + .../network/client/NetworkCriminalTrackerC.java | 15 ++++++++++++++- .../server/NetworkRefreshCriminalTracker.java | 4 +++- src/main/java/xamora/gp_dbc/system/Criminal.java | 2 +- src/main/java/xamora/gp_dbc/system/Criminals.java | 2 ++ src/main/resources/assets/gp_dbc/lang/en_US.lang | 3 ++- 11 files changed, 37 insertions(+), 11 deletions(-) diff --git a/build.gradle b/build.gradle index 0c38149..0915403 100644 --- a/build.gradle +++ b/build.gradle @@ -24,7 +24,7 @@ apply plugin: 'forge' sourceCompatibility = 1.8 targetCompatibility = 1.8 -version = "0.0.1" +version = "0.0.2" 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/commands/CommandGP.java b/src/main/java/xamora/gp_dbc/commands/CommandGP.java index 6d2abe4..fe8f843 100644 --- a/src/main/java/xamora/gp_dbc/commands/CommandGP.java +++ b/src/main/java/xamora/gp_dbc/commands/CommandGP.java @@ -148,7 +148,7 @@ public class CommandGP implements ICommand { System.out.println(e); } } - gp.criminals.addCriminal(player, rate); + error = gp.criminals.addCriminal(player, rate) != null ? 0 : 1; } else if (arg.equals(COMMANDS[6])) { // removeCriminal error = gp.criminals.removeCriminal(player.getUniqueID()) ? 0 : 1; 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 8d5c132..78480e9 100644 --- a/src/main/java/xamora/gp_dbc/gui/CriminalTracker/GuiButtonCriminalTracker.java +++ b/src/main/java/xamora/gp_dbc/gui/CriminalTracker/GuiButtonCriminalTracker.java @@ -1,7 +1,6 @@ package xamora.gp_dbc.gui.CriminalTracker; import xamora.gp_dbc.Main; -import xamora.gp_dbc.config.ConfigManager; import xamora.gp_dbc.system.Criminal; import xamora.gp_dbc.utils.Pos; import xamora.gp_dbc.utils.TimeUtils; @@ -12,7 +11,6 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; import xamora.gp_dbc.utils.DrawGui; -import static xamora.gp_dbc.config.ConfigManager.*; import static xamora.gp_dbc.gui.CriminalTracker.GuiCriminalTracker.*; public class GuiButtonCriminalTracker extends GuiButton { @@ -76,7 +74,7 @@ public class GuiButtonCriminalTracker extends GuiButton { Pos pos = criminal.getLastPos(); long rate = criminal.getRate(); - int ratio = (int)((double)rate / ConfigManager.MAX_RATE_CRIMINAL * 255); + int ratio = (int)((double)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/CriminalTracker/GuiCriminalTracker.java b/src/main/java/xamora/gp_dbc/gui/CriminalTracker/GuiCriminalTracker.java index 4a40c09..359b6e8 100644 --- a/src/main/java/xamora/gp_dbc/gui/CriminalTracker/GuiCriminalTracker.java +++ b/src/main/java/xamora/gp_dbc/gui/CriminalTracker/GuiCriminalTracker.java @@ -25,6 +25,10 @@ public class GuiCriminalTracker extends GuiScreen { public static int wdth; public static int hght; + public static long MAX_RATE_CRIMINAL; + public static long RATE_TO_HAVE_POSITION; + public static long RATE_CRIMINAL_NOT_SAFE; + public static List criminals; int gap_y = 2; int number_by_line = 3; @@ -34,9 +38,12 @@ public class GuiCriminalTracker extends GuiScreen { private GuiButtonCriminalTracker refresh_criminal; - public GuiCriminalTracker(List criminals) { + public GuiCriminalTracker(List criminals, long[] config) { GuiCriminalTracker.criminals = criminals; scroll_y = 0; + MAX_RATE_CRIMINAL = config[0]; + RATE_TO_HAVE_POSITION = config[1]; + RATE_CRIMINAL_NOT_SAFE = config[2]; } @Override diff --git a/src/main/java/xamora/gp_dbc/items/ItemCriminalTracker.java b/src/main/java/xamora/gp_dbc/items/ItemCriminalTracker.java index 6af9aef..98075cc 100644 --- a/src/main/java/xamora/gp_dbc/items/ItemCriminalTracker.java +++ b/src/main/java/xamora/gp_dbc/items/ItemCriminalTracker.java @@ -15,6 +15,8 @@ import net.minecraft.world.World; import java.util.List; +import static xamora.gp_dbc.config.ConfigManager.*; + public class ItemCriminalTracker extends Item { public ItemCriminalTracker() @@ -42,7 +44,7 @@ public class ItemCriminalTracker extends Item { criminals += criminal.toStringWithoutPos() + "#"; } - CommonProxy.network.sendTo(new NetworkCriminalTrackerC("open~" + criminals), (EntityPlayerMP) player); + CommonProxy.network.sendTo(new NetworkCriminalTrackerC("open~" + criminals + "~" + MAX_RATE_CRIMINAL + "#" + RATE_TO_HAVE_POSITION + "#" + RATE_CRIMINAL_NOT_SAFE), (EntityPlayerMP) player); return itemStack; } diff --git a/src/main/java/xamora/gp_dbc/items/ItemGPHandcuff.java b/src/main/java/xamora/gp_dbc/items/ItemGPHandcuff.java index ff95640..2d4e059 100644 --- a/src/main/java/xamora/gp_dbc/items/ItemGPHandcuff.java +++ b/src/main/java/xamora/gp_dbc/items/ItemGPHandcuff.java @@ -2,6 +2,7 @@ package xamora.gp_dbc.items; import JinRyuu.JRMCore.JRMCoreH; import JinRyuu.JRMCore.server.JGPlayerMP; +import com.forgeessentials.api.APIRegistry; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/xamora/gp_dbc/network/client/NetworkCriminalTrackerC.java b/src/main/java/xamora/gp_dbc/network/client/NetworkCriminalTrackerC.java index 5a55974..3b3e3dd 100644 --- a/src/main/java/xamora/gp_dbc/network/client/NetworkCriminalTrackerC.java +++ b/src/main/java/xamora/gp_dbc/network/client/NetworkCriminalTrackerC.java @@ -6,6 +6,7 @@ import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import xamora.gp_dbc.config.ConfigManager; import xamora.gp_dbc.gui.CriminalTracker.GuiCriminalTracker; import xamora.gp_dbc.system.Criminal; import xamora.gp_dbc.utils.Pos; @@ -77,7 +78,19 @@ public class NetworkCriminalTrackerC implements IMessage { } } - Minecraft.getMinecraft().displayGuiScreen(new GuiCriminalTracker(criminals)); + String[] config = split[2].split("#"); + long MAX_RATE_CRIMINAL = ConfigManager.MAX_RATE_CRIMINAL; + long RATE_TO_HAVE_POSITION = ConfigManager.RATE_TO_HAVE_POSITION; + long RATE_CRIMINAL_NOT_SAFE = ConfigManager.RATE_CRIMINAL_NOT_SAFE; + try { + MAX_RATE_CRIMINAL = Long.parseLong(config[0]); + RATE_TO_HAVE_POSITION = Long.parseLong(config[1]); + RATE_CRIMINAL_NOT_SAFE = Long.parseLong(config[2]); + } catch (Exception e) { + System.out.println(e); + } + + Minecraft.getMinecraft().displayGuiScreen(new GuiCriminalTracker(criminals, new long[]{MAX_RATE_CRIMINAL, RATE_TO_HAVE_POSITION, RATE_CRIMINAL_NOT_SAFE})); } return null; diff --git a/src/main/java/xamora/gp_dbc/network/server/NetworkRefreshCriminalTracker.java b/src/main/java/xamora/gp_dbc/network/server/NetworkRefreshCriminalTracker.java index 4d47553..be39710 100644 --- a/src/main/java/xamora/gp_dbc/network/server/NetworkRefreshCriminalTracker.java +++ b/src/main/java/xamora/gp_dbc/network/server/NetworkRefreshCriminalTracker.java @@ -12,6 +12,8 @@ import xamora.gp_dbc.proxy.CommonProxy; import xamora.gp_dbc.system.Criminal; import xamora.gp_dbc.utils.InputUtils; +import static xamora.gp_dbc.config.ConfigManager.*; + public class NetworkRefreshCriminalTracker implements IMessage { private String toSend; @@ -51,7 +53,7 @@ public class NetworkRefreshCriminalTracker implements IMessage { criminals += criminal.toStringWithoutPos() + "#"; } - CommonProxy.network.sendTo(new NetworkCriminalTrackerC("open~" + criminals), player); + CommonProxy.network.sendTo(new NetworkCriminalTrackerC("open~" + criminals + "~" + MAX_RATE_CRIMINAL + "#" + RATE_TO_HAVE_POSITION + "#" + RATE_CRIMINAL_NOT_SAFE), player); return null; } diff --git a/src/main/java/xamora/gp_dbc/system/Criminal.java b/src/main/java/xamora/gp_dbc/system/Criminal.java index a1d1a9a..2974e5e 100644 --- a/src/main/java/xamora/gp_dbc/system/Criminal.java +++ b/src/main/java/xamora/gp_dbc/system/Criminal.java @@ -34,7 +34,7 @@ public class Criminal { public Criminal(UUID uuid, String name, long rate, long last_time_pos, Pos pos) { this.uuid = uuid; - this.rate = rate; + setRate(rate); this.name = name; this.last_time_pos = last_time_pos; this.last_pos = pos; diff --git a/src/main/java/xamora/gp_dbc/system/Criminals.java b/src/main/java/xamora/gp_dbc/system/Criminals.java index ca991eb..063a99b 100644 --- a/src/main/java/xamora/gp_dbc/system/Criminals.java +++ b/src/main/java/xamora/gp_dbc/system/Criminals.java @@ -75,6 +75,8 @@ public class Criminals { public Criminal addCriminal(EntityPlayer player, long rate) { + if (gp.isInGalacticPatrol(player)) + return null; Criminal criminal = null; if (isCriminal(player.getUniqueID())) { diff --git a/src/main/resources/assets/gp_dbc/lang/en_US.lang b/src/main/resources/assets/gp_dbc/lang/en_US.lang index 36a3d97..9562463 100644 --- a/src/main/resources/assets/gp_dbc/lang/en_US.lang +++ b/src/main/resources/assets/gp_dbc/lang/en_US.lang @@ -31,4 +31,5 @@ error.is_not_criminal=He isn't a criminal error.banned_from_galactic_patrol=You are banned from the Galactic Patrol for error.banned_for_being_bad=For having bad alignment error.banned_for_killing_patrolman=For killing another patrolman -error.criminal_try_join_galactic_patrol=You are a criminal \ No newline at end of file +error.criminal_try_join_galactic_patrol=You are a criminal +error.cant_handcuff_dead=You can't handcuff a death \ No newline at end of file