Skip to content

Commit

Permalink
Minecraft 1.8.x Update
Browse files Browse the repository at this point in the history
  • Loading branch information
Calenria committed Jun 8, 2015
1 parent 495db2b commit bb49ce9
Show file tree
Hide file tree
Showing 6 changed files with 269 additions and 31 deletions.
9 changes: 9 additions & 0 deletions config/checkstyle/checkstyle-suppressions.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE suppressions PUBLIC "-//Puppy Crawl//DTD Suppressions 1.1//EN" "http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">

<suppressions>
<suppress checks="JavadocMethod" files="^src[\\/]test[\\/]java"/>
<suppress checks="Indentation" files="package-info\.java"/>
<suppress checks="AbbreviationAsWordInName" files="TNT"/>
<suppress checks="AbbreviationAsWordInName" files="PEBKAC"/>
</suppressions>
228 changes: 228 additions & 0 deletions config/checkstyle/checkstyle.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,228 @@
<?xml version="1.0"?>
<!DOCTYPE module PUBLIC
"-//Puppy Crawl//DTD Check Configuration 1.3//EN"
"http://www.puppycrawl.com/dtds/configuration_1_3.dtd">

<!--
Checkstyle configuration that checks the Google coding conventions from:
- Google Java Style
https://google-styleguide.googlecode.com/svn-history/r130/trunk/javaguide.html
Checkstyle is very configurable. Be sure to read the documentation at
http://checkstyle.sf.net (or in your downloaded distribution).
Most Checks are configurable, be sure to consult the documentation.
To completely disable a check, just comment it out or delete it from the file.
Authors: Max Vetrenko, Ruslan Diachenko, Roman Ivanov.
-->

<module name="Checker">
<property name="charset" value="UTF-8"/>

<!-- Checks for whitespace -->
<!-- See http://checkstyle.sf.net/config_whitespace.html -->
<module name="FileTabCharacter">
<property name="eachLine" value="true"/>
</module>

