Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bleeding #1

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open

Bleeding #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d5988f4
Bleeeeddd
nasiridrishi Oct 23, 2020
2bd3b63
Bleeeeddd
nasiridrishi Oct 23, 2020
edabdd3
transform Core to lib instead.
nasiridrishi Oct 27, 2020
bfb6d92
add AutoInventory, AutoXp, CombatLogger, broadcaster components.
nasiridrishi Oct 28, 2020
561af36
add CombatLogger Componenet
nasiridrishi Oct 29, 2020
fddf837
fix countdown and add listener to the kitpvp
nasiridrishi Oct 29, 2020
29333ff
some overall improvements
nasiridrishi Nov 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
/Core/target
/Kitpvp/target
.idea
.DS_Store
.DS_Store
6 changes: 1 addition & 5 deletions .idea/PrimeGames.Cloudburst.iml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/compiler.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 6 additions & 1 deletion .idea/encodings.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

57 changes: 41 additions & 16 deletions .idea/jarRepositories.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 0 additions & 13 deletions .idea/libraries/Maven__org_cloudburstmc_cloudburst_server_1_0_0_SNAPSHOT.xml
View file
Open in desktop

This file was deleted.

13 changes: 0 additions & 13 deletions .idea/libraries/Maven__ru_nukkit_dblib_DbLib_1_0_SNAPSHOT.xml
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions .idea/misc.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions .idea/modules.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions .idea/sqldialects.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

32 changes: 32 additions & 0 deletions Factions/Factions.iml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<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$/../../Factions">
<sourceFolder url="file://$MODULE_DIR$/../../Factions/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/../../Factions/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/../../Factions/src/test/java" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/../../Factions/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.cloudburstmc:cloudburst-server:0.0.1-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: org.apache.maven.plugins:maven-deploy-plugin:maven-plugin:2.7" level="project" />
<orderEntry type="library" name="Maven: org.apache.maven:maven-plugin-api:2.0.6" level="project" />
<orderEntry type="library" name="Maven: org.apache.maven:maven-project:2.0.6" level="project" />
<orderEntry type="library" name="Maven: org.apache.maven:maven-settings:2.0.6" level="project" />
<orderEntry type="library" name="Maven: org.apache.maven:maven-profile:2.0.6" level="project" />
<orderEntry type="library" name="Maven: org.apache.maven:maven-artifact-manager:2.0.6" level="project" />
<orderEntry type="library" name="Maven: org.apache.maven:maven-repository-metadata:2.0.6" level="project" />
<orderEntry type="library" name="Maven: org.apache.maven.wagon:wagon-provider-api:1.0-beta-2" level="project" />
<orderEntry type="library" name="Maven: org.apache.maven:maven-plugin-registry:2.0.6" level="project" />
<orderEntry type="library" name="Maven: org.codehaus.plexus:plexus-container-default:1.0-alpha-9-stable-1" level="project" />
<orderEntry type="library" name="Maven: junit:junit:3.8.1" level="project" />
<orderEntry type="library" name="Maven: classworlds:classworlds:1.1-alpha-2" level="project" />
<orderEntry type="library" name="Maven: org.apache.maven:maven-model:2.0.6" level="project" />
<orderEntry type="library" name="Maven: org.apache.maven:maven-artifact:2.0.6" level="project" />
<orderEntry type="library" name="Maven: org.codehaus.plexus:plexus-utils:1.5.6" level="project" />
<orderEntry type="library" name="Maven: ru.nukkit.dblib:DbLib:1.0-SNAPSHOT" level="project" />
</component>
</module>
23 changes: 23 additions & 0 deletions Factions/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ /*
~ * Copyright (C) PrimeGames - All Rights Reserved
~ * Unauthorized copying of this file, via any medium is strictly prohibited
~ * Proprietary and confidential
~ */
-->

<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>core</artifactId>
<groupId>net.primegames</groupId>
<version>0.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>Factions</artifactId>


</project>
2 changes: 0 additions & 2 deletions META-INF/MANIFEST.MF
View file
Open in desktop

This file was deleted.

5 changes: 3 additions & 2 deletions core/core.iml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Cloudburst" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.cloudburstmc:cloudburst-server:1.0.0-SNAPSHOT" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.cloudburstmc:cloudburst-server:0.0.1-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: com.github.nasiridrishi:ScoreboardAPI:48eec4ed9c" level="project" />
<orderEntry type="library" name="Maven: org.apache.maven.plugins:maven-deploy-plugin:maven-plugin:2.7" level="project" />
<orderEntry type="library" name="Maven: org.apache.maven:maven-plugin-api:2.0.6" level="project" />
<orderEntry type="library" name="Maven: org.apache.maven:maven-project:2.0.6" level="project" />
Expand All @@ -42,5 +42,6 @@
<orderEntry type="library" name="Maven: org.apache.maven:maven-artifact:2.0.6" level="project" />
<orderEntry type="library" name="Maven: org.codehaus.plexus:plexus-utils:1.5.6" level="project" />
<orderEntry type="library" name="Maven: ru.nukkit.dblib:DbLib:1.0-SNAPSHOT" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.projectlombok:lombok:1.18.16" level="project" />
</component>
</module>
34 changes: 10 additions & 24 deletions core/dependency-reduced-pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>net.primegames</groupId>
<artifactId>core</artifactId>
<version>1.0-SNAPSHOT</version>
<version>0.0.1-SNAPSHOT</version>
<build>
<defaultGoal>clean install</defaultGoal>
<resources>
Expand All @@ -23,24 +23,12 @@
<goals>
<goal>shade</goal>
</goals>
<configuration>
<outputDirectory>/Users/nasir/Desktop/PrimeGames/plugins</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<repositories>
<repository>
<snapshots />
<id>spring-snapshots</id>
<url>http://repo.spring.io/snapshot</url>
</repository>
<repository>
<id>spring-milestones</id>
<url>http://repo.spring.io/milestone</url>
</repository>
<repository>
<id>nukkit-repo</id>
<url>https://repo.nukkitx.com/maven-snapshots</url>
Expand All @@ -50,27 +38,25 @@
<url>https://jitpack.io</url>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>spring-snapshots</id>
<url>http://repo.spring.io/snapshot</url>
</pluginRepository>
<pluginRepository>
<id>spring-milestones</id>
<url>http://repo.spring.io/milestone</url>
</pluginRepository>
</pluginRepositories>
<dependencies>
<dependency>
<groupId>org.cloudburstmc</groupId>
<artifactId>cloudburst-server</artifactId>
<version>1.0.0-SNAPSHOT</version>
<version>0.0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.16</version>
<scope>provided</scope>
</dependency>
</dependencies>
<properties>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>1.8</maven.compiler.source>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties>
</project>

Loading