make all modules for default

Ecdcaeb · Mar 10, 2024 · a6bf7cb · a6bf7cb
1 parent 729ba10
commit a6bf7cb
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 8 deletions.
diff --git a/build.gradle b/build.gradle
@@ -36,6 +36,8 @@ minecraft {
     accessTransformer = file('src/main/resources/META-INF/rml_at.cfg')
 
 
+
+
     runs {
         client {
             workingDirectory project.file('run')

diff --git a/rmdk/build.gradle b/rmdk/build.gradle
@@ -211,12 +211,12 @@ tasks.register("installRML", Copy){
     to "runServer/mods"
 }
 tasks.register('buildServerRM', Zip) {
-    archiveName = "developing_resource_mod.zip"
+    archiveNameBase = "developing_resource_mod.zip"
     destinationDir = file("runServer/mods")
     from "dev"
 }
 tasks.register('buildClientRM', Zip) {
-    archiveName = "developing_resource_mod.zip"
+    archiveNameBase = "developing_resource_mod.zip"
     destinationDir = file("run/mods")
     from "dev"
 }

diff --git a/rmdk/gradle/rml/ResourceModLoader-1.0.7.jar b/rmdk/gradle/rml/ResourceModLoader-1.0.7.jar
diff --git a/rmdk/gradle/rml/ResourceModLoader-1.0.9.jar b/rmdk/gradle/rml/ResourceModLoader-1.0.9.jar
diff --git a/src/main/java/mods/Hileb/rml/compat/crt/CrTFindingIScriptIteratorEvent.java b/src/main/java/mods/Hileb/rml/compat/crt/CrTFindingIScriptIteratorEvent.java
@@ -20,7 +20,7 @@ public class CrTFindingIScriptIteratorEvent extends Event {
         scriptIterators=list;
     }
     @PublicAPI public void load(IScriptProvider provider){
-        Iterator<IScriptIterator> iterator=provider.getScripts();
+        Iterator<IScriptIterator> iterator = provider.getScripts();
         while (iterator.hasNext()){
             scriptIterators.add(iterator.next());
         }

diff --git a/src/main/java/mods/Hileb/rml/compat/crt/EventScriptProvider.java b/src/main/java/mods/Hileb/rml/compat/crt/EventScriptProvider.java
@@ -27,9 +27,9 @@ public Iterator<IScriptIterator> getScripts() {
         return this.combine().iterator();
     }
     @PrivateAPI public List<IScriptIterator> combine(){
-        LinkedList<IScriptIterator> list=new LinkedList<>();
+        LinkedList<IScriptIterator> list = new LinkedList<>();
 
-        Iterator<IScriptIterator> iterator=proxy.getScripts();
+        Iterator<IScriptIterator> iterator = proxy.getScripts();
         while (iterator.hasNext()){
             list.add(iterator.next());
         }

diff --git a/src/main/java/mods/Hileb/rml/compat/crt/RMLCrTLoader.java b/src/main/java/mods/Hileb/rml/compat/crt/RMLCrTLoader.java
@@ -72,7 +72,7 @@ public class RMLCrTLoader {
                                 byte[] fileBytes=FileHelper.getByteSource(file).read();
 
                                 providerCustom.add(name,fileBytes);
-                                RMLFMLLoadingPlugin.Container.LOGGER.debug(key.toString());
+                                RMLFMLLoadingPlugin.Container.LOGGER.info("Injected {} for CrT",key);
                             } catch (IOException e) {
                                 throw new RuntimeException(e);
                             }

diff --git a/src/main/java/mods/Hileb/rml/core/RMLModDiscover.java b/src/main/java/mods/Hileb/rml/core/RMLModDiscover.java
@@ -28,6 +28,7 @@
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
 import java.util.zip.ZipEntry;
@@ -103,8 +104,13 @@ public static void inject(List<ModContainer> modContainers){
                 throw new RuntimeException("illegal modules opinion for "+jsonObject.get("modid").getAsString(), e);
             }
             jsonObject.remove("modules");
+            ModMetadata metadata = GSON.fromJson(jsonObject, ModMetadata.class);
+            return new ContainerHolder(new RMLModContainer(metadata, modFile), modules.toArray(new ContainerHolder.Modules[0]));
+
+        }else {
+            ModMetadata metadata = GSON.fromJson(jsonObject, ModMetadata.class);
+            return new ContainerHolder(new RMLModContainer(metadata, modFile), ContainerHolder.Modules.values());
         }
-        ModMetadata metadata = GSON.fromJson(jsonObject, ModMetadata.class);
-        return new ContainerHolder(new RMLModContainer(metadata, modFile), modules.toArray(new ContainerHolder.Modules[0]));
+
     }
 }