Skip to content

2.6.0 json cleanup #146

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

Closed
BoyStijn wants to merge 54 commits into from
Closed

2.6.0 json cleanup #146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
042d9be
Re-org classes by usage
KillerOfPie May 25, 2022
cb9704b
Re-org classes by usage + Missed package-info
KillerOfPie May 25, 2022
8f652a8
Separation of CommandRunner.java and DRY'd Shop item methods
KillerOfPie May 25, 2022
365f18a
DRY'd Shop User methods
KillerOfPie May 26, 2022
22ffe94
DRY'd Shop Constructors
KillerOfPie May 26, 2022
ecdd474
Fix for #128
KillerOfPie May 26, 2022
f56b727
Implementation of #129
KillerOfPie May 26, 2022
4da7e23
Removed depreciated UNSUCCESSFUL_SHOP_MEMBERS Message
KillerOfPie May 26, 2022
98ea923
Fix for #130
KillerOfPie May 27, 2022
fcc07c4
Feature add for #131
KillerOfPie May 27, 2022
38f3029
Feature Improvement for #132
KillerOfPie May 28, 2022
7e72192
Bug Fix for #134
KillerOfPie May 28, 2022
37f8891
Feature Add and Bug Fixes
KillerOfPie Jun 13, 2022
b4d1b8f
Bug Fixes
KillerOfPie Jun 13, 2022
9bb4c56
Permission improvements
KillerOfPie Jun 13, 2022
a6ca2f1
Bug Fix
KillerOfPie Jun 13, 2022
c322060
Bug Fix and Improvements
KillerOfPie Jun 13, 2022
aae215a
Bug Fix and Improvements
KillerOfPie Jun 13, 2022
2cfd3aa
Bug Fix
KillerOfPie Jun 14, 2022
2322fea
Mapped Setting Improvements
KillerOfPie Jun 15, 2022
28f2c1b
Per Shop Setting and necessary bug fixes
KillerOfPie Jun 23, 2022
3ea9ed0
Bug Fix
KillerOfPie Jun 23, 2022
9233527
Bug Fixes
KillerOfPie Jun 27, 2022
0007305
Fix midding static handler method
SparklingComet Jul 3, 2022
c3e9354
Add PlayerShopChangeEvent#getChange()
SparklingComet Jul 4, 2022
c8ab1e6
Pom.xml and plugin.yml changes
KillerOfPie Jul 4, 2022
9d9c53a
Merge remote-tracking branch 'origin/2.6.0' into 2.6.0
KillerOfPie Jul 4, 2022
0efd2cb
Bug Fixes
KillerOfPie Jul 4, 2022
4fdb758
Bug Fixes & POM Updates
KillerOfPie Jul 4, 2022
b72aa79
Bug Fixes & POM Updates
KillerOfPie Jul 4, 2022
af0f30f
Additional Debug
KillerOfPie Jul 4, 2022
53c1691
Bug Fix & Command Improvement
KillerOfPie Jul 4, 2022
dd87cda
Bug Fix
KillerOfPie Jul 5, 2022
bad3fc6
Small reformat of lang file
KillerOfPie Jul 9, 2022
fa9eb18
Implement Relative Directions for Chest checking
KillerOfPie Aug 4, 2022
5097fe5
Requested Changes + missed lang update
KillerOfPie Aug 5, 2022
ac6f563
Catching up non SQL code from SQL branch 1/?
KillerOfPie Nov 25, 2022
98b7d88
Catching up non SQL code from SQL branch 1/?
KillerOfPie Nov 25, 2022
2e74d3a
trivial optimization/refactoring of JsonShopConfiguration
SparklingComet Jul 5, 2022
5b66697
Catching up non SQL code from SQL branch 1/?
KillerOfPie Jul 5, 2022
33dd8ba
Minor Changes
KillerOfPie Jul 7, 2022
adac565
Removal of un-needed legacy data fixes
KillerOfPie Jul 7, 2022
e5fe3d2
Catching up non SQL code from SQL branch 1/?
KillerOfPie Jul 8, 2022
15d88bc
Catching up non SQL code from SQL branch 1/?
KillerOfPie Nov 25, 2022
d828ca9
Catching up non SQL code from SQL branch 1/?
KillerOfPie Nov 25, 2022
1086eac
Fix for iTrades showing as full
KillerOfPie Nov 25, 2022
1dbc79c
Fixes for #145
KillerOfPie Nov 25, 2022
450676f
Fixes for #145
KillerOfPie Nov 25, 2022
af98af8
Dependency updates
KillerOfPie Nov 25, 2022
3929ffc
Dependency updates
KillerOfPie Nov 25, 2022
e4480d2
Fix for iTrade shops claiming to be full during trades + Spelling
KillerOfPie Nov 25, 2022
f194ea5
Fix for #143
KillerOfPie Nov 26, 2022
c14d12a
Fix for #143
KillerOfPie Nov 26, 2022
6d32b2b
Removed unused (de)serialization methodes
BoyStijn Nov 26, 2022
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
81 changes: 57 additions & 24 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@

