amy/almostunified
1
0
Fork 0
mirror of https://github.com/AlmostReliable/almostunified.git synced 2024-11-14 11:15:23 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

update to 1.21.1

Browse source
This commit is contained in:
rlnt 2024-08-22 23:32:19 +02:00
parent ff9973a95e
commit 76f2439cc1
No known key found for this signature in database
6 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Common/build.gradle.kts
View file

@ -35,7 +35,7 @@ dependencies {
modCompileOnly("mezz.jei:jei-$minecraftVersion-common-api:$jeiVersion") // required for jei plugin modCompileOnly("mezz.jei:jei-$minecraftVersion-common-api:$jeiVersion") // required for jei plugin
modCompileOnly("me.shedaniel:RoughlyEnoughItems-api:$reiVersion") // required for rei plugin modCompileOnly("me.shedaniel:RoughlyEnoughItems-api:$reiVersion") // required for rei plugin
compileOnly("me.shedaniel:REIPluginCompatibilities-forge-annotations:9.+") // required to disable rei compat layer compileOnly("me.shedaniel:REIPluginCompatibilities-forge-annotations:9.+") // required to disable rei compat layer
modCompileOnly("dev.emi:emi-xplat-intermediary:$emiVersion+$minecraftVersion:api") // required for emi plugin modCompileOnly("dev.emi:emi-xplat-intermediary:$emiVersion+1.21:api") // required for emi plugin TODO: replace on EMI release
} }
buildConfig { buildConfig {

4
Fabric/build.gradle.kts
View file

@ -39,7 +39,7 @@ dependencies {
// compile time // compile time
modCompileOnly("mezz.jei:jei-$minecraftVersion-fabric-api:$jeiVersion") // required for common jei plugin modCompileOnly("mezz.jei:jei-$minecraftVersion-fabric-api:$jeiVersion") // required for common jei plugin
modCompileOnly("me.shedaniel:RoughlyEnoughItems-api-fabric:$reiVersion") // required for common rei plugin modCompileOnly("me.shedaniel:RoughlyEnoughItems-api-fabric:$reiVersion") // required for common rei plugin
modCompileOnly("dev.emi:emi-fabric:$emiVersion+$minecraftVersion:api") // required for common emi plugin modCompileOnly("dev.emi:emi-fabric:$emiVersion+1.21:api") // required for common emi plugin TODO: replace on EMI release
// runtime // runtime
if (enableRuntimeRecipeViewer == "true") { if (enableRuntimeRecipeViewer == "true") {
@ -47,7 +47,7 @@ dependencies {
when (fabricRecipeViewer) { when (fabricRecipeViewer) {
"jei" -> "mezz.jei:jei-$minecraftVersion-fabric:$jeiVersion" "jei" -> "mezz.jei:jei-$minecraftVersion-fabric:$jeiVersion"
"rei" -> "me.shedaniel:RoughlyEnoughItems-fabric:$reiVersion" "rei" -> "me.shedaniel:RoughlyEnoughItems-fabric:$reiVersion"
"emi" -> "dev.emi:emi-fabric:$emiVersion+$minecraftVersion" "emi" -> "dev.emi:emi-fabric:$emiVersion+1.21" // TODO: replace on EMI release
else -> throw GradleException("Invalid fabricRecipeViewer value: $fabricRecipeViewer") else -> throw GradleException("Invalid fabricRecipeViewer value: $fabricRecipeViewer")
} }
) )

2
Jenkinsfile vendored
View file

@ -3,7 +3,7 @@
pipeline { pipeline {
agent any agent any
tools { tools {
jdk "jdk-17.0.1" jdk "jdk-21"
} }
stages { stages {
stage('Clean') { stage('Clean') {

4
NeoForge/build.gradle.kts
View file

@ -65,7 +65,7 @@ dependencies {
// TODO go back to API when solved: https://github.com/architectury/architectury-loom/issues/204 // TODO go back to API when solved: https://github.com/architectury/architectury-loom/issues/204
modCompileOnly("me.shedaniel:RoughlyEnoughItems-neoforge:$reiVersion") // required for common rei plugin modCompileOnly("me.shedaniel:RoughlyEnoughItems-neoforge:$reiVersion") // required for common rei plugin
modLocalRuntime("dev.architectury:architectury-neoforge:13.0.6") // TODO: Remove on new REI version modLocalRuntime("dev.architectury:architectury-neoforge:13.0.6") // TODO: Remove on new REI version
modCompileOnly("dev.emi:emi-neoforge:$emiVersion+$minecraftVersion:api") // required for common emi plugin modCompileOnly("dev.emi:emi-neoforge:$emiVersion+1.21:api") // required for common emi plugin TODO: replace on EMI release
// runtime // runtime
forgeRuntimeLibrary("org.junit.jupiter:junit-jupiter-api:$junitVersion") forgeRuntimeLibrary("org.junit.jupiter:junit-jupiter-api:$junitVersion")
@ -73,7 +73,7 @@ dependencies {
when (neoforgeRecipeViewer) { when (neoforgeRecipeViewer) {
"jei" -> modLocalRuntime("mezz.jei:jei-$minecraftVersion-neoforge:$jeiVersion") { isTransitive = false } "jei" -> modLocalRuntime("mezz.jei:jei-$minecraftVersion-neoforge:$jeiVersion") { isTransitive = false }
"rei" -> modLocalRuntime("me.shedaniel:RoughlyEnoughItems-neoforge:$reiVersion") "rei" -> modLocalRuntime("me.shedaniel:RoughlyEnoughItems-neoforge:$reiVersion")
"emi" -> modLocalRuntime("dev.emi:emi-neoforge:$emiVersion+$minecraftVersion") "emi" -> modLocalRuntime("dev.emi:emi-neoforge:$emiVersion+1.21") //TODO: replace on EMI release
else -> throw GradleException("Invalid forgeRecipeViewer value: $neoforgeRecipeViewer") else -> throw GradleException("Invalid forgeRecipeViewer value: $neoforgeRecipeViewer")
} }
} }

2
build.gradle.kts
View file

@ -93,7 +93,7 @@ subprojects {
"minecraft"("com.mojang:minecraft:$minecraftVersion") "minecraft"("com.mojang:minecraft:$minecraftVersion")
"mappings"(loom.layered { "mappings"(loom.layered {
officialMojangMappings() officialMojangMappings()
parchment("org.parchmentmc.data:parchment-$minecraftVersion:$parchmentVersion@zip") parchment("org.parchmentmc.data:parchment-1.21:$parchmentVersion@zip") // TODO: replace on aprchment update
}) })
/** /**

12
gradle.properties
View file

@ -5,7 +5,7 @@ enabledPlatforms = fabric,neoforge
enableAccessWidener = false enableAccessWidener = false
# Minecraft # Minecraft
minecraftVersion = 1.21 minecraftVersion = 1.21.1
# Mod # Mod
modVersion = 0.7.2 modVersion = 0.7.2
@ -22,18 +22,18 @@ parchmentVersion = 2024.07.28
# Recipe Viewers # Recipe Viewers
enableRuntimeRecipeViewer = true enableRuntimeRecipeViewer = true
jeiVersion = 19.5.2.66 jeiVersion = 19.8.4.113
reiVersion = 16.0.744 reiVersion = 16.0.754
emiVersion = 1.1.10 emiVersion = 1.1.10
fabricRecipeViewer = rei fabricRecipeViewer = rei
neoforgeRecipeViewer = emi neoforgeRecipeViewer = emi
# Fabric Dependencies # Fabric Dependencies
fabricLoaderVersion = 0.15.11 fabricLoaderVersion = 0.16.2
fabricApiVersion = 0.100.1 fabricApiVersion = 0.102.1
# NeoForge Dependencies # NeoForge Dependencies
neoforgeVersion = 21.0.143 neoforgeVersion = 21.1.20
# Github # Github
githubUser = AlmostReliable githubUser = AlmostReliable