Skip to content

Commit

Permalink
Update to 1.14 (#121)
Browse files Browse the repository at this point in the history 
* Bump com.github.BlueMap-Minecraft:BlueMapAPI from v2.4.0 to 2.7.0

Bumps [com.github.BlueMap-Minecraft:BlueMapAPI](https://github.com/BlueMap-Minecraft/BlueMapAPI) from v2.4.0 to 2.7.0.
- [Release notes](https://github.com/BlueMap-Minecraft/BlueMapAPI/releases)
- [Commits](BlueMap-Minecraft/BlueMapAPI@v2.4.0...v2.7.0)

---
updated-dependencies:
- dependency-name: com.github.BlueMap-Minecraft:BlueMapAPI
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>

* Bump org.bstats:bstats-bukkit from 3.0.0 to 3.0.2

Bumps [org.bstats:bstats-bukkit](https://github.com/Bastian/bStats-Metrics) from 3.0.0 to 3.0.2.
- [Release notes](https://github.com/Bastian/bStats-Metrics/releases)
- [Commits](Bastian/bstats-metrics@v3.0.0...v3.0.2)

---
updated-dependencies:
- dependency-name: org.bstats:bstats-bukkit
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>

* Bump com.github.MilkBowl:VaultAPI from 1.7 to 1.7.1

Bumps [com.github.MilkBowl:VaultAPI](https://github.com/MilkBowl/VaultAPI) from 1.7 to 1.7.1.
- [Release notes](https://github.com/MilkBowl/VaultAPI/releases)
- [Commits](MilkBowl/VaultAPI@1.7...1.7.1)

---
updated-dependencies:
- dependency-name: com.github.MilkBowl:VaultAPI
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>

* Bump org.jetbrains:annotations from 23.0.0 to 24.1.0

Bumps [org.jetbrains:annotations](https://github.com/JetBrains/java-annotations) from 23.0.0 to 24.1.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](JetBrains/java-annotations@23.0.0...24.1.0)

---
updated-dependencies:
- dependency-name: org.jetbrains:annotations
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>

* Bump de.tr7zw:item-nbt-api-plugin from 2.10.0 to 2.13.1

Bumps de.tr7zw:item-nbt-api-plugin from 2.10.0 to 2.13.1.

---
updated-dependencies:
- dependency-name: de.tr7zw:item-nbt-api-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

* Bump org.apache.commons:commons-text from 1.9 to 1.12.0

Bumps org.apache.commons:commons-text from 1.9 to 1.12.0.

---
updated-dependencies:
- dependency-name: org.apache.commons:commons-text
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

* Fix Nth bluemap inits not being received

* chore: bump version to 1.14

* Experimental damage modification in Claim Mode

* Remove unecessary switch

* Experimental event API

* More events

* Fix values used for armor slots

* Fix edge case deadlock when adding chunk to claim

* (1.14) Improve BlueMap outlines (#125)

* Experimental improvements to map marker tracing

* Fixes for new outline style

* Do not shade fastutil

* Add files via upload

* Add turkish translation to initalization

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Krayir5 <[email protected]>
  • Loading branch information
@WasabiThumb @dependabot @Krayir5
3 people authored Aug 18, 2024
1 parent 00823de commit a70ecfe
Show file tree
Hide file tree
Showing 38 changed files with 1,884 additions and 300 deletions.
14 changes: 7 additions & 7 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>codes.wasabi</groupId>
<artifactId>xclaim</artifactId>
<version>1.13.1</version>
<version>1.14.0</version>
<packaging>jar</packaging>

<name>XClaim</name>
Expand Down Expand Up @@ -190,7 +190,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
<version>1.9</version>
<version>1.12.0</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -222,7 +222,7 @@
<dependency>
<groupId>com.github.BlueMap-Minecraft</groupId>
<artifactId>BlueMapAPI</artifactId>
<version>v2.4.0</version>
<version>2.7.0</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand All @@ -234,13 +234,13 @@
<dependency>
<groupId>org.jetbrains</groupId>
<artifactId>annotations</artifactId>
<version>23.0.0</version>
<version>24.1.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.github.MilkBowl</groupId>
<artifactId>VaultAPI</artifactId>
<version>1.7</version>
<version>1.7.1</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand All @@ -252,7 +252,7 @@
<dependency>
<groupId>de.tr7zw</groupId>
<artifactId>item-nbt-api-plugin</artifactId>
<version>2.10.0</version>
<version>2.13.1</version>
<scope>provided</scope>
</dependency>
<!--
Expand All @@ -266,7 +266,7 @@
<dependency>
<groupId>org.bstats</groupId>
<artifactId>bstats-bukkit</artifactId>
<version>3.0.0</version>
<version>3.0.2</version>
<scope>compile</scope>
</dependency>
</dependencies>
Expand Down
6 changes: 5 additions & 1 deletion src/main/java/codes/wasabi/xclaim/XClaim.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ private void loadGeneralConfig() {
}

private static final String[] bundledLangs = new String[] {
"en-US", "de", "zh"
"en-US", "de", "zh", "tr"
};
private void setupLang() {
String l = mainConfig.getString("language", "en-US");
Expand Down Expand Up @@ -387,6 +387,10 @@ public static class Lang {
return map.get(key);
}

public boolean has(String key) {
return map.containsKey(key);
}

public String get(String key) {
return get(key, new String[0]);
}
Expand Down
16 changes: 8 additions & 8 deletions src/main/java/codes/wasabi/xclaim/api/Claim.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
import codes.wasabi.xclaim.api.enums.TrustLevel;
import codes.wasabi.xclaim.api.enums.permission.PermissionHandler;
import codes.wasabi.xclaim.gui.ChunkEditor;
import codes.wasabi.xclaim.map.MapMarker;
import codes.wasabi.xclaim.map.MapService;
import codes.wasabi.xclaim.map.MapServiceOp;
import codes.wasabi.xclaim.platform.Platform;
import codes.wasabi.xclaim.platform.PlatformPersistentDataContainer;
import codes.wasabi.xclaim.platform.PlatformPersistentDataType;
Expand Down Expand Up @@ -197,9 +197,7 @@ public class Claim {
private void validateMarkers() {
if (MapService.isAvailable()) {
MapService ms = MapService.getNonNull();
ms.getMarkerAsync(this, (MapMarker marker) -> {
if (marker != null) marker.update(this);
});
ms.queueOperation(MapServiceOp.update(this));
}
}

Expand Down Expand Up @@ -358,15 +356,19 @@ public boolean addChunk(@NotNull Chunk chunk) throws IllegalArgumentException {
if (ret) {
generateBounds();
if (manageHandlers) {
List<Claim> collides = new ArrayList<>(1);
registryLock.readLock().lock();
try {
for (Claim c : registry) {
if (c == this) continue;
if (c.chunks.contains(ref)) c.removeChunk(chunk);
if (c.chunks.contains(ref)) {
collides.add(c);
}
}
} finally {
registryLock.readLock().unlock();
}
for (Claim collided : collides) collided.removeChunk(ref);
} else if (claim) {
claim();
}
Expand Down Expand Up @@ -615,9 +617,7 @@ public boolean unclaim() {
ownerChangeCallbacks.clear();
if (MapService.isAvailable()) {
MapService ms = MapService.getNonNull();
ms.getMarkerAsync(this, (MapMarker marker) -> {
if (marker != null) marker.deleteMarker();
});
ms.queueOperation(MapServiceOp.delete(this));
}
return true;
}
Expand Down
Loading

0 comments on commit a70ecfe

Please sign in to comment.