-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch '1.19.2-fabric' into 1.18.2-fabric
# Conflicts: # gradle.properties
- Loading branch information
Showing
25 changed files
with
293 additions
and
131 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,32 @@ | ||
| ## What's new: | ||
|
|
||
| Breaking changes for the Mixpanel module, notable ones for others. | ||
|
|
||
| ### Analytics | ||
|
|
||
| * New analytics module! `analytics-crashes` | ||
| * * Adds event-like crash handling. Also, features a class to quickly upload logs to mclo.gs | ||
| * Analytics config moved to JSON + new option for Crashlytics. | ||
| * Fixed new users getting null IDs. | ||
| * ID will only be assigned if analytics are enabled. | ||
| * Now, handlers will handle messages if either analytics or crashlytics are on. | ||
| * Added null checks for various method arguments. | ||
| * Mixpanel module has undergone a rewrite: | ||
| * `org.json` and `mixpanel` dependencies were dropped. | ||
| * `mixpanel` was condensed into a single MixpanelAPI class, which immediately sends your request. | ||
| * MessageProvider no longer requires you to return anything. | ||
|
|
||
| ### Content | ||
|
|
||
| * Non-prefixed methods in ItemGroupExtensions are now deprecated. | ||
|
|
||
| ### Danger | ||
|
|
||
| * Danger will no longer auto-start with the game. | ||
| * You no longer need `"dark-matter-danger:instrumentation"` in your `fabric.mod.json`. | ||
|
|
||
| ### Enums | ||
|
|
||
| * EnumWrapper now uses `values()[0]` just in case anything gets renamed. | ||
|
|
||
| ### Minecraft | ||
| ### Recipe Book | ||
|
|
||
| * Fixed matrices not getting popped after rendering tooltips. (1.20+) | ||
| * Non-prefixed methods in PaginatedRecipeGroupButtonWidget and PaginatedRecipeBookWidget are now deprecated. | ||
| * Removed ApiStatus annotation from classes. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,3 @@ | ||
| dependencies { | ||
| implementation(include("com.mixpanel:mixpanel-java:${project.mixpanel_version}")) | ||
| implementation(include("org.json:json:${project.org_json_version}")) | ||
| api(project(path: ':dark-matter-analytics', configuration: 'namedElements')) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
132 changes: 132 additions & 0 deletions
132
...s-mixpanel/src/main/java/me/melontini/dark_matter/analytics/mixpanel/api/MixpanelAPI.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,132 @@ | ||
| package me.melontini.dark_matter.analytics.mixpanel.api; | ||
|
|
||
| import com.google.gson.JsonArray; | ||
| import com.google.gson.JsonNull; | ||
| import com.google.gson.JsonObject; | ||
|
|
||
| import java.io.IOException; | ||
| import java.net.ProxySelector; | ||
| import java.net.URI; | ||
| import java.net.http.HttpClient; | ||
| import java.net.http.HttpRequest; | ||
| import java.net.http.HttpResponse; | ||
| import java.time.Duration; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
| import java.util.UUID; | ||
|
|
||
| /** | ||
| * Basic API to interact with Mixpanel. | ||
| * <p> | ||
| * Only features basic functionality. | ||
| */ | ||
| //TODO (Union, Append, Remove) List properties | ||
| //TODO Group profiles (everything) | ||
| public class MixpanelAPI { | ||
| private static final String BASE_URL = "https://api.mixpanel.com"; | ||
| private static final String EU_URL = "https://api-eu.mixpanel.com"; | ||
|
|
||
| private final String endpoint; | ||
| private final HttpClient client = HttpClient.newBuilder().connectTimeout(Duration.ofMillis(2000)).proxy(ProxySelector.getDefault()).build(); | ||
| private final String token; | ||
|
|
||
| public MixpanelAPI(boolean eu, String projectToken) { | ||
| this.endpoint = eu ? EU_URL : BASE_URL; | ||
| this.token = projectToken; | ||
| } | ||
|
|
||
| public void trackEvent(String userID, String eventName, JsonObject props) { | ||
| JsonObject object = new JsonObject(); | ||
| object.addProperty("event", eventName); | ||
|
|
||
| if (props == null) { | ||
| props = new JsonObject(); | ||
| } | ||
|
|
||
| if (!props.has("token")) props.addProperty("token", this.token); | ||
| if (!props.has("time")) props.addProperty("time", System.currentTimeMillis()); | ||
| if (!props.has("$insert_id")) props.addProperty("$insert_id", UUID.randomUUID().toString()); | ||
| if (userID != null && !props.has("distinct_id")) props.addProperty("distinct_id", userID); | ||
|
|
||
| object.add("properties", props); | ||
|
|
||
| call("/track?ip=0", object); | ||
| } | ||
|
|
||
| public void set(String userID, JsonObject props) { | ||
| JsonObject object = profileDefaults(userID); | ||
| object.add("$set", props); | ||
| call("/engage?ip=0#profile-set", object); | ||
| } | ||
|
|
||
| public void setOnce(String userID, JsonObject props) { | ||
| JsonObject object = profileDefaults(userID); | ||
| object.add("$set_once", props); | ||
| call("/engage?ip=0#profile-set-once", object); | ||
| } | ||
|
|
||
| public void add(String userID, Map<String, Long> increment) { | ||
| JsonObject object = profileDefaults(userID); | ||
|
|
||
| JsonObject props = new JsonObject(); | ||
| for (Map.Entry<String, Long> entry : increment.entrySet()) { | ||
| props.addProperty(entry.getKey(), entry.getValue()); | ||
| } | ||
|
|
||
| object.add("$add", props); | ||
| call("/engage?ip=0#profile-numerical-add", object); | ||
| } | ||
|
|
||
| public void unset(String userID, String... props) { | ||
| JsonObject object = profileDefaults(userID); | ||
| JsonArray array = new JsonArray(); | ||
| for (String prop : props) { | ||
| array.add(prop); | ||
| } | ||
| object.add("$unset", array); | ||
| call("/engage?ip=0#profile-unset", object); | ||
| } | ||
|
|
||
| public void unset(String userID, List<String> props) { | ||
| JsonObject object = profileDefaults(userID); | ||
| JsonArray array = new JsonArray(); | ||
| for (String prop : props) { | ||
| array.add(prop); | ||
| } | ||
| object.add("$unset", array); | ||
| call("/engage?ip=0#profile-unset", object); | ||
| } | ||
|
|
||
| public void delete(String userID) { | ||
| JsonObject object = profileDefaults(userID); | ||
| object.add("$delete", JsonNull.INSTANCE); | ||
| call("/engage?ip=0#profile-delete", object); | ||
| } | ||
|
|
||
| public JsonObject profileDefaults(String userID) { | ||
| JsonObject object = new JsonObject(); | ||
| if (!object.has("$token")) object.addProperty("$token", this.token); | ||
| if (!object.has("$time")) object.addProperty("$time", System.currentTimeMillis()); | ||
| if (userID != null && !object.has("$distinct_id")) object.addProperty("$distinct_id", userID); | ||
| return object; | ||
| } | ||
|
|
||
| private void call(String endpoint, JsonObject... objects) { | ||
| JsonArray array = new JsonArray(); | ||
| for (JsonObject object : objects) { | ||
| array.add(object); | ||
| } | ||
| try { | ||
| HttpRequest request = HttpRequest.newBuilder() | ||
| .uri(URI.create(this.endpoint + endpoint)) | ||
| .header("accept", "text/plain") | ||
| .header("content-type", "application/json") | ||
| .method("POST", HttpRequest.BodyPublishers.ofString(array.toString())) | ||
| .build(); | ||
| HttpResponse<String> response = client.send(request, HttpResponse.BodyHandlers.ofString()); | ||
| if (response.statusCode() != 200) throw new RuntimeException("Status Code: " + response.statusCode() + " Body: " + response.body()); | ||
| } catch (IOException | InterruptedException e) { | ||
| throw new RuntimeException(e); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.