<module name="TreeWalker">
<module name="OuterTypeFilename"/>
<module name="IllegalTokenText">
<property name="tokens" value="STRING_LITERAL, CHAR_LITERAL"/>
<property name="format" value="\\u00(08|09|0(a|A)|0(c|C)|0(d|D)|22|27|5(C|c))|\\(0(10|11|12|14|15|42|47)|134)"/>
<property name="message" value="Avoid using corresponding octal or Unicode escape."/>
</module>
<module name="AvoidEscapedUnicodeCharacters">
<property name="allowEscapesForControlCharacters" value="true"/>
<property name="allowByTailComment" value="true"/>
<property name="allowNonPrintableEscapes" value="true"/>
</module>
<module name="LineLength">
<!--<property name="max" value="100"/>-->
<property name="max" value="150"/>
<property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
</module>
<module name="AvoidStarImport"/>
<module name="OneTopLevelClass"/>
<module name="NoLineWrap"/>
<module name="EmptyBlock">
<property name="option" value="TEXT"/>
<property name="tokens" value="LITERAL_TRY, LITERAL_CATCH, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_SWITCH"/>
</module>
<module name="NeedBraces"/>
<module name="LeftCurly">
<!--<property name="maxLineLength" value="100"/>-->
<property name="maxLineLength" value="150"/>
</module>
<module name="RightCurly"/>
<module name="RightCurly">
<property name="option" value="alone"/>
<property name="tokens" value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, LITERAL_WHILE, LITERAL_DO, STATIC_INIT, INSTANCE_INIT"/>
</module>
<module name="WhitespaceAround">
<property name="allowEmptyConstructors" value="true"/>
<property name="allowEmptyMethods" value="true"/>
<property name="allowEmptyTypes" value="true"/>
<property name="allowEmptyLoops" value="true"/>
<message key="ws.notFollowed"
value="WhitespaceAround: ''{0}'' is not followed by whitespace."/>
<message key="ws.notPreceded"
value="WhitespaceAround: ''{0}'' is not preceded with whitespace."/>
</module>
<module name="OneStatementPerLine"/>
<module name="MultipleVariableDeclarations"/>
<module name="ArrayTypeStyle"/>
<module name="MissingSwitchDefault"/>
<module name="FallThrough"/>
<module name="UpperEll"/>
<module name="ModifierOrder"/>
<module name="EmptyLineSeparator">
<!-- TODO: This is disabled for package because the Gradle License plugin doesn't create a new line after the license header, do we want to enable this? -->
<property name="tokens"
value="IMPORT, CLASS_DEF, ENUM_DEF, INTERFACE_DEF, CTOR_DEF, METHOD_DEF, STATIC_INIT, INSTANCE_INIT, VARIABLE_DEF"/>
<property name="allowNoEmptyLineBetweenFields" value="true"/>
</module>
<module name="SeparatorWrap">
<property name="tokens" value="DOT"/>
<property name="option" value="nl"/>
</module>
<module name="SeparatorWrap">
<property name="tokens" value="COMMA"/>
<property name="option" value="EOL"/>
</module>
<module name="PackageName">
<property name="format" value="^[a-z]+(\.[a-z][a-z0-9]*)*$"/>
<message key="name.invalidPattern"
value="Package name ''{0}'' must match pattern ''{1}''."/>
</module>
<module name="TypeName">
<message key="name.invalidPattern"
value="Type name ''{0}'' must match pattern ''{1}''."/>
</module>
<module name="MemberName">
<!--<property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9]*$"/>-->
<property name="format" value="^[a-z][a-zA-Z0-9]*$"/>
<message key="name.invalidPattern"
value="Member name ''{0}'' must match pattern ''{1}''."/>
</module>
<module name="ParameterName">
<!--<property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9]*$"/>-->
<property name="format" value="^[a-z][a-zA-Z0-9]*$"/>
<message key="name.invalidPattern"
value="Parameter name ''{0}'' must match pattern ''{1}''."/>
</module>
<module name="LocalVariableName">
<property name="tokens" value="VARIABLE_DEF"/>
<!--<property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9]*$"/>-->
<property name="format" value="^[a-z][a-zA-Z0-9]*$"/>
<property name="allowOneCharVarInForLoop" value="true"/>
<message key="name.invalidPattern"
value="Local variable name ''{0}'' must match pattern ''{1}''."/>
</module>
<module name="ClassTypeParameterName">
<property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
<message key="name.invalidPattern"
value="Class type name ''{0}'' must match pattern ''{1}''."/>
</module>
<module name="MethodTypeParameterName">
<property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
<message key="name.invalidPattern"
value="Method type name ''{0}'' must match pattern ''{1}''."/>
</module>
<module name="NoFinalizer"/>
<module name="GenericWhitespace">
<message key="ws.followed"
value="GenericWhitespace ''{0}'' is followed by whitespace."/>
<message key="ws.preceded"
value="GenericWhitespace ''{0}'' is preceded with whitespace."/>
<message key="ws.illegalFollow"
value="GenericWhitespace ''{0}'' should followed by whitespace."/>
<message key="ws.notPreceded"
value="GenericWhitespace ''{0}'' is not preceded with whitespace."/>
</module>
<module name="Indentation">
<!--<property name="basicOffset" value="2"/>-->
<property name="basicOffset" value="4"/>
<property name="braceAdjustment" value="0"/>
<!--<property name="caseIndent" value="2"/>-->
<property name="caseIndent" value="4"/>
<property name="throwsIndent" value="4"/>
<property name="lineWrappingIndentation" value="4"/>
<!--<property name="arrayInitIndent" value="2"/>-->
<property name="arrayInitIndent" value="4"/>
</module>
<module name="AbbreviationAsWordInName">
<property name="ignoreFinal" value="false"/>
<property name="allowedAbbreviationLength" value="1"/>
</module>
<module name="OverloadMethodsDeclarationOrder"/>
<module name="VariableDeclarationUsageDistance"/>
<module name="CustomImportOrder">
<property name="thirdPartyPackageRegExp" value=".*"/>
<!--<property name="specialImportsRegExp" value="com.google"/>-->
<property name="sortImportsInGroupAlphabetically" value="true"/>
<property name="customImportOrderRules" value="STATIC###SPECIAL_IMPORTS###THIRD_PARTY_PACKAGE###STANDARD_JAVA_PACKAGE"/>
</module>
<module name="MethodParamPad"/>
<module name="OperatorWrap">
<property name="option" value="NL"/>
<property name="tokens"
value="BAND, BOR, BSR, BXOR, DIV, EQUAL, GE, GT, LAND, LE, LITERAL_INSTANCEOF, LOR, LT, MINUS, MOD, NOT_EQUAL, PLUS, QUESTION, SL, SR, STAR "/>
</module>
<module name="AnnotationLocation">
<property name="tokens" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF"/>
</module>
<module name="AnnotationLocation">
<property name="tokens" value="VARIABLE_DEF"/>
<property name="allowSamelineMultipleAnnotations" value="true"/>
</module>
<module name="NonEmptyAtclauseDescription"/>
<module name="JavadocTagContinuationIndentation"/>
<module name="SummaryJavadocCheck">
<property name="forbiddenSummaryFragments" value="^@return the *|^This method returns |^A [{]@code [a-zA-Z0-9]+[}]( is a )"/>
</module>
<module name="JavadocParagraph"/>
<module name="AtclauseOrder">
<property name="tagOrder" value="@param, @return, @throws, @deprecated"/>
<property name="target" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/>
</module>
<module name="JavadocMethod">
<property name="scope" value="public"/>
<!--
<property name="allowMissingParamTags" value="true"/>
<property name="allowMissingThrowsTags" value="true"/>
<property name="allowMissingReturnTag" value="true"/>
<property name="minLineCount" value="2"/>
-->
<property name="allowedAnnotations" value="Override, Test"/>
<property name="allowThrowsTagsForSubclasses" value="true"/>
</module>
<module name="MethodName">
<!--<property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9_]*$"/>-->
<property name="format" value="^[a-z][a-zA-Z0-9_]*$"/>
<message key="name.invalidPattern"
value="Method name ''{0}'' must match pattern ''{1}''."/>
</module>
<module name="SingleLineJavadoc"/>


