From 59675f8288e33c409e90367a92857f2bc5d0642e Mon Sep 17 00:00:00 2001 From: JamieS1211 Date: Sat, 16 Jul 2016 10:15:27 +0100 Subject: [PATCH 1/4] Split messages containing players username into two strings around the first instance of the username. Process both parts separately to prevent names being filtered causing issues. --- build.gradle | 30 +++++++++++--- .../listener/PwnFilterPlayerListener.java | 39 ++++++++++++++++--- 2 files changed, 57 insertions(+), 12 deletions(-) diff --git a/build.gradle b/build.gradle index 5e348dc3..0a507888 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,8 @@ plugins { - id 'java' + id "com.qixalite.spongestart" version "1.4.6" + id 'java' + id 'com.github.johnrengelman.shadow' version '1.2.3' + //id 'org.spongepowered.plugin' version '0.5.1' } defaultTasks 'clean', 'build' @@ -13,9 +16,16 @@ version = project.version repositories { mavenCentral() maven { - name 'Sponge maven repo' + name 'Sonatype' + url 'https://oss.sonatype.org/content/repositories/snapshots/' + } + maven { url "https://jitpack.io" } + maven { + name 'sponge' url 'http://repo.spongepowered.org/maven' } + maven { url "http://repo.maven.apache.org/maven2" } + //maven { url "http://dl.bintray.com/austinv11/maven" } } dependencies { @@ -24,14 +34,22 @@ dependencies { } dependencies { - compile("org.spongepowered:spongeapi:${project.apiVersion}") { - transitive = true - } + compile 'org.spongepowered:spongeapi:4.0.3' compile 'junit:junit:4.12' } +spongestart{ + eula true + + //optional configs + spongeVanillaBuild 'LATEST' + spongeForgeBuild '1538' + forgeServerFolder 'run' + //vanillaServerFolder 'run/vanilla' +} + if (JavaVersion.current().isJava8Compatible() || JavaVersion.current().isJava9Compatible()) { tasks.withType(Javadoc) { options.addStringOption('Xdoclint:none', '-quiet') } -} +} \ No newline at end of file diff --git a/src/main/java/com/pwn9/PwnFilter/minecraft/listener/PwnFilterPlayerListener.java b/src/main/java/com/pwn9/PwnFilter/minecraft/listener/PwnFilterPlayerListener.java index 5f83cafa..58d471a0 100644 --- a/src/main/java/com/pwn9/PwnFilter/minecraft/listener/PwnFilterPlayerListener.java +++ b/src/main/java/com/pwn9/PwnFilter/minecraft/listener/PwnFilterPlayerListener.java @@ -24,6 +24,8 @@ import org.spongepowered.api.event.message.MessageChannelEvent; import org.spongepowered.api.text.serializer.TextSerializers; +import java.util.ArrayList; +import java.util.Arrays; import java.util.Optional; /** @@ -58,9 +60,6 @@ public void handle(MessageChannelEvent.Chat event) { if (event.isCancelled()) return; -// if(1 == 1) - // return; - Optional playerOptional = event.getCause().first(Player.class); if(!playerOptional.isPresent()) { return; @@ -93,7 +92,23 @@ public void handle(MessageChannelEvent.Chat event) { } - FilterTask state = new FilterTask(new ColoredString(message), bukkitPlayer, this); + String part1 = message; + String part2 = null; + String player = bukkitPlayer.getName(); + + if (message.contains(player)) { + String[] parts = message.split(player, 2); + part1 = parts[0]; + part2 = parts[1]; + } + + ArrayList parts = new ArrayList<>(Arrays.asList(part1, part2)); + + Boolean messageChanged = false; + + for (int indexNumber = 0; indexNumber < 2; indexNumber ++) { + + FilterTask state = new FilterTask(new ColoredString(parts.get(indexNumber)), bukkitPlayer, this); // Global decolor if ((SpongeConfig.decolor()) && !(bukkitPlayer.hasPermission("pwnfilter.color"))) { @@ -108,9 +123,21 @@ public void handle(MessageChannelEvent.Chat event) { // Only update the message if it has been changed. if (state.messageChanged()){ - event.setMessage(TextSerializers.FORMATTING_CODE.deserialize((state.getModifiedMessage()).getColoredString())); + messageChanged = true; + + parts.set(indexNumber, state.getModifiedMessage().getColoredString()); } - if (state.isCancelled()) event.setCancelled(true); + + if (state.isCancelled()) { + event.setCancelled(true); + } + + } + + if (messageChanged) { + event.setMessage(TextSerializers.FORMATTING_CODE.deserialize(parts.get(0) + bukkitPlayer.getName() + parts.get(1))); + } + } /** From c85152bb01ab4011ffa55a444d8ee3de0da9bb7f Mon Sep 17 00:00:00 2001 From: JamieS1211 Date: Sat, 16 Jul 2016 10:32:14 +0100 Subject: [PATCH 2/4] GitIgnore not working --- .gitignore | 7 ++- .idea/gradle.xml | 18 ++++++ .../Gradle__aopalliance_aopalliance_1_0.xml | 11 ++++ ...radle__com_flowpowered_flow_math_1_0_1.xml | 11 ++++ ..._flowpowered_flow_noise_1_0_1_SNAPSHOT.xml | 11 ++++ ..._com_google_code_findbugs_jsr305_1_3_9.xml | 9 +++ ...radle__com_google_code_gson_gson_2_2_4.xml | 11 ++++ .../Gradle__com_google_guava_guava_17_0.xml | 11 ++++ .../Gradle__com_google_inject_guice_4_0.xml | 11 ++++ .../Gradle__com_typesafe_config_1_3_0.xml | 11 ++++ ...ing_configurate_configurate_core_3_1_1.xml | 11 ++++ ...ing_configurate_configurate_gson_3_1_1.xml | 11 ++++ ...ng_configurate_configurate_hocon_3_1_1.xml | 11 ++++ ...ing_configurate_configurate_yaml_3_1_1.xml | 11 ++++ .../Gradle__org_ow2_asm_asm_5_0_3.xml | 11 ++++ .../Gradle__org_slf4j_slf4j_api_1_7_14.xml | 11 ++++ ...org_spongepowered_event_gen_core_1_1_0.xml | 9 +++ ...ongepowered_plugin_meta_0_1_1_SNAPSHOT.xml | 11 ++++ ...dle__org_spongepowered_spongeapi_4_0_3.xml | 11 ++++ .../Gradle__org_yaml_snakeyaml_1_16.xml | 11 ++++ .idea/modules.xml | 10 ++++ .idea/modules/PwnFilter_main.iml | 54 ++++++++++++++++++ .idea/modules/PwnFilter_test.iml | 56 +++++++++++++++++++ 23 files changed, 338 insertions(+), 1 deletion(-) create mode 100644 .idea/gradle.xml create mode 100644 .idea/libraries/Gradle__aopalliance_aopalliance_1_0.xml create mode 100644 .idea/libraries/Gradle__com_flowpowered_flow_math_1_0_1.xml create mode 100644 .idea/libraries/Gradle__com_flowpowered_flow_noise_1_0_1_SNAPSHOT.xml create mode 100644 .idea/libraries/Gradle__com_google_code_findbugs_jsr305_1_3_9.xml create mode 100644 .idea/libraries/Gradle__com_google_code_gson_gson_2_2_4.xml create mode 100644 .idea/libraries/Gradle__com_google_guava_guava_17_0.xml create mode 100644 .idea/libraries/Gradle__com_google_inject_guice_4_0.xml create mode 100644 .idea/libraries/Gradle__com_typesafe_config_1_3_0.xml create mode 100644 .idea/libraries/Gradle__ninja_leaping_configurate_configurate_core_3_1_1.xml create mode 100644 .idea/libraries/Gradle__ninja_leaping_configurate_configurate_gson_3_1_1.xml create mode 100644 .idea/libraries/Gradle__ninja_leaping_configurate_configurate_hocon_3_1_1.xml create mode 100644 .idea/libraries/Gradle__ninja_leaping_configurate_configurate_yaml_3_1_1.xml create mode 100644 .idea/libraries/Gradle__org_ow2_asm_asm_5_0_3.xml create mode 100644 .idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_14.xml create mode 100644 .idea/libraries/Gradle__org_spongepowered_event_gen_core_1_1_0.xml create mode 100644 .idea/libraries/Gradle__org_spongepowered_plugin_meta_0_1_1_SNAPSHOT.xml create mode 100644 .idea/libraries/Gradle__org_spongepowered_spongeapi_4_0_3.xml create mode 100644 .idea/libraries/Gradle__org_yaml_snakeyaml_1_16.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/modules/PwnFilter_main.iml create mode 100644 .idea/modules/PwnFilter_test.iml diff --git a/.gitignore b/.gitignore index fafcb97e..3d5758a5 100644 --- a/.gitignore +++ b/.gitignore @@ -12,4 +12,9 @@ PwnFilter.iml PwnFilter.ipr PwnFilter.iws .gradle -build \ No newline at end of file +build +run +idea +.idea +\.idea +/.idea \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 00000000..4743f717 --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,18 @@ + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Gradle__aopalliance_aopalliance_1_0.xml new file mode 100644 index 00000000..dfd1af5e --- /dev/null +++ b/.idea/libraries/Gradle__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_flowpowered_flow_math_1_0_1.xml b/.idea/libraries/Gradle__com_flowpowered_flow_math_1_0_1.xml new file mode 100644 index 00000000..ddd6c333 --- /dev/null +++ b/.idea/libraries/Gradle__com_flowpowered_flow_math_1_0_1.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_flowpowered_flow_noise_1_0_1_SNAPSHOT.xml b/.idea/libraries/Gradle__com_flowpowered_flow_noise_1_0_1_SNAPSHOT.xml new file mode 100644 index 00000000..9df8e846 --- /dev/null +++ b/.idea/libraries/Gradle__com_flowpowered_flow_noise_1_0_1_SNAPSHOT.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_google_code_findbugs_jsr305_1_3_9.xml b/.idea/libraries/Gradle__com_google_code_findbugs_jsr305_1_3_9.xml new file mode 100644 index 00000000..63b7b354 --- /dev/null +++ b/.idea/libraries/Gradle__com_google_code_findbugs_jsr305_1_3_9.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_google_code_gson_gson_2_2_4.xml b/.idea/libraries/Gradle__com_google_code_gson_gson_2_2_4.xml new file mode 100644 index 00000000..5fadbfbb --- /dev/null +++ b/.idea/libraries/Gradle__com_google_code_gson_gson_2_2_4.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_google_guava_guava_17_0.xml b/.idea/libraries/Gradle__com_google_guava_guava_17_0.xml new file mode 100644 index 00000000..0ecc15e1 --- /dev/null +++ b/.idea/libraries/Gradle__com_google_guava_guava_17_0.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_google_inject_guice_4_0.xml b/.idea/libraries/Gradle__com_google_inject_guice_4_0.xml new file mode 100644 index 00000000..87bea56e --- /dev/null +++ b/.idea/libraries/Gradle__com_google_inject_guice_4_0.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_typesafe_config_1_3_0.xml b/.idea/libraries/Gradle__com_typesafe_config_1_3_0.xml new file mode 100644 index 00000000..8cb397c0 --- /dev/null +++ b/.idea/libraries/Gradle__com_typesafe_config_1_3_0.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__ninja_leaping_configurate_configurate_core_3_1_1.xml b/.idea/libraries/Gradle__ninja_leaping_configurate_configurate_core_3_1_1.xml new file mode 100644 index 00000000..ada8c35c --- /dev/null +++ b/.idea/libraries/Gradle__ninja_leaping_configurate_configurate_core_3_1_1.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__ninja_leaping_configurate_configurate_gson_3_1_1.xml b/.idea/libraries/Gradle__ninja_leaping_configurate_configurate_gson_3_1_1.xml new file mode 100644 index 00000000..9252d0c0 --- /dev/null +++ b/.idea/libraries/Gradle__ninja_leaping_configurate_configurate_gson_3_1_1.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__ninja_leaping_configurate_configurate_hocon_3_1_1.xml b/.idea/libraries/Gradle__ninja_leaping_configurate_configurate_hocon_3_1_1.xml new file mode 100644 index 00000000..8914a29b --- /dev/null +++ b/.idea/libraries/Gradle__ninja_leaping_configurate_configurate_hocon_3_1_1.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__ninja_leaping_configurate_configurate_yaml_3_1_1.xml b/.idea/libraries/Gradle__ninja_leaping_configurate_configurate_yaml_3_1_1.xml new file mode 100644 index 00000000..f5972251 --- /dev/null +++ b/.idea/libraries/Gradle__ninja_leaping_configurate_configurate_yaml_3_1_1.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_ow2_asm_asm_5_0_3.xml b/.idea/libraries/Gradle__org_ow2_asm_asm_5_0_3.xml new file mode 100644 index 00000000..2f6ad78c --- /dev/null +++ b/.idea/libraries/Gradle__org_ow2_asm_asm_5_0_3.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_14.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_14.xml new file mode 100644 index 00000000..99cf1ab8 --- /dev/null +++ b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_14.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_spongepowered_event_gen_core_1_1_0.xml b/.idea/libraries/Gradle__org_spongepowered_event_gen_core_1_1_0.xml new file mode 100644 index 00000000..a8014cd8 --- /dev/null +++ b/.idea/libraries/Gradle__org_spongepowered_event_gen_core_1_1_0.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_spongepowered_plugin_meta_0_1_1_SNAPSHOT.xml b/.idea/libraries/Gradle__org_spongepowered_plugin_meta_0_1_1_SNAPSHOT.xml new file mode 100644 index 00000000..63059ef8 --- /dev/null +++ b/.idea/libraries/Gradle__org_spongepowered_plugin_meta_0_1_1_SNAPSHOT.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_spongepowered_spongeapi_4_0_3.xml b/.idea/libraries/Gradle__org_spongepowered_spongeapi_4_0_3.xml new file mode 100644 index 00000000..8d03daf7 --- /dev/null +++ b/.idea/libraries/Gradle__org_spongepowered_spongeapi_4_0_3.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_yaml_snakeyaml_1_16.xml b/.idea/libraries/Gradle__org_yaml_snakeyaml_1_16.xml new file mode 100644 index 00000000..73918ac0 --- /dev/null +++ b/.idea/libraries/Gradle__org_yaml_snakeyaml_1_16.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 00000000..9af1f0db --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/PwnFilter_main.iml b/.idea/modules/PwnFilter_main.iml new file mode 100644 index 00000000..bc4aeb29 --- /dev/null +++ b/.idea/modules/PwnFilter_main.iml @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/PwnFilter_test.iml b/.idea/modules/PwnFilter_test.iml new file mode 100644 index 00000000..12b4b3ac --- /dev/null +++ b/.idea/modules/PwnFilter_test.iml @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 63061263294269dc74c37f30e6928cf982733f80 Mon Sep 17 00:00:00 2001 From: JamieS1211 Date: Thu, 2 Feb 2017 12:46:13 +0000 Subject: [PATCH 3/4] Project updates --- ...radle__com_flowpowered_flow_math_1_0_1.xml | 11 ------ ..._flowpowered_flow_noise_1_0_1_SNAPSHOT.xml | 4 +-- ...ing_configurate_configurate_core_3_1_1.xml | 11 ------ ...ing_configurate_configurate_gson_3_1_1.xml | 11 ------ ...ng_configurate_configurate_hocon_3_1_1.xml | 11 ------ ...ing_configurate_configurate_yaml_3_1_1.xml | 11 ------ .../Gradle__org_slf4j_slf4j_api_1_7_14.xml | 11 ------ ...org_spongepowered_event_gen_core_1_1_0.xml | 9 ----- ...ongepowered_plugin_meta_0_1_1_SNAPSHOT.xml | 11 ------ ...dle__org_spongepowered_spongeapi_4_0_3.xml | 11 ------ .idea/modules/PwnFilter_main.iml | 33 +++++++++-------- .idea/modules/PwnFilter_test.iml | 35 ++++++++++--------- 12 files changed, 39 insertions(+), 130 deletions(-) delete mode 100644 .idea/libraries/Gradle__com_flowpowered_flow_math_1_0_1.xml delete mode 100644 .idea/libraries/Gradle__ninja_leaping_configurate_configurate_core_3_1_1.xml delete mode 100644 .idea/libraries/Gradle__ninja_leaping_configurate_configurate_gson_3_1_1.xml delete mode 100644 .idea/libraries/Gradle__ninja_leaping_configurate_configurate_hocon_3_1_1.xml delete mode 100644 .idea/libraries/Gradle__ninja_leaping_configurate_configurate_yaml_3_1_1.xml delete mode 100644 .idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_14.xml delete mode 100644 .idea/libraries/Gradle__org_spongepowered_event_gen_core_1_1_0.xml delete mode 100644 .idea/libraries/Gradle__org_spongepowered_plugin_meta_0_1_1_SNAPSHOT.xml delete mode 100644 .idea/libraries/Gradle__org_spongepowered_spongeapi_4_0_3.xml diff --git a/.idea/libraries/Gradle__com_flowpowered_flow_math_1_0_1.xml b/.idea/libraries/Gradle__com_flowpowered_flow_math_1_0_1.xml deleted file mode 100644 index ddd6c333..00000000 --- a/.idea/libraries/Gradle__com_flowpowered_flow_math_1_0_1.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_flowpowered_flow_noise_1_0_1_SNAPSHOT.xml b/.idea/libraries/Gradle__com_flowpowered_flow_noise_1_0_1_SNAPSHOT.xml index 9df8e846..e975e275 100644 --- a/.idea/libraries/Gradle__com_flowpowered_flow_noise_1_0_1_SNAPSHOT.xml +++ b/.idea/libraries/Gradle__com_flowpowered_flow_noise_1_0_1_SNAPSHOT.xml @@ -1,11 +1,11 @@ - + - + \ No newline at end of file diff --git a/.idea/libraries/Gradle__ninja_leaping_configurate_configurate_core_3_1_1.xml b/.idea/libraries/Gradle__ninja_leaping_configurate_configurate_core_3_1_1.xml deleted file mode 100644 index ada8c35c..00000000 --- a/.idea/libraries/Gradle__ninja_leaping_configurate_configurate_core_3_1_1.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__ninja_leaping_configurate_configurate_gson_3_1_1.xml b/.idea/libraries/Gradle__ninja_leaping_configurate_configurate_gson_3_1_1.xml deleted file mode 100644 index 9252d0c0..00000000 --- a/.idea/libraries/Gradle__ninja_leaping_configurate_configurate_gson_3_1_1.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__ninja_leaping_configurate_configurate_hocon_3_1_1.xml b/.idea/libraries/Gradle__ninja_leaping_configurate_configurate_hocon_3_1_1.xml deleted file mode 100644 index 8914a29b..00000000 --- a/.idea/libraries/Gradle__ninja_leaping_configurate_configurate_hocon_3_1_1.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__ninja_leaping_configurate_configurate_yaml_3_1_1.xml b/.idea/libraries/Gradle__ninja_leaping_configurate_configurate_yaml_3_1_1.xml deleted file mode 100644 index f5972251..00000000 --- a/.idea/libraries/Gradle__ninja_leaping_configurate_configurate_yaml_3_1_1.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_14.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_14.xml deleted file mode 100644 index 99cf1ab8..00000000 --- a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_14.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_spongepowered_event_gen_core_1_1_0.xml b/.idea/libraries/Gradle__org_spongepowered_event_gen_core_1_1_0.xml deleted file mode 100644 index a8014cd8..00000000 --- a/.idea/libraries/Gradle__org_spongepowered_event_gen_core_1_1_0.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_spongepowered_plugin_meta_0_1_1_SNAPSHOT.xml b/.idea/libraries/Gradle__org_spongepowered_plugin_meta_0_1_1_SNAPSHOT.xml deleted file mode 100644 index 63059ef8..00000000 --- a/.idea/libraries/Gradle__org_spongepowered_plugin_meta_0_1_1_SNAPSHOT.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_spongepowered_spongeapi_4_0_3.xml b/.idea/libraries/Gradle__org_spongepowered_spongeapi_4_0_3.xml deleted file mode 100644 index 8d03daf7..00000000 --- a/.idea/libraries/Gradle__org_spongepowered_spongeapi_4_0_3.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules/PwnFilter_main.iml b/.idea/modules/PwnFilter_main.iml index bc4aeb29..2a2e5cd5 100644 --- a/.idea/modules/PwnFilter_main.iml +++ b/.idea/modules/PwnFilter_main.iml @@ -18,8 +18,8 @@ + - @@ -29,26 +29,29 @@ + - - - - + + + + - - - - - - + + + + + + + - + + - - - + + + \ No newline at end of file diff --git a/.idea/modules/PwnFilter_test.iml b/.idea/modules/PwnFilter_test.iml index 12b4b3ac..6dde93b5 100644 --- a/.idea/modules/PwnFilter_test.iml +++ b/.idea/modules/PwnFilter_test.iml @@ -10,6 +10,7 @@ + @@ -20,7 +21,8 @@ - + + @@ -30,27 +32,28 @@ - - - - - + + + + - - - - - - + + + + + + + - + + - - - + + + \ No newline at end of file From 5f759a59ccb49f8e7415abe3667726a9f366a6b2 Mon Sep 17 00:00:00 2001 From: JamieS1211 Date: Sat, 4 Feb 2017 15:25:56 +0000 Subject: [PATCH 4/4] build.gradle update to new versions and api --- build.gradle | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 0a507888..92501390 100644 --- a/build.gradle +++ b/build.gradle @@ -34,7 +34,7 @@ dependencies { } dependencies { - compile 'org.spongepowered:spongeapi:4.0.3' + compile 'org.spongepowered:spongeapi:6.0.0-SNAPSHOT' compile 'junit:junit:4.12' } @@ -42,10 +42,8 @@ spongestart{ eula true //optional configs - spongeVanillaBuild 'LATEST' - spongeForgeBuild '1538' + spongeForgeBuild '2109' forgeServerFolder 'run' - //vanillaServerFolder 'run/vanilla' } if (JavaVersion.current().isJava8Compatible() || JavaVersion.current().isJava9Compatible()) {