1
0
mirror of https://github.com/chylex/Better-Controls.git synced 2024-11-25 19:42:45 +01:00

Compare commits

..

No commits in common. "8a7febb76b90fb5eef4818c4c3581758b29dc816" and "2126402d28252817a831cebbacdc62a85dc25f98" have entirely different histories.

5 changed files with 9 additions and 21 deletions

View File

@ -29,7 +29,7 @@
}], }],
"depends": { "depends": {
"fabricloader": ">=${minimumFabricVersion}", "fabricloader": ">=0.7.4",
"minecraft": ">=${minimumMinecraftVersion}" "minecraft": ">=1.17"
} }
} }

View File

@ -4,7 +4,7 @@ import chylex.bettercontrols.gui.BetterControlsScreen;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.gui.screens.Screen;
import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.client.ConfigScreenHandler.ConfigScreenFactory; import net.minecraftforge.client.ConfigGuiHandler.ConfigGuiFactory;
import net.minecraftforge.fml.DistExecutor; import net.minecraftforge.fml.DistExecutor;
import net.minecraftforge.fml.IExtensionPoint.DisplayTest; import net.minecraftforge.fml.IExtensionPoint.DisplayTest;
import net.minecraftforge.fml.ModLoadingContext; import net.minecraftforge.fml.ModLoadingContext;
@ -16,7 +16,7 @@ import net.minecraftforge.network.NetworkConstants;
public final class BetterControlsMod { public final class BetterControlsMod {
public BetterControlsMod() { public BetterControlsMod() {
BetterControlsCommon.setConfig(DistExecutor.safeCallWhenOn(Dist.CLIENT, () -> ClientLoader::loadConfig)); BetterControlsCommon.setConfig(DistExecutor.safeCallWhenOn(Dist.CLIENT, () -> ClientLoader::loadConfig));
ModLoadingContext.get().registerExtensionPoint(ConfigScreenFactory.class, () -> new ConfigScreenFactory(ClientLoader::createScreen)); ModLoadingContext.get().registerExtensionPoint(ConfigGuiFactory.class, () -> new ConfigGuiFactory(ClientLoader::createScreen));
ModLoadingContext.get().registerExtensionPoint(DisplayTest.class, () -> new DisplayTest(() -> NetworkConstants.IGNORESERVERONLY, (a, b) -> true)); ModLoadingContext.get().registerExtensionPoint(DisplayTest.class, () -> new DisplayTest(() -> NetworkConstants.IGNORESERVERONLY, (a, b) -> true));
} }

View File

@ -1,5 +1,5 @@
modLoader = "javafml" modLoader = "javafml"
loaderVersion = "[0,)" loaderVersion = "[37,)"
authors = "${author}" authors = "${author}"
license = "${license}" license = "${license}"
@ -15,13 +15,13 @@ logoFile = "icon.png"
[[dependencies.${id}]] [[dependencies.${id}]]
modId = "minecraft" modId = "minecraft"
mandatory = true mandatory = true
versionRange = "[${minimumMinecraftVersion},)" versionRange = "[1.17.1,)"
ordering = "NONE" ordering = "NONE"
side = "BOTH" side = "BOTH"
[[dependencies.${id}]] [[dependencies.${id}]]
modId = "forge" modId = "forge"
mandatory = true mandatory = true
versionRange = "[${minimumForgeVersion},)" versionRange = "[37,)"
ordering = "NONE" ordering = "NONE"
side = "BOTH" side = "BOTH"

View File

@ -14,10 +14,6 @@ val modIssuesURL: String by project
val minecraftVersion: String by project val minecraftVersion: String by project
val mixinVersion: String by project val mixinVersion: String by project
val minimumMinecraftVersion: String by project
val minimumForgeVersion: String by project
val minimumFabricVersion: String by project
val modNameStripped = modName.replace(" ", "") val modNameStripped = modName.replace(" ", "")
val jarVersion = "$minecraftVersion+v$modVersion" val jarVersion = "$minecraftVersion+v$modVersion"
@ -114,9 +110,6 @@ subprojects {
inputs.property("license", modLicense) inputs.property("license", modLicense)
inputs.property("sourcesURL", modSourcesURL) inputs.property("sourcesURL", modSourcesURL)
inputs.property("issuesURL", modIssuesURL) inputs.property("issuesURL", modIssuesURL)
inputs.property("minimumMinecraftVersion", minimumMinecraftVersion)
inputs.property("minimumForgeVersion", minimumForgeVersion)
inputs.property("minimumFabricVersion", minimumFabricVersion)
from(rootProject.sourceSets.main.get().resources) { from(rootProject.sourceSets.main.get().resources) {
expand(inputs.properties) expand(inputs.properties)

View File

@ -3,23 +3,18 @@ modId=bettercontrols
modName=Better Controls modName=Better Controls
modDescription=Adds many powerful key bindings and options to control your movement.\\n\\nThe features complement vanilla mechanics without giving unfair advantages, so server use should be fine. modDescription=Adds many powerful key bindings and options to control your movement.\\n\\nThe features complement vanilla mechanics without giving unfair advantages, so server use should be fine.
modAuthor=chylex modAuthor=chylex
modVersion=1.2.3a modVersion=1.2.3
modLicense=MPL-2.0 modLicense=MPL-2.0
modSourcesURL=https://github.com/chylex/Better-Controls modSourcesURL=https://github.com/chylex/Better-Controls
modIssuesURL=https://github.com/chylex/Better-Controls/issues modIssuesURL=https://github.com/chylex/Better-Controls/issues
# Dependencies # Dependencies
minecraftVersion=1.19 minecraftVersion=1.19
forgeVersion=41.1.0 forgeVersion=41.0.1
fabricVersion=0.14.6 fabricVersion=0.14.6
loomVersion=0.12 loomVersion=0.12
mixinVersion=0.8.5 mixinVersion=0.8.5
# Constraints
minimumMinecraftVersion=1.19
minimumForgeVersion=41.0.94
minimumFabricVersion=0.7.4
# Gradle # Gradle
org.gradle.jvmargs=-Xmx3G org.gradle.jvmargs=-Xmx3G
org.gradle.daemon=false org.gradle.daemon=false