Fork/mmocore
2
0
Fork 0
forked from Upstream/mmocore
Code Pull Requests Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Ka0rX 2022-11-10 16:15:54 +01:00
commit c03400228f
6 changed files with 95 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitignore vendored
View File

@ -1,10 +1,12 @@
bin/ bin/
.m2/
target/ target/
.settings/ .settings/
.idea/ .idea/
.classpath .classpath
.project .project
dependency-reduced-pom.xml
.flattened-pom.xml
MMOCore.eml MMOCore.eml
MMOCore.iml MMOCore.iml
dependency-reduced-pom.xml /MMOCore-API/MMOCore-API.iml
/MMOCore-Dist/MMOCore-Dist.iml

11
.gitlab-ci.yml
View File

@ -1,11 +0,0 @@
image: maven:3-openjdk-16-slim
build:
stage: build
script:
- mvn clean package
deploy:
stage: deploy
script:
- mvn deploy

17
MMOCore-API/MMOCore-API.iml
View File

@ -1,17 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module version="4">
<component name="FacetManager">
<facet type="minecraft" name="Minecraft">
<configuration>
<autoDetectTypes>
<platformType>SPIGOT</platformType>
<platformType>MCP</platformType>
<platformType>BUKKIT</platformType>
</autoDetectTypes>
</configuration>
</facet>
</component>
<component name="McpModuleSettings">
<option name="srgType" value="SRG" />
</component>
</module>

186
MMOCore-API/src/main/java/net/Indyuce/mmocore/experience/Booster.java
View File

@ -6,118 +6,112 @@ import java.util.Objects;
import java.util.UUID; import java.util.UUID;
public class Booster { public class Booster {
private final UUID uuid = UUID.randomUUID(); private final UUID uuid = UUID.randomUUID();
private final long date = System.currentTimeMillis(); private final long date = System.currentTimeMillis();
private final Profession profession; private final Profession profession;
private final double extra; private final double extra;
private final String author; private final String author;
/** /**
* Length is not final because boosters can stacks. This allows to reduce * Length is not final because boosters can stacks. This allows to reduce
* the amount of boosters displayed in the main player menu * the amount of boosters displayed in the main player menu
* * <p>
* See {@link BoosterManager#register(Booster)} * See {@link BoosterManager#register(Booster)}
*/ */
private long length; private long length;
/** /**
* @param extra * @param extra 1 for +100% experience, 3 for 300% etc.
* 1 for +100% experience, 3 for 300% etc. * @param length Booster length in seconds
* @param length */
* Booster length in milliseconds public Booster(double extra, long length) {
*/ this(null, null, extra, length);
public Booster(double extra, long length) { }
this(null, null, extra, length);
}
/** /**
* Main class experience booster * Main class experience booster
* *
* @param author The booster creator * @param author The booster creator
* @param extra 1 for +100% experience, 3 for 300% etc. * @param extra 1 for +100% experience, 3 for 300% etc.
* @param length Booster length in milliseconds * @param length Booster length in seconds
*/ */
public Booster(String author, double extra, long length) { public Booster(String author, double extra, long length) {
this(author, null, extra, length); this(author, null, extra, length);
} }
/** /**
* Profession experience booster * Profession experience booster
* *
* @param author * @param author The booster creator
* The booster creator * @param profession Either null for main level boosters or a specific profession
* @param profession * @param extra 1 for +100% experience, 3 for 300% etc.
* Either null for main level boosters or a specific profession * @param length Booster length in seconds
* @param extra */
* 1 for +100% experience, 3 for 300% etc. public Booster(String author, Profession profession, double extra, long length) {
* @param length this.author = author;
* Booster length in milliseconds this.length = length * 1000;
*/ this.profession = profession;
public Booster(String author, Profession profession, double extra, long length) { this.extra = extra;
this.author = author; }
this.length = length * 1000;
this.profession = profession;
this.extra = extra;
}
public UUID getUniqueId() { public UUID getUniqueId() {
return uuid; return uuid;
} }
public double getExtra() { public double getExtra() {
return extra; return extra;
} }
public boolean hasAuthor() { public boolean hasAuthor() {
return author != null; return author != null;
} }
public String getAuthor() { public String getAuthor() {
return author; return author;
} }
public long getCreationDate() { public long getCreationDate() {
return date; return date;
} }
public boolean hasProfession() { public boolean hasProfession() {
return profession != null; return profession != null;
} }
public Profession getProfession() { public Profession getProfession() {
return profession; return profession;
} }
public boolean isTimedOut() { public boolean isTimedOut() {
return date + length < System.currentTimeMillis(); return date + length < System.currentTimeMillis();
} }
public long getLeft() { public long getLeft() {
return Math.max(0, date + length - System.currentTimeMillis()); return Math.max(0, date + length - System.currentTimeMillis());
} }
public long getLength() { public long getLength() {
return length; return length;
} }
public void addLength(long length) { public void addLength(long length) {
this.length += length; this.length += length;
} }
public boolean canStackWith(Booster booster) { public boolean canStackWith(Booster booster) {
return extra == booster.extra && Objects.equals(profession, booster.profession); return extra == booster.extra && Objects.equals(profession, booster.profession);
} }
@Override @Override
public boolean equals(Object o) { public boolean equals(Object o) {
if (this == o) return true; if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false; if (o == null || getClass() != o.getClass()) return false;
Booster booster = (Booster) o; Booster booster = (Booster) o;
return Objects.equals(uuid, booster.uuid); return Objects.equals(uuid, booster.uuid);
} }
@Override @Override
public int hashCode() { public int hashCode() {
return Objects.hash(uuid); return Objects.hash(uuid);
} }
} }

16
MMOCore-Dist/MMOCore-Dist.iml
View File

@ -1,16 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module version="4">
<component name="FacetManager">
<facet type="minecraft" name="Minecraft">
<configuration>
<autoDetectTypes>
<platformType>SPIGOT</platformType>
<platformType>MCP</platformType>
</autoDetectTypes>
</configuration>
</facet>
</component>
<component name="McpModuleSettings">
<option name="srgType" value="SRG" />
</component>
</module>

2
MMOCore-Dist/src/main/resources/config.yml
View File

@ -153,7 +153,7 @@ party:
# Exp won't be split if players are too far apart. # Exp won't be split if players are too far apart.
# #
# Set to 0 to disable # Set to 0 to disable
max-exp-split-range: 50 max-exp-split-range: 48
# When enabled, being in a party also splits profession exp # When enabled, being in a party also splits profession exp
profession-exp-split: false profession-exp-split: false