Merge pull request #3 from FTBTeam/feature/1.21/oritech-jei

Start work on Oritech JEI Plugin

CHANGELOG.md

@@ -1,3 +1,7 @@
-## Fixed
+## Added
 
-- Minor issue with stack copying
+- Oritech JEI Compact
+
+## Removed
+
+- AdvancedAE JEI Compact due to AdvancedAE adding it's self

build.gradle

@@ -43,8 +43,8 @@ neoForge {
             systemProperty 'neoforge.enabledGameTestNamespaces', project.mod_id
 
             // Add --width and --height to the client run configuration
-            programArgument '--width=1920'
-            programArgument '--height=1080'
+//            programArgument '--width=1920'
+//            programArgument '--height=1080'
         }
 
         server {
@@ -89,26 +89,39 @@ dependencies {
     localRuntime "mezz.jei:jei-${minecraft_version}-neoforge:${jei_version}"
 
     def extendedAEAtRuntime = true
-    def advancedAEAtRuntime = true
+    def oritechAtRuntime = true
 
     compileOnly("curse.maven:applied-energistics-2-223794:5662490")
-    compileOnly("curse.maven:glodium-957920:5614731")
     compileOnly("curse.maven:extendedae-892005:5680210")
 
     if (extendedAEAtRuntime) localRuntime("curse.maven:extendedae-892005:5680210")
 
-    compileOnly("curse.maven:advancedae-1084104:5715851")
-    if (advancedAEAtRuntime) localRuntime("curse.maven:advancedae-1084104:5881249")
+    if (extendedAEAtRuntime) runtimeOnly("curse.maven:applied-energistics-2-223794:5662490")
+    if (extendedAEAtRuntime || oritechAtRuntime) runtimeOnly("curse.maven:geckolib-388172:5874016")
+
+    compileOnly("curse.maven:oritech-1030830:5952879")
+    // All these are required for depending on oritech
+    compileOnly("curse.maven:architectury-api-419699:5786327")
+    compileOnly("org.sinytra.forgified-fabric-api:forgified-fabric-api:0.104.0+2.0.19+1.21.1")
+    compileOnly("curse.maven:geckolib-388172:5874016")
+    compileOnly("curse.maven:owo-lib-532610:5945693")
+
+    if (oritechAtRuntime) {
+        localRuntime("curse.maven:oritech-1030830:5952879")
+        runtimeOnly("curse.maven:architectury-api-419699:5786327")
+        runtimeOnly("curse.maven:owo-lib-532610:5945693")
+        runtimeOnly("curse.maven:athena-841890:5629395")
+        runtimeOnly("org.sinytra.forgified-fabric-api:forgified-fabric-api:0.104.0+2.0.19+1.21.1")
+    }
+
 
-    if (extendedAEAtRuntime || advancedAEAtRuntime) runtimeOnly("curse.maven:applied-energistics-2-223794:5662490")
-    if (extendedAEAtRuntime || advancedAEAtRuntime) runtimeOnly("curse.maven:glodium-957920:5614731")
-    if (extendedAEAtRuntime || advancedAEAtRuntime) runtimeOnly("curse.maven:geckolib-388172:5874016")
 }
 
 repositories {
     mavenLocal()
     maven { url "https://modmaven.dev" }
     maven { url "https://cursemaven.com" }
+    maven { url "https://maven.su5ed.dev/releases" }
 }
 
 // This block of code expands all declared replace properties in the specified resource targets.

gradle.properties

@@ -16,10 +16,10 @@ loader_version_range=[4,)
 mod_id=ftbjeiextras
 mod_name=FTB Jei Extras
 mod_license=All Rights Reserved
-mod_version=21.1.3
+mod_version=21.1.4
 mod_group_id=dev.ftb.mods
 mod_authors=FTB Team
 mod_description=Stand in mod to add extra JEI support for mods that don't have it.
 
-jei_version=19.17.0.193
+jei_version=19.21.0.247
 curseforge_id=1103259

src/main/java/dev/ftb/mods/ftbjeiextras/loader/ExtendedPluginLoader.java

@@ -1,8 +1,8 @@
 package dev.ftb.mods.ftbjeiextras.loader;
 
 import dev.ftb.mods.ftbjeiextras.FTBJeiExtras;
-import dev.ftb.mods.ftbjeiextras.advancedae.AdvancedAePlugin;
 import dev.ftb.mods.ftbjeiextras.extendedae.ExtendedAePlugin;
+import dev.ftb.mods.ftbjeiextras.oritech.OritechPlugin;
 import mezz.jei.api.IModPlugin;
 import mezz.jei.api.JeiPlugin;
 import mezz.jei.api.helpers.IPlatformFluidHelper;
@@ -23,7 +23,7 @@
 public class ExtendedPluginLoader implements IModPlugin {
     final List<IConditionalModPlugin> containedPlugins = List.of(
             new ExtendedAePlugin(),
-            new AdvancedAePlugin()
+            new OritechPlugin()
     );
 
     @Override