<groupId>org.shanerx</groupId>
<artifactId>tradeshop</artifactId>
<version>2.5.1-STABLE</version>
<version>2.6.0-DEV</version>
<packaging>jar</packaging>
<name>TradeShop</name>
<url>https://tradeshop.github.io/</url>
Expand All @@ -73,44 +73,68 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.build.timestamp.format>yyyy-MM-dd'T'HH.mm.ss</maven.build.timestamp.format>
<timestamp>${maven.build.timestamp}</timestamp>
<builddate/> <!-- default value for non-DEV build -->
<pluginDir>org/shanerx/tradeshop</pluginDir>
<resourceDir>src/main/resources</resourceDir>

<!-- Profile variables -->
<expirationFile/> <!-- default value for non-DEV build -->
<doClean/> <!-- default value for clean build -->
<skipDocs/> <!-- default value for clean build -->

<!-- Changeable variables -->
<outputDir>target/output-files
</outputDir> <!-- Set to relative directory output of PreShade and JavaDoc files -->

</properties>

<profiles>
<profile>
<id>expiration</id> <!-- additional profile for DEV build -->
<properties>
<builddate>builddate.yml</builddate>
<expirationFile>builddate.yml</expirationFile>
</properties>
</profile>
<profile>
<id>clean</id> <!-- additional profile for a Clean build -->
<properties>
<doClean>clean</doClean>
</properties>
</profile>
<profile>
<id>skipDocs</id> <!-- additional profile for a Clean build -->
<properties>
<skipDocs>true</skipDocs>
</properties>
</profile>
</profiles>

<build>
<defaultGoal>install</defaultGoal>
<finalName>${project.artifactId}-${project.version}-${maven.build.timestamp}</finalName>
<defaultGoal>${doClean} install</defaultGoal>
<finalName>${project.name}-${project.version}-${maven.build.timestamp}</finalName>

<sourceDirectory>src/main/java</sourceDirectory>
<resources>
<resource>
<targetPath>.</targetPath>
<filtering>true</filtering>
<directory>${basedir}/src/main/resources/</directory>
<directory>${basedir}/${resourceDir}</directory>
<includes>
<include>plugin.yml</include>
<include>${builddate}</include>
<include>${expirationFile}</include>
</includes>
</resource>
<resource>
<targetPath>./Lang</targetPath>
<filtering>false</filtering>
<directory>${basedir}/src/main/resources/Lang</directory>
<directory>${basedir}/${resourceDir}/Lang</directory>
</resource>
</resources>

