Skip to content

Some minor internal code updates. UPD: A lot of changes. #68

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

Open
SimSonic wants to merge 44 commits into
base: master
Choose a base branch
from
Open

Some minor internal code updates. UPD: A lot of changes. #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
4620d2f
0.8.1b updated.
Melonking906 Jan 16, 2015
41c9700
Names now update.
Melonking906 Feb 5, 2015
28f6713
Code update
SimSonic Mar 9, 2015
8c803af
Code update
SimSonic Mar 25, 2015
47f93ca
Merge pull request #2 from Nonnisi/master
SimSonic Mar 25, 2015
e86e161
Merge remote-tracking branch 'origin/master' into nick
SimSonic Mar 25, 2015
85b1efc
Resolve merge errors
SimSonic Mar 25, 2015
4da6fba
Move resources.
SimSonic Mar 25, 2015
df967e1
Merge pull request #3 from VoxileRu/nick
SimSonic Mar 25, 2015
f239294
Package renamed.
SimSonic Mar 26, 2015
ecc2655
Completely removed MongoDB support
SimSonic Mar 27, 2015
d015efe
Reformat the most part of code
SimSonic Mar 27, 2015
6513f91
Minor changes
SimSonic Mar 27, 2015
dd2d3ee
I've found problems with Multiverse that it is looking for old class …
SimSonic Mar 30, 2015
c8fd00e
Revert main class name, change plugin name via new property ${project…
SimSonic Mar 30, 2015
f95d472
Rearrange classes
SimSonic Apr 6, 2015
7e1c4dc
A lot of little improvements.
SimSonic Apr 6, 2015
5e309cc
Let it be the final 0.8.4 version.
SimSonic Apr 6, 2015
90a676e
Add new class Settings to work with config.yml.
SimSonic May 17, 2015
9b3a6d9
(BROKEN) From this commit I start big rewrite of database connections…
SimSonic May 17, 2015
dce5da1
Rewrite in progress.
SimSonic May 18, 2015
3f2d50c
All commands are working again.
SimSonic May 18, 2015
13fbbdc
Account.setName() is working good.
SimSonic May 18, 2015
a7243e0
MySQL saving use parallel task.
SimSonic May 18, 2015
019c317
Added command /fe migrate <database type>.
SimSonic May 19, 2015
ce7b1c1
Use LinkedBlockingQueue instead of ConcurrentLinkedQueue.
SimSonic May 20, 2015
bc5d766
Add /fe debug command to toggle a lot of debugging info in console.
SimSonic May 20, 2015
3291c41
Split Account class into Account interface and AccountInt implementat…
SimSonic May 20, 2015
e29dcce
Add new option for mysql database: maximum-consistency.
SimSonic May 20, 2015
48cebe0
maximum-consistency option is working completely.
SimSonic May 20, 2015
c432656
Fix plugin.yml
SimSonic May 20, 2015
60aafa5
Added URL to build server
SimSonic May 20, 2015
3e84df9
Add `id` PRIMARY KEY column for accounts table.
SimSonic May 21, 2015
1a700f0
Format pom.xml
SimSonic May 29, 2015
9e9a397
Completely remove UUIDFetcher.
SimSonic Jul 13, 2015
e97fdb3
Fix errorneous method name.
SimSonic Jul 13, 2015
4e42ff6
0.9.2
SimSonic Jul 13, 2015
8d32ca7
Fix money dupe.
SimSonic Jul 16, 2015
e0f3f3a
Fix null when NameChange and getAccount.
ryush00 Jul 30, 2015
9784782
.gitignore
SimSonic Mar 23, 2016
4bada66
Build against 1.9
bhwz Mar 30, 2016
7a300cb
Update dependencies.
lifehome Jun 15, 2016
99dd3ba
Fixed MySQL null username issue.
lifehome Jun 15, 2016
722e089
Merge branch 'master' into Branch_99dd3baa8692bc958cb0b0d213b4bcb4849…
SimSonic Jun 30, 2016
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
20 changes: 10 additions & 10 deletions .gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@
*.dbproj merge=union

# Standard to msysgit
*.doc diff=astextplain
*.DOC diff=astextplain
*.docx diff=astextplain
*.DOCX diff=astextplain
*.dot diff=astextplain
*.DOT diff=astextplain
*.pdf diff=astextplain
*.PDF diff=astextplain
*.rtf diff=astextplain
*.RTF diff=astextplain
*.doc diff=astextplain
*.DOC diff=astextplain
*.docx diff=astextplain
*.DOCX diff=astextplain
*.dot diff=astextplain
*.DOT diff=astextplain
*.pdf diff=astextplain
*.PDF diff=astextplain
*.rtf diff=astextplain
*.RTF diff=astextplain
88 changes: 67 additions & 21 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,34 +1,80 @@
# Eclipse
/.classpath
/.project
/.settings
# Subversion
.svn

# Netbeans
/nbproject
## IDEs ##

# Android Studio
*.apk
*.ap_
*.dex
bin/
gen/
out/
.navigation/
proguard/
/local.properties
/captures

# IntelliJ
*.iml
*.ipr
*.iws
.idea/

# Netbeans IDE
nbproject/
nbactions.xml

# Eclipse stuff
.classpath
.project
.settings/

# vim
.*.sw[a-p]

## Build systems ##

# Mobile Tools for Java (J2ME)
.mtj.tmp/

# We use maven!
/build.xml
build.xml

# Maven
/target
dependency-reduced-pom.xml
target/

# Vim
.*.sw[a-p]
# Gradle
!gradle-wrapper.jar
.gradle
build/
gradle-app.setting
.gradletasknamecache

# Package Files
*.jar
*.war
*.ear

# Various other potential build files
/build
/bin
/dist
/manifest.mf
*.class
build/
bin/
dist/
manifest.mf

/world
## Other files ##

# Mac filesystem dust
.DS_Store
.DS_Store/

# IntelliJ
*.iml
*.ipr
*.iws
.idea/
# Logs
*.log*
hs_err_pid*

# Keystore files
*.jks

# delombok
*/src/main/lombok
4 changes: 3 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
Fe, the simple economy plugin
=============

Welcome to the GitHub repository for Fe! If you'd like to contribute code, you can make a pull request.
Welcome to the GitHub repository for Fe! If you'd like to contribute code, you can make a pull request.

Currently, build server for this fork is based here: https://ci.methuselah.ru/job/Fe-economy
24 changes: 0 additions & 24 deletions config.yml
View file
Open in desktop

This file was deleted.

191 changes: 104 additions & 87 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,90 +1,107 @@
<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>com.niccholaspage.Fe</groupId>
<artifactId>Fe</artifactId>
<version>0.8-SNAPSHOT</version>
<name>Fe</name>
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>com.niccholaspage</groupId>
<artifactId>Fe</artifactId>
<version>0.9.3</version>
<name>Fe</name>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.bukkitpluginname>Fe</project.bukkitpluginname>
</properties>

<repositories>
<repository>
<id>bukkit-repo</id>
<url>http://repo.bukkit.org/content/groups/public/</url>
</repository>
<repository>
<id>vault-repo</id>
<url>http://nexus.theyeticave.net/content/repositories/pub_releases</url>
</repository>
</repositories>
<repositories>
<repository>
<id>spigot-repo</id>
<url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
</repository>
<repository>
<id>vault-repo</id>
<url>http://nexus.theyeticave.net/content/repositories/pub_releases/</url>
</repository>
<repository>
<id>metrics-repo</id>
<url>http://repo.mcstats.org/content/repositories/public/</url>
</repository>
</repositories>

<dependencies>
<dependency>
<groupId>org.bukkit</groupId>
<artifactId>bukkit</artifactId>
<version>1.7.9-R0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.milkbowl.vault</groupId>
<artifactId>VaultAPI</artifactId>
<version>1.4</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.mongodb</groupId>
<artifactId>mongo-java-driver</artifactId>
<version>2.10.1</version>
</dependency>
</dependencies>
<build>
<defaultGoal>clean package install</defaultGoal>
<finalName>${project.name}</finalName>
<sourceDirectory>${basedir}/src</sourceDirectory>
<resources>
<resource>
<targetPath>.</targetPath>
<filtering>true</filtering>
<directory>${basedir}</directory>
<includes>
<include>*.yml</include>
</includes>
</resource>
</resources>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>2.1</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<minimizeJar>true</minimizeJar>
<artifactSet>
<includes>
<include>org.mongodb:mongo-java-driver</include>
</includes>
</artifactSet>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
<dependencies>
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId>
<version>1.10-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.milkbowl.vault</groupId>
<artifactId>VaultAPI</artifactId>
<version>1.6</version>
<type>jar</type>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mcstats.bukkit</groupId>
<artifactId>metrics</artifactId>
<version>R8-SNAPSHOT</version>
</dependency>
</dependencies>

<build>
<finalName>${project.name}_v${project.version}</finalName>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.3</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
<encoding>${project.build.sourceEncoding}</encoding>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.6</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>2.3</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<minimizeJar>true</minimizeJar>
<artifactSet>
<includes>
<include>org.mcstats.bukkit:metrics</include>
</includes>
</artifactSet>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>2.7</version>
<configuration>
<encoding>${project.build.sourceEncoding}</encoding>
</configuration>
</plugin>
</plugins>
<resources>
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
<includes>
<include>*.yml</include>
</includes>
</resource>
</resources>
</build>
</project>
16 changes: 16 additions & 0 deletions src/main/java/com/niccholaspage/Fe/API/Account.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
package com.niccholaspage.Fe.API;

import java.util.UUID;

public interface Account extends Comparable<Account>
{
public UUID getUUID();
public String getName();
public void setName(String name);
public double getMoney();
public void setMoney(double money);
public boolean has(double amount);
public boolean canReceive(double amount);
public void deposit(double amount);
public void withdraw(double amount);
}
8 changes: 8 additions & 0 deletions src/main/java/com/niccholaspage/Fe/API/CommandType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
package com.niccholaspage.Fe.API;

public enum CommandType
{
CONSOLE,
PLAYER,
CONSOLE_WITH_ARGUMENTS
}
Loading