Skip to content

Commit

Permalink
Merge pull request #10 from DmitryRendov/master
Browse files Browse the repository at this point in the history
 Plugin refactoring to Maven, remove legacy stuff
  • Loading branch information
DenAbr authored Sep 2, 2018
2 parents a09c1d0 + dfd9381 commit 0eb46a7
Show file tree
Hide file tree
Showing 54 changed files with 863 additions and 134 deletions.
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,6 @@
/.project
/build.xml

/.classpath
/.classpath
/target
/.idea
Binary file removed ChatGuard.jar
Binary file not shown.
674 changes: 674 additions & 0 deletions LICENSE

Large diffs are not rendered by default.

Binary file removed libs/AuthMe-2.5.jar
Binary file not shown.
Binary file removed libs/AuthMe-3.4.jar
Binary file not shown.
Binary file removed libs/AuthMe-5.0-beta3.jar
Binary file not shown.
Binary file removed libs/NoCheatPlus 3.16.0-RC-sMD5NET-b1134.jar
Binary file not shown.
Binary file removed libs/ProtocolLib-3.6.4.jar
Binary file not shown.
Binary file removed libs/bukkit-1.5.2-R1.1-20130701.165003-5.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion src/plugin.yml → plugin.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: ChatGuard
main: ru.Den_Abr.ChatGuard.ChatGuardPlugin
version: 7.5.5
version: 7.6.0
author: Den_Abr
description: Guard for your chat
softdepend: [ProtocolLib, AuthMe, NoCheatPlus]
Expand Down
113 changes: 113 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,113 @@
<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>ru.Den_Abr.ChatGuard</groupId>
<artifactId>ChatGuardPlugin</artifactId>
<version>7.6.0</version>
<packaging>jar</packaging>
<name>ChatGuardPlugin</name>
<description>Guard for your chat.</description>
<url>https://github.com/DenAbr/ChatGuard</url>

<properties>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
</properties>

<dependencies>
<dependency>
<groupId>org.bukkit</groupId>
<artifactId>bukkit</artifactId>
<version>1.13-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>fr.xephi</groupId>
<artifactId>authme</artifactId>
<version>5.4.0</version>
</dependency>
<dependency>
<groupId>fr.neatmonster</groupId>
<artifactId>nocheatplus</artifactId>
<version>3.16.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.comphenix.protocol</groupId>
<artifactId>ProtocolLib</artifactId>
<version>4.2.1</version>
</dependency>
<dependency>
<groupId>com.comphenix.protocol</groupId>
<artifactId>ProtocolLib-API</artifactId>
<version>4.2.1</version>
</dependency>
</dependencies>

<repositories>
<!-- Spigot -->
<repository>
<id>spigot-repo</id>
<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
</repository>
<repository>
<id>spigot</id>
<url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
</repository>
<repository>
<id>codemc-repo</id>
<url>http://repo.codemc.org/repository/maven-public/</url>
</repository>
<repository>
<id>md_5-snapshots</id>
<url>https://repo.md-5.net/content/repositories/snapshots/</url>
</repository>
<repository>
<id>md_5-releases</id>
<url>https://repo.md-5.net/content/repositories/releases/</url>
</repository>
<repository>
<id>dmulloy2-repo</id>
<url>http://repo.dmulloy2.net/nexus/repository/public/</url>
</repository>
<repository>
<id>drtshock-repo</id>
<url>http://ci.drtshock.net/plugin/repository/everything/</url>
</repository>
</repositories>

<build>
<defaultGoal>clean package</defaultGoal>
<finalName>${project.name}${project.version}</finalName>
<sourceDirectory>${basedir}/src</sourceDirectory>
<resources>
<resource>
<filtering>true</filtering>
<directory>${project.basedir}</directory>
<includes>
<include>plugin.yml</include>
</includes>
</resource>
<resource>
<filtering>true</filtering>
<directory>src/main/resources/</directory>
<includes>
<include>*.yml</include>
<include>*.txt</include>
</includes>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.2</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
</plugins>
</build>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
* either expressed or implied, of anybody else.
*/

