diff --git a/gradle.properties b/gradle.properties index d8564bc..6b18030 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,7 +7,7 @@ org.gradle.parallel=false #org.gradle.configureondemand=true # Mod properties -mod.version=1.9.0-beta.2 +mod.version=1.9.0-beta.3 mod.group=eu.midnightdust mod.id=midnightlib mod.name=MidnightLib diff --git a/src/main/java/eu/midnightdust/core/MidnightLib.java b/src/main/java/eu/midnightdust/core/MidnightLib.java index c2c813b..3d18eed 100644 --- a/src/main/java/eu/midnightdust/core/MidnightLib.java +++ b/src/main/java/eu/midnightdust/core/MidnightLib.java @@ -21,7 +21,7 @@ import com.terraformersmc.modmenu.api.ModMenuApi; import java.util.HashMap; import java.util.Map; -public class MidnightLib implements ClientModInitializer, ModMenuApi { +public class MidnightLib implements ClientModInitializer { //?} else if neoforge { /*import com.mojang.brigadier.builder.LiteralArgumentBuilder; import eu.midnightdust.lib.config.AutoCommand; @@ -76,9 +76,10 @@ public class MidnightLib { } //? if fabric { + public static class ModMenuInit implements ModMenuApi { @Override public ConfigScreenFactory getModConfigScreenFactory() { - return parent -> MidnightLibConfig.getScreen(parent,MOD_ID); + return parent -> MidnightLibConfig.getScreen(parent, MOD_ID); } @Override @@ -90,6 +91,7 @@ public class MidnightLib { }); return map; } + } //?} /*? if neoforge {*/ diff --git a/src/main/resources/architectury.common.json b/src/main/resources/architectury.common.json deleted file mode 100644 index 9e26dfe..0000000 --- a/src/main/resources/architectury.common.json +++ /dev/null @@ -1 +0,0 @@ -{} \ No newline at end of file diff --git a/versions/1.20.1-fabric/gradle.properties b/versions/1.20.1-fabric/gradle.properties index 5e6477a..1a0653e 100644 --- a/versions/1.20.1-fabric/gradle.properties +++ b/versions/1.20.1-fabric/gradle.properties @@ -1,7 +1,7 @@ -mod.mc_dep_fabric==1.20.1 +mod.mc_dep_fabric=>=1.20 <=1.20.1 mod.mc_dep_forgelike=[1.20, 1.20.1] mod.mc_title=1.20.1 -mod.mc_targets=1.20.1 +mod.mc_targets=1.20 1.20.1 deps.forge_loader=47.3.0 deps.neoforge_loader=[UNSUPPORTED] diff --git a/src/main/resources/fabric.mod.json b/versions/1.20.1-fabric/src/main/resources/fabric.mod.json similarity index 93% rename from src/main/resources/fabric.mod.json rename to versions/1.20.1-fabric/src/main/resources/fabric.mod.json index e39bbe2..b891091 100644 --- a/src/main/resources/fabric.mod.json +++ b/versions/1.20.1-fabric/src/main/resources/fabric.mod.json @@ -29,12 +29,12 @@ "eu.midnightdust.core.MidnightLib" ], "modmenu": [ - "eu.midnightdust.core.MidnightLib" + "eu.midnightdust.core.MidnightLib\$ModMenuInit" ] }, "depends": { "fabric-resource-loader-v0": "*", - "minecraft": "*" + "minecraft": "${minecraft}" }, "mixins": [ diff --git a/versions/1.20.1-forge/gradle.properties b/versions/1.20.1-forge/gradle.properties index 7829d34..789f044 100644 --- a/versions/1.20.1-forge/gradle.properties +++ b/versions/1.20.1-forge/gradle.properties @@ -1,7 +1,7 @@ -mod.mc_dep_fabric==1.20.1 +mod.mc_dep_fabric=>=1.20 <=1.20.1 mod.mc_dep_forgelike=[1.20, 1.20.1] mod.mc_title=1.20.1 -mod.mc_targets=1.20.1 +mod.mc_targets=1.20 1.20.1 deps.forge_loader=47.3.0 deps.neoforge_loader=[UNSUPPORTED] diff --git a/src/main/resources/META-INF/mods.toml b/versions/1.20.1-forge/src/main/resources/META-INF/mods.toml similarity index 95% rename from src/main/resources/META-INF/mods.toml rename to versions/1.20.1-forge/src/main/resources/META-INF/mods.toml index 35d3799..8775040 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/versions/1.20.1-forge/src/main/resources/META-INF/mods.toml @@ -26,6 +26,6 @@ side = "BOTH" [[dependencies.midnightlib]] modId = "minecraft" mandatory = true -versionRange = "[1.20,)" +versionRange = "${minecraft}" ordering = "NONE" side = "BOTH" diff --git a/versions/1.20.1-forge/src/main/resources/midnightlib.png b/versions/1.20.1-forge/src/main/resources/midnightlib.png new file mode 100644 index 0000000..b586c74 Binary files /dev/null and b/versions/1.20.1-forge/src/main/resources/midnightlib.png differ diff --git a/versions/1.21.1-fabric/src/main/resources/fabric.mod.json b/versions/1.21.1-fabric/src/main/resources/fabric.mod.json new file mode 100644 index 0000000..b891091 --- /dev/null +++ b/versions/1.21.1-fabric/src/main/resources/fabric.mod.json @@ -0,0 +1,54 @@ +{ + "schemaVersion": 1, + "id": "${id}", + "version": "${version}", + "name": "${name}", + "description": "Lightweight config library with config screens and commands.", + "authors": [ + "Motschen" + ], + "contributors": [ + "maloryware", + "Jaffe2718" + ], + "contact": { + "homepage": "https://www.midnightdust.eu/", + "sources": "https://github.com/TeamMidnightDust/MidnightLib", + "issues": "https://github.com/TeamMidnightDust/MidnightLib/issues" + }, + + "license": "MIT", + "icon": "assets/midnightlib/icon.png", + + "environment": "*", + "entrypoints": { + "server": [ + "eu.midnightdust.lib.config.AutoCommand" + ], + "client": [ + "eu.midnightdust.core.MidnightLib" + ], + "modmenu": [ + "eu.midnightdust.core.MidnightLib\$ModMenuInit" + ] + }, + "depends": { + "fabric-resource-loader-v0": "*", + "minecraft": "${minecraft}" + }, + + "mixins": [ + "midnightlib.mixins.json" + ], + + "custom": { + "modmenu": { + "links": { + "modmenu.discord": "http://discord.midnightdust.eu/", + "modmenu.website": "https://midnightdust.eu/midnightlib", + "midnightlib.wiki": "https://midnightdust.eu/wiki/midnightlib" + }, + "badges": [ "library" ] + } + } +} diff --git a/src/main/resources/META-INF/neoforge.mods.toml b/versions/1.21.1-neoforge/src/main/resources/META-INF/neoforge.mods.toml similarity index 93% rename from src/main/resources/META-INF/neoforge.mods.toml rename to versions/1.21.1-neoforge/src/main/resources/META-INF/neoforge.mods.toml index cb0f9a4..6a5889d 100644 --- a/src/main/resources/META-INF/neoforge.mods.toml +++ b/versions/1.21.1-neoforge/src/main/resources/META-INF/neoforge.mods.toml @@ -26,6 +26,6 @@ side = "BOTH" [[dependencies.midnightlib]] modId = "minecraft" mandatory = true -versionRange = "[1.20.5,)" +versionRange = "${minecraft}" ordering = "NONE" side = "BOTH" \ No newline at end of file diff --git a/versions/1.21.1-neoforge/src/main/resources/midnightlib.png b/versions/1.21.1-neoforge/src/main/resources/midnightlib.png new file mode 100644 index 0000000..b586c74 Binary files /dev/null and b/versions/1.21.1-neoforge/src/main/resources/midnightlib.png differ diff --git a/versions/1.21.10-fabric/gradle.properties b/versions/1.21.10-fabric/gradle.properties index ecfd4dd..0b4bb2c 100644 --- a/versions/1.21.10-fabric/gradle.properties +++ b/versions/1.21.10-fabric/gradle.properties @@ -1,7 +1,7 @@ mod.mc_dep_fabric=>=1.21.9 -mod.mc_dep_forgelike=[1.21.10,) +mod.mc_dep_forgelike=[1.21.9,) mod.mc_title=1.21.10 -mod.mc_targets=1.21.9, 1.21.10 +mod.mc_targets=1.21.9 1.21.10 deps.forge_loader=0 deps.neoforge_loader=21.10.47-beta diff --git a/versions/1.21.10-fabric/src/main/resources/fabric.mod.json b/versions/1.21.10-fabric/src/main/resources/fabric.mod.json new file mode 100644 index 0000000..b891091 --- /dev/null +++ b/versions/1.21.10-fabric/src/main/resources/fabric.mod.json @@ -0,0 +1,54 @@ +{ + "schemaVersion": 1, + "id": "${id}", + "version": "${version}", + "name": "${name}", + "description": "Lightweight config library with config screens and commands.", + "authors": [ + "Motschen" + ], + "contributors": [ + "maloryware", + "Jaffe2718" + ], + "contact": { + "homepage": "https://www.midnightdust.eu/", + "sources": "https://github.com/TeamMidnightDust/MidnightLib", + "issues": "https://github.com/TeamMidnightDust/MidnightLib/issues" + }, + + "license": "MIT", + "icon": "assets/midnightlib/icon.png", + + "environment": "*", + "entrypoints": { + "server": [ + "eu.midnightdust.lib.config.AutoCommand" + ], + "client": [ + "eu.midnightdust.core.MidnightLib" + ], + "modmenu": [ + "eu.midnightdust.core.MidnightLib\$ModMenuInit" + ] + }, + "depends": { + "fabric-resource-loader-v0": "*", + "minecraft": "${minecraft}" + }, + + "mixins": [ + "midnightlib.mixins.json" + ], + + "custom": { + "modmenu": { + "links": { + "modmenu.discord": "http://discord.midnightdust.eu/", + "modmenu.website": "https://midnightdust.eu/midnightlib", + "midnightlib.wiki": "https://midnightdust.eu/wiki/midnightlib" + }, + "badges": [ "library" ] + } + } +} diff --git a/versions/1.21.10-neoforge/gradle.properties b/versions/1.21.10-neoforge/gradle.properties index baf58ca..cafa43e 100644 --- a/versions/1.21.10-neoforge/gradle.properties +++ b/versions/1.21.10-neoforge/gradle.properties @@ -1,7 +1,7 @@ mod.mc_dep_fabric=>=1.21.9 -mod.mc_dep_forgelike=[1.21.10,) +mod.mc_dep_forgelike=[1.21.9,) mod.mc_title=1.21.10 -mod.mc_targets=1.21.9, 1.21.10 +mod.mc_targets=1.21.9 1.21.10 deps.forge_loader=0 deps.neoforge_loader=21.10.47-beta diff --git a/versions/1.21.10-neoforge/src/main/resources/META-INF/neoforge.mods.toml b/versions/1.21.10-neoforge/src/main/resources/META-INF/neoforge.mods.toml new file mode 100644 index 0000000..6a5889d --- /dev/null +++ b/versions/1.21.10-neoforge/src/main/resources/META-INF/neoforge.mods.toml @@ -0,0 +1,31 @@ +modLoader = "javafml" +loaderVersion = "[2,)" +#issueTrackerURL = "" +license = "MIT License" + +[[mods]] +modId = "midnightlib" +version = "${version}" +displayName = "${name}" +logoFile = "midnightlib.png" +authors = "TeamMidnightDust, Motschen" +description = ''' +Lightweight config library with config screens and commands. +''' + +[[mixins]] +config = "midnightlib.mixins.json" + +[[dependencies.midnightlib]] +modId = "neoforge" +mandatory = true +versionRange = "[20.5,)" +ordering = "NONE" +side = "BOTH" + +[[dependencies.midnightlib]] +modId = "minecraft" +mandatory = true +versionRange = "${minecraft}" +ordering = "NONE" +side = "BOTH" \ No newline at end of file diff --git a/versions/1.21.10-neoforge/src/main/resources/midnightlib.png b/versions/1.21.10-neoforge/src/main/resources/midnightlib.png new file mode 100644 index 0000000..b586c74 Binary files /dev/null and b/versions/1.21.10-neoforge/src/main/resources/midnightlib.png differ diff --git a/versions/1.21.5-fabric/gradle.properties b/versions/1.21.5-fabric/gradle.properties index 7e266b9..ffb40a9 100644 --- a/versions/1.21.5-fabric/gradle.properties +++ b/versions/1.21.5-fabric/gradle.properties @@ -1,7 +1,7 @@ -mod.mc_dep_fabric==1.21.5 -mod.mc_dep_forgelike=[1.21.5] +mod.mc_dep_fabric=>=1.21.4 <=1.21.5 +mod.mc_dep_forgelike=[1.21.4, 1.21.5] mod.mc_title=1.21.5 -mod.mc_targets=1.21.5 +mod.mc_targets=1.21.4 1.21.5 deps.forge_loader=54.0.13 deps.neoforge_loader=21.4.47-beta diff --git a/versions/1.21.5-fabric/src/main/resources/fabric.mod.json b/versions/1.21.5-fabric/src/main/resources/fabric.mod.json new file mode 100644 index 0000000..b891091 --- /dev/null +++ b/versions/1.21.5-fabric/src/main/resources/fabric.mod.json @@ -0,0 +1,54 @@ +{ + "schemaVersion": 1, + "id": "${id}", + "version": "${version}", + "name": "${name}", + "description": "Lightweight config library with config screens and commands.", + "authors": [ + "Motschen" + ], + "contributors": [ + "maloryware", + "Jaffe2718" + ], + "contact": { + "homepage": "https://www.midnightdust.eu/", + "sources": "https://github.com/TeamMidnightDust/MidnightLib", + "issues": "https://github.com/TeamMidnightDust/MidnightLib/issues" + }, + + "license": "MIT", + "icon": "assets/midnightlib/icon.png", + + "environment": "*", + "entrypoints": { + "server": [ + "eu.midnightdust.lib.config.AutoCommand" + ], + "client": [ + "eu.midnightdust.core.MidnightLib" + ], + "modmenu": [ + "eu.midnightdust.core.MidnightLib\$ModMenuInit" + ] + }, + "depends": { + "fabric-resource-loader-v0": "*", + "minecraft": "${minecraft}" + }, + + "mixins": [ + "midnightlib.mixins.json" + ], + + "custom": { + "modmenu": { + "links": { + "modmenu.discord": "http://discord.midnightdust.eu/", + "modmenu.website": "https://midnightdust.eu/midnightlib", + "midnightlib.wiki": "https://midnightdust.eu/wiki/midnightlib" + }, + "badges": [ "library" ] + } + } +} diff --git a/versions/1.21.5-neoforge/gradle.properties b/versions/1.21.5-neoforge/gradle.properties index e36ac2e..73063d1 100644 --- a/versions/1.21.5-neoforge/gradle.properties +++ b/versions/1.21.5-neoforge/gradle.properties @@ -1,7 +1,7 @@ -mod.mc_dep_fabric==1.21.5 -mod.mc_dep_forgelike=[1.21.5] +mod.mc_dep_fabric=>=1.21.4 <=1.21.5 +mod.mc_dep_forgelike=[1.21.4, 1.21.5] mod.mc_title=1.21.5 -mod.mc_targets=1.21.5 +mod.mc_targets=1.21.4 1.21.5 deps.forge_loader=0 deps.neoforge_loader=21.5.54-beta diff --git a/versions/1.21.5-neoforge/src/main/resources/META-INF/neoforge.mods.toml b/versions/1.21.5-neoforge/src/main/resources/META-INF/neoforge.mods.toml new file mode 100644 index 0000000..6a5889d --- /dev/null +++ b/versions/1.21.5-neoforge/src/main/resources/META-INF/neoforge.mods.toml @@ -0,0 +1,31 @@ +modLoader = "javafml" +loaderVersion = "[2,)" +#issueTrackerURL = "" +license = "MIT License" + +[[mods]] +modId = "midnightlib" +version = "${version}" +displayName = "${name}" +logoFile = "midnightlib.png" +authors = "TeamMidnightDust, Motschen" +description = ''' +Lightweight config library with config screens and commands. +''' + +[[mixins]] +config = "midnightlib.mixins.json" + +[[dependencies.midnightlib]] +modId = "neoforge" +mandatory = true +versionRange = "[20.5,)" +ordering = "NONE" +side = "BOTH" + +[[dependencies.midnightlib]] +modId = "minecraft" +mandatory = true +versionRange = "${minecraft}" +ordering = "NONE" +side = "BOTH" \ No newline at end of file diff --git a/versions/1.21.5-neoforge/src/main/resources/midnightlib.png b/versions/1.21.5-neoforge/src/main/resources/midnightlib.png new file mode 100644 index 0000000..b586c74 Binary files /dev/null and b/versions/1.21.5-neoforge/src/main/resources/midnightlib.png differ diff --git a/versions/1.21.8-fabric/gradle.properties b/versions/1.21.8-fabric/gradle.properties index 0da1f37..bd9db05 100644 --- a/versions/1.21.8-fabric/gradle.properties +++ b/versions/1.21.8-fabric/gradle.properties @@ -1,7 +1,7 @@ -mod.mc_dep_fabric==1.21.8 -mod.mc_dep_forgelike=[1.21.8] +mod.mc_dep_fabric=>=1.21.6 <=1.21.8 +mod.mc_dep_forgelike=[1.21.6, 1.21.8] mod.mc_title=1.21.8 -mod.mc_targets=1.21.8 +mod.mc_targets=1.21.6 1.21.7 1.21.8 deps.forge_loader=0 deps.neoforge_loader=21.8.50 diff --git a/versions/1.21.8-fabric/src/main/resources/fabric.mod.json b/versions/1.21.8-fabric/src/main/resources/fabric.mod.json new file mode 100644 index 0000000..b891091 --- /dev/null +++ b/versions/1.21.8-fabric/src/main/resources/fabric.mod.json @@ -0,0 +1,54 @@ +{ + "schemaVersion": 1, + "id": "${id}", + "version": "${version}", + "name": "${name}", + "description": "Lightweight config library with config screens and commands.", + "authors": [ + "Motschen" + ], + "contributors": [ + "maloryware", + "Jaffe2718" + ], + "contact": { + "homepage": "https://www.midnightdust.eu/", + "sources": "https://github.com/TeamMidnightDust/MidnightLib", + "issues": "https://github.com/TeamMidnightDust/MidnightLib/issues" + }, + + "license": "MIT", + "icon": "assets/midnightlib/icon.png", + + "environment": "*", + "entrypoints": { + "server": [ + "eu.midnightdust.lib.config.AutoCommand" + ], + "client": [ + "eu.midnightdust.core.MidnightLib" + ], + "modmenu": [ + "eu.midnightdust.core.MidnightLib\$ModMenuInit" + ] + }, + "depends": { + "fabric-resource-loader-v0": "*", + "minecraft": "${minecraft}" + }, + + "mixins": [ + "midnightlib.mixins.json" + ], + + "custom": { + "modmenu": { + "links": { + "modmenu.discord": "http://discord.midnightdust.eu/", + "modmenu.website": "https://midnightdust.eu/midnightlib", + "midnightlib.wiki": "https://midnightdust.eu/wiki/midnightlib" + }, + "badges": [ "library" ] + } + } +} diff --git a/versions/1.21.8-neoforge/gradle.properties b/versions/1.21.8-neoforge/gradle.properties index 0e4c559..32bbfb2 100644 --- a/versions/1.21.8-neoforge/gradle.properties +++ b/versions/1.21.8-neoforge/gradle.properties @@ -1,7 +1,7 @@ -mod.mc_dep_fabric==1.21.5 -mod.mc_dep_forgelike=[1.21.5] -mod.mc_title=1.21.5 -mod.mc_targets=1.21.5 +mod.mc_dep_fabric=>=1.21.6 <=1.21.8 +mod.mc_dep_forgelike=[1.21.6, 1.21.8] +mod.mc_title=1.21.8 +mod.mc_targets=1.21.6 1.21.7 1.21.8 deps.forge_loader=0 deps.neoforge_loader=21.8.50 diff --git a/versions/1.21.8-neoforge/src/main/resources/META-INF/neoforge.mods.toml b/versions/1.21.8-neoforge/src/main/resources/META-INF/neoforge.mods.toml new file mode 100644 index 0000000..6a5889d --- /dev/null +++ b/versions/1.21.8-neoforge/src/main/resources/META-INF/neoforge.mods.toml @@ -0,0 +1,31 @@ +modLoader = "javafml" +loaderVersion = "[2,)" +#issueTrackerURL = "" +license = "MIT License" + +[[mods]] +modId = "midnightlib" +version = "${version}" +displayName = "${name}" +logoFile = "midnightlib.png" +authors = "TeamMidnightDust, Motschen" +description = ''' +Lightweight config library with config screens and commands. +''' + +[[mixins]] +config = "midnightlib.mixins.json" + +[[dependencies.midnightlib]] +modId = "neoforge" +mandatory = true +versionRange = "[20.5,)" +ordering = "NONE" +side = "BOTH" + +[[dependencies.midnightlib]] +modId = "minecraft" +mandatory = true +versionRange = "${minecraft}" +ordering = "NONE" +side = "BOTH" \ No newline at end of file diff --git a/versions/1.21.8-neoforge/src/main/resources/midnightlib.png b/versions/1.21.8-neoforge/src/main/resources/midnightlib.png new file mode 100644 index 0000000..b586c74 Binary files /dev/null and b/versions/1.21.8-neoforge/src/main/resources/midnightlib.png differ