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

project cleanup

Browse source
This commit is contained in:
Relentless 2022-08-21 19:47:06 +02:00
parent f47c983b68
commit e37f590800
No known key found for this signature in database
GPG key ID: 759D97B8C6F25265
8 changed files with 28 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Common/src/main/resources/almostunified-common.mixins.json
View file

@ -1,9 +1,9 @@
{
"required": true,
"minVersion": "0.8",
"minVersion": "0.8.4",
"package": "com.almostreliable.unified.mixin",
"refmap": "almostunified.refmap.json",
"compatibilityLevel": "JAVA_16",
"compatibilityLevel": "JAVA_17",
"mixins": [
"RecipeManagerMixin",
"ReloadableServerResourcesMixin"

4
Common/src/main/resources/pack.mcmeta
View file

@ -1,6 +1,6 @@
{
"pack": {
"description": "${modName}",
"pack_format": 8
"description": "${modName} resources",
"pack_format": 9
}
}

6
Fabric/build.gradle.kts
View file

@ -11,8 +11,8 @@ val modName: String by project
val modId: String by project
val mappingsChannel: String by project
val mappingsVersion: String by project
val extraModsDirectory: String by project
val reiVersion: String by project
val jeiVersion: String by project
val baseArchiveName = "${modId}-fabric-${minecraftVersion}"
@ -35,7 +35,7 @@ dependencies {
modCompileOnly("me.shedaniel:RoughlyEnoughItems-api-fabric:${reiVersion}")
modRuntimeOnly("me.shedaniel:RoughlyEnoughItems-fabric:${reiVersion}")
fileTree("extra-mods-$minecraftVersion") { include("**/*.jar") }
fileTree("$extraModsDirectory-$minecraftVersion") { include("**/*.jar") }
.forEach { f ->
val sepIndex = f.nameWithoutExtension.lastIndexOf('-');
if(sepIndex == -1) {
@ -44,7 +44,7 @@ dependencies {
val mod = f.nameWithoutExtension.substring(0, sepIndex);
val version = f.nameWithoutExtension.substring(sepIndex + 1);
println("Extra mod $mod with version $version detected")
modLocalRuntime("extra-mods:$mod:$version")
modLocalRuntime("$extraModsDirectory:$mod:$version")
}
implementation(project(":Common"))

2
Fabric/src/main/resources/fabric.mod.json
View file

@ -9,7 +9,7 @@
],
"contact": {
"homepage": "https://almostreliable.com/",
"sources": "https://github.com/${githubUser}/${githubRepo}/issues"
"sources": "https://github.com/${githubUser}/${githubRepo}"
},
"license": "${license}",
"icon": "logo.png",

13
Forge/build.gradle.kts
View file

@ -1,23 +1,20 @@
plugins {
java
eclipse
`maven-publish`
id("net.minecraftforge.gradle") version ("5.1.+")
id("org.parchmentmc.librarian.forgegradle") version ("1.+")
id("org.spongepowered.mixin") version ("0.7-SNAPSHOT")
`maven-publish`
id("org.spongepowered.mixin") version ("0.7.+")
}
val minecraftVersion: String by project
val mixinVersion: String by project
val forgeVersion: String by project
val modName: String by project
val modAuthor: String by project
val modId: String by project
val mappingsChannel: String by project
val mappingsVersion: String by project
val extraModsDirectory: String by project
val jeiVersion: String by project
val almostlibVersion: String by project
val baseArchiveName = "${modId}-forge-${minecraftVersion}"
@ -72,7 +69,7 @@ dependencies {
compileOnly(fg.deobf("mezz.jei:jei-${minecraftVersion}-forge-api:${jeiVersion}"))
runtimeOnly(fg.deobf("mezz.jei:jei-${minecraftVersion}-forge:${jeiVersion}"))
fileTree("extra-mods-$minecraftVersion") { include("**/*.jar") }
fileTree("$extraModsDirectory-$minecraftVersion") { include("**/*.jar") }
.forEach { f ->
val sepIndex = f.nameWithoutExtension.lastIndexOf('-');
if(sepIndex == -1) {
@ -81,7 +78,7 @@ dependencies {
val mod = f.nameWithoutExtension.substring(0, sepIndex);
val version = f.nameWithoutExtension.substring(sepIndex + 1);
println("Extra mod $mod with version $version detected")
runtimeOnly(fg.deobf("extra-mods:$mod:$version"))
runtimeOnly(fg.deobf("$extraModsDirectory:$mod:$version"))
}
annotationProcessor("org.spongepowered:mixin:${mixinVersion}:processor")

9
build.gradle.kts
View file

@ -8,6 +8,7 @@ val modName: String by project
val modAuthor: String by project
val modDescription: String by project
val forgeMinVersion: String by project
val extraModsDirectory: String by project
val githubUser: String by project
val githubRepo: String by project
@ -19,8 +20,8 @@ plugins {
allprojects {
repositories {
flatDir {
name = "extra-mods"
dir(file("extra-mods-$minecraftVersion"))
name = extraModsDirectory
dir(file("$extraModsDirectory-$minecraftVersion"))
}
mavenLocal()
mavenCentral()
@ -81,9 +82,9 @@ subprojects {
}
tasks.processResources {
val resourceTargets = listOf<String>("META-INF/mods.toml", "pack.mcmeta", "fabric.mod.json")
val resourceTargets = listOf("META-INF/mods.toml", "pack.mcmeta", "fabric.mod.json")
val replaceProperties = mapOf<String, String>(
val replaceProperties = mapOf(
"version" to project.version as String,
"license" to license,
"modId" to modId,

8
gradle.properties
View file

@ -1,7 +1,7 @@
# Project
version = 0.0.1
group = com.almostreliable.unified
license = GNU Lesser General Public License v3.0
license = LGPL-3.0
mixinVersion = 0.8.5
# Common
@ -23,17 +23,17 @@ kubejsVersion = 1802.5.4-build.500
# Mappings
mappingsChannel = parchment
mappingsVersion = 2022.05.22
mappingsVersion = 2022.08.21
# Mod options
modId = almostunified
modName = AlmostUnified
modAuthor = AlmostReliable
modDescription = Unify all materials.
modDescription = Unify all resources.
# Github
githubUser = AlmostReliable
githubRepo = almost-unified
githubRepo = almostunified
# Gradle
org.gradle.jvmargs = -Xmx3G