-
Notifications
You must be signed in to change notification settings - Fork 5
[REFERENCE ONLY DO NOT REVIEW!!!] Implement Mojang WebAPI, common user root class, and playerheads #56
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: master
Are you sure you want to change the base?
[REFERENCE ONLY DO NOT REVIEW!!!] Implement Mojang WebAPI, common user root class, and playerheads #56
Changes from 27 commits
5972a00
b8a5bf6
8dae48a
7d74d10
3db73ff
004fbf0
b014f6b
329515f
ab69d97
67a9c4b
680655b
8c113ec
ac010e4
0b15f04
b6f0496
6d4bcec
c4a023e
0fb226b
c44992f
b278a81
8c6b7b5
786590d
cacaefb
ade9f94
223a6f9
84c0b3b
6b4316f
42b1739
d16c439
3aaa25b
6fc4385
263164b
26c8415
614816b
e6a97e1
94683c6
aa23150
7f2cab7
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,6 +6,8 @@ plugins { | |
| id "com.github.hierynomus.license" version "0.15.0" | ||
| } | ||
|
|
||
|
|
||
|
|
||
| jacoco { | ||
| // Use JaCoCo 0.8.6 for (experimental) support for Java 15 class files. | ||
| toolVersion = "0.8.6" | ||
|
|
@@ -25,6 +27,7 @@ license { | |
| tasks.withType(JavaCompile) { | ||
| options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation" << "-XDignore.symbol.file" | ||
| } | ||
|
|
||
| // Run the license formatter before compiling the source code. | ||
| tasks.compileJava.dependsOn licenseFormatMain, licenseFormatTest | ||
|
|
||
|
|
@@ -37,6 +40,7 @@ configurations { | |
| repositories { | ||
| mavenCentral() | ||
| jcenter() | ||
| google() | ||
|
|
||
| maven { url 'https://oss.sonatype.org/content/repositories/snapshots' } | ||
| maven { url 'https://papermc.io/repo/repository/maven-public/' } | ||
|
|
@@ -48,30 +52,38 @@ dependencies { | |
|
|
||
| compileOnly 'com.destroystokyo.paper:paper-api:1.16.4-R0.1-SNAPSHOT' | ||
| compileOnly 'net.md-5:bungeecord-api:1.16-R0.4-SNAPSHOT' | ||
|
|
||
| implementation 'org.jetbrains:annotations:20.1.0' | ||
| implementation 'com.google.code.gson:gson:2.8.6' | ||
| implementation 'io.github.classgraph:classgraph:4.8.92' | ||
| implementation 'io.github.classgraph:classgraph:4.8.98' | ||
| implementation 'com.github.seancfoley:ipaddress:5.3.3' | ||
| implementation 'com.squareup.okhttp3:okhttp:4.9.0' | ||
| implementation 'commons-validator:commons-validator:1.7' | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Please use Guava's preconditions rather than shading in deps to StickyAPI.
Collaborator
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Please explain
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. See the JavaDocs for preconditions. This is included in both bukkit and bungee so will work at runtime. No need to shade in extra dependencies.
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Unless you're intending to use this for a completely different reason.
Collaborator
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Validator is used primarily to check url formatting for validity, and determine if a URL is validly formatted (and I think it also checks if it's resolvable). There are a couple other ways I plan to use it.
Collaborator
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We can also theoretically call the minimize() function to reduce jar size
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Google preconditions does thissssss - just include a URL regex.
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
This has side effects, we've already tried it.
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Do we even need to validate the URL ourselves? OkHttp should throw an exception when unable to parse a URL, and if we don't want to use OkHttp, a regular expression will do for URL validity
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We could also probably test URL validity by attempting to construct a URL object using the string and seeing if a MalformedURLException is thrown |
||
| implementation 'com.google.guava:guava:30.1-jre' | ||
|
|
||
| // JUnit 5 Testing | ||
| testImplementation("org.junit.jupiter:junit-jupiter-api:5.7.0") | ||
| testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.7.0") | ||
| testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.0' | ||
| testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.7.0' | ||
|
|
||
| // Mocking | ||
| testImplementation("org.powermock:powermock-module-junit4:2.0.9") | ||
| testImplementation("org.powermock:powermock-api-mockito2:2.0.9") | ||
| testImplementation("org.powermock:powermock-module-junit4-rule:2.0.9") | ||
| testImplementation("org.powermock:powermock-classloading-xstream:2.0.9") | ||
| testImplementation("org.mockito:mockito-core:3.6.28") | ||
| testImplementation("org.mockito:mockito-core:3.7.0") | ||
| testImplementation 'com.github.seeseemelk:MockBukkit-v1.16:0.5.0' | ||
| testImplementation 'it.unimi.dsi:fastutil:8.4.4' | ||
|
||
| } | ||
|
|
||
|
|
||
| test { | ||
| useJUnitPlatform() | ||
| testLogging { | ||
| events "passed", "skipped", "failed" | ||
| // Show System.out for code ran by tests | ||
| showStandardStreams = true | ||
| } | ||
| //ignoreFailures = true | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. remove this line if it's commented.
Collaborator
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Its there for testing. I will try to fold into a new task |
||
| finalizedBy jacocoTestReport // report is always generated after tests run | ||
| } | ||
|
|
||
|
|
@@ -88,9 +100,44 @@ task sources(type: Jar, dependsOn: classes) { | |
| from sourceSets.main.allSource | ||
| } | ||
|
|
||
| tasks.delombok.shouldRunAfter(sources) | ||
| tasks.publish.dependsOn build | ||
| tasks.build.shouldRunAfter(clean) | ||
| tasks.javadoc.shouldRunAfter(clean) | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I'm a little hesitant to have javadoc and build run after clean... @NotZachery thoughts?
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I don't see how this could become an issue so I'm fine by it.
Collaborator
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. They are set to run after as should, not forced. This prevents (if you did, say,
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Ah okay - thanks! |
||
| tasks.build.finalizedBy(sources) | ||
|
|
||
| delombok { | ||
| finalizedBy(javadoc) | ||
| print(true) | ||
| //verbose(true) | ||
| } | ||
|
|
||
| tasks.withType(JavaCompile) { | ||
| options.encoding = "UTF-8" | ||
| } | ||
| tasks.withType(Test) { | ||
| systemProperty "file.encoding", "UTF-8" | ||
| } | ||
|
|
||
| javadoc { | ||
| options.addBooleanOption('XDignore.symbol.file', true) | ||
| options.addBooleanOption('-frames', true) | ||
| options.addBooleanOption('private', true) | ||
| test.ignoreFailures true; | ||
| options.encoding = 'UTF-8' | ||
| dependsOn delombok | ||
| } | ||
|
|
||
| tasks.publish.dependsOn build, sources | ||
| task browseJavadoc { | ||
| dependsOn javadoc | ||
| doLast { | ||
| java.awt.Desktop.desktop.browse new URI(("file:///" << System.getProperty("user.dir").replace('\\','/') << "/build/docs/javadoc/index.html").toString()) | ||
| } | ||
| } | ||
|
|
||
| task rebuild { | ||
| dependsOn build, clean | ||
| } | ||
|
|
||
|
|
||
|
|
||
|
|
||
| Original file line number | Diff line number | Diff line change | ||||||
|---|---|---|---|---|---|---|---|---|
| @@ -0,0 +1 @@ | ||||||||
| systemProp.file.encoding=utf-8 | ||||||||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,5 @@ | ||
| distributionBase=GRADLE_USER_HOME | ||
| distributionPath=wrapper/dists | ||
| distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip | ||
| distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip | ||
| zipStoreBase=GRADLE_USER_HOME | ||
| zipStorePath=wrapper/dists | ||
| compileJava.options.encoding=UTF-8 |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,17 @@ | ||
| /* | ||
| * Copyright (c) 2020 DumbDogDiner <dumbdogdiner.com>. All rights reserved. | ||
| * Copyright (c) 2021 DumbDogDiner <dumbdogdiner.com>. All rights reserved. | ||
| * Licensed under the MIT license, see LICENSE for more information... | ||
| */ | ||
| package com.dumbdogdiner.stickyapi; | ||
|
|
||
| import lombok.Getter; | ||
| import lombok.Setter; | ||
|
|
||
| import java.io.InputStream; | ||
| import java.util.concurrent.ExecutorService; | ||
| import java.util.concurrent.Executors; | ||
| import java.util.logging.Logger; | ||
|
|
||
| import lombok.Getter; | ||
| import lombok.Setter; | ||
|
|
||
| /** | ||
| * <h1>StickyAPI</h1> Utility methods, classes and potentially | ||
| * code-dupe-annihilating code for DDD plugins. | ||
|
|
@@ -25,4 +26,15 @@ public class StickyAPI { | |
| @Getter | ||
| @Setter | ||
| private static ExecutorService pool = Executors.newCachedThreadPool(); | ||
|
|
||
| /** | ||
| * Provides a wrapper for {@link java.lang.Class#getResourceAsStream(String)} (String)} | ||
| * @param resourceName The resource to get | ||
| * @return an {@link InputStream} to that resource | ||
| */ | ||
| public static InputStream getResourceAsStream(String resourceName){ | ||
| return StickyAPI.class.getResourceAsStream(resourceName); | ||
| } | ||
|
||
|
|
||
| private StickyAPI() {} | ||
| } | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,36 +1,27 @@ | ||
| /* | ||
| * Copyright (c) 2020 DumbDogDiner <dumbdogdiner.com>. All rights reserved. | ||
| * Copyright (c) 2021 DumbDogDiner <dumbdogdiner.com>. All rights reserved. | ||
| * Licensed under the MIT license, see LICENSE for more information... | ||
| */ | ||
| package com.dumbdogdiner.stickyapi.bukkit.command; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.Arrays; | ||
| import java.util.Collections; | ||
| import java.util.HashMap; | ||
| import java.util.List; | ||
| import java.util.concurrent.FutureTask; | ||
|
|
||
| import com.dumbdogdiner.stickyapi.StickyAPI; | ||
| import com.dumbdogdiner.stickyapi.bukkit.util.SoundUtil; | ||
| import com.dumbdogdiner.stickyapi.common.ServerVersion; | ||
| import com.dumbdogdiner.stickyapi.common.arguments.Arguments; | ||
| import com.dumbdogdiner.stickyapi.common.command.CommandBuilder; | ||
| import com.dumbdogdiner.stickyapi.common.command.ExitCode; | ||
| import com.dumbdogdiner.stickyapi.common.ServerVersion; | ||
| import com.dumbdogdiner.stickyapi.common.util.NotificationType; | ||
| import com.dumbdogdiner.stickyapi.common.util.ReflectionUtil; | ||
| import com.dumbdogdiner.stickyapi.common.util.StringUtil; | ||
| import com.google.common.collect.ImmutableList; | ||
|
|
||
| import org.bukkit.command.Command; | ||
| import org.bukkit.command.CommandExecutor; | ||
| import org.bukkit.command.CommandMap; | ||
| import org.bukkit.command.CommandSender; | ||
| import org.bukkit.command.TabCompleter; | ||
| import org.bukkit.command.*; | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. No wild card imports. |
||
| import org.bukkit.entity.Player; | ||
| import org.bukkit.plugin.Plugin; | ||
| import org.jetbrains.annotations.NotNull; | ||
|
|
||
| import java.util.*; | ||
| import java.util.concurrent.FutureTask; | ||
|
|
||
| /** | ||
| * CommandBuilder for avoiding bukkit's terrible command API and making creating | ||
| * new commands as simple as possible | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,22 +1,23 @@ | ||
| /* | ||
| * Copyright (c) 2020 DumbDogDiner <dumbdogdiner.com>. All rights reserved. | ||
| * Copyright (c) 2021 DumbDogDiner <dumbdogdiner.com>. All rights reserved. | ||
| * Licensed under the MIT license, see LICENSE for more information... | ||
| */ | ||
| package com.dumbdogdiner.stickyapi.bukkit.generator; | ||
|
|
||
| import java.util.Random; | ||
|
|
||
| import org.bukkit.World; | ||
| import org.bukkit.generator.ChunkGenerator; | ||
| import org.jetbrains.annotations.NotNull; | ||
|
|
||
| import java.util.Random; | ||
|
|
||
| /** | ||
| * A class for generating empty void worlds | ||
| */ | ||
| @SuppressWarnings("unused") | ||
| public class VoidGenerator extends ChunkGenerator { | ||
|
|
||
| @Override | ||
| public ChunkData generateChunkData(@NotNull World world, Random random, int x, int z, BiomeGrid biome) { | ||
| public @NotNull ChunkData generateChunkData(@NotNull World world, @NotNull Random random, int x, int z, @NotNull BiomeGrid biome) { | ||
| return createChunkData(world); | ||
| } | ||
| } |
Uh oh!
There was an error while loading. Please reload this page.