Repo-Mirror/MiraiMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Resolve conflicts

Browse Source
This commit is contained in:
Etil
2021-12-22 16:21:05 +01:00
parent a3ae5436ff
commit fcf90ee06d
11 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/api/0003-Add-GameProfileLookupEvent.patch
View File

@@ -1,22 +1,22 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Etil <81570777+etil2jz@users.noreply.github.com>
Date: Thu, 9 Dec 2021 19:00:39 +0100
Date: Wed, 22 Dec 2021 16:19:23 +0100
Subject: [PATCH] Add GameProfileLookupEvent
Original code by YatopiaMC, licensed under MIT
You can find the original code on https://github.com/YatopiaMC/Yatopia
diff --git a/build.gradle.kts b/build.gradle.kts
index f44d9fef297c8f6d4cf42b40f738d704d5207f5f..6e05b88a8ef08c2d267920888f20edffe120a7fa 100644
index f00d21bdb0fced241dbbd37784c05f1c3a4598e4..129c5b41b410b57952fedf90c1ea713ba1c36470 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -50,6 +50,7 @@ dependencies {
compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.0")
compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.0")
compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.2")
compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.2")
compileOnly("com.google.code.findbugs:jsr305:1.3.9") // Paper
+ compileOnly("com.mojang:authlib:3.2.38") // Yatopia
val annotations = "org.jetbrains:annotations:21.0.1" // Paper - we don't want Java 5 annotations...
val annotations = "org.jetbrains:annotations:23.0.0" // Paper - we don't want Java 5 annotations...
compileOnly(annotations)
diff --git a/src/main/java/org/yatopiamc/yatopia/api/events/GameProfileLookupEvent.java b/src/main/java/org/yatopiamc/yatopia/api/events/GameProfileLookupEvent.java
new file mode 100644