Compare commits
12 Commits
3abd7a5678
...
main
Author | SHA1 | Date | |
---|---|---|---|
accda2c675 | |||
6361693a70 | |||
9a93a1e0ef | |||
be3798e7cc | |||
7ce814a005 | |||
53729fc61c | |||
dd8bc88494 | |||
1e35e555c2 | |||
c6ca791676 | |||
92b4ebfb34 | |||
67b4eb18b8 | |||
84066a8da8 |
2
.gitattributes
vendored
2
.gitattributes
vendored
@ -1,2 +0,0 @@
|
||||
# Auto detect text files and perform LF normalization
|
||||
* text=auto
|
113
.gitignore
vendored
113
.gitignore
vendored
@ -1,113 +0,0 @@
|
||||
# User-specific stuff
|
||||
.idea/
|
||||
|
||||
*.iml
|
||||
*.ipr
|
||||
*.iws
|
||||
|
||||
# IntelliJ
|
||||
out/
|
||||
|
||||
# Compiled class file
|
||||
*.class
|
||||
|
||||
# Log file
|
||||
*.log
|
||||
|
||||
# BlueJ files
|
||||
*.ctxt
|
||||
|
||||
# Package Files #
|
||||
*.jar
|
||||
*.war
|
||||
*.nar
|
||||
*.ear
|
||||
*.zip
|
||||
*.tar.gz
|
||||
*.rar
|
||||
|
||||
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
|
||||
hs_err_pid*
|
||||
|
||||
*~
|
||||
|
||||
# temporary files which can be created if a process still has a handle open of a deleted file
|
||||
.fuse_hidden*
|
||||
|
||||
# KDE directory preferences
|
||||
.directory
|
||||
|
||||
# Linux trash folder which might appear on any partition or disk
|
||||
.Trash-*
|
||||
|
||||
# .nfs files are created when an open file is removed but is still being accessed
|
||||
.nfs*
|
||||
|
||||
# General
|
||||
.DS_Store
|
||||
.AppleDouble
|
||||
.LSOverride
|
||||
|
||||
# Icon must end with two \r
|
||||
Icon
|
||||
|
||||
# Thumbnails
|
||||
._*
|
||||
|
||||
# Files that might appear in the root of a volume
|
||||
.DocumentRevisions-V100
|
||||
.fseventsd
|
||||
.Spotlight-V100
|
||||
.TemporaryItems
|
||||
.Trashes
|
||||
.VolumeIcon.icns
|
||||
.com.apple.timemachine.donotpresent
|
||||
|
||||
# Directories potentially created on remote AFP share
|
||||
.AppleDB
|
||||
.AppleDesktop
|
||||
Network Trash Folder
|
||||
Temporary Items
|
||||
.apdisk
|
||||
|
||||
# Windows thumbnail cache files
|
||||
Thumbs.db
|
||||
Thumbs.db:encryptable
|
||||
ehthumbs.db
|
||||
ehthumbs_vista.db
|
||||
|
||||
# Dump file
|
||||
*.stackdump
|
||||
|
||||
# Folder config file
|
||||
[Dd]esktop.ini
|
||||
|
||||
# Recycle Bin used on file shares
|
||||
$RECYCLE.BIN/
|
||||
|
||||
# Windows Installer files
|
||||
*.cab
|
||||
*.msi
|
||||
*.msix
|
||||
*.msm
|
||||
*.msp
|
||||
|
||||
# Windows shortcuts
|
||||
*.lnk
|
||||
|
||||
target/
|
||||
|
||||
pom.xml.tag
|
||||
pom.xml.releaseBackup
|
||||
pom.xml.versionsBackup
|
||||
pom.xml.next
|
||||
|
||||
release.properties
|
||||
dependency-reduced-pom.xml
|
||||
buildNumber.properties
|
||||
.mvn/timing.properties
|
||||
.mvn/wrapper/maven-wrapper.jar
|
||||
.flattened-pom.xml
|
||||
|
||||
# Common working directory
|
||||
run/
|
3
.idea/.gitignore
generated
vendored
3
.idea/.gitignore
generated
vendored
@ -1,3 +0,0 @@
|
||||
# Default ignored files
|
||||
/shelf/
|
||||
/workspace.xml
|
16
.idea/compiler.xml
generated
16
.idea/compiler.xml
generated
@ -1,16 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="CompilerConfiguration">
|
||||
<annotationProcessing>
|
||||
<profile name="Maven default annotation processors profile" enabled="true">
|
||||
<sourceOutputDir name="target/generated-sources/annotations" />
|
||||
<sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
|
||||
<outputRelativeToContentRoot value="true" />
|
||||
<module name="BedWars" />
|
||||
</profile>
|
||||
</annotationProcessing>
|
||||
<bytecodeTargetLevel>
|
||||
<module name="BedWars" target="1.8" />
|
||||
</bytecodeTargetLevel>
|
||||
</component>
|
||||
</project>
|
7
.idea/discord.xml
generated
7
.idea/discord.xml
generated
@ -1,7 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="DiscordProjectSettings">
|
||||
<option name="show" value="ASK" />
|
||||
<option name="description" value="" />
|
||||
</component>
|
||||
</project>
|
7
.idea/encodings.xml
generated
7
.idea/encodings.xml
generated
@ -1,7 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="Encoding">
|
||||
<file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
|
||||
</component>
|
||||
</project>
|
40
.idea/jarRepositories.xml
generated
40
.idea/jarRepositories.xml
generated
@ -1,40 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="RemoteRepositoriesConfiguration">
|
||||
<remote-repository>
|
||||
<option name="id" value="central" />
|
||||
<option name="name" value="Central Repository" />
|
||||
<option name="url" value="https://repo.maven.apache.org/maven2" />
|
||||
</remote-repository>
|
||||
<remote-repository>
|
||||
<option name="id" value="sonatype" />
|
||||
<option name="name" value="sonatype" />
|
||||
<option name="url" value="https://oss.sonatype.org/content/groups/public/" />
|
||||
</remote-repository>
|
||||
<remote-repository>
|
||||
<option name="id" value="fawe-repo" />
|
||||
<option name="name" value="fawe-repo" />
|
||||
<option name="url" value="https://ci.athion.net/job/FastAsyncWorldEdit/ws/mvn/" />
|
||||
</remote-repository>
|
||||
<remote-repository>
|
||||
<option name="id" value="spigotmc-repo" />
|
||||
<option name="name" value="spigotmc-repo" />
|
||||
<option name="url" value="https://hub.spigotmc.org/nexus/content/repositories/snapshots/" />
|
||||
</remote-repository>
|
||||
<remote-repository>
|
||||
<option name="id" value="central" />
|
||||
<option name="name" value="Maven Central repository" />
|
||||
<option name="url" value="https://repo1.maven.org/maven2" />
|
||||
</remote-repository>
|
||||
<remote-repository>
|
||||
<option name="id" value="placeholderapi" />
|
||||
<option name="name" value="placeholderapi" />
|
||||
<option name="url" value="https://repo.extendedclip.com/content/repositories/placeholderapi/" />
|
||||
</remote-repository>
|
||||
<remote-repository>
|
||||
<option name="id" value="jboss.community" />
|
||||
<option name="name" value="JBoss Community repository" />
|
||||
<option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
|
||||
</remote-repository>
|
||||
</component>
|
||||
</project>
|
@ -1,13 +0,0 @@
|
||||
<component name="libraryTable">
|
||||
<library name="Maven: com.google.code.gson:gson:2.8.8">
|
||||
<CLASSES>
|
||||
<root url="jar://$MAVEN_REPOSITORY$/com/google/code/gson/gson/2.8.8/gson-2.8.8.jar!/" />
|
||||
</CLASSES>
|
||||
<JAVADOC>
|
||||
<root url="jar://$MAVEN_REPOSITORY$/com/google/code/gson/gson/2.8.8/gson-2.8.8-javadoc.jar!/" />
|
||||
</JAVADOC>
|
||||
<SOURCES>
|
||||
<root url="jar://$MAVEN_REPOSITORY$/com/google/code/gson/gson/2.8.8/gson-2.8.8-sources.jar!/" />
|
||||
</SOURCES>
|
||||
</library>
|
||||
</component>
|
@ -1,13 +0,0 @@
|
||||
<component name="libraryTable">
|
||||
<library name="Maven: org.mongodb:mongo-java-driver:3.12.10">
|
||||
<CLASSES>
|
||||
<root url="jar://$MAVEN_REPOSITORY$/org/mongodb/mongo-java-driver/3.12.10/mongo-java-driver-3.12.10.jar!/" />
|
||||
</CLASSES>
|
||||
<JAVADOC>
|
||||
<root url="jar://$MAVEN_REPOSITORY$/org/mongodb/mongo-java-driver/3.12.10/mongo-java-driver-3.12.10-javadoc.jar!/" />
|
||||
</JAVADOC>
|
||||
<SOURCES>
|
||||
<root url="jar://$MAVEN_REPOSITORY$/org/mongodb/mongo-java-driver/3.12.10/mongo-java-driver-3.12.10-sources.jar!/" />
|
||||
</SOURCES>
|
||||
</library>
|
||||
</component>
|
@ -1,13 +0,0 @@
|
||||
<component name="libraryTable">
|
||||
<library name="Maven: org.projectlombok:lombok:1.18.20">
|
||||
<CLASSES>
|
||||
<root url="jar://$MAVEN_REPOSITORY$/org/projectlombok/lombok/1.18.20/lombok-1.18.20.jar!/" />
|
||||
</CLASSES>
|
||||
<JAVADOC>
|
||||
<root url="jar://$MAVEN_REPOSITORY$/org/projectlombok/lombok/1.18.20/lombok-1.18.20-javadoc.jar!/" />
|
||||
</JAVADOC>
|
||||
<SOURCES>
|
||||
<root url="jar://$MAVEN_REPOSITORY$/org/projectlombok/lombok/1.18.20/lombok-1.18.20-sources.jar!/" />
|
||||
</SOURCES>
|
||||
</library>
|
||||
</component>
|
18
.idea/misc.xml
generated
18
.idea/misc.xml
generated
@ -1,18 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="EntryPointsManager">
|
||||
<list size="1">
|
||||
<item index="0" class="java.lang.String" itemvalue="org.bukkit.event.EventHandler" />
|
||||
</list>
|
||||
</component>
|
||||
<component name="MavenProjectsManager">
|
||||
<option name="originalFiles">
|
||||
<list>
|
||||
<option value="$PROJECT_DIR$/pom.xml" />
|
||||
</list>
|
||||
</option>
|
||||
</component>
|
||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
|
||||
<output url="file://$PROJECT_DIR$/out" />
|
||||
</component>
|
||||
</project>
|
8
.idea/modules.xml
generated
8
.idea/modules.xml
generated
@ -1,8 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="ProjectModuleManager">
|
||||
<modules>
|
||||
<module fileurl="file://$PROJECT_DIR$/BedWars.iml" filepath="$PROJECT_DIR$/BedWars.iml" />
|
||||
</modules>
|
||||
</component>
|
||||
</project>
|
10
.idea/runConfigurations.xml
generated
10
.idea/runConfigurations.xml
generated
@ -1,10 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="RunConfigurationProducerService">
|
||||
<option name="ignoredProducers">
|
||||
<set>
|
||||
<option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
|
||||
</set>
|
||||
</option>
|
||||
</component>
|
||||
</project>
|
6
.idea/vcs.xml
generated
6
.idea/vcs.xml
generated
@ -1,6 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="VcsDirectoryMappings">
|
||||
<mapping directory="" vcs="Git" />
|
||||
</component>
|
||||
</project>
|
161
.idea/workspace.xml
generated
161
.idea/workspace.xml
generated
@ -1,161 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="AutoImportSettings">
|
||||
<option name="autoReloadType" value="SELECTIVE" />
|
||||
</component>
|
||||
<component name="BranchesTreeState">
|
||||
<expand>
|
||||
<path>
|
||||
<item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />
|
||||
<item name="LOCAL_ROOT" type="e8cecc67:BranchNodeDescriptor" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />
|
||||
<item name="REMOTE_ROOT" type="e8cecc67:BranchNodeDescriptor" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />
|
||||
<item name="REMOTE_ROOT" type="e8cecc67:BranchNodeDescriptor" />
|
||||
<item name="GROUP_NODE:origin" type="e8cecc67:BranchNodeDescriptor" />
|
||||
</path>
|
||||
</expand>
|
||||
<select />
|
||||
</component>
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="998d5e92-ac1f-4423-8aef-5f389ab213de" name="Changes" comment="">
|
||||
<change beforePath="$PROJECT_DIR$/.idea/jarRepositories.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/jarRepositories.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/rip/tilly/bedwars/BedWars.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/rip/tilly/bedwars/BedWars.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/rip/tilly/bedwars/listeners/game/GameStartListener.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/rip/tilly/bedwars/listeners/game/GameStartListener.java" afterDir="false" />
|
||||
</list>
|
||||
<option name="SHOW_DIALOG" value="false" />
|
||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
||||
<option name="LAST_RESOLUTION" value="IGNORE" />
|
||||
</component>
|
||||
<component name="FileTemplateManagerImpl">
|
||||
<option name="RECENT_TEMPLATES">
|
||||
<list>
|
||||
<option value="Class" />
|
||||
</list>
|
||||
</option>
|
||||
</component>
|
||||
<component name="Git.Settings">
|
||||
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
||||
</component>
|
||||
<component name="MavenImportPreferences">
|
||||
<option name="importingSettings">
|
||||
<MavenImportingSettings>
|
||||
<option name="downloadDocsAutomatically" value="true" />
|
||||
<option name="downloadSourcesAutomatically" value="true" />
|
||||
</MavenImportingSettings>
|
||||
</option>
|
||||
</component>
|
||||
<component name="ProjectId" id="21EOh3Gfft72pz4cKj8pDMABrTU" />
|
||||
<component name="ProjectViewState">
|
||||
<option name="hideEmptyMiddlePackages" value="true" />
|
||||
<option name="showLibraryContents" value="true" />
|
||||
</component>
|
||||
<component name="PropertiesComponent">
|
||||
<property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
|
||||
<property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
|
||||
<property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/java/rip/tilly/bedwars/commands/arena" />
|
||||
<property name="settings.editor.selected.configurable" value="MTConfigurable" />
|
||||
</component>
|
||||
<component name="RecentsManager">
|
||||
<key name="CopyFile.RECENT_KEYS">
|
||||
<recent name="C:\Users\logan\Documents\GitHub\BedWars\src\main\java\rip\tilly\bedwars\commands\arena" />
|
||||
<recent name="C:\Users\logan\Documents\GitHub\BedWars\src\main\java" />
|
||||
<recent name="C:\Users\logan\Documents\GitHub\BedWars\src\main\java\rip\tilly\bedwars\commands" />
|
||||
<recent name="C:\Users\Luca\Documents\GitHub\BedWars\src\main\java\rip\tilly\bedwars" />
|
||||
</key>
|
||||
<key name="CopyClassDialog.RECENTS_KEY">
|
||||
<recent name="rip.tilly.bedwars.commands.arena" />
|
||||
<recent name="rip.tilly.bedwars.mongo" />
|
||||
<recent name="rip.tilly.bedwars.utils" />
|
||||
</key>
|
||||
</component>
|
||||
<component name="RunManager">
|
||||
<configuration name="BedWars build" type="MavenRunConfiguration" factoryName="Maven">
|
||||
<MavenSettings>
|
||||
<option name="myGeneralSettings">
|
||||
<MavenGeneralSettings>
|
||||
<option name="alwaysUpdateSnapshots" value="false" />
|
||||
<option name="checksumPolicy" value="NOT_SET" />
|
||||
<option name="failureBehavior" value="NOT_SET" />
|
||||
<option name="localRepository" value="" />
|
||||
<option name="mavenHome" value="Bundled (Maven 3)" />
|
||||
<option name="nonRecursive" value="false" />
|
||||
<option name="outputLevel" value="INFO" />
|
||||
<option name="pluginUpdatePolicy" value="DEFAULT" />
|
||||
<option name="printErrorStackTraces" value="false" />
|
||||
<option name="showDialogWithAdvancedSettings" value="false" />
|
||||
<option name="threads" />
|
||||
<option name="usePluginRegistry" value="false" />
|
||||
<option name="userSettingsFile" value="" />
|
||||
<option name="workOffline" value="false" />
|
||||
</MavenGeneralSettings>
|
||||
</option>
|
||||
<option name="myRunnerSettings">
|
||||
<MavenRunnerSettings>
|
||||
<option name="delegateBuildToMaven" value="false" />
|
||||
<option name="environmentProperties">
|
||||
<map />
|
||||
</option>
|
||||
<option name="jreName" value="#USE_PROJECT_JDK" />
|
||||
<option name="mavenProperties">
|
||||
<map />
|
||||
</option>
|
||||
<option name="passParentEnv" value="true" />
|
||||
<option name="runMavenInBackground" value="true" />
|
||||
<option name="skipTests" value="false" />
|
||||
<option name="vmOptions" value="" />
|
||||
</MavenRunnerSettings>
|
||||
</option>
|
||||
<option name="myRunnerParameters">
|
||||
<MavenRunnerParameters>
|
||||
<option name="profiles">
|
||||
<set />
|
||||
</option>
|
||||
<option name="goals">
|
||||
<list>
|
||||
<option value="clean" />
|
||||
<option value="package" />
|
||||
</list>
|
||||
</option>
|
||||
<option name="pomFileName" />
|
||||
<option name="profilesMap">
|
||||
<map />
|
||||
</option>
|
||||
<option name="resolveToWorkspace" value="false" />
|
||||
<option name="workingDirPath" value="$PROJECT_DIR$" />
|
||||
</MavenRunnerParameters>
|
||||
</option>
|
||||
</MavenSettings>
|
||||
<method v="2" />
|
||||
</configuration>
|
||||
</component>
|
||||
<component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
|
||||
<component name="TaskManager">
|
||||
<task active="true" id="Default" summary="Default task">
|
||||
<changelist id="998d5e92-ac1f-4423-8aef-5f389ab213de" name="Changes" comment="" />
|
||||
<created>1637502897092</created>
|
||||
<option name="number" value="Default" />
|
||||
<option name="presentableId" value="Default" />
|
||||
<updated>1637502897092</updated>
|
||||
</task>
|
||||
<servers />
|
||||
</component>
|
||||
<component name="Vcs.Log.Tabs.Properties">
|
||||
<option name="TAB_STATES">
|
||||
<map>
|
||||
<entry key="MAIN">
|
||||
<value>
|
||||
<State />
|
||||
</value>
|
||||
</entry>
|
||||
</map>
|
||||
</option>
|
||||
<option name="oldMeFiltersMigrated" value="true" />
|
||||
</component>
|
||||
</project>
|
45
BedWars.iml
45
BedWars.iml
@ -1,45 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
|
||||
<component name="FacetManager">
|
||||
<facet type="minecraft" name="Minecraft">
|
||||
<configuration>
|
||||
<autoDetectTypes>
|
||||
<platformType>SPIGOT</platformType>
|
||||
</autoDetectTypes>
|
||||
</configuration>
|
||||
</facet>
|
||||
</component>
|
||||
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
|
||||
<output url="file://$MODULE_DIR$/target/classes" />
|
||||
<output-test url="file://$MODULE_DIR$/target/test-classes" />
|
||||
<content url="file://$MODULE_DIR$">
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/target" />
|
||||
</content>
|
||||
<orderEntry type="inheritedJdk" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
<orderEntry type="module-library">
|
||||
<library name="Maven: org.papermc:PaperSpigot:1.8.8-R0.1-SNAPSHOT">
|
||||
<CLASSES>
|
||||
<root url="jar://$MODULE_DIR$/libs/PaperSpigot-1.8.8-R0.1-SNAPSHOT.jar!/" />
|
||||
</CLASSES>
|
||||
<JAVADOC />
|
||||
<SOURCES />
|
||||
</library>
|
||||
</orderEntry>
|
||||
<orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.8" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.mongodb:mongo-java-driver:3.12.10" level="project" />
|
||||
<orderEntry type="library" scope="PROVIDED" name="Maven: org.projectlombok:lombok:1.18.20" level="project" />
|
||||
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sk89q:worldedit:6.0.0-SNAPSHOT" level="project" />
|
||||
<orderEntry type="library" scope="PROVIDED" name="Maven: de.schlichtherle:truezip:6.8.3" level="project" />
|
||||
<orderEntry type="library" scope="PROVIDED" name="Maven: rhino:js:1.7R2" level="project" />
|
||||
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:guava:10.0.1" level="project" />
|
||||
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.findbugs:jsr305:1.3.9" level="project" />
|
||||
<orderEntry type="library" scope="PROVIDED" name="Maven: com.boydti:fawe-api:latest" level="project" />
|
||||
<orderEntry type="library" scope="PROVIDED" name="Maven: me.clip:placeholderapi:2.10.9" level="project" />
|
||||
<orderEntry type="library" scope="PROVIDED" name="Maven: org.jetbrains:annotations:19.0.0" level="project" />
|
||||
</component>
|
||||
</module>
|
23
README.md
23
README.md
@ -1,23 +0,0 @@
|
||||
## BedWars [](https://github.com/Lucanius69/KnockbackFFA)
|
||||
BedWars Plugin Made By Lucanius & Trixkz
|
||||
|
||||
For Tilly.RIP
|
||||
|
||||
If you have any issues, message Luca / Logan on discord (lucA#0999 / LoganM#3465)
|
||||
|
||||
#### Commands
|
||||
* /arena [Permission: bedwars.admin]
|
||||
* /level [Permission: bedwars.admin]
|
||||
* /setspawn [Permission: bedwars.admin]
|
||||
* /xp [Permission: bedwars.admin]
|
||||
* /party
|
||||
|
||||
#### PlaceholderAPI
|
||||
* %bedwars_kills%
|
||||
* %bedwars_deaths%
|
||||
* %bedwars_xp%
|
||||
* %bedwars_level%
|
||||
* %bedwars_wins%
|
||||
* %bedwars_losses%
|
||||
* %bedwars_gamesplayed%
|
||||
* %bedwars_bedsdestroyed%
|
2
pom.xml
2
pom.xml
@ -4,7 +4,7 @@
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<groupId>rip.tilly</groupId>
|
||||
<groupId>com.loganmagnan</groupId>
|
||||
<artifactId>BedWars</artifactId>
|
||||
<version>1.0</version>
|
||||
<packaging>jar</packaging>
|
||||
|
@ -1,5 +1,12 @@
|
||||
package rip.tilly.bedwars;
|
||||
package com.loganmagnan.bedwars;
|
||||
|
||||
import com.loganmagnan.bedwars.listeners.*;
|
||||
import com.loganmagnan.bedwars.listeners.game.*;
|
||||
import com.loganmagnan.bedwars.managers.GameManager;
|
||||
import com.loganmagnan.bedwars.managers.arena.ArenaManager;
|
||||
import com.loganmagnan.bedwars.managers.queue.QueueManager;
|
||||
import com.loganmagnan.bedwars.providers.scoreboard.ScoreboardProvider;
|
||||
import com.loganmagnan.bedwars.utils.menusystem.PlayerMenuUtil;
|
||||
import lombok.Getter;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.Chunk;
|
||||
@ -8,37 +15,25 @@ import org.bukkit.entity.Entity;
|
||||
import org.bukkit.entity.EntityType;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.plugin.java.JavaPlugin;
|
||||
import rip.tilly.bedwars.customitems.bridgeegg.BridgeEggListener;
|
||||
import rip.tilly.bedwars.game.Game;
|
||||
import rip.tilly.bedwars.listeners.*;
|
||||
import rip.tilly.bedwars.listeners.game.*;
|
||||
import rip.tilly.bedwars.managers.CommandManager;
|
||||
import rip.tilly.bedwars.managers.GameManager;
|
||||
import rip.tilly.bedwars.managers.PlayerDataManager;
|
||||
import rip.tilly.bedwars.managers.SpawnManager;
|
||||
import rip.tilly.bedwars.managers.arena.ArenaManager;
|
||||
import rip.tilly.bedwars.managers.arena.chunk.ChunkClearingManager;
|
||||
import rip.tilly.bedwars.managers.arena.chunk.ChunkManager;
|
||||
import rip.tilly.bedwars.managers.hotbar.HotbarManager;
|
||||
import rip.tilly.bedwars.managers.mongo.MongoManager;
|
||||
import rip.tilly.bedwars.managers.party.PartyManager;
|
||||
import rip.tilly.bedwars.managers.queue.QueueManager;
|
||||
import rip.tilly.bedwars.utils.menusystem.PlayerMenuUtil;
|
||||
import rip.tilly.bedwars.providers.placeholderapi.PlaceholderAPIProvider;
|
||||
import rip.tilly.bedwars.providers.scoreboard.ScoreboardProvider;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
import rip.tilly.bedwars.utils.aether.Aether;
|
||||
import rip.tilly.bedwars.utils.config.file.Config;
|
||||
|
||||
import com.loganmagnan.bedwars.customitems.bridgeegg.BridgeEggListener;
|
||||
import com.loganmagnan.bedwars.game.Game;
|
||||
import com.loganmagnan.bedwars.managers.CommandManager;
|
||||
import com.loganmagnan.bedwars.managers.PlayerDataManager;
|
||||
import com.loganmagnan.bedwars.managers.SpawnManager;
|
||||
import com.loganmagnan.bedwars.managers.arena.chunk.ChunkClearingManager;
|
||||
import com.loganmagnan.bedwars.managers.arena.chunk.ChunkManager;
|
||||
import com.loganmagnan.bedwars.managers.hotbar.HotbarManager;
|
||||
import com.loganmagnan.bedwars.managers.mongo.MongoManager;
|
||||
import com.loganmagnan.bedwars.managers.party.PartyManager;
|
||||
import com.loganmagnan.bedwars.providers.placeholderapi.PlaceholderAPIProvider;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
import com.loganmagnan.bedwars.utils.aether.Aether;
|
||||
import com.loganmagnan.bedwars.utils.config.file.Config;
|
||||
import java.util.Arrays;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
import java.util.UUID;
|
||||
|
||||
/**
|
||||
* Created by Lucanius & Trixkz
|
||||
* Project: BedWars
|
||||
*/
|
||||
@Getter
|
||||
public final class BedWars extends JavaPlugin {
|
||||
|
||||
@ -49,12 +44,12 @@ public final class BedWars extends JavaPlugin {
|
||||
private MongoManager mongoManager;
|
||||
private ChunkClearingManager chunkClearingManager;
|
||||
private PlayerDataManager playerDataManager;
|
||||
private SpawnManager spawnManager;
|
||||
private ArenaManager arenaManager;
|
||||
private GameManager gameManager;
|
||||
private SpawnManager spawnManager;
|
||||
private ChunkManager chunkManager;
|
||||
private HotbarManager hotbarManager;
|
||||
private CommandManager commandManager;
|
||||
private GameManager gameManager;
|
||||
private PartyManager partyManager;
|
||||
private QueueManager queueManager;
|
||||
|
||||
@ -70,8 +65,8 @@ public final class BedWars extends JavaPlugin {
|
||||
this.arenasConfig = new Config("arenas", this);
|
||||
|
||||
Bukkit.getConsoleSender().sendMessage("------------------------------------------------");
|
||||
Bukkit.getConsoleSender().sendMessage(CC.translate("&dBedWars &8- &av" + getDescription().getVersion()));
|
||||
Bukkit.getConsoleSender().sendMessage(CC.translate("&7Made on &dTilly RIP &7by &eTrixkz &7& &eLucanius"));
|
||||
Bukkit.getConsoleSender().sendMessage(CC.translate("&dzBedWars &8- &av" + this.getDescription().getVersion()));
|
||||
Bukkit.getConsoleSender().sendMessage(CC.translate("&7Made by &eLoganM Development"));
|
||||
Bukkit.getConsoleSender().sendMessage("------------------------------------------------");
|
||||
|
||||
this.loadManagers();
|
||||
@ -123,12 +118,12 @@ public final class BedWars extends JavaPlugin {
|
||||
this.mongoManager = new MongoManager();
|
||||
this.chunkClearingManager = new ChunkClearingManager();
|
||||
this.playerDataManager = new PlayerDataManager();
|
||||
this.spawnManager = new SpawnManager();
|
||||
this.arenaManager = new ArenaManager();
|
||||
this.gameManager = new GameManager();
|
||||
this.spawnManager = new SpawnManager();
|
||||
this.chunkManager = new ChunkManager();
|
||||
this.hotbarManager = new HotbarManager();
|
||||
this.commandManager = new CommandManager();
|
||||
this.gameManager = new GameManager();
|
||||
this.partyManager = new PartyManager();
|
||||
this.queueManager = new QueueManager();
|
||||
}
|
||||
@ -143,7 +138,7 @@ public final class BedWars extends JavaPlugin {
|
||||
}
|
||||
|
||||
private void loadRunnables() {
|
||||
new Aether(this, new ScoreboardProvider());
|
||||
// new Aether(this, new ScoreboardProvider());
|
||||
}
|
||||
|
||||
public PlayerMenuUtil getPlayerMenuUtil(Player player) {
|
@ -1,4 +1,4 @@
|
||||
package rip.tilly.bedwars.commands;
|
||||
package com.loganmagnan.bedwars.commands;
|
||||
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
@ -1,14 +1,13 @@
|
||||
package rip.tilly.bedwars.commands.arena;
|
||||
package com.loganmagnan.bedwars.commands.arena;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.menus.arena.ArenaManageMenu;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandExecutor;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.game.arena.Arena;
|
||||
import rip.tilly.bedwars.menus.arena.ArenaManagerMenu;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
import rip.tilly.bedwars.utils.menusystem.menu.UpgradesMenu;
|
||||
import com.loganmagnan.bedwars.game.arena.Arena;
|
||||
|
||||
public class ArenaCommand implements CommandExecutor {
|
||||
|
||||
@ -168,7 +167,7 @@ public class ArenaCommand implements CommandExecutor {
|
||||
return true;
|
||||
}
|
||||
|
||||
new ArenaManagerMenu().openMenu(player);
|
||||
new ArenaManageMenu().openMenu(player);
|
||||
|
||||
break;
|
||||
case "generate":
|
@ -1,12 +1,12 @@
|
||||
package rip.tilly.bedwars.commands.arena;
|
||||
package com.loganmagnan.bedwars.commands.arena;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.commands.BaseCommand;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.commands.BaseCommand;
|
||||
import rip.tilly.bedwars.game.arena.Arena;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
import com.loganmagnan.bedwars.game.arena.Arena;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
@ -1,12 +1,12 @@
|
||||
package rip.tilly.bedwars.commands.arena;
|
||||
package com.loganmagnan.bedwars.commands.arena;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.commands.BaseCommand;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.commands.BaseCommand;
|
||||
import rip.tilly.bedwars.game.arena.Arena;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
import com.loganmagnan.bedwars.game.arena.Arena;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
@ -1,13 +1,13 @@
|
||||
package rip.tilly.bedwars.commands.arena;
|
||||
package com.loganmagnan.bedwars.commands.arena;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.commands.BaseCommand;
|
||||
import com.loganmagnan.bedwars.runnables.ArenaCommandRunnable;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.commands.BaseCommand;
|
||||
import rip.tilly.bedwars.game.arena.Arena;
|
||||
import rip.tilly.bedwars.runnables.ArenaCommandRunnable;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
import com.loganmagnan.bedwars.game.arena.Arena;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
@ -1,13 +1,13 @@
|
||||
package rip.tilly.bedwars.commands.arena;
|
||||
package com.loganmagnan.bedwars.commands.arena;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.commands.BaseCommand;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
import com.loganmagnan.bedwars.utils.CustomLocation;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.commands.BaseCommand;
|
||||
import rip.tilly.bedwars.game.arena.Arena;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
import rip.tilly.bedwars.utils.CustomLocation;
|
||||
import com.loganmagnan.bedwars.game.arena.Arena;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
@ -1,12 +1,12 @@
|
||||
package rip.tilly.bedwars.commands.arena;
|
||||
package com.loganmagnan.bedwars.commands.arena;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.commands.BaseCommand;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.commands.BaseCommand;
|
||||
import rip.tilly.bedwars.game.arena.Arena;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
import com.loganmagnan.bedwars.game.arena.Arena;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
@ -1,14 +1,14 @@
|
||||
package rip.tilly.bedwars.commands.arena;
|
||||
package com.loganmagnan.bedwars.commands.arena;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.commands.BaseCommand;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
import com.loganmagnan.bedwars.utils.CustomLocation;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.commands.BaseCommand;
|
||||
import rip.tilly.bedwars.game.arena.Arena;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
import rip.tilly.bedwars.utils.CustomLocation;
|
||||
import com.loganmagnan.bedwars.game.arena.Arena;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
@ -1,14 +1,14 @@
|
||||
package rip.tilly.bedwars.commands.arena;
|
||||
package com.loganmagnan.bedwars.commands.arena;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.commands.BaseCommand;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
import com.loganmagnan.bedwars.utils.CustomLocation;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.commands.BaseCommand;
|
||||
import rip.tilly.bedwars.game.arena.Arena;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
import rip.tilly.bedwars.utils.CustomLocation;
|
||||
import com.loganmagnan.bedwars.game.arena.Arena;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
@ -1,12 +1,12 @@
|
||||
package rip.tilly.bedwars.commands.arena;
|
||||
package com.loganmagnan.bedwars.commands.arena;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.commands.BaseCommand;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.commands.BaseCommand;
|
||||
import rip.tilly.bedwars.game.arena.Arena;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
import com.loganmagnan.bedwars.game.arena.Arena;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
@ -1,12 +1,12 @@
|
||||
package rip.tilly.bedwars.commands.arena;
|
||||
package com.loganmagnan.bedwars.commands.arena;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.commands.BaseCommand;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.commands.BaseCommand;
|
||||
import rip.tilly.bedwars.game.arena.Arena;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
import com.loganmagnan.bedwars.game.arena.Arena;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
@ -1,16 +1,16 @@
|
||||
package rip.tilly.bedwars.commands.arena;
|
||||
package com.loganmagnan.bedwars.commands.arena;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.commands.BaseCommand;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
import com.loganmagnan.bedwars.utils.CustomLocation;
|
||||
import org.bukkit.ChatColor;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.configuration.file.FileConfiguration;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.commands.BaseCommand;
|
||||
import rip.tilly.bedwars.game.arena.Arena;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
import rip.tilly.bedwars.utils.CustomLocation;
|
||||
import com.loganmagnan.bedwars.game.arena.Arena;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
@ -1,16 +1,16 @@
|
||||
package rip.tilly.bedwars.commands.arena;
|
||||
package com.loganmagnan.bedwars.commands.arena;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.commands.BaseCommand;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
import com.loganmagnan.bedwars.utils.CustomLocation;
|
||||
import org.bukkit.ChatColor;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.configuration.file.FileConfiguration;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.commands.BaseCommand;
|
||||
import rip.tilly.bedwars.game.arena.Arena;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
import rip.tilly.bedwars.utils.CustomLocation;
|
||||
import com.loganmagnan.bedwars.game.arena.Arena;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
@ -1,13 +1,13 @@
|
||||
package rip.tilly.bedwars.commands.arena;
|
||||
package com.loganmagnan.bedwars.commands.arena;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.commands.BaseCommand;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
import org.bukkit.Material;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.commands.BaseCommand;
|
||||
import rip.tilly.bedwars.game.arena.Arena;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
import com.loganmagnan.bedwars.game.arena.Arena;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
@ -1,14 +1,14 @@
|
||||
package rip.tilly.bedwars.commands.arena;
|
||||
package com.loganmagnan.bedwars.commands.arena;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.commands.BaseCommand;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
import com.loganmagnan.bedwars.utils.CustomLocation;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.commands.BaseCommand;
|
||||
import rip.tilly.bedwars.game.arena.Arena;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
import rip.tilly.bedwars.utils.CustomLocation;
|
||||
import com.loganmagnan.bedwars.game.arena.Arena;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
@ -1,14 +1,14 @@
|
||||
package rip.tilly.bedwars.commands.arena;
|
||||
package com.loganmagnan.bedwars.commands.arena;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.commands.BaseCommand;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
import com.loganmagnan.bedwars.utils.CustomLocation;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.commands.BaseCommand;
|
||||
import rip.tilly.bedwars.game.arena.Arena;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
import rip.tilly.bedwars.utils.CustomLocation;
|
||||
import com.loganmagnan.bedwars.game.arena.Arena;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
@ -1,14 +1,14 @@
|
||||
package rip.tilly.bedwars.commands.arena;
|
||||
package com.loganmagnan.bedwars.commands.arena;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.commands.BaseCommand;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
import com.loganmagnan.bedwars.utils.CustomLocation;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.commands.BaseCommand;
|
||||
import rip.tilly.bedwars.game.arena.Arena;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
import rip.tilly.bedwars.utils.CustomLocation;
|
||||
import com.loganmagnan.bedwars.game.arena.Arena;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
@ -1,14 +1,14 @@
|
||||
package rip.tilly.bedwars.commands.arena;
|
||||
package com.loganmagnan.bedwars.commands.arena;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.commands.BaseCommand;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
import com.loganmagnan.bedwars.utils.CustomLocation;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.commands.BaseCommand;
|
||||
import rip.tilly.bedwars.game.arena.Arena;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
import rip.tilly.bedwars.utils.CustomLocation;
|
||||
import com.loganmagnan.bedwars.game.arena.Arena;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
@ -1,14 +1,14 @@
|
||||
package rip.tilly.bedwars.commands.arena;
|
||||
package com.loganmagnan.bedwars.commands.arena;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.commands.BaseCommand;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
import com.loganmagnan.bedwars.utils.CustomLocation;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.commands.BaseCommand;
|
||||
import rip.tilly.bedwars.game.arena.Arena;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
import rip.tilly.bedwars.utils.CustomLocation;
|
||||
import com.loganmagnan.bedwars.game.arena.Arena;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
@ -1,14 +1,14 @@
|
||||
package rip.tilly.bedwars.commands.arena;
|
||||
package com.loganmagnan.bedwars.commands.arena;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.commands.BaseCommand;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
import com.loganmagnan.bedwars.utils.CustomLocation;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.commands.BaseCommand;
|
||||
import rip.tilly.bedwars.game.arena.Arena;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
import rip.tilly.bedwars.utils.CustomLocation;
|
||||
import com.loganmagnan.bedwars.game.arena.Arena;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
@ -1,14 +1,14 @@
|
||||
package rip.tilly.bedwars.commands.arena;
|
||||
package com.loganmagnan.bedwars.commands.arena;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.commands.BaseCommand;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
import com.loganmagnan.bedwars.utils.CustomLocation;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.commands.BaseCommand;
|
||||
import rip.tilly.bedwars.game.arena.Arena;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
import rip.tilly.bedwars.utils.CustomLocation;
|
||||
import com.loganmagnan.bedwars.game.arena.Arena;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
@ -1,14 +1,14 @@
|
||||
package rip.tilly.bedwars.commands.arena;
|
||||
package com.loganmagnan.bedwars.commands.arena;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.commands.BaseCommand;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
import com.loganmagnan.bedwars.utils.CustomLocation;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.commands.BaseCommand;
|
||||
import rip.tilly.bedwars.game.arena.Arena;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
import rip.tilly.bedwars.utils.CustomLocation;
|
||||
import com.loganmagnan.bedwars.game.arena.Arena;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
@ -1,14 +1,14 @@
|
||||
package rip.tilly.bedwars.commands.arena;
|
||||
package com.loganmagnan.bedwars.commands.arena;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.commands.BaseCommand;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
import com.loganmagnan.bedwars.utils.CustomLocation;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.commands.BaseCommand;
|
||||
import rip.tilly.bedwars.game.arena.Arena;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
import rip.tilly.bedwars.utils.CustomLocation;
|
||||
import com.loganmagnan.bedwars.game.arena.Arena;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
@ -1,14 +1,14 @@
|
||||
package rip.tilly.bedwars.commands.arena;
|
||||
package com.loganmagnan.bedwars.commands.arena;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.commands.BaseCommand;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
import com.loganmagnan.bedwars.utils.CustomLocation;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.commands.BaseCommand;
|
||||
import rip.tilly.bedwars.game.arena.Arena;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
import rip.tilly.bedwars.utils.CustomLocation;
|
||||
import com.loganmagnan.bedwars.game.arena.Arena;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
@ -1,16 +1,16 @@
|
||||
package rip.tilly.bedwars.commands.arena;
|
||||
package com.loganmagnan.bedwars.commands.arena;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.commands.BaseCommand;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
import com.loganmagnan.bedwars.utils.CustomLocation;
|
||||
import org.bukkit.ChatColor;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.configuration.file.FileConfiguration;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.commands.BaseCommand;
|
||||
import rip.tilly.bedwars.game.arena.Arena;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
import rip.tilly.bedwars.utils.CustomLocation;
|
||||
import com.loganmagnan.bedwars.game.arena.Arena;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
@ -1,12 +1,12 @@
|
||||
package rip.tilly.bedwars.commands.level;
|
||||
package com.loganmagnan.bedwars.commands.level;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.commands.BaseCommand;
|
||||
import com.loganmagnan.bedwars.playerdata.PlayerData;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.commands.BaseCommand;
|
||||
import rip.tilly.bedwars.playerdata.PlayerData;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
@ -1,11 +1,11 @@
|
||||
package rip.tilly.bedwars.commands.level;
|
||||
package com.loganmagnan.bedwars.commands.level;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandExecutor;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
|
||||
public class LevelCommand implements CommandExecutor {
|
||||
|
@ -1,12 +1,12 @@
|
||||
package rip.tilly.bedwars.commands.level;
|
||||
package com.loganmagnan.bedwars.commands.level;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.commands.BaseCommand;
|
||||
import com.loganmagnan.bedwars.playerdata.PlayerData;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.commands.BaseCommand;
|
||||
import rip.tilly.bedwars.playerdata.PlayerData;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
@ -1,12 +1,12 @@
|
||||
package rip.tilly.bedwars.commands.level;
|
||||
package com.loganmagnan.bedwars.commands.level;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.commands.BaseCommand;
|
||||
import com.loganmagnan.bedwars.playerdata.PlayerData;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.commands.BaseCommand;
|
||||
import rip.tilly.bedwars.playerdata.PlayerData;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
@ -1,12 +1,12 @@
|
||||
package rip.tilly.bedwars.commands.party;
|
||||
package com.loganmagnan.bedwars.commands.party;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.commands.BaseCommand;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.commands.BaseCommand;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
@ -1,12 +1,12 @@
|
||||
package rip.tilly.bedwars.commands.party;
|
||||
package com.loganmagnan.bedwars.commands.party;
|
||||
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.commands.BaseCommand;
|
||||
import rip.tilly.bedwars.managers.party.Party;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.commands.BaseCommand;
|
||||
import com.loganmagnan.bedwars.managers.party.Party;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
@ -1,10 +1,10 @@
|
||||
package rip.tilly.bedwars.commands.party;
|
||||
package com.loganmagnan.bedwars.commands.party;
|
||||
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.commands.BaseCommand;
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.commands.BaseCommand;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
@ -1,12 +1,12 @@
|
||||
package rip.tilly.bedwars.commands.party;
|
||||
package com.loganmagnan.bedwars.commands.party;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.commands.BaseCommand;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.commands.BaseCommand;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
@ -1,12 +1,12 @@
|
||||
package rip.tilly.bedwars.commands.party;
|
||||
package com.loganmagnan.bedwars.commands.party;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.commands.BaseCommand;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.commands.BaseCommand;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
@ -1,11 +1,11 @@
|
||||
package rip.tilly.bedwars.commands.party;
|
||||
package com.loganmagnan.bedwars.commands.party;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.commands.BaseCommand;
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.commands.BaseCommand;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
@ -1,12 +1,12 @@
|
||||
package rip.tilly.bedwars.commands.party;
|
||||
package com.loganmagnan.bedwars.commands.party;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.commands.BaseCommand;
|
||||
import com.loganmagnan.bedwars.playerdata.PlayerState;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.commands.BaseCommand;
|
||||
import rip.tilly.bedwars.playerdata.PlayerState;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
@ -1,10 +1,10 @@
|
||||
package rip.tilly.bedwars.commands.party;
|
||||
package com.loganmagnan.bedwars.commands.party;
|
||||
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandExecutor;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
|
||||
public class PartyCommand implements CommandExecutor {
|
||||
|
@ -1,13 +1,13 @@
|
||||
package rip.tilly.bedwars.commands.party;
|
||||
package com.loganmagnan.bedwars.commands.party;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.commands.BaseCommand;
|
||||
import rip.tilly.bedwars.managers.party.Party;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.commands.BaseCommand;
|
||||
import com.loganmagnan.bedwars.managers.party.Party;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
@ -1,13 +1,13 @@
|
||||
package rip.tilly.bedwars.commands.setspawn;
|
||||
package com.loganmagnan.bedwars.commands.setspawn;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.commands.BaseCommand;
|
||||
import com.loganmagnan.bedwars.utils.CustomLocation;
|
||||
import org.bukkit.ChatColor;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.configuration.file.FileConfiguration;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.commands.BaseCommand;
|
||||
import rip.tilly.bedwars.utils.CustomLocation;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
@ -1,13 +1,13 @@
|
||||
package rip.tilly.bedwars.commands.setspawn;
|
||||
package com.loganmagnan.bedwars.commands.setspawn;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.commands.BaseCommand;
|
||||
import com.loganmagnan.bedwars.utils.CustomLocation;
|
||||
import org.bukkit.ChatColor;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.configuration.file.FileConfiguration;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.commands.BaseCommand;
|
||||
import rip.tilly.bedwars.utils.CustomLocation;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
@ -1,10 +1,10 @@
|
||||
package rip.tilly.bedwars.commands.setspawn;
|
||||
package com.loganmagnan.bedwars.commands.setspawn;
|
||||
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandExecutor;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
|
||||
public class SetSpawnCommand implements CommandExecutor {
|
||||
|
@ -1,13 +1,13 @@
|
||||
package rip.tilly.bedwars.commands.setspawn;
|
||||
package com.loganmagnan.bedwars.commands.setspawn;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.commands.BaseCommand;
|
||||
import com.loganmagnan.bedwars.utils.CustomLocation;
|
||||
import org.bukkit.ChatColor;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.configuration.file.FileConfiguration;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.commands.BaseCommand;
|
||||
import rip.tilly.bedwars.utils.CustomLocation;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
@ -1,14 +1,14 @@
|
||||
package rip.tilly.bedwars.commands.spectate;
|
||||
package com.loganmagnan.bedwars.commands.spectate;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.playerdata.PlayerData;
|
||||
import com.loganmagnan.bedwars.playerdata.PlayerState;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandExecutor;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.game.Game;
|
||||
import rip.tilly.bedwars.playerdata.PlayerData;
|
||||
import rip.tilly.bedwars.playerdata.PlayerState;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
import com.loganmagnan.bedwars.game.Game;
|
||||
|
||||
public class SpectateCommand implements CommandExecutor {
|
||||
|
@ -1,12 +1,12 @@
|
||||
package rip.tilly.bedwars.commands.toggle;
|
||||
package com.loganmagnan.bedwars.commands.toggle;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.commands.BaseCommand;
|
||||
import com.loganmagnan.bedwars.playerdata.PlayerSettings;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.commands.BaseCommand;
|
||||
import rip.tilly.bedwars.playerdata.PlayerSettings;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
@ -1,12 +1,12 @@
|
||||
package rip.tilly.bedwars.commands.toggle;
|
||||
package com.loganmagnan.bedwars.commands.toggle;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.commands.BaseCommand;
|
||||
import com.loganmagnan.bedwars.playerdata.PlayerSettings;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.commands.BaseCommand;
|
||||
import rip.tilly.bedwars.playerdata.PlayerSettings;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
@ -1,10 +1,10 @@
|
||||
package rip.tilly.bedwars.commands.toggle;
|
||||
package com.loganmagnan.bedwars.commands.toggle;
|
||||
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandExecutor;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
|
||||
public class ToggleCommand implements CommandExecutor {
|
||||
|
@ -1,12 +1,12 @@
|
||||
package rip.tilly.bedwars.commands.xp;
|
||||
package com.loganmagnan.bedwars.commands.xp;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.commands.BaseCommand;
|
||||
import com.loganmagnan.bedwars.playerdata.PlayerData;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.commands.BaseCommand;
|
||||
import rip.tilly.bedwars.playerdata.PlayerData;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
@ -1,12 +1,12 @@
|
||||
package rip.tilly.bedwars.commands.xp;
|
||||
package com.loganmagnan.bedwars.commands.xp;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.commands.BaseCommand;
|
||||
import com.loganmagnan.bedwars.playerdata.PlayerData;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.commands.BaseCommand;
|
||||
import rip.tilly.bedwars.playerdata.PlayerData;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
@ -1,12 +1,12 @@
|
||||
package rip.tilly.bedwars.commands.xp;
|
||||
package com.loganmagnan.bedwars.commands.xp;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.commands.BaseCommand;
|
||||
import com.loganmagnan.bedwars.playerdata.PlayerData;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.commands.BaseCommand;
|
||||
import rip.tilly.bedwars.playerdata.PlayerData;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
@ -1,11 +1,11 @@
|
||||
package rip.tilly.bedwars.commands.xp;
|
||||
package com.loganmagnan.bedwars.commands.xp;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandExecutor;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
|
||||
public class XpCommand implements CommandExecutor {
|
||||
|
@ -1,14 +1,14 @@
|
||||
package rip.tilly.bedwars.customitems.bridgeegg;
|
||||
package com.loganmagnan.bedwars.customitems.bridgeegg;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.playerdata.PlayerTeam;
|
||||
import org.bukkit.entity.Egg;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.event.EventHandler;
|
||||
import org.bukkit.event.Listener;
|
||||
import org.bukkit.event.entity.ProjectileHitEvent;
|
||||
import org.bukkit.event.entity.ProjectileLaunchEvent;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.game.Game;
|
||||
import rip.tilly.bedwars.playerdata.PlayerTeam;
|
||||
import com.loganmagnan.bedwars.game.Game;
|
||||
|
||||
import java.util.Collections;
|
||||
import java.util.HashMap;
|
@ -1,5 +1,7 @@
|
||||
package rip.tilly.bedwars.customitems.bridgeegg;
|
||||
package com.loganmagnan.bedwars.customitems.bridgeegg;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.playerdata.PlayerTeam;
|
||||
import lombok.Getter;
|
||||
import org.bukkit.Effect;
|
||||
import org.bukkit.Location;
|
||||
@ -9,9 +11,7 @@ import org.bukkit.block.Block;
|
||||
import org.bukkit.entity.Egg;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.scheduler.BukkitTask;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.game.Game;
|
||||
import rip.tilly.bedwars.playerdata.PlayerTeam;
|
||||
import com.loganmagnan.bedwars.game.Game;
|
||||
|
||||
@Getter
|
||||
@SuppressWarnings("WeakerAccess")
|
@ -1,15 +1,15 @@
|
||||
package rip.tilly.bedwars.customitems.popuptower;
|
||||
package com.loganmagnan.bedwars.customitems.popuptower;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.playerdata.PlayerTeam;
|
||||
import org.bukkit.Material;
|
||||
import org.bukkit.block.Block;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.game.Game;
|
||||
import rip.tilly.bedwars.playerdata.PlayerTeam;
|
||||
import com.loganmagnan.bedwars.game.Game;
|
||||
|
||||
public class PlaceTower {
|
||||
|
||||
private final BedWars plugin = BedWars.getInstance();
|
||||
private BedWars plugin = BedWars.getInstance();
|
||||
|
||||
public PlaceTower(Block block, String xyz, PlayerTeam playerTeam, Player player, boolean ladder, int ladderData) {
|
||||
int x = Integer.parseInt(xyz.split(", ")[0]);
|
@ -1,5 +1,8 @@
|
||||
package rip.tilly.bedwars.customitems.popuptower.types;
|
||||
package com.loganmagnan.bedwars.customitems.popuptower.types;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.customitems.popuptower.PlaceTower;
|
||||
import com.loganmagnan.bedwars.playerdata.PlayerTeam;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.Material;
|
||||
@ -8,9 +11,6 @@ import org.bukkit.block.Block;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.inventory.ItemStack;
|
||||
import org.bukkit.scheduler.BukkitTask;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.customitems.popuptower.PlaceTower;
|
||||
import rip.tilly.bedwars.playerdata.PlayerTeam;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
@ -1,5 +1,8 @@
|
||||
package rip.tilly.bedwars.customitems.popuptower.types;
|
||||
package com.loganmagnan.bedwars.customitems.popuptower.types;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.customitems.popuptower.PlaceTower;
|
||||
import com.loganmagnan.bedwars.playerdata.PlayerTeam;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.Material;
|
||||
@ -8,9 +11,6 @@ import org.bukkit.block.Block;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.inventory.ItemStack;
|
||||
import org.bukkit.scheduler.BukkitTask;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.customitems.popuptower.PlaceTower;
|
||||
import rip.tilly.bedwars.playerdata.PlayerTeam;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
@ -1,5 +1,8 @@
|
||||
package rip.tilly.bedwars.customitems.popuptower.types;
|
||||
package com.loganmagnan.bedwars.customitems.popuptower.types;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.customitems.popuptower.PlaceTower;
|
||||
import com.loganmagnan.bedwars.playerdata.PlayerTeam;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.Material;
|
||||
@ -8,9 +11,6 @@ import org.bukkit.block.Block;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.inventory.ItemStack;
|
||||
import org.bukkit.scheduler.BukkitTask;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.customitems.popuptower.PlaceTower;
|
||||
import rip.tilly.bedwars.playerdata.PlayerTeam;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
@ -1,5 +1,8 @@
|
||||
package rip.tilly.bedwars.customitems.popuptower.types;
|
||||
package com.loganmagnan.bedwars.customitems.popuptower.types;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.customitems.popuptower.PlaceTower;
|
||||
import com.loganmagnan.bedwars.playerdata.PlayerTeam;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.Material;
|
||||
@ -8,9 +11,6 @@ import org.bukkit.block.Block;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.inventory.ItemStack;
|
||||
import org.bukkit.scheduler.BukkitTask;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.customitems.popuptower.PlaceTower;
|
||||
import rip.tilly.bedwars.playerdata.PlayerTeam;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
@ -1,8 +1,8 @@
|
||||
package rip.tilly.bedwars.events;
|
||||
package com.loganmagnan.bedwars.events;
|
||||
|
||||
import com.loganmagnan.bedwars.game.GameTeam;
|
||||
import lombok.Getter;
|
||||
import rip.tilly.bedwars.game.Game;
|
||||
import rip.tilly.bedwars.game.GameTeam;
|
||||
import com.loganmagnan.bedwars.game.Game;
|
||||
|
||||
@Getter
|
||||
public class GameEndEvent extends GameEvent {
|
@ -1,10 +1,10 @@
|
||||
package rip.tilly.bedwars.events;
|
||||
package com.loganmagnan.bedwars.events;
|
||||
|
||||
import lombok.Getter;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.bukkit.event.Event;
|
||||
import org.bukkit.event.HandlerList;
|
||||
import rip.tilly.bedwars.game.Game;
|
||||
import com.loganmagnan.bedwars.game.Game;
|
||||
|
||||
@Getter
|
||||
@RequiredArgsConstructor
|
@ -1,6 +1,6 @@
|
||||
package rip.tilly.bedwars.events;
|
||||
package com.loganmagnan.bedwars.events;
|
||||
|
||||
import rip.tilly.bedwars.game.Game;
|
||||
import com.loganmagnan.bedwars.game.Game;
|
||||
|
||||
public class GameStartEvent extends GameEvent {
|
||||
|
@ -1,4 +1,4 @@
|
||||
package rip.tilly.bedwars.events;
|
||||
package com.loganmagnan.bedwars.events;
|
||||
|
||||
import lombok.Getter;
|
||||
import org.bukkit.entity.Player;
|
@ -1,5 +1,14 @@
|
||||
package rip.tilly.bedwars.game;
|
||||
package com.loganmagnan.bedwars.game;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.game.arena.Arena;
|
||||
import com.loganmagnan.bedwars.game.arena.CopiedArena;
|
||||
import com.loganmagnan.bedwars.generators.Generator;
|
||||
import com.loganmagnan.bedwars.generators.GeneratorTier;
|
||||
import com.loganmagnan.bedwars.generators.GeneratorType;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
import com.loganmagnan.bedwars.utils.CustomLocation;
|
||||
import com.loganmagnan.bedwars.utils.TimeUtils;
|
||||
import io.netty.util.internal.ConcurrentSet;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
@ -12,15 +21,6 @@ import org.bukkit.entity.Player;
|
||||
import org.bukkit.entity.Villager;
|
||||
import org.bukkit.inventory.ItemStack;
|
||||
import org.github.paperspigot.Title;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.game.arena.Arena;
|
||||
import rip.tilly.bedwars.game.arena.CopiedArena;
|
||||
import rip.tilly.bedwars.generators.Generator;
|
||||
import rip.tilly.bedwars.generators.GeneratorTier;
|
||||
import rip.tilly.bedwars.generators.GeneratorType;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
import rip.tilly.bedwars.utils.CustomLocation;
|
||||
import rip.tilly.bedwars.utils.TimeUtils;
|
||||
|
||||
import java.util.*;
|
||||
import java.util.stream.Collectors;
|
||||
@ -38,9 +38,9 @@ public class Game {
|
||||
private final Set<Integer> runnables = new HashSet<>();
|
||||
private final Set<ItemStack> droppedItems = new ConcurrentSet<>();
|
||||
|
||||
private final List<GameTeam> teams;
|
||||
private final Arena arena;
|
||||
private final GameType gameType;
|
||||
private final List<GameTeam> teams;
|
||||
|
||||
private final UUID gameId = UUID.randomUUID();
|
||||
|
||||
@ -312,6 +312,11 @@ public class Game {
|
||||
}
|
||||
|
||||
public void spawnVillagers() {
|
||||
// CustomVillager villager = new CustomVillager(this.copiedArena.getA().toBukkitWorld());
|
||||
// villager.register();
|
||||
// villager.spawn(this.copiedArena.getTeamAshop().toBukkitLocation(), "&aItem Shop");
|
||||
// this.addEntityToRemove(villager.getBukkitEntity());
|
||||
|
||||
Villager teamAShopVillager = this.copiedArena.getTeamAshop().toBukkitLocation().getWorld().spawn(this.copiedArena.getTeamAshop().toBukkitLocation(), Villager.class);
|
||||
teamAShopVillager.setCustomName(CC.translate("&aItem Shop"));
|
||||
teamAShopVillager.setCustomNameVisible(true);
|
@ -1,8 +1,8 @@
|
||||
package rip.tilly.bedwars.game;
|
||||
package com.loganmagnan.bedwars.game;
|
||||
|
||||
import com.loganmagnan.bedwars.game.arena.Arena;
|
||||
import lombok.Getter;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import rip.tilly.bedwars.game.arena.Arena;
|
||||
|
||||
import java.util.UUID;
|
||||
|
@ -1,8 +1,8 @@
|
||||
package rip.tilly.bedwars.game;
|
||||
package com.loganmagnan.bedwars.game;
|
||||
|
||||
public enum GameState {
|
||||
|
||||
STARTING,
|
||||
FIGHTING,
|
||||
ENDING
|
||||
ENDING;
|
||||
}
|
@ -1,10 +1,10 @@
|
||||
package rip.tilly.bedwars.game;
|
||||
package com.loganmagnan.bedwars.game;
|
||||
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
import org.bukkit.entity.Player;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.playerdata.PlayerTeam;
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.playerdata.PlayerTeam;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
@ -1,4 +1,4 @@
|
||||
package rip.tilly.bedwars.game;
|
||||
package com.loganmagnan.bedwars.game;
|
||||
|
||||
import lombok.Getter;
|
||||
import lombok.RequiredArgsConstructor;
|
@ -1,10 +1,10 @@
|
||||
package rip.tilly.bedwars.game.arena;
|
||||
package com.loganmagnan.bedwars.game.arena;
|
||||
|
||||
import com.loganmagnan.bedwars.utils.CustomLocation;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.Setter;
|
||||
import rip.tilly.bedwars.utils.CustomLocation;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
@ -1,10 +1,10 @@
|
||||
package rip.tilly.bedwars.game.arena;
|
||||
package com.loganmagnan.bedwars.game.arena;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.Setter;
|
||||
import rip.tilly.bedwars.utils.CustomLocation;
|
||||
import com.loganmagnan.bedwars.utils.CustomLocation;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
@ -36,5 +36,4 @@ public class CopiedArena {
|
||||
private List<CustomLocation> teamGenerators = new ArrayList<>();
|
||||
private List<CustomLocation> diamondGenerators = new ArrayList<>();
|
||||
private List<CustomLocation> emeraldGenerators = new ArrayList<>();
|
||||
|
||||
}
|
@ -1,15 +1,14 @@
|
||||
package rip.tilly.bedwars.generators;
|
||||
package com.loganmagnan.bedwars.generators;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.Material;
|
||||
import org.bukkit.entity.ArmorStand;
|
||||
import org.bukkit.inventory.ItemStack;
|
||||
import org.bukkit.scheduler.BukkitTask;
|
||||
import org.bukkit.util.EulerAngle;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.game.Game;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
import com.loganmagnan.bedwars.game.Game;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
|
||||
public class Generator {
|
||||
|
@ -1,4 +1,4 @@
|
||||
package rip.tilly.bedwars.generators;
|
||||
package com.loganmagnan.bedwars.generators;
|
||||
|
||||
import java.util.Arrays;
|
||||
|
@ -1,4 +1,4 @@
|
||||
package rip.tilly.bedwars.generators;
|
||||
package com.loganmagnan.bedwars.generators;
|
||||
|
||||
public enum GeneratorType {
|
||||
|
@ -1,5 +1,8 @@
|
||||
package rip.tilly.bedwars.listeners;
|
||||
package com.loganmagnan.bedwars.listeners;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.utils.menu.Button;
|
||||
import com.loganmagnan.bedwars.utils.menu.Menu;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.event.EventHandler;
|
||||
@ -9,9 +12,6 @@ import org.bukkit.event.inventory.ClickType;
|
||||
import org.bukkit.event.inventory.InventoryAction;
|
||||
import org.bukkit.event.inventory.InventoryClickEvent;
|
||||
import org.bukkit.event.inventory.InventoryCloseEvent;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.utils.menu.Button;
|
||||
import rip.tilly.bedwars.utils.menu.Menu;
|
||||
|
||||
public class ButtonListener implements Listener {
|
||||
|
@ -1,11 +1,14 @@
|
||||
package rip.tilly.bedwars.listeners;
|
||||
package com.loganmagnan.bedwars.listeners;
|
||||
|
||||
import com.loganmagnan.bedwars.menus.settings.SettingsMenu;
|
||||
import com.loganmagnan.bedwars.playerdata.PlayerData;
|
||||
import com.loganmagnan.bedwars.playerdata.PlayerState;
|
||||
import org.bukkit.ChatColor;
|
||||
import org.bukkit.GameMode;
|
||||
import org.bukkit.Material;
|
||||
import org.bukkit.entity.ArmorStand;
|
||||
import org.bukkit.entity.EntityType;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.entity.Villager;
|
||||
import org.bukkit.event.EventHandler;
|
||||
import org.bukkit.event.Listener;
|
||||
import org.bukkit.event.block.Action;
|
||||
@ -14,16 +17,11 @@ import org.bukkit.event.player.PlayerInteractEntityEvent;
|
||||
import org.bukkit.event.player.PlayerInteractEvent;
|
||||
import org.bukkit.inventory.ItemStack;
|
||||
import org.bukkit.material.TrapDoor;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.game.GameState;
|
||||
import rip.tilly.bedwars.managers.hotbar.impl.HotbarItem;
|
||||
import rip.tilly.bedwars.menus.queue.PlayAGameMenu;
|
||||
import rip.tilly.bedwars.menus.settings.SettingsMenu;
|
||||
import rip.tilly.bedwars.menus.shop.blocks.BlocksMenu;
|
||||
import rip.tilly.bedwars.playerdata.PlayerData;
|
||||
import rip.tilly.bedwars.playerdata.PlayerState;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
import rip.tilly.bedwars.utils.menusystem.menu.UpgradesMenu;
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.managers.hotbar.impl.HotbarItem;
|
||||
import com.loganmagnan.bedwars.menus.queue.PlayAGameMenu;
|
||||
import com.loganmagnan.bedwars.menus.shop.blocks.BlocksMenu;
|
||||
import com.loganmagnan.bedwars.utils.menusystem.menu.UpgradesMenu;
|
||||
|
||||
public class InteractListener implements Listener {
|
||||
|
||||
@ -31,18 +29,24 @@ public class InteractListener implements Listener {
|
||||
|
||||
@EventHandler
|
||||
public void onPlayerInteract(PlayerInteractEvent event) {
|
||||
Player player = event.getPlayer();
|
||||
|
||||
PlayerData playerData = this.plugin.getPlayerDataManager().getPlayerData(player.getUniqueId());
|
||||
|
||||
if (playerData.getPlayerState() == PlayerState.PLAYING) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (player.getGameMode() == GameMode.CREATIVE) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (event.getAction() == Action.PHYSICAL && event.getClickedBlock().getType() == Material.SOIL) {
|
||||
event.setCancelled(true);
|
||||
return;
|
||||
}
|
||||
|
||||
if ((event.getAction() != Action.RIGHT_CLICK_BLOCK && event.getAction() != Action.RIGHT_CLICK_AIR)) {
|
||||
return;
|
||||
}
|
||||
|
||||
Player player = event.getPlayer();
|
||||
|
||||
if (player.getGameMode() == GameMode.CREATIVE) {
|
||||
if (event.getAction() != Action.RIGHT_CLICK_BLOCK && event.getAction() != Action.RIGHT_CLICK_AIR) {
|
||||
return;
|
||||
}
|
||||
|
||||
@ -61,16 +65,13 @@ public class InteractListener implements Listener {
|
||||
}
|
||||
|
||||
ItemStack itemStack = player.getItemInHand();
|
||||
|
||||
if (!event.hasItem() || itemStack == null) {
|
||||
return;
|
||||
}
|
||||
|
||||
PlayerData playerData = this.plugin.getPlayerDataManager().getPlayerData(player.getUniqueId());
|
||||
if (playerData.getPlayerState() == PlayerState.PLAYING) {
|
||||
return;
|
||||
}
|
||||
HotbarItem hotbarItem = HotbarItem.getItemByItemStack(itemStack);
|
||||
|
||||
HotbarItem hotbarItem = HotbarItem.getItemByItemStack(player.getItemInHand());
|
||||
if (hotbarItem == null) {
|
||||
return;
|
||||
}
|
||||
@ -97,7 +98,7 @@ public class InteractListener implements Listener {
|
||||
|
||||
break;
|
||||
case COSMETICS_MENU:
|
||||
new BlocksMenu().openMenu(player);
|
||||
// new BlocksMenu().openMenu(player);
|
||||
// open cosmetics menu
|
||||
break;
|
||||
case PREFERENCES_MENU:
|
||||
@ -108,7 +109,7 @@ public class InteractListener implements Listener {
|
||||
// open party games menu
|
||||
break;
|
||||
case PARTY_INFO:
|
||||
player.performCommand("party info");
|
||||
player.chat("/party info");
|
||||
|
||||
break;
|
||||
case PARTY_LEAVE:
|
||||
@ -147,7 +148,7 @@ public class InteractListener implements Listener {
|
||||
return;
|
||||
}
|
||||
|
||||
String name = event.getRightClicked().getCustomName();
|
||||
String name = event.getRightClicked().getName();
|
||||
|
||||
if (name == null) {
|
||||
return;
|
||||
@ -170,4 +171,13 @@ public class InteractListener implements Listener {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
public void onEntityDamage(EntityDamageEvent event) {
|
||||
if (event.getEntityType() == EntityType.VILLAGER) {
|
||||
event.setCancelled(true);
|
||||
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
@ -1,10 +1,10 @@
|
||||
package rip.tilly.bedwars.listeners;
|
||||
package com.loganmagnan.bedwars.listeners;
|
||||
|
||||
import com.loganmagnan.bedwars.utils.menusystem.Menu;
|
||||
import org.bukkit.event.EventHandler;
|
||||
import org.bukkit.event.Listener;
|
||||
import org.bukkit.event.inventory.InventoryClickEvent;
|
||||
import org.bukkit.inventory.InventoryHolder;
|
||||
import rip.tilly.bedwars.utils.menusystem.Menu;
|
||||
|
||||
public class MenuListener implements Listener {
|
||||
|
@ -1,14 +1,14 @@
|
||||
package rip.tilly.bedwars.listeners;
|
||||
package com.loganmagnan.bedwars.listeners;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.managers.party.Party;
|
||||
import com.loganmagnan.bedwars.playerdata.PlayerData;
|
||||
import com.loganmagnan.bedwars.playerdata.PlayerSettings;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.event.EventHandler;
|
||||
import org.bukkit.event.Listener;
|
||||
import org.bukkit.event.player.AsyncPlayerChatEvent;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.managers.party.Party;
|
||||
import rip.tilly.bedwars.playerdata.PlayerData;
|
||||
import rip.tilly.bedwars.playerdata.PlayerSettings;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
|
||||
public class PartyChatListener implements Listener {
|
||||
|
@ -1,13 +1,13 @@
|
||||
package rip.tilly.bedwars.listeners;
|
||||
package com.loganmagnan.bedwars.listeners;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.playerdata.PlayerData;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.event.EventHandler;
|
||||
import org.bukkit.event.EventPriority;
|
||||
import org.bukkit.event.Listener;
|
||||
import org.bukkit.event.player.*;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.playerdata.PlayerData;
|
||||
|
||||
public class PlayerDataListener implements Listener {
|
||||
|
@ -1,5 +1,8 @@
|
||||
package rip.tilly.bedwars.listeners;
|
||||
package com.loganmagnan.bedwars.listeners;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.playerdata.PlayerData;
|
||||
import com.loganmagnan.bedwars.playerdata.PlayerState;
|
||||
import org.bukkit.GameMode;
|
||||
import org.bukkit.entity.EntityType;
|
||||
import org.bukkit.entity.Player;
|
||||
@ -13,9 +16,6 @@ import org.bukkit.event.inventory.InventoryClickEvent;
|
||||
import org.bukkit.event.inventory.InventoryType;
|
||||
import org.bukkit.event.player.PlayerToggleFlightEvent;
|
||||
import org.bukkit.event.weather.WeatherChangeEvent;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.playerdata.PlayerData;
|
||||
import rip.tilly.bedwars.playerdata.PlayerState;
|
||||
|
||||
public class RandomListeners implements Listener {
|
||||
|
@ -1,5 +1,12 @@
|
||||
package rip.tilly.bedwars.listeners.game;
|
||||
package com.loganmagnan.bedwars.listeners.game;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.events.PlayerKillEvent;
|
||||
import com.loganmagnan.bedwars.game.Game;
|
||||
import com.loganmagnan.bedwars.game.GameState;
|
||||
import com.loganmagnan.bedwars.playerdata.PlayerData;
|
||||
import com.loganmagnan.bedwars.playerdata.PlayerState;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.entity.Arrow;
|
||||
import org.bukkit.entity.Player;
|
||||
@ -8,13 +15,6 @@ import org.bukkit.event.EventHandler;
|
||||
import org.bukkit.event.Listener;
|
||||
import org.bukkit.event.entity.EntityDamageByEntityEvent;
|
||||
import org.bukkit.event.entity.EntityDamageEvent;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.events.PlayerKillEvent;
|
||||
import rip.tilly.bedwars.game.Game;
|
||||
import rip.tilly.bedwars.game.GameState;
|
||||
import rip.tilly.bedwars.playerdata.PlayerData;
|
||||
import rip.tilly.bedwars.playerdata.PlayerState;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
|
||||
public class DamageListener implements Listener {
|
||||
|
@ -1,19 +1,19 @@
|
||||
package rip.tilly.bedwars.listeners.game;
|
||||
package com.loganmagnan.bedwars.listeners.game;
|
||||
|
||||
import com.loganmagnan.bedwars.game.GameTeam;
|
||||
import org.bukkit.entity.Entity;
|
||||
import org.bukkit.event.EventHandler;
|
||||
import org.bukkit.event.Listener;
|
||||
import org.github.paperspigot.Title;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.events.GameEndEvent;
|
||||
import rip.tilly.bedwars.game.Game;
|
||||
import rip.tilly.bedwars.game.GameState;
|
||||
import rip.tilly.bedwars.game.GameTeam;
|
||||
import rip.tilly.bedwars.generators.Generator;
|
||||
import rip.tilly.bedwars.playerdata.PlayerData;
|
||||
import rip.tilly.bedwars.playerdata.currentgame.TeamUpgrades;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
import rip.tilly.bedwars.utils.PlayerUtil;
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.events.GameEndEvent;
|
||||
import com.loganmagnan.bedwars.game.Game;
|
||||
import com.loganmagnan.bedwars.game.GameState;
|
||||
import com.loganmagnan.bedwars.generators.Generator;
|
||||
import com.loganmagnan.bedwars.playerdata.PlayerData;
|
||||
import com.loganmagnan.bedwars.playerdata.currentgame.TeamUpgrades;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
import com.loganmagnan.bedwars.utils.PlayerUtil;
|
||||
|
||||
public class GameEndListener implements Listener {
|
||||
|
@ -1,21 +1,21 @@
|
||||
package rip.tilly.bedwars.listeners.game;
|
||||
package com.loganmagnan.bedwars.listeners.game;
|
||||
|
||||
import com.loganmagnan.bedwars.events.GameStartEvent;
|
||||
import com.loganmagnan.bedwars.runnables.GameRunnable;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.event.EventHandler;
|
||||
import org.bukkit.event.Listener;
|
||||
import org.bukkit.inventory.ItemStack;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.events.GameStartEvent;
|
||||
import rip.tilly.bedwars.game.Game;
|
||||
import rip.tilly.bedwars.game.arena.CopiedArena;
|
||||
import rip.tilly.bedwars.generators.Generator;
|
||||
import rip.tilly.bedwars.generators.GeneratorType;
|
||||
import rip.tilly.bedwars.playerdata.PlayerData;
|
||||
import rip.tilly.bedwars.playerdata.PlayerState;
|
||||
import rip.tilly.bedwars.runnables.GameRunnable;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
import rip.tilly.bedwars.utils.CustomLocation;
|
||||
import rip.tilly.bedwars.utils.PlayerUtil;
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.game.Game;
|
||||
import com.loganmagnan.bedwars.game.arena.CopiedArena;
|
||||
import com.loganmagnan.bedwars.generators.Generator;
|
||||
import com.loganmagnan.bedwars.generators.GeneratorType;
|
||||
import com.loganmagnan.bedwars.playerdata.PlayerData;
|
||||
import com.loganmagnan.bedwars.playerdata.PlayerState;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
import com.loganmagnan.bedwars.utils.CustomLocation;
|
||||
import com.loganmagnan.bedwars.utils.PlayerUtil;
|
||||
|
||||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
@ -105,6 +105,6 @@ public class GameStartListener implements Listener {
|
||||
}
|
||||
}
|
||||
|
||||
new GameRunnable(game).runTaskTimer(this.plugin, 20, 20);
|
||||
new GameRunnable(game).runTaskTimer(this.plugin, 20L, 20L);
|
||||
}
|
||||
}
|
@ -1,5 +1,9 @@
|
||||
package rip.tilly.bedwars.listeners.game;
|
||||
package com.loganmagnan.bedwars.listeners.game;
|
||||
|
||||
import com.loganmagnan.bedwars.BedWars;
|
||||
import com.loganmagnan.bedwars.game.GameTeam;
|
||||
import com.loganmagnan.bedwars.playerdata.PlayerData;
|
||||
import com.loganmagnan.bedwars.playerdata.PlayerState;
|
||||
import org.bukkit.GameMode;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.entity.Player;
|
||||
@ -8,16 +12,11 @@ import org.bukkit.event.Listener;
|
||||
import org.bukkit.event.player.PlayerMoveEvent;
|
||||
import org.bukkit.potion.PotionEffect;
|
||||
import org.bukkit.potion.PotionEffectType;
|
||||
import rip.tilly.bedwars.BedWars;
|
||||
import rip.tilly.bedwars.events.PlayerKillEvent;
|
||||
import rip.tilly.bedwars.game.Game;
|
||||
import rip.tilly.bedwars.game.GameState;
|
||||
import rip.tilly.bedwars.game.GameTeam;
|
||||
import rip.tilly.bedwars.playerdata.PlayerData;
|
||||
import rip.tilly.bedwars.playerdata.PlayerState;
|
||||
import rip.tilly.bedwars.upgrades.Upgrade;
|
||||
import rip.tilly.bedwars.utils.CC;
|
||||
import rip.tilly.bedwars.utils.LocationUtils;
|
||||
import com.loganmagnan.bedwars.events.PlayerKillEvent;
|
||||
import com.loganmagnan.bedwars.game.Game;
|
||||
import com.loganmagnan.bedwars.game.GameState;
|
||||
import com.loganmagnan.bedwars.upgrades.Upgrade;
|
||||
import com.loganmagnan.bedwars.utils.CC;
|
||||
|
||||
public class MovementListener implements Listener {
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user