From 7afb9f7360a8327d7d22488003b1cb351f9a3131 Mon Sep 17 00:00:00 2001
From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
Date: Sun, 3 Dec 2023 18:42:17 -0700
Subject: [PATCH] Build updates

---
 build.gradle.kts    | 16 +++-------------
 settings.gradle.kts |  3 +++
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 8c96c272..5e551d41 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,5 +1,4 @@
 import net.fabricmc.loom.task.AbstractRunTask
-import org.gradlex.javaecosystem.capabilities.rules.GuavaListenableFutureRule
 
 plugins {
     val indraVer = "3.1.3"
@@ -7,10 +6,12 @@ plugins {
     id("net.kyori.indra.publishing") version indraVer
     id("net.kyori.indra.publishing.sonatype") version indraVer
     id("net.kyori.indra.license-header") version indraVer
-    id("dev.architectury.loom") version "1.4-SNAPSHOT"
+    id("xyz.jpenilla.quiet-architectury-loom") version "1.4-SNAPSHOT"
 }
 
 repositories {
+    mavenCentral()
+    maven("https://repo.papermc.io/repository/maven-public/")
     maven("https://maven.neoforged.net/releases/")
 }
 
@@ -27,18 +28,7 @@ val transitiveInclude: Configuration by configurations.creating {
     exclude("org.apiguardian")
 }
 
-loom.silentMojangMappingsLicense()
-
 dependencies {
-    components.withModule(GuavaListenableFutureRule.MODULES[0]) {
-        // Ad-hoc rule to revert the effect of 'GuavaListenableFutureRule' (NeoForge has broken dependencies)
-        allVariants {
-            withCapabilities {
-                removeCapability(GuavaListenableFutureRule.CAPABILITY_GROUP, GuavaListenableFutureRule.CAPABILITY_NAME)
-            }
-        }
-    }
-
     minecraft("com.mojang:minecraft:1.20.2")
     mappings(loom.officialMojangMappings())
     neoForge("net.neoforged", "neoforge", "20.2.86")
diff --git a/settings.gradle.kts b/settings.gradle.kts
index d4f4a07c..f69bc65a 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,9 +1,12 @@
 pluginManagement {
     repositories {
         gradlePluginPortal()
+        mavenCentral()
+        maven("https://repo.papermc.io/repository/maven-public/")
         maven("https://maven.fabricmc.net/")
         maven("https://maven.neoforged.net/releases/")
         maven("https://maven.architectury.dev/")
+        maven("https://repo.jpenilla.xyz/snapshots/")
     }
 }