Skip to content

Commit 72af8d3

Browse files
committed
Add bStats integration
1 parent 2d4ba5e commit 72af8d3

File tree

3 files changed

+43
-8
lines changed

3 files changed

+43
-8
lines changed

build.gradle

Lines changed: 33 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,16 @@
1+
buildscript {
2+
repositories {
3+
jcenter()
4+
}
5+
dependencies {
6+
classpath 'com.github.jengelman.gradle.plugins:shadow:1.2.4'
7+
}
8+
}
19

210
apply plugin: 'java'
311
apply plugin: 'eclipse'
12+
apply plugin: 'idea'
13+
apply plugin: 'com.github.johnrengelman.shadow'
414

515
sourceCompatibility = "1.8"
616
targetCompatibility = "1.8"
@@ -22,6 +32,10 @@ repositories {
2232
name = 'mojang'
2333
url = 'https://libraries.minecraft.net/'
2434
}
35+
maven {
36+
name = 'bstats'
37+
url = 'http://repo.bstats.org/content/repositories/releases/'
38+
}
2539
}
2640

2741
compileJava.options.encoding = 'UTF-8'
@@ -30,16 +44,30 @@ compileJava.options.compilerArgs += '-proc:none'
3044

3145
configurations {
3246
fastutil
47+
shaded
48+
compile.extendsFrom shaded
3349
}
3450

3551
dependencies {
3652
compile 'org.spongepowered:spongeapi:5.0.0'
3753
fastutil 'it.unimi.dsi:fastutil:7.0.12' // from spongecommon
3854
compile 'org.spongepowered:spongecommon:5.0.0-SNAPSHOT:dev'
55+
shaded 'org.bstats:bstats-sponge-lite:1.1'
56+
}
57+
58+
processResources {
59+
from('src/main/resources') {
60+
include 'mcmod.info'
61+
expand(version: project.version, apiVersionRange: '[5.0.0,6.0.0)')
62+
}
3963
}
4064

4165
jar {
42-
from(zipTree(configurations.fastutil.first())) {
66+
classifier = 'dev'
67+
}
68+
69+
shadowJar {
70+
from(zipTree(project.configurations.fastutil.first())) {
4371
include 'it/unimi/dsi/fastutil/chars/*Char2ObjectFunction.class'
4472
include 'it/unimi/dsi/fastutil/chars/*Char2ObjectFunction$*'
4573
include 'it/unimi/dsi/fastutil/chars/*Char2ObjectMap.class'
@@ -58,11 +86,9 @@ jar {
5886
include 'it/unimi/dsi/fastutil/ints/*Int2CharMap$*'
5987
include 'it/unimi/dsi/fastutil/ints/*Int2CharOpenHashMap*'
6088
}
89+
configurations = [project.configurations.shaded]
90+
classifier = ''
91+
relocate 'org.bstats', 'com.simon816.chatui.bstats'
6192
}
6293

63-
processResources {
64-
from('src/main/resources') {
65-
include 'mcmod.info'
66-
expand(version: project.version, apiVersionRange: '[5.0.0,6.0.0)')
67-
}
68-
}
94+
assemble.dependsOn = [shadowJar]

src/main/java/com/simon816/chatui/ChatUI.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,14 @@
66
import com.google.common.collect.Lists;
77
import com.google.common.collect.Maps;
88
import com.google.inject.Inject;
9+
import com.google.inject.Injector;
910
import com.simon816.chatui.group.ChatGroupFeature;
1011
import com.simon816.chatui.pagination.TabbedPaginationService;
1112
import com.simon816.chatui.privmsg.PrivateMessageFeature;
1213
import ninja.leaping.configurate.ConfigurationNode;
1314
import ninja.leaping.configurate.commented.CommentedConfigurationNode;
1415
import ninja.leaping.configurate.loader.ConfigurationLoader;
16+
import org.bstats.MetricsLite;
1517
import org.slf4j.Logger;
1618
import org.spongepowered.api.Sponge;
1719
import org.spongepowered.api.command.CommandSource;
@@ -65,6 +67,9 @@ public class ChatUI {
6567
@Inject
6668
private Logger logger;
6769

70+
@Inject
71+
private Injector injector;
72+
6873
public static ChatUI instance() {
6974
return instance;
7075
}
@@ -103,6 +108,11 @@ public static ExecuteCallback execClick(Consumer<CommandSource> handler) {
103108
@Listener
104109
public void onPreInit(GamePreInitializationEvent event) {
105110
instance = this;
111+
try {
112+
this.injector.getInstance(MetricsLite.class);
113+
} catch (ExceptionInInitializerError e) {
114+
// in development mode - metrics class is not relocated
115+
}
106116
}
107117

108118
private Map<String, Supplier<AbstractFeature>> featuresToLoad;

src/main/java/com/simon816/chatui/tabs/perm/SubjectListPane.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,6 @@ public void onTextEntered(PlayerChatView view, Text input) {
179179
}
180180
this.addMode = false;
181181
if (add(view.getPlayer(), input.toPlain())) {
182-
this.tableScroll.scrollToOffset(this.tableScroll.getModel().getRowCount() - 1);
183182
view.update();
184183
}
185184
}

0 commit comments

Comments
 (0)