fix JiJ metadata being wrong

Mari023 · Aug 6, 2024 · 21211cf · 21211cf
1 parent f93a20e
commit 21211cf
Show file tree

Hide file tree

Showing 44 changed files with 6 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1 @@
+- fix issue where the wrong version of ae2wtlib_api gets selected
diff --git a/api/build.gradle.kts → ae2wtlib_api/build.gradle.kts b/api/build.gradle.kts → ae2wtlib_api/build.gradle.kts
diff --git a/ae2wtlib_api/gradle.properties b/ae2wtlib_api/gradle.properties
@@ -0,0 +1,2 @@
+modID=ae2wtlib_api
+group=de.mari_023
diff --git a/...de/mari_023/ae2wtlib/api/AE2wtlibAPI.java → ...de/mari_023/ae2wtlib/api/AE2wtlibAPI.java b/...de/mari_023/ae2wtlib/api/AE2wtlibAPI.java → ...de/mari_023/ae2wtlib/api/AE2wtlibAPI.java
diff --git a/...3/ae2wtlib/api/AE2wtlibAPIEntrypoint.java → ...3/ae2wtlib/api/AE2wtlibAPIEntrypoint.java b/...3/ae2wtlib/api/AE2wtlibAPIEntrypoint.java → ...3/ae2wtlib/api/AE2wtlibAPIEntrypoint.java
diff --git a/...ari_023/ae2wtlib/api/AE2wtlibAPIImpl.java → ...ari_023/ae2wtlib/api/AE2wtlibAPIImpl.java b/...ari_023/ae2wtlib/api/AE2wtlibAPIImpl.java → ...ari_023/ae2wtlib/api/AE2wtlibAPIImpl.java
diff --git a/..._023/ae2wtlib/api/AE2wtlibComponents.java → ..._023/ae2wtlib/api/AE2wtlibComponents.java b/..._023/ae2wtlib/api/AE2wtlibComponents.java → ..._023/ae2wtlib/api/AE2wtlibComponents.java
diff --git a/.../mari_023/ae2wtlib/api/TextConstants.java → .../mari_023/ae2wtlib/api/TextConstants.java b/.../mari_023/ae2wtlib/api/TextConstants.java → .../mari_023/ae2wtlib/api/TextConstants.java
diff --git a/...2wtlib/api/gui/AE2wtlibSlotSemantics.java → ...2wtlib/api/gui/AE2wtlibSlotSemantics.java b/...2wtlib/api/gui/AE2wtlibSlotSemantics.java → ...2wtlib/api/gui/AE2wtlibSlotSemantics.java
diff --git a/...va/de/mari_023/ae2wtlib/api/gui/Icon.java → ...va/de/mari_023/ae2wtlib/api/gui/Icon.java b/...va/de/mari_023/ae2wtlib/api/gui/Icon.java → ...va/de/mari_023/ae2wtlib/api/gui/Icon.java
diff --git a/...mari_023/ae2wtlib/api/gui/IconButton.java → ...mari_023/ae2wtlib/api/gui/IconButton.java b/...mari_023/ae2wtlib/api/gui/IconButton.java → ...mari_023/ae2wtlib/api/gui/IconButton.java
diff --git a/...wtlib/api/gui/ScrollingUpgradesPanel.java → ...wtlib/api/gui/ScrollingUpgradesPanel.java b/...wtlib/api/gui/ScrollingUpgradesPanel.java → ...wtlib/api/gui/ScrollingUpgradesPanel.java
diff --git a/...3/ae2wtlib/api/gui/UpgradeBackground.java → ...3/ae2wtlib/api/gui/UpgradeBackground.java b/...3/ae2wtlib/api/gui/UpgradeBackground.java → ...3/ae2wtlib/api/gui/UpgradeBackground.java
diff --git a/...ri_023/ae2wtlib/api/gui/package-info.java → ...ri_023/ae2wtlib/api/gui/package-info.java b/...ri_023/ae2wtlib/api/gui/package-info.java → ...ri_023/ae2wtlib/api/gui/package-info.java
diff --git a/...e/mari_023/ae2wtlib/api/package-info.java → ...e/mari_023/ae2wtlib/api/package-info.java b/...e/mari_023/ae2wtlib/api/package-info.java → ...e/mari_023/ae2wtlib/api/package-info.java
diff --git a/...ib/api/registration/AddTerminalEvent.java → ...ib/api/registration/AddTerminalEvent.java b/...ib/api/registration/AddTerminalEvent.java → ...ib/api/registration/AddTerminalEvent.java
diff --git a/...wtlib/api/registration/UpgradeHelper.java → ...wtlib/api/registration/UpgradeHelper.java b/...wtlib/api/registration/UpgradeHelper.java → ...wtlib/api/registration/UpgradeHelper.java
diff --git a/...2wtlib/api/registration/WTDefinition.java → ...2wtlib/api/registration/WTDefinition.java b/...2wtlib/api/registration/WTDefinition.java → ...2wtlib/api/registration/WTDefinition.java
diff --git a/...api/registration/WTDefinitionBuilder.java → ...api/registration/WTDefinitionBuilder.java b/...api/registration/WTDefinitionBuilder.java → ...api/registration/WTDefinitionBuilder.java
diff --git a/...2wtlib/api/registration/package-info.java → ...2wtlib/api/registration/package-info.java b/...2wtlib/api/registration/package-info.java → ...2wtlib/api/registration/package-info.java
diff --git a/...e2wtlib/api/results/ActionHostResult.java → ...e2wtlib/api/results/ActionHostResult.java b/...e2wtlib/api/results/ActionHostResult.java → ...e2wtlib/api/results/ActionHostResult.java
diff --git a/..._023/ae2wtlib/api/results/LongResult.java → ..._023/ae2wtlib/api/results/LongResult.java b/..._023/ae2wtlib/api/results/LongResult.java → ..._023/ae2wtlib/api/results/LongResult.java
diff --git a/...mari_023/ae2wtlib/api/results/Result.java → ...mari_023/ae2wtlib/api/results/Result.java b/...mari_023/ae2wtlib/api/results/Result.java → ...mari_023/ae2wtlib/api/results/Result.java
diff --git a/...mari_023/ae2wtlib/api/results/Status.java → ...mari_023/ae2wtlib/api/results/Status.java b/...mari_023/ae2wtlib/api/results/Status.java → ...mari_023/ae2wtlib/api/results/Status.java
diff --git a/...23/ae2wtlib/api/results/package-info.java → ...23/ae2wtlib/api/results/package-info.java b/...23/ae2wtlib/api/results/package-info.java → ...23/ae2wtlib/api/results/package-info.java
diff --git a/...api/terminal/Ae2wtlibLocatingService.java → ...api/terminal/Ae2wtlibLocatingService.java b/...api/terminal/Ae2wtlibLocatingService.java → ...api/terminal/Ae2wtlibLocatingService.java
diff --git a/...i/terminal/IUniversalTerminalCapable.java → ...i/terminal/IUniversalTerminalCapable.java b/...i/terminal/IUniversalTerminalCapable.java → ...i/terminal/IUniversalTerminalCapable.java
diff --git a/...ari_023/ae2wtlib/api/terminal/ItemWT.java → ...ari_023/ae2wtlib/api/terminal/ItemWT.java b/...ari_023/ae2wtlib/api/terminal/ItemWT.java → ...ari_023/ae2wtlib/api/terminal/ItemWT.java
diff --git a/...ri_023/ae2wtlib/api/terminal/ItemWUT.java → ...ri_023/ae2wtlib/api/terminal/ItemWUT.java b/...ri_023/ae2wtlib/api/terminal/ItemWUT.java → ...ri_023/ae2wtlib/api/terminal/ItemWUT.java
diff --git a/...023/ae2wtlib/api/terminal/WTMenuHost.java → ...023/ae2wtlib/api/terminal/WTMenuHost.java b/...023/ae2wtlib/api/terminal/WTMenuHost.java → ...023/ae2wtlib/api/terminal/WTMenuHost.java
diff --git a/...023/ae2wtlib/api/terminal/WUTHandler.java → ...023/ae2wtlib/api/terminal/WUTHandler.java b/...023/ae2wtlib/api/terminal/WUTHandler.java → ...023/ae2wtlib/api/terminal/WUTHandler.java
diff --git a/...3/ae2wtlib/api/terminal/package-info.java → ...3/ae2wtlib/api/terminal/package-info.java b/...3/ae2wtlib/api/terminal/package-info.java → ...3/ae2wtlib/api/terminal/package-info.java
diff --git a/.../resources/META-INF/accesstransformer.cfg → .../resources/META-INF/accesstransformer.cfg b/.../resources/META-INF/accesstransformer.cfg → .../resources/META-INF/accesstransformer.cfg
diff --git a/...ain/resources/META-INF/neoforge.mods.toml → ...ain/resources/META-INF/neoforge.mods.toml b/...ain/resources/META-INF/neoforge.mods.toml → ...ain/resources/META-INF/neoforge.mods.toml
diff --git a/...rces/assets/ae2/screens/wtlib/schema.json → ...rces/assets/ae2/screens/wtlib/schema.json b/...rces/assets/ae2/screens/wtlib/schema.json → ...rces/assets/ae2/screens/wtlib/schema.json
diff --git a/...ae2/screens/wtlib/universal_terminal.json → ...ae2/screens/wtlib/universal_terminal.json b/...ae2/screens/wtlib/universal_terminal.json → ...ae2/screens/wtlib/universal_terminal.json
diff --git a/.../assets/ae2/textures/wtlib/guis/icons.png → .../assets/ae2/textures/wtlib/guis/icons.png b/.../assets/ae2/textures/wtlib/guis/icons.png → .../assets/ae2/textures/wtlib/guis/icons.png
diff --git a/...urces/assets/ae2wtlib_api/lang/de_de.json → ...urces/assets/ae2wtlib_api/lang/de_de.json b/...urces/assets/ae2wtlib_api/lang/de_de.json → ...urces/assets/ae2wtlib_api/lang/de_de.json
diff --git a/...urces/assets/ae2wtlib_api/lang/en_ud.json → ...urces/assets/ae2wtlib_api/lang/en_ud.json b/...urces/assets/ae2wtlib_api/lang/en_ud.json → ...urces/assets/ae2wtlib_api/lang/en_ud.json
diff --git a/...urces/assets/ae2wtlib_api/lang/en_us.json → ...urces/assets/ae2wtlib_api/lang/en_us.json b/...urces/assets/ae2wtlib_api/lang/en_us.json → ...urces/assets/ae2wtlib_api/lang/en_us.json
diff --git a/api/src/main/resources/icon.png → ae2wtlib_api/src/main/resources/icon.png b/api/src/main/resources/icon.png → ae2wtlib_api/src/main/resources/icon.png
diff --git a/api/gradle.properties b/api/gradle.properties
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -38,8 +38,8 @@ java.toolchain.languageVersion = JavaLanguageVersion.of(21)
 dependencies {
     //implementation("top.theillusivec4.curios:curios-neoforge:${curiosVersion}")
     implementation("appeng:appliedenergistics2:${ae2Version}")
-    jarJar(project(path = ":api"))
-    api(project(path = ":api"))
+    jarJar(project(path = ":ae2wtlib_api"))
+    api(project(path = ":ae2wtlib_api"))
 
     compileOnly("me.shedaniel:RoughlyEnoughItems-neoforge:${reiVersion}")
     compileOnly("mezz.jei:jei-${jeiMinecraftVersion}-neoforge:${jeiVersion}")

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1,2 +1,2 @@
 rootProject.name = "ae2wtlib"
-include("api")
+include("ae2wtlib_api")
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		- fix issue where the wrong version of ae2wtlib_api gets selected