Merge branch 'release/0.2.2-develop'

.github/workflows/maven.yml

@@ -0,0 +1,39 @@
+# This workflow will build a Java project with Maven
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
+
+name: Java CI with Maven
+
+on:
+  push:
+    branches: [ develop ]
+  pull_request:
+    branches: [ develop ]
+  release:
+    types: [created]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Cache local Maven repository
+      uses: actions/cache@v2
+      with:
+        path: ~/.m2/repository
+        key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+        restore-keys: |
+          ${{ runner.os }}-maven-
+    - name: Set up JDK 1.8
+      uses: actions/setup-java@v1
+      with:
+        java-version: 1.8
+    - name: Build with Maven
+      run: mvn -B package --file pom.xml
+    - name: develop-build-release
+      uses: fnkr/github-action-ghr@v1
+      if: startsWith(github.ref, 'refs/tags/')
+      env:
+        GHR_PATH: target/ModularMSMF.jar
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -1,85 +1,11 @@
-# Compiled class file
-*.class
-
-# Log file
-*.log
-
-# BlueJ files
-*.ctxt
-
-# Mobile Tools for Java (J2ME)
-.mtj.tmp/
-
-# Package Files #
-*.jar
-*.war
-*.nar
-*.ear
-*.zip
-*.tar.gz
-*.rar
-
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-hs_err_pid*
+.vscode/*
+!.vscode/launch.json
+testserver/*
+!testserver/start.bat
+!testserver/start.sh
+!testserver/README.md
 /bin/
-/MMSMF_Build/
-*.stackdump
-.classpath
-.project
-*.prefs
-
-.metadata
-bin/
-tmp/
-*.tmp
-*.bak
-*.swp
-*~.nib
-local.properties
-.settings/
-.loadpath
-.recommenders
-
-# External tool builders
-.externalToolBuilders/
-
-# Locally stored "Eclipse launch configurations"
-*.launch
-
-# PyDev specific (Python IDE for Eclipse)
-*.pydevproject
-
-# CDT-specific (C/C++ Development Tooling)
-.cproject
-
-# CDT- autotools
-.autotools
-
-# Java annotation processor (APT)
-.factorypath
-
-# PDT-specific (PHP Development Tools)
-.buildpath
-
-# sbteclipse plugin
-.target
-
-# Tern plugin
-.tern-project
-
-# TeXlipse plugin
-.texlipse
-
-# STS (Spring Tool Suite)
-.springBeans
-
-# Code Recommenders
-.recommenders/
-
-# Annotation Processing
-.apt_generated/
-
-# Scala IDE specific (Scala & Java development for Eclipse)
-.cache-main
-.scala_dependencies
-.worksheet
+/target/
+/.project
+/.settings/
+.classpath

.gitpod.yml

@@ -0,0 +1,4 @@
+image: gitpod/workspace-full
+
+tasks:
+  - init: mvn package

.vscode/launch.json

@@ -0,0 +1,16 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "java",
+            "name": "Debug (Attach)",
+            "projectName": "ModularMSMF",
+            "request": "attach",
+            "hostName": "localhost",
+            "port": 5005
+        }
+    ]
+}

README.MD

@@ -1,3 +1,7 @@
+[![Java CI with Maven](https://github.com/davidmc971/ModularMSMF/actions/workflows/maven.yml/badge.svg?branch=develop)](https://github.com/davidmc971/ModularMSMF/actions/workflows/maven.yml)
+
+OUTDATED GUIDE! Since we switched to maven, this guide will be updated.
+
 You need to have the following installed (when using Windows):
 
 	Java Development Kit (JDK) (at least Java 8)

src/Todo.txt → Todo.txt

@@ -1,6 +1,6 @@
 COMMANDS:
 	REPORT:
-		DESCRIPTION:
+		DESCRIPTION: (TODO: 0%)
 			/report <category> <args>
 			categories: player, bug, other
 			/report player <playername> <reason>
@@ -9,53 +9,60 @@ COMMANDS:
 		PROGRESS:
 			structure updated, needs work
 	BAN:
-		PROGRESS: 
+		PROGRESS: (65%)
 			- console can ban (w/o permission)
 			- can ban player on+offline (with permission)
+			- TODO: banip not implemented yet
 	FEED:
 		PROGRESS: (100%)
 			- can feed yourself (with permission)
 			- can feed other users (with permission)
 			- cannot feed console (only player can be feeded)
 			- console can feed everyone but not itself (w/o permissions)
 	HEAL:
-		PROGRESS:
-
+		PROGRESS: (100%)
+			- can heal a player
+			- healing yourself
 	KICK:
-		PROGRESS:
-
+		PROGRESS: (100%)
+			- can kick a player
+			- even with or without reason
+			- broadcasting it worldwide on server
 	LAND:
 		PROGRESS:
-			 
+
 	MMSMF:
-		PROGRESS:
-
+		PROGRESS: (5%)
+			- TODO: missing many functions, have to be added			
 	TELEPORT:
-		PROGRESS:
-
+		PROGRESS: (15%)
+			- can teleport players
 	UNBAN:
-		PROGRESS:
-
+		PROGRESS: (65%)
+			- same as BAN
 	ECO:
 		PROGRESS:
+			- nothing really happened earlier, so fixing commands
 
 	MONEY:
-		PROGRESS:
+		PROGRESS: (same as ECO)
 
 	HOME: 
-		PROGRESS:
+		PROGRESS: (?%)
+			- only displaying messages and permissions has been set
+			- no playerdata atm
 
-	MUTE / UNMUTE:
-		PROGRESS:
+	MUTE / UNMUTE: 
+		PROGRESS: (?%)
 
-	WORTH:
-		PROGRESS:
+	WORTH: 
+		PROGRESS: (?%)
 
 	GETSERVER:
-		PROGRESS:
+		PROGRESS: (?%)
 
 	MOTD:
-		PROGRESS:
+		PROGRESS: (?%)
 
 
 
@@ -67,11 +74,13 @@ Ideas:
 			might convert "languages.*" into seperate files to create which can be accessed outside which the user can edit to its own?
 			like we dont need this anymore, creating a basic file which the user can edit at it's own will? option should be switchable
 			in the console or as player in it's OP-state. like "/changelang"?
+			TODO: Changing language for each player?
+			TODO: /language set//get
 
 		Debugging-Info:
 			like "/debug" which only the real dev's can see? all information should be displayed for console and for ingame real dev's.
 			if anyone's getting trouble using our plugin so they can contact us via ingame chat using "/devhelp <message>" which could
-			create a file or sending a message to our discord server trought a bot?
+			create a file or sending a message to our discord server throught a bot?
 
 		LannguageManager.java:
 			Adding client-side language setting? hard to code, but possible anyways. server should look up where's the user's coming from
@@ -86,7 +95,7 @@ Lightkeks:
 			* TODO Implementing changeLocHome (sethome)
 			* TODO Implementing changeLocHomeOtherPlayer (sethome)
 		All cmds:
-			* TODO adjusting all permissions and all language-linkings in all cmds
+			* TODO adjusting all permissions and all language-linkings in all cmds (still working on it)
 
 davidmc971:
 	Command structure:
@@ -95,16 +104,23 @@ davidmc971:
 			TODO: at the moment it has to be in plugin.yml to be executable, could be automated
 
 	System of interfacing with players and console:
-		LanguageManager
-		ChatUtils
+		LanguageManager [Still TODO:]
+		ChatUtils [Still TODO:]
 
 	Internal data management:
 		DataManager
 			-> switch mostly from yml to json, but still keep support
-		YamlManager [deprecated?]
-		JsonManager [TODO]
-		PermissionManager [TODO]
-		Statistics [what exactly?]
+		PermissionManager [TODO:]
 
 	General utilities:
-		Utils
+		Utils
+	Lightkeks:
+		Interface für Einteilung zw. Spigot, Bukkit und Forge und dass wir die Daten auf gleiche Art und Weise bekommen können
+		Feature: Annotation wie Forge only/Spigot only/Bukkit only
+	Lightkeks:
+		settings.yml mit Währungseinstellung
+		loading currency while set in settings.yml like $ or €
+	Lightkeks:
+		Filtering bad words? Wäre eine sehr gute Idee für alle die, die nicht unbedingt beleidigungen oder böse wörter im chat haben wollen.
+	Lightkeks:
+		Verwarnsystem? Textchat-farbe des jenigen ändert sich auf gelb wenn einmal verwarnt, beim zweiten mal rot und beim dritten mal fliegt die person?

pkg.sh

@@ -0,0 +1 @@
+git pull && mvn package && yes | cp target/ModularMSMF.jar testserver/plugins/