<module name="RedundantImport"/>
<module name="RedundantModifier"/>
<module name="RequireThis">
<property name="checkMethods" value="false"/>
</module>
</module>

<module name="NewlineAtEndOfFile"/>
<module name="SuppressionFilter">
<property name="file" value="${suppressions}"/>
</module>

<property name="basedir" value="${basedir}"/>
<property name="severity" value="${severity}"/>
</module>
Binary file modified lib/BungeeCord.jar
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion plugin.yml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: SimpleChat
version: 0.4.1
version: 0.4.2
main: com.github.calenria.scbungee.SimpleChat
author: Calenria
26 changes: 13 additions & 13 deletions src/com/github/calenria/scbungee/SimpleChat.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
package com.github.calenria.scbungee;

import net.md_5.bungee.BungeeCord;
import net.md_5.bungee.api.plugin.Plugin;

import java.io.BufferedWriter;
import java.io.File;
import java.io.FileInputStream;
Expand All @@ -10,27 +13,24 @@
import java.util.PropertyResourceBundle;
import java.util.ResourceBundle;

import net.md_5.bungee.BungeeCord;
import net.md_5.bungee.api.plugin.Plugin;

public class SimpleChat extends Plugin {
public static ResourceBundle messages = null;
public static String pluginPath = "./plugins/SimpleChat-Bungee/";
public File messagesFile = new File(pluginPath + "messages.properties");
public static Boolean hideStream = true;
public static Boolean debug = false;
public static ResourceBundle messages = null;
public static String pluginPath = "./plugins/SimpleChat-Bungee/";
public File messagesFile = new File(pluginPath + "messages.properties");
public static Boolean hideStream = true;
public static Boolean debug = false;

@Override
public void onEnable() {
BungeeCord.getInstance().registerChannel("SimpleChat");
BungeeCord.getInstance().getPluginManager().registerListener(new SimpleChatListener());
BungeeCord.getInstance().getPluginManager().registerListener(this, new SimpleChatListener());
messages = readProperties();
hideStream = Boolean.parseBoolean(messages.getString("hideStream"));
try {
debug = Boolean.parseBoolean(messages.getString("debug"));
} catch (MissingResourceException e) {
try {
BufferedWriter out = new BufferedWriter(new FileWriter(messagesFile, true));
BufferedWriter out = new BufferedWriter(new FileWriter(this.messagesFile, true));
out.write("debug=false");
out.newLine();
out.close();
Expand All @@ -45,12 +45,12 @@ private PropertyResourceBundle readProperties() {
PropertyResourceBundle bundle = null;

File pluginDir = new File(pluginPath);
if (!messagesFile.exists()) {
if (!this.messagesFile.exists()) {
try {
if (!pluginDir.exists()) {
pluginDir.mkdirs();
}
BufferedWriter out = new BufferedWriter(new FileWriter(messagesFile));
BufferedWriter out = new BufferedWriter(new FileWriter(this.messagesFile));
out.write("hideStream=true");
out.newLine();
out.write("login=&6%s hat das Spiel betreten");
Expand All @@ -65,7 +65,7 @@ private PropertyResourceBundle readProperties() {
}
}
try {
bundle = new PropertyResourceBundle(new FileInputStream(messagesFile));
bundle = new PropertyResourceBundle(new FileInputStream(this.messagesFile));
} catch (FileNotFoundException e) {
e.printStackTrace();
} catch (IOException e) {
Expand Down
Loading

0 comments on commit bb49ce9

Please sign in to comment.