fix crash when ae2 does not present

Author: zyxkad

build.gradle

@@ -58,6 +58,7 @@ def modrinthKey = secretEnv["MODRINTH_KEY"] ?: System.getenv("MODRINTH_KEY")
 def repositoryName = secretEnv["PUBLIC_REP_NAME"] ?: System.getenv("PUBLIC_REP_NAME")
 def repositoryKey = secretEnv["PUBLIC_REP_KEY"] ?: System.getenv("PUBLIC_REP_KEY")
 def githubKey = secretEnv["GITHUB_KEY"] ?: System.getenv("GITHUB_KEY")
+def minimumRuntime = project.hasProperty('clean_test') && project.property('clean_test').toBoolean()
 
 // Include resources generated by data generators.
 sourceSets.main.resources { srcDir 'src/generated/resources' }
@@ -248,44 +249,63 @@ dependencies {
 
     // Minimal requirements end
 
-    compileOnly("com.refinedmods.refinedstorage:refinedstorage-neoforge:${refinedstorage_version}")
-    runtimeOnly("com.refinedmods.refinedstorage:refinedstorage-neoforge:${refinedstorage_version}") {
-        transitive = false
+    compileOnly "com.refinedmods.refinedstorage:refinedstorage-neoforge:${refinedstorage_version}"
+    if (!minimumRuntime) {
+        runtimeOnly("com.refinedmods.refinedstorage:refinedstorage-neoforge:${refinedstorage_version}") {
+            transitive = false
+        }
     }
 
     // Transitive prevents that this dependency would load other dependencies which are used by refined storage and are faulty marked
-    compileOnly("com.refinedmods.refinedstorage:refinedstorage-mekanism-integration:${refinedstorage_mekanism_version}")
-    runtimeOnly("com.refinedmods.refinedstorage:refinedstorage-mekanism-integration:${refinedstorage_mekanism_version}")  {
-        transitive = false
+    compileOnly "com.refinedmods.refinedstorage:refinedstorage-mekanism-integration:${refinedstorage_mekanism_version}"
+    if (!minimumRuntime) {
+        runtimeOnly("com.refinedmods.refinedstorage:refinedstorage-mekanism-integration:${refinedstorage_mekanism_version}")  {
+            transitive = false
+        }
     }
 
     // Extended requirements
     // We don't use the api since we need a specific class from mekanism
     compileOnly "mekanism:Mekanism:${mekanism_version}"
-    runtimeOnly "mekanism:Mekanism:${mekanism_version}"
+    if (!minimumRuntime) {
+        runtimeOnly "mekanism:Mekanism:${mekanism_version}"
+    }
 
     // Applied Energistics 2
     compileOnly "org.appliedenergistics:appliedenergistics2:${appliedenergistics_version}"
-    runtimeOnly "org.appliedenergistics:appliedenergistics2:${appliedenergistics_version}"
+    if (!minimumRuntime) {
+        runtimeOnly "org.appliedenergistics:appliedenergistics2:${appliedenergistics_version}"
+    }
 
     // Applied Mekanistics
     compileOnly "curse.maven:applied-mekanistics-574300:${appliedmekanistics_version}"
-    runtimeOnly "curse.maven:applied-mekanistics-574300:${appliedmekanistics_version}"
+    if (!minimumRuntime) {
+        runtimeOnly "curse.maven:applied-mekanistics-574300:${appliedmekanistics_version}"
+    }
 
     // AE2 Things
     compileOnly "curse.maven:ae2things-609977:${ae2things_version}-sources"
-    runtimeOnly "curse.maven:ae2things-609977:${ae2things_version}-sources"
+    if (!minimumRuntime) {
+        runtimeOnly "curse.maven:ae2things-609977:${ae2things_version}-sources"
+    }
 
     // Create
-    implementation ("com.simibubi.create:create-${minecraft_version}:${create_version}:slim") { transitive = false }
-    implementation "net.createmod.ponder:Ponder-NeoForge-${minecraft_version}:${ponder_version}"
+    compileOnly("com.simibubi.create:create-${minecraft_version}:${create_version}:slim") { transitive = false }
+    compileOnly "net.createmod.ponder:Ponder-NeoForge-${minecraft_version}:${ponder_version}"
     compileOnly "dev.engine-room.flywheel:flywheel-neoforge-api-${minecraft_version}:${flywheel_version}"
-    runtimeOnly "dev.engine-room.flywheel:flywheel-neoforge-${minecraft_version}:${flywheel_version}"
-    implementation "com.tterrag.registrate:Registrate:${registrate_version}"
+    compileOnly "com.tterrag.registrate:Registrate:${registrate_version}"
+    if (!minimumRuntime) {
+        runtimeOnly("com.simibubi.create:create-${minecraft_version}:${create_version}:slim") { transitive = false }
+        runtimeOnly "net.createmod.ponder:Ponder-NeoForge-${minecraft_version}:${ponder_version}"
+        runtimeOnly "dev.engine-room.flywheel:flywheel-neoforge-${minecraft_version}:${flywheel_version}"
+        runtimeOnly "com.tterrag.registrate:Registrate:${registrate_version}"
+    }
 
     // Curios
-    runtimeOnly "top.theillusivec4.curios:curios-neoforge:${curios_version}"
     compileOnly "top.theillusivec4.curios:curios-neoforge:${curios_version}:api"
+    if (!minimumRuntime) {
+        runtimeOnly "top.theillusivec4.curios:curios-neoforge:${curios_version}"
+    }
 
     // DimStorage
     compileOnly "curse.maven:dimstorage-353882:${dimstorage_version}"
@@ -296,19 +316,25 @@ dependencies {
     compileOnly "com.ldtteam:domum-ornamentum:${domumornamentum_version}"
     compileOnly "com.ldtteam:minecolonies:${minecolonies_version}"
     compileOnly "com.ldtteam:structurize:${structurize_version}"
-    runtimeOnly "com.ldtteam:blockui:${blockui_version}"
-    runtimeOnly "com.ldtteam:domum-ornamentum:${domumornamentum_version}"
-    runtimeOnly "com.ldtteam:minecolonies:${minecolonies_version}"
-    runtimeOnly "com.ldtteam:structurize:${structurize_version}"
+    if (!minimumRuntime) {
+        runtimeOnly "com.ldtteam:blockui:${blockui_version}"
+        runtimeOnly "com.ldtteam:domum-ornamentum:${domumornamentum_version}"
+        runtimeOnly "com.ldtteam:minecolonies:${minecolonies_version}"
+        runtimeOnly "com.ldtteam:structurize:${structurize_version}"
+    }
 
     // Patchouli
     compileOnly "vazkii.patchouli:Patchouli:${patchouli_version}-NEOFORGE"
-    runtimeOnly "vazkii.patchouli:Patchouli:${patchouli_version}-NEOFORGE"
+    if (!minimumRuntime) {
+        runtimeOnly "vazkii.patchouli:Patchouli:${patchouli_version}-NEOFORGE"
+    }
 
     // Powah
     compileOnly "curse.maven:powah-633483:${powah_version}"
-    runtimeOnly "me.shedaniel.cloth:cloth-config-neoforge:${cloth_config_version}"
-    runtimeOnly "curse.maven:powah-633483:${powah_version}"
+    if (!minimumRuntime) {
+        runtimeOnly "me.shedaniel.cloth:cloth-config-neoforge:${cloth_config_version}"
+        runtimeOnly "curse.maven:powah-633483:${powah_version}"
+    }
 
     testModImplementation sourceSets.main.output
 
@@ -321,9 +347,12 @@ dependencies {
     runtimeOnly "dev.emi:emi-neoforge:${emi_version}"
     // Spark
     runtimeOnly "maven.modrinth:spark:1.10.124-neoforge-1.21.1"
-    // Sophisticated Backpacks
-    runtimeOnly "maven.modrinth:sophisticated-backpacks:${sophisticated_backpacks_version}"
-    runtimeOnly "maven.modrinth:sophisticated-core:${sophisticated_core_version}"
+
+    if (!minimumRuntime) {
+        // Sophisticated Backpacks
+        runtimeOnly "maven.modrinth:sophisticated-backpacks:${sophisticated_backpacks_version}"
+        runtimeOnly "maven.modrinth:sophisticated-core:${sophisticated_core_version}"
+    }
 }
 
 

src/main/java/de/srendi/advancedperipherals/client/ClientRegistry.java

@@ -5,6 +5,7 @@
 import dan200.computercraft.api.client.turtle.TurtleUpgradeModeller;
 import de.srendi.advancedperipherals.AdvancedPeripherals;
 import de.srendi.advancedperipherals.client.renderer.AEDiskKeyRenderer;
+import de.srendi.advancedperipherals.client.renderer.AERendererRegister;
 import de.srendi.advancedperipherals.client.renderer.DistanceDetectorRenderer;
 import de.srendi.advancedperipherals.client.screens.InventoryManagerScreen;
 import de.srendi.advancedperipherals.client.screens.KeyboardScreen;
@@ -37,7 +38,7 @@ public class ClientRegistry {
     public static void onClientSetup(FMLClientSetupEvent event) {
         ItemPropertiesRegistry.register();
         if (APAddon.AE2.isLoaded()) {
-            AEKeyRendering.register(AEDiskKeys.INSTANCE, AEDiskKey.class, new AEDiskKeyRenderer());
+            AERendererRegister.register();
         }
     }
 

src/main/java/de/srendi/advancedperipherals/client/renderer/AERendererRegister.java

@@ -0,0 +1,11 @@
+package de.srendi.advancedperipherals.client.renderer;
+
+import appeng.api.client.AEKeyRendering;
+import de.srendi.advancedperipherals.common.addons.ae2.disk.AEDiskKey;
+import de.srendi.advancedperipherals.common.addons.ae2.disk.AEDiskKeys;
+
+public final class AERendererRegister {
+    public static void register() {
+        AEKeyRendering.register(AEDiskKeys.INSTANCE, AEDiskKey.class, new AEDiskKeyRenderer());
+    }
+}