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.

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

Updates Dynmap-Towny to work with Towny's new API (0.94.0.2+) #23

Open
wants to merge 93 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
93 commits
Select commit Hold shift + click to select a range
9156b0b
Update to 1.13.2, java8, remove telemetry
hankjordan Apr 21, 2019
5ef8936
add README.md
hankjordan Apr 21, 2019
c52c415
Update plugin to fall in line with Towny's new API (0.94.0.2+)
LlmDl Jul 30, 2019
e898269
Update pom with Towny github repo.
LlmDl Oct 2, 2019
34c40e8
- Re-compile to work with Towny 0.95.0.5+
LlmDl Nov 8, 2019
26fab98
0.75
TheFlagCourier Jan 23, 2020
af76846
Merge pull request #3 from TheFlagCourier/update/Deps&Docs
LlmDl Jan 23, 2020
df9f4e9
Fix for reloading dynmap causing towns to not render anymore.
LlmDl Jan 23, 2020
253bd12
Remove [home] from beside town names.
LlmDl Jan 25, 2020
881f5ad
Fix for markers disappearing on /dynmap reload.
LlmDl Feb 23, 2020
c9efb15
Added new Placeholders and updated dependencies.
suneettipirneni Mar 29, 2020
b30807d
Added new Placeholders and updated dependencies.
suneettipirneni Mar 29, 2020
457f244
added %residentdisplaynames%
suneettipirneni Mar 29, 2020
0040813
separated upkeep tag and added "$" prefixes.
suneettipirneni Mar 29, 2020
a31ee56
fix tax formatting.
suneettipirneni Mar 29, 2020
41a6ea3
actually fix taxes this time.
suneettipirneni Mar 29, 2020
642dbca
Merge pull request #7 from TownyAdvanced/feature/new-placeholders
suneettipirneni Mar 29, 2020
41c5328
fix performance issues.
suneettipirneni Apr 7, 2020
aa29e02
Merge pull request #8 from TownyAdvanced/hotfix/performance
suneettipirneni Apr 7, 2020
5626fcd
Fix formatting for physical currencies.
suneettipirneni Apr 23, 2020
0ea798c
bump version number
suneettipirneni Apr 23, 2020
9f1ec96
Merge pull request #11 from TownyAdvanced/hotfix/formatting
suneettipirneni Apr 23, 2020
8829094
Dynamic Nation Colours (#4)
Goosius1 Apr 25, 2020
2dbb603
Feature: bank caching. (#12)
LlmDl Apr 25, 2020
eaa44e1
Fix calling on Towny for economy values when the economy might not be
LlmDl Apr 27, 2020
e9eacb2
Bump version to 0.80.
LlmDl Apr 27, 2020
10d948a
Update README.md
LlmDl May 17, 2020
78d347b
Fix townblock fetching for latest update.
suneettipirneni Jul 18, 2020
3262934
Merge pull request #13 from TownyAdvanced/hotfix/collection
suneettipirneni Jul 18, 2020
0167c31
Update pom.xml
LlmDl Jul 18, 2020
06b602a
fix versioning
suneettipirneni Jul 19, 2020
228697d
Merge pull request #14 from TownyAdvanced/hotfix/versioning
LlmDl Jul 20, 2020
87fdc66
0.82:
LlmDl Aug 23, 2020
36e0e95
0.83:
LlmDl Dec 17, 2020
acf713f
Use TC on jitpack instead of local dep.
LlmDl Jan 8, 2021
0256205
Only display the bank value is TownyEconomyHandler is active &
LlmDl Jan 15, 2021
dfa3f3d
Bump version number for release.
LlmDl Jan 15, 2021
9e13664
Bump Towny version.
LlmDl Jan 18, 2021
4e2d053
Improved town map colour retrieval
Mar 18, 2021
d778c6f
Fixed bug with version checking
Mar 18, 2021
76f810b
Town colour retrieval fixes
Mar 18, 2021
73eb2ea
Added event for building the town popup (#19)
Goosius1 Mar 18, 2021
81934e3
Merge pull request #18 from Goosius1/improve_town_mapcolour_retrieval
Goosius1 Mar 19, 2021
9827f1a
event fix
Mar 19, 2021
68d1ca4
Fix to fix
Mar 19, 2021
c86033d
Merge pull request #20 from Goosius1/fix_to_event
Goosius1 Mar 19, 2021
4ab1a49
bugfix for asynch event calling
Mar 19, 2021
a30807a
Merge pull request #21 from Goosius1/synch_bugfix
Goosius1 Mar 19, 2021
862a335
Add a new `ruined` flag (#22)
Warriorrrr Jun 26, 2021
d2ac795
Updated POM + Utilize new cache in Towny (#16)
darbyjack Jun 26, 2021
4aa723c
Display time left on ruined towns, alter their marker to be the warning
LlmDl Jun 26, 2021
fff2077
Choose the ruined icon earlier.
LlmDl Jun 26, 2021
c5819af
Successfully achieve what we were going for there.
LlmDl Jun 27, 2021
24393f5
Bump min. Towny Version to 0.97.0.0.
LlmDl Jul 24, 2021
17f8b08
Fix Dynmap-Towny generating errors when Towny is in SafeMode.
LlmDl Jul 24, 2021
7fbadaf
Add replaceable tags:
LlmDl Jul 24, 2021
afcadb8
Adds support for towns as well as nations having a map color. (#23)
LlmDl Jul 30, 2021
c8c1752
Add space between townname and townblocktype.
LlmDl Aug 1, 2021
94b39b2
Update a comment.
LlmDl Aug 1, 2021
e6c9e57
Added option to config town colour on/off
Aug 6, 2021
e8adfc6
Merge pull request #24 from Goosius1/add_dtcolour_config_option
Goosius1 Aug 6, 2021
0e6d8fc
Update for Towny 0.97.2.0 compat.
LlmDl Sep 25, 2021
11274e8
Shorten resident lists in infowindow.
LlmDl Nov 1, 2021
6d406c7
Fix scenario where a nationless town was never setting a border colour.
LlmDl Nov 13, 2021
1d18ab9
Fix TownBlockType colouring no longer applying when town or nation
LlmDl Nov 15, 2021
c181286
Merge pull request #25 from TownyAdvanced/hotfix/fix_townblocktype_co…
LlmDl Nov 15, 2021
c137a54
- Remove error message when a town has no homeblock set.
LlmDl May 7, 2022
d537e86
Update min. Towny version to 0.98.1.0
LlmDl May 7, 2022
c320753
Fix %residentdisplaynames% placeholder not using ", " in the list.
LlmDl Dec 27, 2022
dabe299
Merge pull request #27 from TownyAdvanced/fix/residentdisplaynames_pl…
LlmDl Dec 27, 2022
e3aea53
Add TownRenderEvent, update min Towny to 0.98.6.0. (#28)
LlmDl Feb 20, 2023
313131c
Change http dynmap repo to https
Warriorrrr Mar 9, 2023
c936a18
Merge pull request #29 from TownyAdvanced/fix/replace-http-repo
LlmDl Mar 9, 2023
8f46e40
Add TownSetMarkerIconEvent
galacticwarrior9 Apr 5, 2023
a07e71e
Merge pull request #30 from galacticwarrior9/add-marker-event
LlmDl Apr 5, 2023
53e9900
Update version number.
LlmDl Apr 5, 2023
9d347e2
Folia Support
Warriorrrr May 9, 2023
0c323d7
Merge pull request #31 from TownyAdvanced/feat/folia
LlmDl May 9, 2023
2e254c5
Update pom.xml
LlmDl May 9, 2023
7e5cad7
Merge pull request #32 from TownyAdvanced/LlmDl-patch-1
LlmDl May 9, 2023
56bb40f
0.95
LlmDl Aug 22, 2023
bc11847
Fix outposts being rendered on same world as town homeblocks.
LlmDl Sep 21, 2023
e56c893
Fix update period not being respected, and reduce chances log being
LlmDl Nov 2, 2023
41d39b7
Add noNationSlug to the Config, used when a town has no nation.
LlmDl Dec 20, 2023
384dfbc
Fix plugin.yml version not parsing properly.
LlmDl Dec 26, 2023
febf288
Refactor Dynmap-Towny. (#34)
LlmDl Jan 8, 2024
0dc1b87
Set up default goal so jabel ought to always be run.
LlmDl Jan 18, 2024
cdb18f1
Fix towns updates stopping after load. (#35)
LlmDl Jan 29, 2024
647e665
Fix towns not rendering. (#36)
LlmDl Feb 8, 2024
8d4e207
Update README.md (#37)
LlmDl Feb 8, 2024
29bf6b1
Change outpost to use formatted description (#38)
lexiccn Apr 7, 2024
872b83e
Translate most of the info window that isn't translated. (#39)
LlmDl May 2, 2024
4ca3af6
Add %conquered% placeholder which will output Enabled or Disabled. (#41)
LlmDl Aug 25, 2024
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
11 changes: 10 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@
/.classpath
/.project
/.settings
/.vscode

# Intellij
.idea
*.iml

#dependencies
/deps

# netbeans
/nbproject
Expand All @@ -22,4 +30,5 @@
/manifest.mf

# Mac filesystem dust
/.DS_Store
/.DS_Store
/Dynmap-Towny.iml
Empty file removed README
Empty file.
22 changes: 22 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# Dynmap-Towny

Dynmap-Towny provides a simple way to add visibility of Towny towns and nations on Dynmap's maps. The plugin depends on the presence of both Dynmap and Towny Advanced, and interacts directly with the Towny API. Updates to zones are automatically processed (on a settable period - default is once per 5 minutes (300 seconds)). By default, the plugin will be active after simply installing it (by unzipping the distribution into the plugins/ directory and restarting the server).

Towns of any shape are supported, and a proper outline border is computed and displayed that will encompass all the contiguous blocks of a given town (**limitation - 'holes' in the middle of a town may still be shaded to look like part of the town, this is a limitation of Dynmap itself.**). Outposts, including outposts on other worlds, are supported. Clicking on the town will display a popup with a configurable set of data on the town.

Dynmap-Towny will also show configurable icons for the home block of each town, including distinctive icons when the town is a capital of its country.

Display style, including the color and opacity of the outlines and fill, as well as icons used for home markers, can be tailored. This can be done at the global default level, the per-nation level, or the per town level. The Y coordinate (altitude) of the town outlines can also be set (default is 64 - standard sea level) - typically this would be done using 'custstyle', to set the value for each town needing to be adjusted individually.

Visibility of towns can be controlled via the 'visibleregions' and 'hiddenregions' settings. Besides listing the names of the towns to be made visible or hidden, entries with the format 'world:<worldname>' can be used to make all towns on a given world visible or hidden.

Also, the display of the town outlines can be restricted to a minimum zoom-in level, via the 'minzoom' setting. When non-zero, this setting causes the town outlines to only be displayed at or beyond the given zoom-in level.

## Plugin Configuration
After the first load, there will be a config.yml file in the plugins/Dynmap-Towny directory. Details of the default configuration, and all the provided settings, can be found [here](https://github.com/TownyAdvanced/Dynmap-Towny/wiki)

## Acknowledgements
This is a fork of [Dynmap-Towny](https://github.com/webbukkit/Dynmap-Towny).

LlmDl forked this from Hank Jordan who forked it from the original repo.

Binary file removed Towny-0.88.0.0.jar
Binary file not shown.
Binary file removed TownyChat-0.88.0.0.jar
Binary file not shown.
182 changes: 97 additions & 85 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -1,87 +1,99 @@
<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">
<modelVersion>4.0.0</modelVersion>
<groupId>org.dynmap</groupId>
<artifactId>Dynmap-Towny</artifactId>
<version>0.71</version>
<modelVersion>4.0.0</modelVersion>
<groupId>org.dynmap</groupId>
<artifactId>Dynmap-Towny</artifactId>
<version>1.1.2</version>

<build>
<resources>
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
<includes>
<include>*.yml</include>
<include>*.txt</include>
</includes>
</resource>
<resource>
<directory>src/main/resources</directory>
<filtering>false</filtering>
<excludes>
<exclude>*.yml</exclude>
<exclude>*.txt</exclude>
</excludes>
</resource>
</resources>

<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.0.2</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
</configuration>
</plugin>
</plugins>
</build>
<repositories>
<repository>
<releases>
</releases>
<snapshots>
</snapshots>
<id>bukkit-repo</id>
<url>http://repo.bukkit.org/content/repositories/releases/</url>
</repository>
<repository>
<releases>
</releases>
<snapshots>
</snapshots>
<id>dynmap-repo</id>
<url>http://repo.mikeprimm.com/</url>
</repository>
</repositories>

<dependencies>
<dependency>
<groupId>us.dynmap</groupId>
<artifactId>dynmap-api</artifactId>
<version>2.2</version>
</dependency>
<dependency>
<groupId>org.bukkit</groupId>
<artifactId>bukkit</artifactId>
<version>1.7.10-R0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.palmergames</groupId>
<artifactId>Towny</artifactId>
<version>0.88.0.0</version>
<scope>system</scope>
<systemPath>${project.basedir}/Towny-0.88.0.0.jar</systemPath>
</dependency>
<dependency>
<groupId>com.palmergames</groupId>
<artifactId>TownyChat</artifactId>
<version>0.88.0.0</version>
<scope>system</scope>
<systemPath>${project.basedir}/TownyChat-0.88.0.0.jar</systemPath>
</dependency>
</dependencies>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
</project>
<defaultGoal>clean package</defaultGoal>
<resources>
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
<includes>
<include>*.yml</include>
<include>*.txt</include>
</includes>
</resource>
<resource>
<directory>src/main/resources</directory>
<filtering>false</filtering>
<excludes>
<exclude>*.yml</exclude>
<exclude>*.txt</exclude>
</excludes>
</resource>
</resources>

<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.11.0</version>
<configuration>
<release>8</release>
<source>${java.version}</source>
<target>${java.version}</target>
<compilerArgs>
<arg>-Xplugin:jabel</arg>
</compilerArgs>
</configuration>
</plugin>
</plugins>
</build>
<repositories>
<repository>
<id>spigot-repo</id>
<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
</repository>
<repository>
<id>dynmap-repo</id>
<url>https://repo.mikeprimm.com/</url>
</repository>
<repository>
<id>glaremasters repo</id>
<url>https://repo.glaremasters.me/repository/towny/</url>
</repository>
<repository>
<id>jitpack.io</id>
<url>https://jitpack.io</url>
</repository>
</repositories>

<dependencies>
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId>
<version>1.16.5-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>us.dynmap</groupId>
<artifactId>dynmap-api</artifactId>
<version>2.5</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.palmergames.bukkit.towny</groupId>
<artifactId>towny</artifactId>
<version>0.100.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.github.TownyAdvanced</groupId>
<artifactId>TownyChat</artifactId>
<version>0.90</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.github.bsideup.jabel</groupId>
<artifactId>jabel-javac-plugin</artifactId>
<version>1.0.0</version>
<scope>provided</scope>
</dependency>
</dependencies>
<properties>
<java.version>17</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
</project>
Loading