Removes Unnecessary Repo Handlers That Actually Break Things (#4)

babric · Jul 12, 2024 · a7ef915 · a7ef915
1 parent 43bc886
commit a7ef915
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 25 deletions.
diff --git a/src/main/java/babric/BabricRepositoryHandler.java b/src/main/java/babric/BabricRepositoryHandler.java
@@ -44,11 +44,11 @@ private void declareRepositories(RepositoryHandler repositories) {
             repo.setName("Babric");
             repo.setUrl(Constants.BABRIC_MAVEN);
         });
-        repositories.maven(repo -> { // No filter, all parts of this repo are used in a project.
+        repositories.maven(repo -> {
             repo.setName("Modrinth");
-            repo.setUrl(Constants.MODRINTH_MAVEN);
+            repo.setUrl(Constants.GLASS_MAVEN);
             repo.content(content -> {
-                content.includeModule("maven.modrinth", "gambac"); // Allow only gambac, don't let folk rely on this adding MR for them.
+                content.includeModule("net.danygames2014", "gambac"); // Allow only gambac, don't let folk rely on this adding MR for them.
             });
         });
     }

diff --git a/src/main/java/babric/Constants.java b/src/main/java/babric/Constants.java
@@ -3,5 +3,5 @@
 public class Constants {
     public static final String LEGACYFABRIC_MAVEN = "https://repo.legacyfabric.net/repository/legacyfabric/";
     public static final String BABRIC_MAVEN = "https://maven.glass-launcher.net/babric/";
-    public static final String MODRINTH_MAVEN = "https://api.modrinth.com/maven/";
+    public static final String GLASS_MAVEN = "https://maven.glass-launcher.net/releases/";
 }
diff --git a/src/main/java/babric/processor/GambacLibraryProcessor.java b/src/main/java/babric/processor/GambacLibraryProcessor.java
@@ -49,19 +49,9 @@ public Predicate<Library> apply(Consumer<Library> dependencyConsumer) {
         if (!applied) {
             applied = true;
 
-            dependencyConsumer.accept(Library.fromMaven("maven.modrinth:gambac:" + VERSION, Library.Target.LOCAL_MOD));
+            dependencyConsumer.accept(Library.fromMaven("net.danygames2014:gambac:" + VERSION, Library.Target.LOCAL_MOD));
         }
 
         return ALLOW_ALL;
     }
-
-    @Override
-    public void applyRepositories(RepositoryHandler repositories) {
-        repositories.exclusiveContent(repository -> {
-            repository.forRepositories(repositories.findByName("Modrinth"));
-            repository.filter(filter -> {
-                filter.includeModule("maven.modrinth", "gambac"); // Allow only gambac, don't let folk rely on this adding MR for them.
-            });
-        });
-    }
 }
diff --git a/src/main/java/babric/processor/LWJGL2LibraryProcessor.java b/src/main/java/babric/processor/LWJGL2LibraryProcessor.java
@@ -50,16 +50,6 @@ public Predicate<Library> apply(Consumer<Library> dependencyConsumer) {
         };
     }
 
-    @Override
-    public void applyRepositories(RepositoryHandler repositories) {
-        repositories.exclusiveContent(repository -> {
-            repository.forRepositories(repositories.findByName("Legacy Fabric"));
-            repository.filter(filter -> {
-                filter.includeGroup("org.lwjgl.lwjgl");
-            });
-        });
-    }
-
     public static String getNativeClassifier() {
         switch (Platform.CURRENT.getOperatingSystem()) {
             case MAC_OS -> {