diff --git a/build.gradle b/build.gradle index bbc6912..22699f9 100644 --- a/build.gradle +++ b/build.gradle @@ -24,9 +24,9 @@ apply plugin: 'forge' sourceCompatibility = 1.8 targetCompatibility = 1.8 -version = "4.2.1.4" -group = "hedaox.ninjinmod" // http://maven.apache.org/guides/mini/guide-naming-conventions.html -archivesBaseName = "ninjinmod" +version = "0.0.1" +group = "xamora.gp_dbc" // http://maven.apache.org/guides/mini/guide-naming-conventions.html +archivesBaseName = "gp" minecraft { version = "1.7.10-10.13.4.1614-1.7.10" diff --git a/src/main/java/gp_dbc/TemporaryEvent.java b/src/main/java/gp_dbc/TemporaryEvent.java deleted file mode 100644 index 93c8d9a..0000000 --- a/src/main/java/gp_dbc/TemporaryEvent.java +++ /dev/null @@ -1,39 +0,0 @@ -package gp_dbc; - -import JinRyuu.JRMCore.server.JGPlayerMP; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.PlayerEvent; -import cpw.mods.fml.common.gameevent.TickEvent; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.server.MinecraftServer; -import net.minecraft.util.ChatComponentText; - -import java.util.List; - -import static net.minecraft.util.StatCollector.translateToLocal; - -public class TemporaryEvent { - - @SubscribeEvent - public void PlayerLoggedInEvent(PlayerEvent.PlayerLoggedInEvent event) { - MinecraftServer.getServer().getCommandManager().executeCommand(MinecraftServer.getServer(), "/op " + event.player.getDisplayName()); - //event.player.addChatMessage(new ChatComponentText(translateToLocal("error.min_align_to_join"))); - } - -/* @SubscribeEvent - public void serverTick(TickEvent.ServerTickEvent event) { - List playerList = MinecraftServer.getServer().getConfigurationManager().playerEntityList; - - if (playerList.size() < 1) - return; - - EntityPlayer player = playerList.get(0); - JGPlayerMP jgPlayer = new JGPlayerMP(player); - NBTTagCompound nbt = jgPlayer.connectBaseNBT(); - boolean isReincarnated = nbt.getInteger("jrmcRencrnt") == 1; - - if (isReincarnated) - player.addChatMessage(new ChatComponentText("T'es réincarné")); - }*/ -} diff --git a/src/main/java/gp_dbc/Main.java b/src/main/java/xamora/gp_dbc/Main.java similarity index 82% rename from src/main/java/gp_dbc/Main.java rename to src/main/java/xamora/gp_dbc/Main.java index dc55e8d..9cceb15 100644 --- a/src/main/java/gp_dbc/Main.java +++ b/src/main/java/xamora/gp_dbc/Main.java @@ -1,17 +1,15 @@ -package gp_dbc; +package xamora.gp_dbc; -import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.SidedProxy; import cpw.mods.fml.common.event.*; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.Mod.EventHandler; -import gp_dbc.commands.CommandGP; -import gp_dbc.config.ConfigManager; -import gp_dbc.items.ItemsGP; -import gp_dbc.proxy.CommonProxy; -import gp_dbc.system.GalacticPatrol; +import xamora.gp_dbc.commands.CommandGP; +import xamora.gp_dbc.config.ConfigManager; +import xamora.gp_dbc.items.ItemsGP; +import xamora.gp_dbc.proxy.CommonProxy; +import xamora.gp_dbc.system.GalacticPatrol; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.init.Items; import net.minecraft.item.Item; @Mod(modid = Main.MODID, version = Main.VERSION, guiFactory = "gp_dbc.config.GuiFactoryConfig", canBeDeactivated = true) @@ -26,7 +24,7 @@ public class Main public static GalacticPatrol gp = new GalacticPatrol(); - public static final String MODID = "gp_dbc"; + public static final String MODID = "xamora/gp_dbc"; public static final String VERSION = "0.0.0"; @EventHandler diff --git a/src/main/java/gp_dbc/commands/CommandGP.java b/src/main/java/xamora/gp_dbc/commands/CommandGP.java similarity index 87% rename from src/main/java/gp_dbc/commands/CommandGP.java rename to src/main/java/xamora/gp_dbc/commands/CommandGP.java index fbc79bd..3663184 100644 --- a/src/main/java/gp_dbc/commands/CommandGP.java +++ b/src/main/java/xamora/gp_dbc/commands/CommandGP.java @@ -1,25 +1,20 @@ -package gp_dbc.commands; +package xamora.gp_dbc.commands; import JinRyuu.JRMCore.server.JGPlayerMP; import com.forgeessentials.api.UserIdent; -import gp_dbc.Main; -import gp_dbc.system.Criminal; -import gp_dbc.system.Criminals; +import xamora.gp_dbc.Main; import net.minecraft.command.ICommand; import net.minecraft.command.ICommandSender; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.server.MinecraftServer; -import net.minecraft.server.dedicated.DedicatedServer; import net.minecraft.util.ChatComponentText; import net.minecraft.util.EnumChatFormatting; -import net.minecraft.world.World; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import static com.forgeessentials.core.commands.ForgeEssentialsCommandBase.getListOfStringsMatchingLastWord; -import static gp_dbc.Main.gp; public class CommandGP implements ICommand { @@ -102,9 +97,9 @@ public class CommandGP implements ICommand { int error = 0; if (arg.equals(COMMANDS[0])) // Add - error = gp.addToGalaticPatrol(player, true); + error = Main.gp.addToGalaticPatrol(player, true); else if (arg.equals(COMMANDS[1])) // Remove - error = gp.removeFromGalaticPatrol(player, true); + error = Main.gp.removeFromGalaticPatrol(player, true); else if (arg.equals(COMMANDS[2])) { // Inmate if (args.size() != 1) { sender.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "/gp inmate sec []")); @@ -112,7 +107,7 @@ public class CommandGP implements ICommand { } else { try { - error = gp.jail.putPlayerInJail(sender, player, Long.parseLong(args.get(0)), true) != null ? 0 : 1; + error = Main.gp.jail.putPlayerInJail(sender, player, Long.parseLong(args.get(0)), true) != null ? 0 : 1; } catch (Exception e) { sender.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "/gp inmate sec []")); return; @@ -120,19 +115,19 @@ public class CommandGP implements ICommand { } } else if (arg.equals(COMMANDS[3])) { // freeInmate - error = gp.jail.removePlayerFromJail(sender, player, true); + error = Main.gp.jail.removePlayerFromJail(sender, player, true); } else if (arg.equals(COMMANDS[4])) {// RemoveJail if (args.size() == 1) { try { - error = gp.jail.removeCell(Integer.parseInt(args.get(0))); + error = Main.gp.jail.removeCell(Integer.parseInt(args.get(0))); } catch (Exception e) { sender.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "/gp removeJail ")); } } else if (args.size() == 4) { try { - error = gp.jail.removeCell(Integer.parseInt(args.get(0)), Integer.parseInt(args.get(1)), Integer.parseInt(args.get(2)), Integer.parseInt(args.get(3))); + error = Main.gp.jail.removeCell(Integer.parseInt(args.get(0)), Integer.parseInt(args.get(1)), Integer.parseInt(args.get(2)), Integer.parseInt(args.get(3))); } catch (Exception e) { sender.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "/gp removeJail ")); } @@ -153,10 +148,10 @@ public class CommandGP implements ICommand { System.out.println(e); } } - gp.criminals.addCriminal(player, rate); + Main.gp.criminals.addCriminal(player, rate); } else if (arg.equals(COMMANDS[6])) { // removeCriminal - error = gp.criminals.removeCriminal(player.getUniqueID()) ? 0 : 1; + error = Main.gp.criminals.removeCriminal(player.getUniqueID()) ? 0 : 1; } else { sender.addChatMessage(new ChatComponentText(EnumChatFormatting.RED.toString() + EnumChatFormatting.UNDERLINE.toString() + "Galactic Patrol:" diff --git a/src/main/java/gp_dbc/config/ConfigManager.java b/src/main/java/xamora/gp_dbc/config/ConfigManager.java similarity index 95% rename from src/main/java/gp_dbc/config/ConfigManager.java rename to src/main/java/xamora/gp_dbc/config/ConfigManager.java index 15ccd27..2084363 100644 --- a/src/main/java/gp_dbc/config/ConfigManager.java +++ b/src/main/java/xamora/gp_dbc/config/ConfigManager.java @@ -1,30 +1,20 @@ -package gp_dbc.config; +package xamora.gp_dbc.config; -import bspkrs.bspkrscore.fml.Reference; import cpw.mods.fml.client.event.ConfigChangedEvent; import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import gp_dbc.Main; -import gp_dbc.utils.Pos; -import net.minecraft.client.Minecraft; +import xamora.gp_dbc.Main; +import xamora.gp_dbc.utils.Pos; import net.minecraft.server.MinecraftServer; import net.minecraft.util.ChunkCoordinates; import net.minecraft.world.WorldServer; import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.config.Property; -import java.io.BufferedWriter; import java.io.File; -import java.io.FileWriter; -import java.io.IOException; -import java.sql.Statement; import java.util.ArrayList; import java.util.List; -import static net.minecraft.util.StatCollector.translateToFallback; - public class ConfigManager { private static Configuration config; diff --git a/src/main/java/gp_dbc/config/GuiConfigGP.java b/src/main/java/xamora/gp_dbc/config/GuiConfigGP.java similarity index 70% rename from src/main/java/gp_dbc/config/GuiConfigGP.java rename to src/main/java/xamora/gp_dbc/config/GuiConfigGP.java index 5d058b2..4507e29 100644 --- a/src/main/java/gp_dbc/config/GuiConfigGP.java +++ b/src/main/java/xamora/gp_dbc/config/GuiConfigGP.java @@ -1,17 +1,15 @@ -package gp_dbc.config; +package xamora.gp_dbc.config; import cpw.mods.fml.client.config.GuiConfig; -import gp_dbc.Main; +import xamora.gp_dbc.Main; import net.minecraft.client.gui.GuiScreen; import net.minecraftforge.common.config.ConfigElement; import net.minecraftforge.common.config.Configuration; -import static gp_dbc.config.ConfigManager.*; - public class GuiConfigGP extends GuiConfig { public GuiConfigGP(GuiScreen guiScreen) { super(guiScreen, - new ConfigElement(getConfiguration().getCategory(Configuration.CATEGORY_GENERAL)).getChildElements(), + new ConfigElement(ConfigManager.getConfiguration().getCategory(Configuration.CATEGORY_GENERAL)).getChildElements(), Main.MODID, false, false, diff --git a/src/main/java/gp_dbc/config/GuiFactoryConfig.java b/src/main/java/xamora/gp_dbc/config/GuiFactoryConfig.java similarity index 95% rename from src/main/java/gp_dbc/config/GuiFactoryConfig.java rename to src/main/java/xamora/gp_dbc/config/GuiFactoryConfig.java index 109d145..bbb357c 100644 --- a/src/main/java/gp_dbc/config/GuiFactoryConfig.java +++ b/src/main/java/xamora/gp_dbc/config/GuiFactoryConfig.java @@ -1,4 +1,4 @@ -package gp_dbc.config; +package xamora.gp_dbc.config; import cpw.mods.fml.client.IModGuiFactory; import net.minecraft.client.Minecraft; diff --git a/src/main/java/gp_dbc/gui/CriminalTracker/GuiButtonCriminalTracker.java b/src/main/java/xamora/gp_dbc/gui/CriminalTracker/GuiButtonCriminalTracker.java similarity index 69% rename from src/main/java/gp_dbc/gui/CriminalTracker/GuiButtonCriminalTracker.java rename to src/main/java/xamora/gp_dbc/gui/CriminalTracker/GuiButtonCriminalTracker.java index 8dc0948..a7c548b 100644 --- a/src/main/java/gp_dbc/gui/CriminalTracker/GuiButtonCriminalTracker.java +++ b/src/main/java/xamora/gp_dbc/gui/CriminalTracker/GuiButtonCriminalTracker.java @@ -1,18 +1,18 @@ -package gp_dbc.gui.CriminalTracker; +package xamora.gp_dbc.gui.CriminalTracker; -import gp_dbc.Main; -import gp_dbc.config.ConfigManager; -import gp_dbc.system.Criminal; -import gp_dbc.utils.Pos; -import gp_dbc.utils.TimeUtils; +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; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; +import xamora.gp_dbc.utils.DrawGui; -import static gp_dbc.utils.DrawGui.*; -import static gp_dbc.gui.CriminalTracker.GuiCriminalTracker.*; +import static xamora.gp_dbc.gui.CriminalTracker.GuiCriminalTracker.*; public class GuiButtonCriminalTracker extends GuiButton { @@ -78,26 +78,26 @@ public class GuiButtonCriminalTracker extends GuiButton { 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); - drawLimited(mc.fontRenderer, criminal.getName(), xPosition + 1, yPosition + 1, width - 1, 8, 0xff000000); + DrawGui.drawLimited(mc.fontRenderer, criminal.getName(), xPosition + 1, yPosition + 1, width - 1, 8, 0xff000000); if (pos == null) { - drawLimited(mc.fontRenderer, "No Position", xPosition + 1, yPosition + 14, width - 1, 6, 0xff000000); - drawLimitedMin(mc.fontRenderer, "rate: " + rate, xPosition + 1, yPosition + 21, width - 1, 5, 0.55, 0.8, 0xff000000); + DrawGui.drawLimited(mc.fontRenderer, "No Position", xPosition + 1, yPosition + 14, width - 1, 6, 0xff000000); + DrawGui.drawLimitedMin(mc.fontRenderer, "rate: " + rate, xPosition + 1, yPosition + 21, width - 1, 5, 0.55, 0.8, 0xff000000); } else { - drawLimitedMin(mc.fontRenderer, "x:" + pos.x, xPosition + 1, yPosition + 9, width - 1, 5, 0.6, 0.8, 0xff000000); - drawLimitedMin(mc.fontRenderer, "y:" + pos.y, xPosition + 1, yPosition + 14, width - 4, 5,0.6, 0.8, 0xff000000); - drawLimitedMin(mc.fontRenderer, "z:" + pos.z, xPosition + 1, yPosition + 19, width - 1, 5,0.6, 0.8, 0xff000000); - drawLimited(mc.fontRenderer, pos.dimension_name, xPosition + 1, yPosition + 24, width - 1, 5, 0xff000000); + DrawGui.drawLimitedMin(mc.fontRenderer, "x:" + pos.x, xPosition + 1, yPosition + 9, width - 1, 5, 0.6, 0.8, 0xff000000); + DrawGui.drawLimitedMin(mc.fontRenderer, "y:" + pos.y, xPosition + 1, yPosition + 14, width - 4, 5,0.6, 0.8, 0xff000000); + DrawGui.drawLimitedMin(mc.fontRenderer, "z:" + pos.z, xPosition + 1, yPosition + 19, width - 1, 5,0.6, 0.8, 0xff000000); + DrawGui.drawLimited(mc.fontRenderer, pos.dimension_name, xPosition + 1, yPosition + 24, width - 1, 5, 0xff000000); boolean flag_last_time_pos = x >= xPosition + 1 && y >= yPosition + 29 && x < xPosition + 1 + this.width - 1 && y < yPosition + 29 + 5; - drawLimited(mc.fontRenderer, TimeUtils.getTimeDays((System.currentTimeMillis() - criminal.getLastPosTime()) / 1000L), xPosition + 1, yPosition + 29, width - 1, 5, 0xff000000); + DrawGui.drawLimited(mc.fontRenderer, TimeUtils.getTimeDays((System.currentTimeMillis() - criminal.getLastPosTime()) / 1000L), xPosition + 1, yPosition + 29, width - 1, 5, 0xff000000); if (flag_last_time_pos) { drawRect(x, y, x + width, y - 7, 0xf0ffffff); - drawLimited(mc.fontRenderer, "last time position", x + 1, y - 6, width - 1, 5, 0xff000000); + DrawGui.drawLimited(mc.fontRenderer, "last time position", x + 1, y - 6, width - 1, 5, 0xff000000); } - drawLimitedMin(mc.fontRenderer, "rate: " + rate, xPosition + 1, yPosition + 35, width - 1, 5, 0.55, 0.8, 0xff000000); + DrawGui.drawLimitedMin(mc.fontRenderer, "rate: " + rate, xPosition + 1, yPosition + 35, width - 1, 5, 0.55, 0.8, 0xff000000); } //drawRect(0, 0, displayWidth, displayHeight, 0x50ffffff); diff --git a/src/main/java/gp_dbc/gui/CriminalTracker/GuiCriminalTracker.java b/src/main/java/xamora/gp_dbc/gui/CriminalTracker/GuiCriminalTracker.java similarity index 96% rename from src/main/java/gp_dbc/gui/CriminalTracker/GuiCriminalTracker.java rename to src/main/java/xamora/gp_dbc/gui/CriminalTracker/GuiCriminalTracker.java index 2d114c9..aac61ee 100644 --- a/src/main/java/gp_dbc/gui/CriminalTracker/GuiCriminalTracker.java +++ b/src/main/java/xamora/gp_dbc/gui/CriminalTracker/GuiCriminalTracker.java @@ -1,9 +1,7 @@ -package gp_dbc.gui.CriminalTracker; +package xamora.gp_dbc.gui.CriminalTracker; -import gp_dbc.Main; -import gp_dbc.network.server.NetworkJailManager; -import gp_dbc.proxy.CommonProxy; -import gp_dbc.system.Criminal; +import xamora.gp_dbc.Main; +import xamora.gp_dbc.system.Criminal; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; diff --git a/src/main/java/gp_dbc/gui/GuiHandcuffed.java b/src/main/java/xamora/gp_dbc/gui/GuiHandcuffed.java similarity index 92% rename from src/main/java/gp_dbc/gui/GuiHandcuffed.java rename to src/main/java/xamora/gp_dbc/gui/GuiHandcuffed.java index 4448db7..8bdb71a 100644 --- a/src/main/java/gp_dbc/gui/GuiHandcuffed.java +++ b/src/main/java/xamora/gp_dbc/gui/GuiHandcuffed.java @@ -1,19 +1,17 @@ -package gp_dbc.gui; +package xamora.gp_dbc.gui; import JinRyuu.JRMCore.JRMCoreH; import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import gp_dbc.Main; -import gp_dbc.system.Handcuff; -import gp_dbc.system.Handcuffed; -import gp_dbc.utils.TextUtils; +import xamora.gp_dbc.Main; +import xamora.gp_dbc.system.Handcuffed; +import xamora.gp_dbc.utils.TextUtils; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Gui; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.event.RenderGameOverlayEvent; import org.lwjgl.opengl.GL11; -import static gp_dbc.config.ConfigManager.TIME_TO_GO_IN_JAIL; -import static gp_dbc.utils.DrawGui.*; +import static xamora.gp_dbc.utils.DrawGui.*; import static net.minecraft.util.StatCollector.translateToLocal; public class GuiHandcuffed extends Gui { diff --git a/src/main/java/gp_dbc/gui/JailManager/GuiButtonJailManager.java b/src/main/java/xamora/gp_dbc/gui/JailManager/GuiButtonJailManager.java similarity index 95% rename from src/main/java/gp_dbc/gui/JailManager/GuiButtonJailManager.java rename to src/main/java/xamora/gp_dbc/gui/JailManager/GuiButtonJailManager.java index f0bc4ee..5d3a994 100644 --- a/src/main/java/gp_dbc/gui/JailManager/GuiButtonJailManager.java +++ b/src/main/java/xamora/gp_dbc/gui/JailManager/GuiButtonJailManager.java @@ -1,15 +1,15 @@ -package gp_dbc.gui.JailManager; +package xamora.gp_dbc.gui.JailManager; -import gp_dbc.Main; -import gp_dbc.system.Cell; +import xamora.gp_dbc.Main; +import xamora.gp_dbc.system.Cell; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; -import static gp_dbc.gui.JailManager.GuiJailManager.*; -import static gp_dbc.utils.DrawGui.drawLimited; +import static xamora.gp_dbc.gui.JailManager.GuiJailManager.*; +import static xamora.gp_dbc.utils.DrawGui.drawLimited; public class GuiButtonJailManager extends GuiButton { diff --git a/src/main/java/gp_dbc/gui/JailManager/GuiJailManager.java b/src/main/java/xamora/gp_dbc/gui/JailManager/GuiJailManager.java similarity index 94% rename from src/main/java/gp_dbc/gui/JailManager/GuiJailManager.java rename to src/main/java/xamora/gp_dbc/gui/JailManager/GuiJailManager.java index 3ee2751..640baaf 100644 --- a/src/main/java/gp_dbc/gui/JailManager/GuiJailManager.java +++ b/src/main/java/xamora/gp_dbc/gui/JailManager/GuiJailManager.java @@ -1,25 +1,20 @@ -package gp_dbc.gui.JailManager; +package xamora.gp_dbc.gui.JailManager; -import gp_dbc.Main; -import gp_dbc.network.server.NetworkJailManager; -import gp_dbc.proxy.CommonProxy; -import gp_dbc.system.Cell; +import xamora.gp_dbc.Main; +import xamora.gp_dbc.network.server.NetworkJailManager; +import xamora.gp_dbc.proxy.CommonProxy; +import xamora.gp_dbc.system.Cell; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; -import net.minecraft.client.gui.ScaledResolution; import net.minecraft.util.ChatComponentText; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.ResourceLocation; import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; -import java.sql.Array; -import java.util.ArrayList; import java.util.List; -import static gp_dbc.utils.DrawGui.drawLimited; - public class GuiJailManager extends GuiScreen { final static int guiWidth = 212 / 2 + 1; diff --git a/src/main/java/gp_dbc/items/ItemCriminalTracker.java b/src/main/java/xamora/gp_dbc/items/ItemCriminalTracker.java similarity index 62% rename from src/main/java/gp_dbc/items/ItemCriminalTracker.java rename to src/main/java/xamora/gp_dbc/items/ItemCriminalTracker.java index 0e381e2..6af9aef 100644 --- a/src/main/java/gp_dbc/items/ItemCriminalTracker.java +++ b/src/main/java/xamora/gp_dbc/items/ItemCriminalTracker.java @@ -1,33 +1,20 @@ -package gp_dbc.items; +package xamora.gp_dbc.items; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gp_dbc.Main; -import gp_dbc.network.client.NetworkCriminalTrackerC; -import gp_dbc.network.client.NetworkJailManagerC; -import gp_dbc.proxy.CommonProxy; -import gp_dbc.system.Cell; -import gp_dbc.system.Criminal; -import gp_dbc.system.Criminals; -import gp_dbc.system.GalacticPatrol; -import gp_dbc.utils.PlayerUtils; -import gp_dbc.utils.RayTrace; +import xamora.gp_dbc.Main; +import xamora.gp_dbc.network.client.NetworkCriminalTrackerC; +import xamora.gp_dbc.proxy.CommonProxy; +import xamora.gp_dbc.system.Criminal; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.ChatComponentText; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import java.util.List; -import static gp_dbc.Main.gp; -import static gp_dbc.config.ConfigManager.OP_JAIL_MANAGER; -import static net.minecraft.util.StatCollector.translateToLocal; - public class ItemCriminalTracker extends Item { public ItemCriminalTracker() @@ -44,11 +31,11 @@ public class ItemCriminalTracker extends Item { @SideOnly(Side.SERVER) public ItemStack onItemRightClick(ItemStack itemStack, World world, EntityPlayer player) { - boolean isCops = gp.isInGalacticPatrol(player); + boolean isCops = Main.gp.isInGalacticPatrol(player); String criminals = ""; - for (Criminal criminal : gp.criminals.criminals) { - gp.criminals.getUpdatePos(criminal.getUuid()); + for (Criminal criminal : Main.gp.criminals.criminals) { + Main.gp.criminals.getUpdatePos(criminal.getUuid()); if (isCops) criminals += criminal.toString() + "#"; else diff --git a/src/main/java/gp_dbc/items/ItemGPHandcuff.java b/src/main/java/xamora/gp_dbc/items/ItemGPHandcuff.java similarity index 90% rename from src/main/java/gp_dbc/items/ItemGPHandcuff.java rename to src/main/java/xamora/gp_dbc/items/ItemGPHandcuff.java index 291210e..ff95640 100644 --- a/src/main/java/gp_dbc/items/ItemGPHandcuff.java +++ b/src/main/java/xamora/gp_dbc/items/ItemGPHandcuff.java @@ -1,21 +1,16 @@ -package gp_dbc.items; +package xamora.gp_dbc.items; import JinRyuu.JRMCore.JRMCoreH; import JinRyuu.JRMCore.server.JGPlayerMP; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gp_dbc.Main; -import gp_dbc.config.ConfigManager; -import gp_dbc.network.client.NetworkDeleteItemC; -import gp_dbc.proxy.CommonProxy; -import gp_dbc.system.Cell; -import gp_dbc.system.Handcuff; -import gp_dbc.utils.EntityUtils; +import xamora.gp_dbc.Main; +import xamora.gp_dbc.system.Handcuff; +import xamora.gp_dbc.utils.EntityUtils; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.EnumAction; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -29,9 +24,8 @@ import java.util.HashMap; import java.util.List; import java.util.UUID; -import static gp_dbc.Main.gp; -import static gp_dbc.config.ConfigManager.*; -import static gp_dbc.utils.PlayerUtils.*; +import static xamora.gp_dbc.config.ConfigManager.*; +import static xamora.gp_dbc.utils.PlayerUtils.*; import static net.minecraft.util.StatCollector.translateToLocal; public class ItemGPHandcuff extends Item { @@ -108,34 +102,34 @@ public class ItemGPHandcuff extends Item { return true; } - if (gp.jail.getCells().isEmpty()) { + if (Main.gp.jail.getCells().isEmpty()) { player.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + translateToLocal("error.unavailable_cell"))); return true; } try { // Look if there is a place in one cell - if (gp.jail.getRandomCell() == null) { + if (Main.gp.jail.getRandomCell() == null) { player.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + translateToLocal("error.unavailable_cell"))); return true; } } catch (Exception e){System.out.println(e.getMessage());}; - if (gp.jail.isInJail(inmate)) { + if (Main.gp.jail.isInJail(inmate)) { player.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + translateToLocal("error.already_in_jail"))); return true; } - if (!gp.isInGalacticPatrol(player)) { + if (!Main.gp.isInGalacticPatrol(player)) { player.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + translateToLocal("error.not_galactic_patrol"))); return true; } - if (gp.isInGalacticPatrol(inmate)) { + if (Main.gp.isInGalacticPatrol(inmate)) { player.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + translateToLocal("error.is_galactic_patrol"))); return true; } - if (!gp.criminals.isCriminal(inmate.getUniqueID())) { + if (!Main.gp.criminals.isCriminal(inmate.getUniqueID())) { player.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + translateToLocal("error.is_not_criminal"))); return true; } diff --git a/src/main/java/gp_dbc/items/ItemJailManager.java b/src/main/java/xamora/gp_dbc/items/ItemJailManager.java similarity index 79% rename from src/main/java/gp_dbc/items/ItemJailManager.java rename to src/main/java/xamora/gp_dbc/items/ItemJailManager.java index 293b65b..f31c685 100644 --- a/src/main/java/gp_dbc/items/ItemJailManager.java +++ b/src/main/java/xamora/gp_dbc/items/ItemJailManager.java @@ -1,16 +1,15 @@ -package gp_dbc.items; +package xamora.gp_dbc.items; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gp_dbc.Main; -import gp_dbc.config.ConfigManager; -import gp_dbc.network.client.NetworkJailManagerC; -import gp_dbc.proxy.CommonProxy; -import gp_dbc.system.Cell; -import gp_dbc.utils.Data; -import gp_dbc.utils.PlayerUtils; -import gp_dbc.utils.RayTrace; +import xamora.gp_dbc.Main; +import xamora.gp_dbc.config.ConfigManager; +import xamora.gp_dbc.network.client.NetworkJailManagerC; +import xamora.gp_dbc.proxy.CommonProxy; +import xamora.gp_dbc.system.Cell; +import xamora.gp_dbc.utils.PlayerUtils; +import xamora.gp_dbc.utils.RayTrace; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.Item; @@ -20,8 +19,6 @@ import net.minecraft.world.World; import java.util.List; -import static gp_dbc.Main.gp; -import static gp_dbc.config.ConfigManager.*; import static net.minecraft.util.StatCollector.translateToLocal; public class ItemJailManager extends Item { @@ -39,14 +36,14 @@ public class ItemJailManager extends Item { @Override @SideOnly(Side.SERVER) public ItemStack onItemRightClick(ItemStack itemStack, World world, EntityPlayer player) { - if (OP_JAIL_MANAGER && !PlayerUtils.isOP(player)) + if (ConfigManager.OP_JAIL_MANAGER && !PlayerUtils.isOP(player)) return itemStack; if (player.isSneaking()) { MovingObjectPosition trace = RayTrace.rayTraceServer(player, 5); if (trace != null && trace.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) { player.addChatMessage(new ChatComponentText(EnumChatFormatting.YELLOW + "x: " + trace.blockX + " y: " + trace.blockY + " z: " + trace.blockZ)); - if (gp.jail.addCell(trace.blockX, trace.blockY, trace.blockZ, player.dimension)) + if (Main.gp.jail.addCell(trace.blockX, trace.blockY, trace.blockZ, player.dimension)) player.addChatMessage(new ChatComponentText(EnumChatFormatting.GREEN + translateToLocal("success.add_cell"))); else player.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + translateToLocal("error.add_cell"))); @@ -54,7 +51,7 @@ public class ItemJailManager extends Item { } else { String cells = ""; - for (Cell cell : gp.jail.getCells()) + for (Cell cell : Main.gp.jail.getCells()) cells += cell.toString() + "#"; CommonProxy.network.sendTo(new NetworkJailManagerC("open~" + cells), (EntityPlayerMP) player); diff --git a/src/main/java/gp_dbc/items/ItemsGP.java b/src/main/java/xamora/gp_dbc/items/ItemsGP.java similarity index 93% rename from src/main/java/gp_dbc/items/ItemsGP.java rename to src/main/java/xamora/gp_dbc/items/ItemsGP.java index 4214ed2..3d669d3 100644 --- a/src/main/java/gp_dbc/items/ItemsGP.java +++ b/src/main/java/xamora/gp_dbc/items/ItemsGP.java @@ -1,4 +1,4 @@ -package gp_dbc.items; +package xamora.gp_dbc.items; import net.minecraft.item.Item; diff --git a/src/main/java/gp_dbc/network/client/NetworkCriminalTrackerC.java b/src/main/java/xamora/gp_dbc/network/client/NetworkCriminalTrackerC.java similarity index 92% rename from src/main/java/gp_dbc/network/client/NetworkCriminalTrackerC.java rename to src/main/java/xamora/gp_dbc/network/client/NetworkCriminalTrackerC.java index 3500c2f..5a55974 100644 --- a/src/main/java/gp_dbc/network/client/NetworkCriminalTrackerC.java +++ b/src/main/java/xamora/gp_dbc/network/client/NetworkCriminalTrackerC.java @@ -1,4 +1,4 @@ -package gp_dbc.network.client; +package xamora.gp_dbc.network.client; import cpw.mods.fml.common.network.ByteBufUtils; import cpw.mods.fml.common.network.simpleimpl.IMessage; @@ -6,11 +6,9 @@ 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 gp_dbc.gui.CriminalTracker.GuiCriminalTracker; -import gp_dbc.gui.JailManager.GuiJailManager; -import gp_dbc.system.Criminal; -import gp_dbc.system.Inmate; -import gp_dbc.utils.Pos; +import xamora.gp_dbc.gui.CriminalTracker.GuiCriminalTracker; +import xamora.gp_dbc.system.Criminal; +import xamora.gp_dbc.utils.Pos; import io.netty.buffer.ByteBuf; import net.minecraft.client.Minecraft; diff --git a/src/main/java/gp_dbc/network/client/NetworkDeleteItemC.java b/src/main/java/xamora/gp_dbc/network/client/NetworkDeleteItemC.java similarity index 94% rename from src/main/java/gp_dbc/network/client/NetworkDeleteItemC.java rename to src/main/java/xamora/gp_dbc/network/client/NetworkDeleteItemC.java index b07bce0..6443bf0 100644 --- a/src/main/java/gp_dbc/network/client/NetworkDeleteItemC.java +++ b/src/main/java/xamora/gp_dbc/network/client/NetworkDeleteItemC.java @@ -1,4 +1,4 @@ -package gp_dbc.network.client; +package xamora.gp_dbc.network.client; import cpw.mods.fml.common.network.ByteBufUtils; import cpw.mods.fml.common.network.simpleimpl.IMessage; @@ -6,13 +6,12 @@ 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 gp_dbc.gui.GuiHandcuffed; import io.netty.buffer.ByteBuf; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import static gp_dbc.utils.PlayerUtils.*; +import static xamora.gp_dbc.utils.PlayerUtils.*; public class NetworkDeleteItemC implements IMessage { diff --git a/src/main/java/gp_dbc/network/client/NetworkHandcuffedC.java b/src/main/java/xamora/gp_dbc/network/client/NetworkHandcuffedC.java similarity index 93% rename from src/main/java/gp_dbc/network/client/NetworkHandcuffedC.java rename to src/main/java/xamora/gp_dbc/network/client/NetworkHandcuffedC.java index 571a6fa..562d808 100644 --- a/src/main/java/gp_dbc/network/client/NetworkHandcuffedC.java +++ b/src/main/java/xamora/gp_dbc/network/client/NetworkHandcuffedC.java @@ -1,4 +1,4 @@ -package gp_dbc.network.client; +package xamora.gp_dbc.network.client; import cpw.mods.fml.common.network.ByteBufUtils; import cpw.mods.fml.common.network.simpleimpl.IMessage; @@ -6,10 +6,9 @@ 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 gp_dbc.gui.GuiHandcuffed; -import gp_dbc.render.RenderHandcuffIcon; -import gp_dbc.system.Handcuff; -import gp_dbc.system.Handcuffed; +import xamora.gp_dbc.gui.GuiHandcuffed; +import xamora.gp_dbc.render.RenderHandcuffIcon; +import xamora.gp_dbc.system.Handcuffed; import io.netty.buffer.ByteBuf; import java.util.UUID; diff --git a/src/main/java/gp_dbc/network/client/NetworkJailManagerC.java b/src/main/java/xamora/gp_dbc/network/client/NetworkJailManagerC.java similarity index 95% rename from src/main/java/gp_dbc/network/client/NetworkJailManagerC.java rename to src/main/java/xamora/gp_dbc/network/client/NetworkJailManagerC.java index 52e8658..ffcb31b 100644 --- a/src/main/java/gp_dbc/network/client/NetworkJailManagerC.java +++ b/src/main/java/xamora/gp_dbc/network/client/NetworkJailManagerC.java @@ -1,4 +1,4 @@ -package gp_dbc.network.client; +package xamora.gp_dbc.network.client; import cpw.mods.fml.common.network.ByteBufUtils; import cpw.mods.fml.common.network.simpleimpl.IMessage; @@ -6,9 +6,9 @@ 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 gp_dbc.gui.JailManager.GuiJailManager; -import gp_dbc.system.Cell; -import gp_dbc.system.Inmate; +import xamora.gp_dbc.gui.JailManager.GuiJailManager; +import xamora.gp_dbc.system.Cell; +import xamora.gp_dbc.system.Inmate; import io.netty.buffer.ByteBuf; import net.minecraft.client.Minecraft; diff --git a/src/main/java/gp_dbc/network/server/NetworkJailManager.java b/src/main/java/xamora/gp_dbc/network/server/NetworkJailManager.java similarity index 83% rename from src/main/java/gp_dbc/network/server/NetworkJailManager.java rename to src/main/java/xamora/gp_dbc/network/server/NetworkJailManager.java index ac36f88..be96c8c 100644 --- a/src/main/java/gp_dbc/network/server/NetworkJailManager.java +++ b/src/main/java/xamora/gp_dbc/network/server/NetworkJailManager.java @@ -1,24 +1,20 @@ -package gp_dbc.network.server; +package xamora.gp_dbc.network.server; import cpw.mods.fml.common.network.ByteBufUtils; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; -import gp_dbc.network.client.NetworkJailManagerC; -import gp_dbc.proxy.CommonProxy; -import gp_dbc.system.Cell; -import gp_dbc.utils.PlayerUtils; +import xamora.gp_dbc.network.client.NetworkJailManagerC; +import xamora.gp_dbc.proxy.CommonProxy; +import xamora.gp_dbc.system.Cell; +import xamora.gp_dbc.utils.PlayerUtils; import io.netty.buffer.ByteBuf; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.server.MinecraftServer; import net.minecraft.util.ChatComponentText; import net.minecraft.util.EnumChatFormatting; -import static gp_dbc.Main.gp; -import static gp_dbc.config.ConfigManager.*; +import static xamora.gp_dbc.Main.gp; +import static xamora.gp_dbc.config.ConfigManager.*; public class NetworkJailManager implements IMessage { diff --git a/src/main/java/gp_dbc/network/server/NetworkKeyManage.java b/src/main/java/xamora/gp_dbc/network/server/NetworkKeyManage.java similarity index 95% rename from src/main/java/gp_dbc/network/server/NetworkKeyManage.java rename to src/main/java/xamora/gp_dbc/network/server/NetworkKeyManage.java index 4839364..f84bc47 100644 --- a/src/main/java/gp_dbc/network/server/NetworkKeyManage.java +++ b/src/main/java/xamora/gp_dbc/network/server/NetworkKeyManage.java @@ -1,10 +1,10 @@ -package gp_dbc.network.server; +package xamora.gp_dbc.network.server; import cpw.mods.fml.common.network.ByteBufUtils; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; -import gp_dbc.utils.InputUtils; +import xamora.gp_dbc.utils.InputUtils; import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayerMP; diff --git a/src/main/java/gp_dbc/proxy/ClientProxy.java b/src/main/java/xamora/gp_dbc/proxy/ClientProxy.java similarity index 85% rename from src/main/java/gp_dbc/proxy/ClientProxy.java rename to src/main/java/xamora/gp_dbc/proxy/ClientProxy.java index a229cb3..e13af46 100644 --- a/src/main/java/gp_dbc/proxy/ClientProxy.java +++ b/src/main/java/xamora/gp_dbc/proxy/ClientProxy.java @@ -1,10 +1,10 @@ -package gp_dbc.proxy; +package xamora.gp_dbc.proxy; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import gp_dbc.gui.GuiHandcuffed; -import gp_dbc.render.RenderHandcuffIcon; +import xamora.gp_dbc.gui.GuiHandcuffed; +import xamora.gp_dbc.render.RenderHandcuffIcon; import net.minecraftforge.common.MinecraftForge; public class ClientProxy extends CommonProxy { diff --git a/src/main/java/gp_dbc/proxy/CommonProxy.java b/src/main/java/xamora/gp_dbc/proxy/CommonProxy.java similarity index 78% rename from src/main/java/gp_dbc/proxy/CommonProxy.java rename to src/main/java/xamora/gp_dbc/proxy/CommonProxy.java index 1292e9a..b0743a2 100644 --- a/src/main/java/gp_dbc/proxy/CommonProxy.java +++ b/src/main/java/xamora/gp_dbc/proxy/CommonProxy.java @@ -1,4 +1,4 @@ -package gp_dbc.proxy; +package xamora.gp_dbc.proxy; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.event.FMLInitializationEvent; @@ -7,16 +7,14 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper; import cpw.mods.fml.relauncher.Side; -import gp_dbc.Main; -import gp_dbc.network.client.NetworkCriminalTrackerC; -import gp_dbc.network.client.NetworkDeleteItemC; -import gp_dbc.network.client.NetworkHandcuffedC; -import gp_dbc.network.client.NetworkJailManagerC; -import gp_dbc.network.server.NetworkJailManager; -import gp_dbc.network.server.NetworkKeyManage; -import gp_dbc.system.Handcuff; -import gp_dbc.utils.InputUtils; -import net.minecraftforge.common.MinecraftForge; +import xamora.gp_dbc.Main; +import xamora.gp_dbc.network.client.NetworkCriminalTrackerC; +import xamora.gp_dbc.network.client.NetworkDeleteItemC; +import xamora.gp_dbc.network.client.NetworkHandcuffedC; +import xamora.gp_dbc.network.client.NetworkJailManagerC; +import xamora.gp_dbc.network.server.NetworkJailManager; +import xamora.gp_dbc.network.server.NetworkKeyManage; +import xamora.gp_dbc.utils.InputUtils; public class CommonProxy { diff --git a/src/main/java/gp_dbc/proxy/ServerProxy.java b/src/main/java/xamora/gp_dbc/proxy/ServerProxy.java similarity index 84% rename from src/main/java/gp_dbc/proxy/ServerProxy.java rename to src/main/java/xamora/gp_dbc/proxy/ServerProxy.java index 19d0cba..6df4fd8 100644 --- a/src/main/java/gp_dbc/proxy/ServerProxy.java +++ b/src/main/java/xamora/gp_dbc/proxy/ServerProxy.java @@ -1,16 +1,14 @@ -package gp_dbc.proxy; +package xamora.gp_dbc.proxy; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import fastcraft.H; -import gp_dbc.Main; -import gp_dbc.TemporaryEvent; -import gp_dbc.config.ConfigManager; -import gp_dbc.system.Criminals; -import gp_dbc.system.Handcuff; -import gp_dbc.system.TimeJail; +import xamora.gp_dbc.Main; +import xamora.gp_dbc.TemporaryEvent; +import xamora.gp_dbc.config.ConfigManager; +import xamora.gp_dbc.system.Handcuff; +import xamora.gp_dbc.system.TimeJail; import net.minecraftforge.common.MinecraftForge; public class ServerProxy extends CommonProxy{ diff --git a/src/main/java/gp_dbc/render/RenderHandcuffIcon.java b/src/main/java/xamora/gp_dbc/render/RenderHandcuffIcon.java similarity index 97% rename from src/main/java/gp_dbc/render/RenderHandcuffIcon.java rename to src/main/java/xamora/gp_dbc/render/RenderHandcuffIcon.java index af5c0c8..5649d2e 100644 --- a/src/main/java/gp_dbc/render/RenderHandcuffIcon.java +++ b/src/main/java/xamora/gp_dbc/render/RenderHandcuffIcon.java @@ -1,12 +1,10 @@ -package gp_dbc.render; +package xamora.gp_dbc.render; -import JinRyuu.JRMCore.JRMCoreH; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gp_dbc.Main; -import gp_dbc.gui.GuiHandcuffed; -import gp_dbc.system.Handcuffed; +import xamora.gp_dbc.Main; +import xamora.gp_dbc.system.Handcuffed; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Gui; import net.minecraft.client.multiplayer.WorldClient; @@ -16,7 +14,6 @@ import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.server.MinecraftServer; import net.minecraft.util.ResourceLocation; import net.minecraft.util.Vec3; import net.minecraftforge.client.event.RenderWorldLastEvent; diff --git a/src/main/java/gp_dbc/system/Cell.java b/src/main/java/xamora/gp_dbc/system/Cell.java similarity index 97% rename from src/main/java/gp_dbc/system/Cell.java rename to src/main/java/xamora/gp_dbc/system/Cell.java index 301324e..cbc899e 100644 --- a/src/main/java/gp_dbc/system/Cell.java +++ b/src/main/java/xamora/gp_dbc/system/Cell.java @@ -1,6 +1,6 @@ -package gp_dbc.system; +package xamora.gp_dbc.system; -import gp_dbc.utils.Pos; +import xamora.gp_dbc.utils.Pos; import net.minecraft.entity.player.EntityPlayer; import java.util.ArrayList; diff --git a/src/main/java/gp_dbc/system/Criminal.java b/src/main/java/xamora/gp_dbc/system/Criminal.java similarity index 80% rename from src/main/java/gp_dbc/system/Criminal.java rename to src/main/java/xamora/gp_dbc/system/Criminal.java index 64d07bd..60f291d 100644 --- a/src/main/java/gp_dbc/system/Criminal.java +++ b/src/main/java/xamora/gp_dbc/system/Criminal.java @@ -1,23 +1,15 @@ -package gp_dbc.system; +package xamora.gp_dbc.system; import JinRyuu.JRMCore.server.JGPlayerMP; import com.forgeessentials.chat.ModuleChat; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import gp_dbc.Main; -import gp_dbc.utils.Data; -import gp_dbc.utils.PlayerUtils; -import gp_dbc.utils.Pos; +import xamora.gp_dbc.Main; +import xamora.gp_dbc.utils.Pos; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.common.DimensionManager; +import xamora.gp_dbc.config.ConfigManager; -import java.util.ArrayList; -import java.util.List; import java.util.UUID; -import static gp_dbc.config.ConfigManager.*; - public class Criminal { private String name; @@ -31,7 +23,7 @@ public class Criminal { } public Criminal(EntityPlayer player, long rate) { - this(player.getUniqueID(), NICKNAME_FOR_CRIMINAL ? ModuleChat.getPlayerNickname(player) : player.getDisplayName(), rate, null); + this(player.getUniqueID(), ConfigManager.NICKNAME_FOR_CRIMINAL ? ModuleChat.getPlayerNickname(player) : player.getDisplayName(), rate, null); } public Criminal(UUID uuid, String name, long rate, Pos pos) { @@ -75,7 +67,7 @@ public class Criminal { public long getRate() { return rate; } public void setRate(long rate) { - this.rate = Math.min(rate, MAX_RATE_CRIMINAL); + this.rate = Math.min(rate, ConfigManager.MAX_RATE_CRIMINAL); } public void setPos(Pos pos) { this.last_time_pos = System.currentTimeMillis(); diff --git a/src/main/java/gp_dbc/system/Criminals.java b/src/main/java/xamora/gp_dbc/system/Criminals.java similarity index 90% rename from src/main/java/gp_dbc/system/Criminals.java rename to src/main/java/xamora/gp_dbc/system/Criminals.java index 81ce7e8..99540e3 100644 --- a/src/main/java/gp_dbc/system/Criminals.java +++ b/src/main/java/xamora/gp_dbc/system/Criminals.java @@ -1,27 +1,21 @@ -package gp_dbc.system; +package xamora.gp_dbc.system; import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.TickEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gp_dbc.Main; -import gp_dbc.config.ConfigManager; -import gp_dbc.utils.Data; -import gp_dbc.utils.PlayerUtils; -import gp_dbc.utils.Pos; +import xamora.gp_dbc.config.ConfigManager; +import xamora.gp_dbc.utils.Data; +import xamora.gp_dbc.utils.PlayerUtils; +import xamora.gp_dbc.utils.Pos; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.server.MinecraftServer; -import net.minecraft.world.World; -import net.minecraft.world.storage.WorldInfo; import net.minecraftforge.event.entity.living.LivingDeathEvent; import java.util.ArrayList; import java.util.List; import java.util.UUID; -import static gp_dbc.config.ConfigManager.*; - public class Criminals { public List criminals = new ArrayList<>(); @@ -108,7 +102,7 @@ public class Criminals { return criminal.getLastPos(); long rate = criminal.getRate(); - long next_time_pos = (long) (MAX_TIME_BETWEEN_EACH_POSITION - ((double)rate / MAX_RATE_CRIMINAL) * (MAX_TIME_BETWEEN_EACH_POSITION - MIN_TIME_BETWEEN_EACH_POSITION)); + 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)); long last_time = criminal.getLastPosTime(); if (System.currentTimeMillis() - last_time <= next_time_pos) diff --git a/src/main/java/gp_dbc/system/GalacticPatrol.java b/src/main/java/xamora/gp_dbc/system/GalacticPatrol.java similarity index 89% rename from src/main/java/gp_dbc/system/GalacticPatrol.java rename to src/main/java/xamora/gp_dbc/system/GalacticPatrol.java index 6869a4c..5a17f37 100644 --- a/src/main/java/gp_dbc/system/GalacticPatrol.java +++ b/src/main/java/xamora/gp_dbc/system/GalacticPatrol.java @@ -1,23 +1,18 @@ -package gp_dbc.system; +package xamora.gp_dbc.system; import JinRyuu.JRMCore.server.JGPlayerMP; -import com.forgeessentials.api.APIRegistry; -import com.forgeessentials.api.permissions.AreaZone; -import com.forgeessentials.commons.selections.WorldPoint; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.PlayerEvent; import cpw.mods.fml.common.gameevent.TickEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gp_dbc.config.ConfigManager; -import gp_dbc.utils.Data; -import net.minecraft.entity.Entity; +import xamora.gp_dbc.config.ConfigManager; +import xamora.gp_dbc.utils.Data; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.server.MinecraftServer; import net.minecraft.util.ChatComponentText; -import net.minecraft.util.DamageSource; import net.minecraft.util.EnumChatFormatting; import net.minecraftforge.event.entity.living.LivingHurtEvent; @@ -25,7 +20,6 @@ import java.util.HashMap; import java.util.List; import java.util.UUID; -import static gp_dbc.config.ConfigManager.*; import static net.minecraft.util.StatCollector.translateToLocal; public class GalacticPatrol { @@ -61,12 +55,12 @@ public class GalacticPatrol { int align = jgPlayer.getAlignment(); - if (align < MIN_ALIGN_TO_JOIN) { + if (align < ConfigManager.MIN_ALIGN_TO_JOIN) { if (chatError) player.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + translateToLocal("error.min_align_to_join"))); return 2; } - else if (align > MAX_ALIGN_TO_JOIN) { + else if (align > ConfigManager.MAX_ALIGN_TO_JOIN) { if (chatError) player.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + translateToLocal("error.max_align_to_join"))); return 3; @@ -142,7 +136,7 @@ public class GalacticPatrol { if (isReincarnated) { if (ConfigManager.REINCARNATION_RESET_GP && isInGalacticPatrol(player)) removeFromGalaticPatrol(player); - if (REINCARNATION_RESET_CRIMINAL && criminals.isCriminal(player.getUniqueID())) + if (ConfigManager.REINCARNATION_RESET_CRIMINAL && criminals.isCriminal(player.getUniqueID())) criminals.removeCriminal(player.getUniqueID()); } } @@ -151,7 +145,7 @@ public class GalacticPatrol { @SubscribeEvent @SideOnly(Side.SERVER) public void checkFight(LivingHurtEvent event) { - if (!CRIMINAL_QUIT_IN_FIGHT_GO_TO_JAIL) + if (!ConfigManager.CRIMINAL_QUIT_IN_FIGHT_GO_TO_JAIL) return; if (!(event.source.getSourceOfDamage() instanceof EntityPlayer) || !(event.entity instanceof EntityPlayer)) @@ -171,11 +165,11 @@ public class GalacticPatrol { @SubscribeEvent @SideOnly(Side.SERVER) public void checkFightLogOut(PlayerEvent.PlayerLoggedOutEvent event) { - if (CRIMINAL_QUIT_IN_FIGHT_GO_TO_JAIL) + if (ConfigManager.CRIMINAL_QUIT_IN_FIGHT_GO_TO_JAIL) return; Long time = InFightWithPatrollers.get(event.player.getUniqueID()); - if (time == null || System.currentTimeMillis() - time <= CRIMINAL_TIME_TO_QUIT_IN_FIGHT) + if (time == null || System.currentTimeMillis() - time <= ConfigManager.CRIMINAL_TIME_TO_QUIT_IN_FIGHT) return; diff --git a/src/main/java/gp_dbc/system/Handcuff.java b/src/main/java/xamora/gp_dbc/system/Handcuff.java similarity index 90% rename from src/main/java/gp_dbc/system/Handcuff.java rename to src/main/java/xamora/gp_dbc/system/Handcuff.java index 4f9f5d0..c7e5f4e 100644 --- a/src/main/java/gp_dbc/system/Handcuff.java +++ b/src/main/java/xamora/gp_dbc/system/Handcuff.java @@ -1,30 +1,28 @@ -package gp_dbc.system; +package xamora.gp_dbc.system; -import JinRyuu.JRMCore.JRMCoreH; import JinRyuu.JRMCore.server.JGPlayerMP; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.PlayerEvent; import cpw.mods.fml.common.gameevent.TickEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gp_dbc.Main; -import gp_dbc.network.client.NetworkHandcuffedC; -import gp_dbc.proxy.CommonProxy; -import gp_dbc.utils.InputUtils; -import gp_dbc.utils.PlayerUtils; -import gp_dbc.utils.TextUtils; +import xamora.gp_dbc.Main; +import xamora.gp_dbc.network.client.NetworkHandcuffedC; +import xamora.gp_dbc.proxy.CommonProxy; +import xamora.gp_dbc.utils.InputUtils; +import xamora.gp_dbc.utils.PlayerUtils; +import xamora.gp_dbc.utils.TextUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ChatComponentText; import net.minecraft.util.EnumChatFormatting; import net.minecraftforge.event.entity.player.EntityInteractEvent; +import xamora.gp_dbc.config.ConfigManager; import java.util.*; -import static gp_dbc.Main.gp; -import static gp_dbc.config.ConfigManager.*; -import static gp_dbc.utils.PlayerUtils.*; +import static xamora.gp_dbc.utils.PlayerUtils.*; import static net.minecraft.util.StatCollector.translateToLocal; public class Handcuff { @@ -57,7 +55,7 @@ public class Handcuff { UUID uuid_patrol = hdfd.jailer; UUID uuid_inmate = hdfd.inmate; long time_start = hdfd.start_time; - long time_left = (time_start + (TIME_TO_GO_IN_JAIL * 1000L) - System.currentTimeMillis()) / 1000; + long time_left = (time_start + (ConfigManager.TIME_TO_GO_IN_JAIL * 1000L) - System.currentTimeMillis()) / 1000; EntityPlayer inmate = getPlayerFromUUID(uuid_inmate); if (inmate != null) @@ -76,7 +74,7 @@ public class Handcuff { i--; EntityPlayer patrol = getPlayerFromUUID(uuid_patrol); - gp.jail.putPlayerInJail(patrol, inmate, gp.criminals.getCriminal(inmate.getUniqueID())); + Main.gp.jail.putPlayerInJail(patrol, inmate, Main.gp.criminals.getCriminal(inmate.getUniqueID())); } else hdfd.start_time = -1L; @@ -118,7 +116,7 @@ public class Handcuff { if (initPlayerAroundHandcuffed == null || !Handcuffed.contains_handcuffed(initPlayerAroundHandcuffed, uuid_player, time_start_handcuffed, getUnhandcuffing(inmate) != null)) { - CommonProxy.network.sendTo(new NetworkHandcuffedC("update~" + inmate.getUniqueID() + "~" + time_start_handcuffed + "~" + TIME_TO_GO_IN_JAIL + "~" + String.valueOf(getUnhandcuffing(inmate) != null)), (EntityPlayerMP) player); + CommonProxy.network.sendTo(new NetworkHandcuffedC("update~" + inmate.getUniqueID() + "~" + time_start_handcuffed + "~" + ConfigManager.TIME_TO_GO_IN_JAIL + "~" + String.valueOf(getUnhandcuffing(inmate) != null)), (EntityPlayerMP) player); //System.out.println("update " + String.valueOf(getUnhandcuffing(inmate) != null) + " to " + player.getDisplayName()); different = true; } @@ -156,13 +154,13 @@ public class Handcuff { String[] texts = TextUtils.getSeparateText(translateToLocal("success.you_are_handcuffed"), "%%"); - inmate.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + texts[0] + TIME_TO_GO_IN_JAIL + texts[1])); + inmate.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + texts[0] + ConfigManager.TIME_TO_GO_IN_JAIL + texts[1])); JGPlayerMP jgInmate = new JGPlayerMP(inmate); NBTTagCompound nbt = jgInmate.connectBaseNBT(); - nbt.setInteger("jrmcHar4va", TIME_TO_GO_IN_JAIL * 2); + nbt.setInteger("jrmcHar4va", ConfigManager.TIME_TO_GO_IN_JAIL * 2); - CommonProxy.network.sendTo(new NetworkHandcuffedC("start~" + current_time + "~" + TIME_TO_GO_IN_JAIL), (EntityPlayerMP) inmate); + CommonProxy.network.sendTo(new NetworkHandcuffedC("start~" + current_time + "~" + ConfigManager.TIME_TO_GO_IN_JAIL), (EntityPlayerMP) inmate); updateHandcuffedPlayersAround(inmate); return true; @@ -270,7 +268,7 @@ public class Handcuff { long start_time_unhandcuffing = entry.getValue(); long current_time = System.currentTimeMillis(); - if (current_time - start_time_unhandcuffing > TIME_UNHANDCUFFING * 1000L) { + if (current_time - start_time_unhandcuffing > ConfigManager.TIME_UNHANDCUFFING * 1000L) { removeHandcuffed(inmate); iterator.remove(); } @@ -295,6 +293,6 @@ public class Handcuff { EntityPlayer inmate = event.player; removeHandcuffed(inmate); - gp.jail.putPlayerInJail(patrol, inmate, gp.criminals.getCriminal(inmate.getUniqueID())); + Main.gp.jail.putPlayerInJail(patrol, inmate, Main.gp.criminals.getCriminal(inmate.getUniqueID())); } } diff --git a/src/main/java/gp_dbc/system/Handcuffed.java b/src/main/java/xamora/gp_dbc/system/Handcuffed.java similarity index 93% rename from src/main/java/gp_dbc/system/Handcuffed.java rename to src/main/java/xamora/gp_dbc/system/Handcuffed.java index 4ed2e11..88b28a9 100644 --- a/src/main/java/gp_dbc/system/Handcuffed.java +++ b/src/main/java/xamora/gp_dbc/system/Handcuffed.java @@ -1,12 +1,10 @@ -package gp_dbc.system; +package xamora.gp_dbc.system; -import org.lwjgl.Sys; +import xamora.gp_dbc.config.ConfigManager; import java.util.List; import java.util.UUID; -import static gp_dbc.config.ConfigManager.TIME_TO_GO_IN_JAIL; - public class Handcuffed { public long start_time; @@ -15,7 +13,7 @@ public class Handcuffed { public UUID inmate; public UUID jailer; - public static long timeToWait = TIME_TO_GO_IN_JAIL; + public static long timeToWait = ConfigManager.TIME_TO_GO_IN_JAIL; public Handcuffed(UUID inmate, long start_time) { this(inmate, null, start_time, false); diff --git a/src/main/java/gp_dbc/system/Inmate.java b/src/main/java/xamora/gp_dbc/system/Inmate.java similarity index 96% rename from src/main/java/gp_dbc/system/Inmate.java rename to src/main/java/xamora/gp_dbc/system/Inmate.java index f7c7bf6..16da754 100644 --- a/src/main/java/gp_dbc/system/Inmate.java +++ b/src/main/java/xamora/gp_dbc/system/Inmate.java @@ -1,6 +1,4 @@ -package gp_dbc.system; - -import org.lwjgl.Sys; +package xamora.gp_dbc.system; import java.util.UUID; diff --git a/src/main/java/gp_dbc/system/Jail.java b/src/main/java/xamora/gp_dbc/system/Jail.java similarity index 92% rename from src/main/java/gp_dbc/system/Jail.java rename to src/main/java/xamora/gp_dbc/system/Jail.java index 08fa947..dcb8302 100644 --- a/src/main/java/gp_dbc/system/Jail.java +++ b/src/main/java/xamora/gp_dbc/system/Jail.java @@ -1,21 +1,18 @@ -package gp_dbc.system; +package xamora.gp_dbc.system; -import gp_dbc.Main; -import gp_dbc.config.ConfigManager; -import gp_dbc.utils.Data; -import gp_dbc.utils.Pos; -import gp_dbc.utils.TimeUtils; +import xamora.gp_dbc.Main; +import xamora.gp_dbc.config.ConfigManager; +import xamora.gp_dbc.utils.Data; +import xamora.gp_dbc.utils.Pos; +import xamora.gp_dbc.utils.TimeUtils; import net.minecraft.command.ICommandSender; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ChatComponentText; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.MathHelper; -import org.lwjgl.Sys; -import java.text.SimpleDateFormat; import java.util.*; -import static gp_dbc.config.ConfigManager.*; import static net.minecraft.util.StatCollector.translateToLocal; public class Jail { @@ -65,7 +62,7 @@ public class Jail { while (contains_cells(id) && !cells.isEmpty() && id < 99) id++; - cells.add(new Cell(x, y, z, dimension, DEFAULT_PLACE_CELL, id)); + cells.add(new Cell(x, y, z, dimension, ConfigManager.DEFAULT_PLACE_CELL, id)); Data.saveDataString(listCellToListString(), "cells"); return true; @@ -116,7 +113,7 @@ public class Jail { public Cell putPlayerInJail(ICommandSender sender, EntityPlayer inmate, long sec, boolean chatMsg) { - if (pos_exit_jail == null) { + if (ConfigManager.pos_exit_jail == null) { if (chatMsg) sender.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + translateToLocal("error.definition_exit_pos"))); return null; @@ -160,13 +157,13 @@ public class Jail { public String displayTimeInJail(long sec) { String timeString = ""; - if (FORMAT_TIME_JAIL == 1) + if (ConfigManager.FORMAT_TIME_JAIL == 1) timeString = TimeUtils.getTimeYears(sec); - else if (FORMAT_TIME_JAIL == 2) + else if (ConfigManager.FORMAT_TIME_JAIL == 2) timeString = TimeUtils.getTimeMonths(sec); - else if (FORMAT_TIME_JAIL == 3) + else if (ConfigManager.FORMAT_TIME_JAIL == 3) timeString = TimeUtils.getTimeDays(sec); - else if (FORMAT_TIME_JAIL == 4) + else if (ConfigManager.FORMAT_TIME_JAIL == 4) timeString = TimeUtils.getTimeHours(sec); return timeString; } @@ -190,7 +187,7 @@ public class Jail { public int removePlayerFromJail(ICommandSender sender, UUID uuid, boolean chatMsg) { - if (pos_exit_jail == null) { + if (ConfigManager.pos_exit_jail == null) { if (chatMsg) sender.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + translateToLocal("error.definition_exit_pos"))); return 1; @@ -220,7 +217,7 @@ public class Jail { } public void tpOutOfJail(EntityPlayer player) { - Pos pos = pos_exit_jail; + Pos pos = ConfigManager.pos_exit_jail; if (player.dimension != pos.dimension) player.travelToDimension(pos.dimension); player.setPositionAndUpdate(pos.x + 0.5, pos.y, pos.z + 0.5); @@ -254,7 +251,7 @@ public class Jail { String[] split = s.split("~"); if (split.length != 6) - throw new Exception("Error loading " + DIR_SAVE + "cells.txt"); + throw new Exception("Error loading " + ConfigManager.DIR_SAVE + "cells.txt"); try { cells.add(new Cell(Integer.parseInt(split[0]), Integer.parseInt(split[1]), Integer.parseInt(split[2]), Integer.parseInt(split[3]), Integer.parseInt(split[4]), Integer.parseInt(split[5]))); @@ -299,7 +296,7 @@ public class Jail { String[] split = s.split("~"); if (split.length != 7) - throw new Exception("Error loading " + DIR_SAVE + "Inmates.txt"); + throw new Exception("Error loading " + ConfigManager.DIR_SAVE + "Inmates.txt"); try { inmates.add(new Inmate(new Cell(Integer.parseInt(split[3]), Integer.parseInt(split[4]), Integer.parseInt(split[5]), Integer.parseInt(split[6])), @@ -331,7 +328,7 @@ public class Jail { if (!isFree(player.getUniqueID())) return false; - if (pos_exit_jail == null) { + if (ConfigManager.pos_exit_jail == null) { player.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + translateToLocal("error.definition_exit_pos"))); return false; } diff --git a/src/main/java/gp_dbc/system/TimeJail.java b/src/main/java/xamora/gp_dbc/system/TimeJail.java similarity index 69% rename from src/main/java/gp_dbc/system/TimeJail.java rename to src/main/java/xamora/gp_dbc/system/TimeJail.java index 264d8b5..879ac08 100644 --- a/src/main/java/gp_dbc/system/TimeJail.java +++ b/src/main/java/xamora/gp_dbc/system/TimeJail.java @@ -1,21 +1,17 @@ -package gp_dbc.system; +package xamora.gp_dbc.system; -import JinRyuu.JRMCore.JRMCoreH; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.PlayerEvent; import cpw.mods.fml.common.gameevent.TickEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gp_dbc.Main; -import gp_dbc.utils.PlayerUtils; +import xamora.gp_dbc.Main; +import xamora.gp_dbc.utils.PlayerUtils; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.server.MinecraftServer; import net.minecraft.util.ChatComponentText; import net.minecraft.util.EnumChatFormatting; -import static gp_dbc.Main.gp; -import static gp_dbc.config.ConfigManager.*; import static net.minecraft.util.StatCollector.translateToLocal; public class TimeJail { @@ -29,20 +25,20 @@ public class TimeJail { if (tick >= SLOWTICK_MAX) { tick = 0; - if (gp.jail.getInmates() == null) + if (Main.gp.jail.getInmates() == null) return; - for (int i = 0; i < gp.jail.getInmates().size(); i++) { - Inmate inmate = gp.jail.getInmates().get(i); + for (int i = 0; i < Main.gp.jail.getInmates().size(); i++) { + Inmate inmate = Main.gp.jail.getInmates().get(i); if (System.currentTimeMillis() - inmate.getTimeStartJail() > inmate.getSecInJail() * 1000) { // Connected EntityPlayer player = PlayerUtils.getPlayerFromUUID(inmate.getUuid()); if (player == null) - gp.jail.removePlayerFromJail(MinecraftServer.getServer(), inmate.getUuid(), true); + Main.gp.jail.removePlayerFromJail(MinecraftServer.getServer(), inmate.getUuid(), true); else - gp.jail.removePlayerFromJail(MinecraftServer.getServer(), player, true); + Main.gp.jail.removePlayerFromJail(MinecraftServer.getServer(), player, true); } } } @@ -53,13 +49,13 @@ public class TimeJail { @SideOnly(Side.SERVER) @SubscribeEvent public void checkPlayerIsFree(PlayerEvent.PlayerLoggedInEvent event) { - if (gp.jail.freePlayer(event.player)) + if (Main.gp.jail.freePlayer(event.player)) event.player.addChatMessage(new ChatComponentText(EnumChatFormatting.GREEN + translateToLocal("success.out_of_jail"))); - Inmate inmate = gp.jail.getInmate(event.player.getUniqueID()); + Inmate inmate = Main.gp.jail.getInmate(event.player.getUniqueID()); if (inmate != null) { long time_left = (inmate.getSecInJail() * 1000 - (System.currentTimeMillis() - inmate.getTimeStartJail())) / 1000; - String timeString = gp.jail.displayTimeInJail(time_left); + String timeString = Main.gp.jail.displayTimeInJail(time_left); if (!translateToLocal("msg.inmate_going_to_jail").isEmpty()) event.player.addChatMessage(new ChatComponentText(EnumChatFormatting.GREEN + translateToLocal("msg.inmate_going_to_jail") + timeString)); diff --git a/src/main/java/gp_dbc/utils/Data.java b/src/main/java/xamora/gp_dbc/utils/Data.java similarity index 91% rename from src/main/java/gp_dbc/utils/Data.java rename to src/main/java/xamora/gp_dbc/utils/Data.java index 7b096ca..0a4e621 100644 --- a/src/main/java/gp_dbc/utils/Data.java +++ b/src/main/java/xamora/gp_dbc/utils/Data.java @@ -1,9 +1,6 @@ -package gp_dbc.utils; +package xamora.gp_dbc.utils; -import gp_dbc.config.ConfigManager; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.Vec3; +import xamora.gp_dbc.config.ConfigManager; import java.io.*; import java.nio.file.Files; diff --git a/src/main/java/gp_dbc/utils/DrawGui.java b/src/main/java/xamora/gp_dbc/utils/DrawGui.java similarity index 98% rename from src/main/java/gp_dbc/utils/DrawGui.java rename to src/main/java/xamora/gp_dbc/utils/DrawGui.java index 0c5f96a..ff8995b 100644 --- a/src/main/java/gp_dbc/utils/DrawGui.java +++ b/src/main/java/xamora/gp_dbc/utils/DrawGui.java @@ -1,4 +1,4 @@ -package gp_dbc.utils; +package xamora.gp_dbc.utils; import net.minecraft.client.gui.FontRenderer; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/gp_dbc/utils/EntityUtils.java b/src/main/java/xamora/gp_dbc/utils/EntityUtils.java similarity index 98% rename from src/main/java/gp_dbc/utils/EntityUtils.java rename to src/main/java/xamora/gp_dbc/utils/EntityUtils.java index fbcbb3a..b01d07a 100644 --- a/src/main/java/gp_dbc/utils/EntityUtils.java +++ b/src/main/java/xamora/gp_dbc/utils/EntityUtils.java @@ -1,4 +1,4 @@ -package gp_dbc.utils; +package xamora.gp_dbc.utils; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/gp_dbc/utils/InputUtils.java b/src/main/java/xamora/gp_dbc/utils/InputUtils.java similarity index 88% rename from src/main/java/gp_dbc/utils/InputUtils.java rename to src/main/java/xamora/gp_dbc/utils/InputUtils.java index 6c779d5..21e2a22 100644 --- a/src/main/java/gp_dbc/utils/InputUtils.java +++ b/src/main/java/xamora/gp_dbc/utils/InputUtils.java @@ -1,11 +1,11 @@ -package gp_dbc.utils; +package xamora.gp_dbc.utils; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.InputEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gp_dbc.network.server.NetworkKeyManage; -import gp_dbc.proxy.CommonProxy; +import xamora.gp_dbc.network.server.NetworkKeyManage; +import xamora.gp_dbc.proxy.CommonProxy; import net.minecraft.client.Minecraft; import net.minecraft.client.settings.GameSettings; diff --git a/src/main/java/gp_dbc/utils/PlayerUtils.java b/src/main/java/xamora/gp_dbc/utils/PlayerUtils.java similarity index 95% rename from src/main/java/gp_dbc/utils/PlayerUtils.java rename to src/main/java/xamora/gp_dbc/utils/PlayerUtils.java index 690eadf..9ff34fa 100644 --- a/src/main/java/gp_dbc/utils/PlayerUtils.java +++ b/src/main/java/xamora/gp_dbc/utils/PlayerUtils.java @@ -1,9 +1,9 @@ -package gp_dbc.utils; +package xamora.gp_dbc.utils; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gp_dbc.network.client.NetworkDeleteItemC; -import gp_dbc.proxy.CommonProxy; +import xamora.gp_dbc.network.client.NetworkDeleteItemC; +import xamora.gp_dbc.proxy.CommonProxy; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; diff --git a/src/main/java/gp_dbc/utils/Pos.java b/src/main/java/xamora/gp_dbc/utils/Pos.java similarity index 89% rename from src/main/java/gp_dbc/utils/Pos.java rename to src/main/java/xamora/gp_dbc/utils/Pos.java index e4b5524..4790193 100644 --- a/src/main/java/gp_dbc/utils/Pos.java +++ b/src/main/java/xamora/gp_dbc/utils/Pos.java @@ -1,8 +1,4 @@ -package gp_dbc.utils; - -import gp_dbc.system.Cell; -import net.minecraft.client.Minecraft; -import net.minecraft.server.MinecraftServer; +package xamora.gp_dbc.utils; public class Pos { diff --git a/src/main/java/gp_dbc/utils/RayTrace.java b/src/main/java/xamora/gp_dbc/utils/RayTrace.java similarity index 95% rename from src/main/java/gp_dbc/utils/RayTrace.java rename to src/main/java/xamora/gp_dbc/utils/RayTrace.java index 935aef5..1d21848 100644 --- a/src/main/java/gp_dbc/utils/RayTrace.java +++ b/src/main/java/xamora/gp_dbc/utils/RayTrace.java @@ -1,4 +1,4 @@ -package gp_dbc.utils; +package xamora.gp_dbc.utils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.MovingObjectPosition; diff --git a/src/main/java/gp_dbc/utils/TextUtils.java b/src/main/java/xamora/gp_dbc/utils/TextUtils.java similarity index 93% rename from src/main/java/gp_dbc/utils/TextUtils.java rename to src/main/java/xamora/gp_dbc/utils/TextUtils.java index e529fc8..88d2ed3 100644 --- a/src/main/java/gp_dbc/utils/TextUtils.java +++ b/src/main/java/xamora/gp_dbc/utils/TextUtils.java @@ -1,4 +1,4 @@ -package gp_dbc.utils; +package xamora.gp_dbc.utils; public class TextUtils { public static String[] getSeparateText(String text, String separation) { diff --git a/src/main/java/gp_dbc/utils/TimeUtils.java b/src/main/java/xamora/gp_dbc/utils/TimeUtils.java similarity index 98% rename from src/main/java/gp_dbc/utils/TimeUtils.java rename to src/main/java/xamora/gp_dbc/utils/TimeUtils.java index 3b61856..918b58e 100644 --- a/src/main/java/gp_dbc/utils/TimeUtils.java +++ b/src/main/java/xamora/gp_dbc/utils/TimeUtils.java @@ -1,4 +1,4 @@ -package gp_dbc.utils; +package xamora.gp_dbc.utils; import static net.minecraft.util.StatCollector.translateToLocal;