package thirdparty.org.mcstats;
package org.mcstats;

import java.io.BufferedReader;
import java.io.ByteArrayOutputStream;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
import ru.Den_Abr.ChatGuard.Configuration.Messages.Message;
import ru.Den_Abr.ChatGuard.Configuration.Settings;
import ru.Den_Abr.ChatGuard.Player.CGPlayer;
import thirdparty.org.mcstats.Metrics.Graph;
import thirdparty.org.mcstats.Metrics.Plotter;
import org.mcstats.Metrics.Graph;
import org.mcstats.Metrics.Plotter;

public class CapsFilter extends AbstractFilter {
private boolean informAdmins;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
import ru.Den_Abr.ChatGuard.Violation;
import ru.Den_Abr.ChatGuard.Configuration.Settings;
import ru.Den_Abr.ChatGuard.Player.CGPlayer;
import thirdparty.org.mcstats.Metrics.Graph;
import thirdparty.org.mcstats.Metrics.Plotter;
import org.mcstats.Metrics.Graph;
import org.mcstats.Metrics.Plotter;

import com.google.common.io.Files;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
import ru.Den_Abr.ChatGuard.Configuration.Messages.Message;
import ru.Den_Abr.ChatGuard.Configuration.Settings;
import ru.Den_Abr.ChatGuard.Player.CGPlayer;
import thirdparty.org.mcstats.Metrics.Graph;
import thirdparty.org.mcstats.Metrics.Plotter;
import org.mcstats.Metrics.Graph;
import org.mcstats.Metrics.Plotter;

public class FloodFilter extends AbstractFilter {
private boolean informAdmins;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
import ru.Den_Abr.ChatGuard.Configuration.Whitelist;
import ru.Den_Abr.ChatGuard.Player.CGPlayer;
import ru.Den_Abr.ChatGuard.Utils.Utils;
import thirdparty.org.mcstats.Metrics.Graph;
import thirdparty.org.mcstats.Metrics.Plotter;
import org.mcstats.Metrics.Graph;
import org.mcstats.Metrics.Plotter;

public class SpamFilter extends AbstractFilter {
private Pattern ipPattern;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
import ru.Den_Abr.ChatGuard.Configuration.Whitelist;
import ru.Den_Abr.ChatGuard.Player.CGPlayer;
import ru.Den_Abr.ChatGuard.Utils.Utils;
import thirdparty.org.mcstats.Metrics.Graph;
import thirdparty.org.mcstats.Metrics.Plotter;
import org.mcstats.Metrics.Graph;
import org.mcstats.Metrics.Plotter;

public class SwearFilter extends AbstractFilter {
private static Pattern swearPattern;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,7 @@
import ru.Den_Abr.ChatGuard.Configuration.Settings;
import ru.Den_Abr.ChatGuard.Configuration.Whitelist;
import ru.Den_Abr.ChatGuard.Integration.AbstractIntegration;
import ru.Den_Abr.ChatGuard.Integration.AuthMe34;
import ru.Den_Abr.ChatGuard.Integration.AuthMe5;
import ru.Den_Abr.ChatGuard.Integration.AuthMeLegacy;
import ru.Den_Abr.ChatGuard.Integration.AuthMe;
import ru.Den_Abr.ChatGuard.Integration.NoCheatPlus;
import ru.Den_Abr.ChatGuard.Listeners.FallbackCommandsListener;
import ru.Den_Abr.ChatGuard.Listeners.ItemListener;
Expand All @@ -35,7 +33,7 @@
import ru.Den_Abr.ChatGuard.Listeners.SignListener;
import ru.Den_Abr.ChatGuard.Player.CGPlayer;
import ru.Den_Abr.ChatGuard.Utils.Utils;
import thirdparty.org.mcstats.Metrics;
import org.mcstats.Metrics;

public class ChatGuardPlugin extends JavaPlugin {
private static ChatGuardPlugin instance;
Expand Down Expand Up @@ -93,9 +91,7 @@ private void registerIntegratedPlugins() {
AbstractIntegration.getIntegratedPlugins().clear();

// you can do it from your's plugins
new AuthMeLegacy().register();
new AuthMe34().register();
new AuthMe5().register();
new AuthMe().register();
new NoCheatPlus().register();
}

Expand Down
File renamed without changes.
38 changes: 38 additions & 0 deletions src/main/java/ru/Den_Abr/ChatGuard/Integration/AuthMe.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
package ru.Den_Abr.ChatGuard.Integration;

import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import org.bukkit.plugin.Plugin;
import org.bukkit.plugin.java.JavaPlugin;

import ru.Den_Abr.ChatGuard.Utils.Utils;
import fr.xephi.authme.api.v3.AuthMeApi;

public class AuthMe extends AbstractIntegration {
private JavaPlugin plugin;

@Override
public boolean skipPlayer(Player p) {
return !AuthMeApi.getInstance().isAuthenticated(p);
}

@Override
public JavaPlugin getPlugin() {
return plugin;
}

@Override
public boolean load() {
Plugin pl = Bukkit.getPluginManager().getPlugin("AuthMe");
if (null == pl)
return false;
if (Utils.isInt(pl.getDescription().getVersion().split("\\.")[0])
&& Integer
.parseInt(pl.getDescription().getVersion().split("\\.")[0]) >= 5) {
plugin = (JavaPlugin) pl;
}
return plugin != null && pl.isEnabled();
}


}
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package ru.Den_Abr.ChatGuard.Integration;

import fr.neatmonster.nocheatplus.players.DataManager;
import fr.neatmonster.nocheatplus.players.IPlayerData;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import org.bukkit.plugin.java.JavaPlugin;
Expand All @@ -14,7 +16,10 @@ public class NoCheatPlus extends AbstractIntegration {

@Override
public boolean skipPlayer(Player p) {
return captcha.shouldCheckCaptcha(ChatConfig.getConfig(p), ChatData.getData(p));
IPlayerData pData = DataManager.getPlayerData(p);
ChatData data = (ChatData)pData.getGenericInstance(ChatData.class);
ChatConfig cc = (ChatConfig)pData.getGenericInstance(ChatConfig.class);
return captcha.shouldCheckCaptcha(p, cc, data, pData);
}

@Override
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import org.bukkit.entity.Player;
import org.bukkit.scheduler.BukkitRunnable;

import com.google.common.base.Objects;
import com.google.common.base.MoreObjects;

import ru.Den_Abr.ChatGuard.ChatGuardPlugin;
import ru.Den_Abr.ChatGuard.Violation;
Expand Down Expand Up @@ -94,7 +94,7 @@ public boolean equals(Object obj) {

@Override
public String toString() {
return Objects.toStringHelper(this).addValue(getName()).toString();
return MoreObjects.toStringHelper(this).addValue(getName()).toString();
}

@Override
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion src/config.yml → src/main/resources/config.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# ---------------------- ChatGuard 7.0 default configuration file --------------------- #
# ---------------------- ChatGuard 7.6 default configuration file --------------------- #
# Dont worry if you have just updated plugin. Old configuration saved as old_config.yml #
# Please read comments and dont ask silly questions about configuration #
# Dont use Notepad++ default tabulation. Enable 'Replace by space' in Tab Settings #
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
11 changes: 11 additions & 0 deletions src/main/resources/plugin.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
name: ChatGuard
main: ru.Den_Abr.ChatGuard.ChatGuardPlugin
version: 7.6.0
author: Den_Abr
description: Guard for your chat
softdepend: [ProtocolLib, AuthMe, NoCheatPlus]
commands:
cg:
description: ChatGuard commands.
usage: /<command>
aliases: [chatguard]
File renamed without changes.
File renamed without changes.
39 changes: 0 additions & 39 deletions src/ru/Den_Abr/ChatGuard/Integration/AuthMe34.java

This file was deleted.

Loading

0 comments on commit 0eb46a7

Please sign in to comment.