From 4ef880aa157141f9a5feea96944d48f2b56fdc78 Mon Sep 17 00:00:00 2001 From: Michael Hillcox Date: Thu, 7 Mar 2024 00:24:42 +0000 Subject: [PATCH] feat: improved build tool setup --- build.gradle | 43 ++++++++---------- gradle.properties | 6 ++- src/main/resources/META-INF/mods.toml | 10 ++-- .../tab_actuallyadditions.png | Bin 2375 -> 0 bytes src/main/resources/mcmod.info | 19 -------- src/main/resources/pack.mcmeta | 2 +- 6 files changed, 31 insertions(+), 49 deletions(-) delete mode 100644 src/main/resources/assets/minecraft/textures/gui/container/creative_inventory/tab_actuallyadditions.png delete mode 100644 src/main/resources/mcmod.info diff --git a/build.gradle b/build.gradle index 2dd06515a..3308634ac 100644 --- a/build.gradle +++ b/build.gradle @@ -6,23 +6,19 @@ plugins { id 'net.neoforged.gradle.userdev' version '7.0.96' } -version = "$mod_version" +def buildSuffix = System.getenv('BUILD_NUMBER') ? "-b${System.getenv('BUILD_NUMBER')}" : "" + +version = "$mod_version+mc${game_version}${buildSuffix}" group = "de.ellpeck.actuallyadditions" base { - archivesName = "ActuallyAdditions-$game_version" + archivesName = "ActuallyAdditions" } -if (System.getenv('BUILD_NUMBER') != null) { - version += "." + System.getenv('BUILD_NUMBER') -} - -// Mojang ships Java 17 to end users in 1.18+, so your mod should target Java 17. java.toolchain.languageVersion = JavaLanguageVersion.of(17) if (rootProject.file('src/main/resources/META-INF/accesstransformer.cfg').exists()) { minecraft.accessTransformers.file rootProject.file('src/main/resources/META-INF/accesstransformer.cfg') } -//minecraft.accessTransformers.entry public net.minecraft.client.Minecraft textureManager # textureManager runs { // applies to all the run configs below @@ -93,20 +89,6 @@ dependencies { runtimeOnly "curse.maven:mekanism-268560:5155329" } -// not sure if this is still needed -//processResources { -// inputs.property('version', project.version) -// -// from(sourceSets.main.resources.srcDirs) { -// include 'META-INF/mods.toml' -// expand 'version': project.version -// } -// -// from(sourceSets.main.resources.srcDirs) { -// exclude 'META-INF/mods.toml' -// } -//} - jar { group = 'artifact' manifest { @@ -114,12 +96,27 @@ jar { "Specification-Version" : "1", "Implementation-Title" : project.archivesBaseName, "Implementation-Version" : project.version, - "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")],) + "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ"), + "Modloader": "Neoforge", + "Modloader-Version": project.neo_version, + ]) } from sourceSets.main.output } +processResources { + inputs.property('version', project.version) + inputs.property('neo_version_range', project.neo_version_range) + inputs.property('loader', project.loader) + inputs.property('minecraft_version_range', project.minecraft_version_range) + + filesMatching(['META-INF/mods.toml']) { + expand 'version': project.version, 'neo_version_range': project.neo_version_range, 'loader': project.loader, 'minecraft_version_range': project.minecraft_version_range + } +} + + task apiJar(type: Jar) { from sourceSets.main.output from sourceSets.main.java diff --git a/gradle.properties b/gradle.properties index e26041cf9..fe7b529e4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,13 +2,17 @@ org.gradle.jvmargs=-Xmx3G org.gradle.daemon=false # Actually Additions -# TODO: check this version change is okay. mod_version=1.1.52 # Forge game_version=1.20.4 neo_version=20.4.190 +# mods.toml +loader=2 +neo_version_range=[20.4.190,) +minecraft_version_range=[1.20.4,1.21) + # Parchment (Mappings) neogradle.subsystems.parchment.minecraftVersion=1.20.4 neogradle.subsystems.parchment.mappingsVersion=2024.02.25 diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 30d6e455f..cc87344c2 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -1,13 +1,13 @@ modLoader="javafml" -loaderVersion="[2,)" +loaderVersion="[${loader},)" license="MIT" [[mods]] modId="actuallyadditions" -version="${file.jarVersion}" +version="${version}" displayName="Actually Additions" #logoFile="logo.png" -credits="Author: Ellpeck; Textures and Models: BootyToast, GlenthorLP, canitzp" +credits="Author: Ellpeck; Textures and Models: BootyToast, GlenthorLP, canitzp; Porters: Flanks, MrBysco, ErrorMikey; 1.20+ Textures: Ridanisaurus" authors="Ellpeck" description=''' Do you want Automation? Wireless Transport? Better Machines? A cup o' Coffee? Chests? Better Hoppers? Leaf Blowers? Faster Growth? Plants? Well, Actually Additions has all that and a lot more! @@ -16,13 +16,13 @@ Do you want Automation? Wireless Transport? Better Machines? A cup o' Coffee? Ch [[dependencies.actuallyadditions]] modId="neoforge" type="required" - versionRange="[20.4.167,)" + versionRange="${neo_version_range}" ordering="NONE" side="BOTH" [[dependencies.actuallyadditions]] modId="minecraft" type="required" - versionRange="[1.20.4,1.21)" + versionRange="${minecraft_version_range}" ordering="NONE" side="BOTH" diff --git a/src/main/resources/assets/minecraft/textures/gui/container/creative_inventory/tab_actuallyadditions.png b/src/main/resources/assets/minecraft/textures/gui/container/creative_inventory/tab_actuallyadditions.png deleted file mode 100644 index b6a1e7d5867797957e0d5d1d48ce2edba26dfa08..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2375 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K5893O0R7}x|G!U;i$lZxy-8q?;Kn_c~qpu?a z!^VE@KZ&eBK4*bPWHAE+-vJP2%(~Xe2^5qlag8Vm&QB{TPb^AhC`ioAE78kKEm1Jh zGtjflF|PAtVBpx{>Eakt5%>0LU|&eM5KF-OuBjWez8&2rAy-!EV{O&FOElMX?sG5q z8y^Ly&EM2y|L^0zgHHAP^Y8ClTU>qr|IN?e_P+l1{}1OI*@pM^Rrk()|N8p+e)k8z z_pkeW{r~s>_rE$Obf2GZ|Nq1F_YaoKA7``Yb@=7*r#$cYiSzqvehTdmKm2xoBE!D@ zUmAbBztcB&{@$m#QVh%=@+2DG=;mK$kZ34B%#e~_Ih*YO!yaiih3eC{O&Hi7+%;gh z8GUaVqXEPFHpUb8KAG`0FjkoJIDDJ7J(Gdw!0tqbP22bQGAA(H<7J+JY2@RwH~03( z|BB-Unz~^I;|^nn`F6Ecx4xQ3pORmi{%vBlRQb#*o&)+k2fjX>S7>Xy{<87zxW{_I z{Xh$ke>pSDws*IWEl{t_W#jB`Chv^CN-!`N_?%yJ^YV_-2!;=1=9j{+j z&YgGjD>xt;7%i5iUwe~zC-s#fFz{#0i`=}taQe#Qz}QKyN;^C6SnM)6U|9FPoM{RP zxj~|#Ae|vk{@u;x>2+1lzJJo=bvS;PafjWP&FlK-e{z30v-ZinlIh|9I!Ye1JrHM8 zs6FEzE)RWR`2)@d|f!dwD!*wd$03v zl)o?8z2}qr5@~aW{RRv#lkFZ=RmCk&FWWmfhQ8g*4DTm0zA#|;GmXcgo$yIIWU*8 zq5lkn1cR6{16#vUo(9H*mACure>23qkC$gL+gZn~UoRv5=krm1X8F6NzwPT79