From e266ee9ff6c8e84188233106b0514296896aee89 Mon Sep 17 00:00:00 2001
From: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
Date: Sat, 13 May 2023 22:20:05 -0700
Subject: [PATCH] Properly build on eclipse via indra

Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
---
 build-logic/build.gradle.kts                        |  3 ++-
 .../main/kotlin/geyser.base-conventions.gradle.kts  | 13 +------------
 settings.gradle.kts                                 |  1 +
 3 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/build-logic/build.gradle.kts b/build-logic/build.gradle.kts
index 3d1fb47f7..7506d3f0e 100644
--- a/build-logic/build.gradle.kts
+++ b/build-logic/build.gradle.kts
@@ -3,12 +3,13 @@ plugins {
 }
 
 repositories {
+    maven("https://repo.stellardrift.ca/repository/snapshots/")
     gradlePluginPortal()
     maven("https://repo.opencollab.dev/maven-snapshots")
 }
 
 dependencies {
-    implementation("net.kyori", "indra-common", "3.0.1")
+    implementation("net.kyori", "indra-common", "3.1.0-SNAPSHOT")
     implementation("com.github.johnrengelman", "shadow", "7.1.3-SNAPSHOT")
 
     // Within the gradle plugin classpath, there is a version conflict between loom and some other
diff --git a/build-logic/src/main/kotlin/geyser.base-conventions.gradle.kts b/build-logic/src/main/kotlin/geyser.base-conventions.gradle.kts
index ae946b6ce..93d702939 100644
--- a/build-logic/src/main/kotlin/geyser.base-conventions.gradle.kts
+++ b/build-logic/src/main/kotlin/geyser.base-conventions.gradle.kts
@@ -1,6 +1,5 @@
 plugins {
     `java-library`
-    `eclipse`
     id("net.kyori.indra")
 }
 
@@ -35,14 +34,4 @@ tasks {
             )
         }
     }
-}
-
-eclipse {
-    classpath.file.whenMerged {
-        (this as org.gradle.plugins.ide.eclipse.model.Classpath).entries.forEach { entry ->
-            if (entry is org.gradle.plugins.ide.eclipse.model.Library) {
-                entry.entryAttributes["module"] = false
-            }
-        }
-    }
-}
+}
\ No newline at end of file
diff --git a/settings.gradle.kts b/settings.gradle.kts
index e9c7641e4..0ef308051 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -46,6 +46,7 @@ dependencyResolutionManagement {
 
 pluginManagement {
     repositories {
+        maven(url = "https://repo.stellardrift.ca/repository/snapshots/")
         gradlePluginPortal()
         maven("https://maven.fabricmc.net/")
         maven("https://repo.opencollab.dev/maven-snapshots")