<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.0</version>
<version>3.8.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
Expand All @@ -119,25 +143,34 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.1.0</version>
<version>3.3.0</version>
<configuration>
<outputDirectory>${outputDir}/PreShade</outputDirectory>
<createDependencyReducedPom>false</createDependencyReducedPom>
<artifactSet>
<includes>
<include>org.bstats:*</include>
<pattern>de.themoep:*</pattern>
<include>de.themoep:*</include>
</includes>
</artifactSet>
<relocations>
<relocation>
<pattern>org.bstats</pattern>
<shadedPattern>org.shanerx.tradeshop</shadedPattern>
<shadedPattern>${project.groupId}.${project.artifactId}.bstats</shadedPattern>
</relocation>
<relocation>
<pattern>de.themoep</pattern>
<shadedPattern>io.github.apfelcreme.Pipes.libs</shadedPattern>
<shadedPattern>${project.groupId}.${project.artifactId}</shadedPattern>
</relocation>
</relocations>
<filters>
<filter>
<artifact>*:*</artifact>
<excludes>
<exclude>META-INF/maven/**</exclude>
</excludes>
</filter>
</filters>
</configuration>
<executions>
<execution>
Expand All @@ -151,17 +184,18 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.3.1</version>
<version>3.4.0</version>
<configuration>
<failOnError>false</failOnError>
<jarOutputDirectory>${outputDir}/JavaDocs</jarOutputDirectory>
<!--suppress UnresolvedMavenProperty -->
<skip>${skip_docs}</skip>
<skip>${skipDocs}</skip>
<sourceFileExcludes>
<exclude>org/shanerx/tradeshop/TradeShop.java</exclude>
<exclude>org/shanerx/tradeshop/commands/**</exclude>
<exclude>org/shanerx/tradeshop/listeners/**</exclude>
<exclude>org/shanerx/tradeshop/utils/Updater.java</exclude>
<exclude>org/shanerx/tradeshop/utils/BukkitVersion.java</exclude>
<exclude>${pluginDir}/TradeShop.java</exclude>
<exclude>${pluginDir}/commands/**</exclude>
<exclude>${pluginDir}/shop/listeners/**</exclude>
<exclude>${pluginDir}/utils/versionmanagement/**</exclude>
<exclude>${pluginDir}/player/JoinEventListener.java</exclude>
</sourceFileExcludes>
</configuration>
<executions>
Expand Down Expand Up @@ -197,7 +231,7 @@
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId>
<version>1.18.1-R0.1-SNAPSHOT</version>
<version>1.19.2-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>

Expand All @@ -211,15 +245,14 @@
<dependency>
<groupId>de.themoep</groupId>
<artifactId>inventorygui</artifactId>
<!--The following version may not be the latest. Check it before using.-->
<version>1.4.2-SNAPSHOT</version>
<version>1.6-SNAPSHOT</version>
<scope>compile</scope>
</dependency>

<dependency>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.3.2</version>
<version>3.4.1</version>
<type>maven-plugin</type>
</dependency>
</dependencies>
Expand Down
51 changes: 23 additions & 28 deletions src/main/java/org/shanerx/tradeshop/TradeShop.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,25 +30,26 @@
import org.bukkit.plugin.java.JavaPlugin;
import org.shanerx.tradeshop.commands.CommandCaller;
import org.shanerx.tradeshop.commands.CommandTabCaller;
import org.shanerx.tradeshop.enumys.DebugLevels;
import org.shanerx.tradeshop.enumys.ShopSign;
import org.shanerx.tradeshop.enumys.ShopStorage;
import org.shanerx.tradeshop.listeners.JoinEventListener;
import org.shanerx.tradeshop.listeners.ShopCreateListener;
import org.shanerx.tradeshop.listeners.ShopProtectionListener;
import org.shanerx.tradeshop.listeners.ShopRestockListener;
import org.shanerx.tradeshop.listeners.ShopTradeListener;
import org.shanerx.tradeshop.objects.Debug;
import org.shanerx.tradeshop.objects.ListManager;
import org.shanerx.tradeshop.utils.BukkitVersion;
import org.shanerx.tradeshop.utils.Expirer;
import org.shanerx.tradeshop.data.config.ConfigManager;
import org.shanerx.tradeshop.data.config.Language;
import org.shanerx.tradeshop.data.config.Setting;
import org.shanerx.tradeshop.data.storage.DataStorage;
import org.shanerx.tradeshop.data.storage.DataType;
import org.shanerx.tradeshop.player.JoinEventListener;
import org.shanerx.tradeshop.player.Permissions;
import org.shanerx.tradeshop.shop.ShopSign;
import org.shanerx.tradeshop.shop.ShopStorage;
import org.shanerx.tradeshop.shop.listeners.ShopCreateListener;
import org.shanerx.tradeshop.shop.listeners.ShopProtectionListener;
import org.shanerx.tradeshop.shop.listeners.ShopRestockListener;
import org.shanerx.tradeshop.shop.listeners.ShopTradeListener;
import org.shanerx.tradeshop.utils.ListManager;
import org.shanerx.tradeshop.utils.MetricsManager;
import org.shanerx.tradeshop.utils.Updater;
import org.shanerx.tradeshop.utils.config.ConfigManager;
import org.shanerx.tradeshop.utils.config.Language;
import org.shanerx.tradeshop.utils.config.Setting;
import org.shanerx.tradeshop.utils.data.DataStorage;
import org.shanerx.tradeshop.utils.data.DataType;
import org.shanerx.tradeshop.utils.debug.Debug;
import org.shanerx.tradeshop.utils.debug.DebugLevels;
import org.shanerx.tradeshop.utils.versionmanagement.BukkitVersion;
import org.shanerx.tradeshop.utils.versionmanagement.Expirer;
import org.shanerx.tradeshop.utils.versionmanagement.Updater;

public class TradeShop extends JavaPlugin {

Expand All @@ -58,8 +59,6 @@ public class TradeShop extends JavaPlugin {
private final NamespacedKey signKey = new NamespacedKey(this, "tradeshop-sign-data");

private MetricsManager metricsManager;

private boolean useInternalPerms = false;
private boolean skipHopperProtection = false;

private ListManager lists;
Expand Down Expand Up @@ -101,8 +100,12 @@ public void onEnable() {
getSettingManager().reload();
getMessageManager().reload();

getSettingManager().updateSkipHoppers();

getDebugger();

Permissions.registerPermissions();

if (getDataStorage() == null)
return;

Expand Down Expand Up @@ -138,14 +141,6 @@ public void onDisable() {
getListManager().clearManager();
}

public boolean useInternalPerms() {
return useInternalPerms;
}

public void setUseInternalPerms(boolean useInternalPerms) {
this.useInternalPerms = useInternalPerms;
}

public boolean doSkipHopperProtection() {
return skipHopperProtection;
}
Expand Down
Loading