1
0
Fork 0

Compare commits

...

2 Commits

Author SHA1 Message Date
chylex eaaa3ddc78
Release v1.2.0a for Minecraft 1.15.2 2021-08-22 06:46:48 +02:00
chylex 264a408396
Fix crash when installed on a server 2021-08-22 06:46:33 +02:00
4 changed files with 32 additions and 6 deletions

View File

@ -1,8 +1,7 @@
buildscript {
repositories {
maven { url = 'https://files.minecraftforge.net/maven' }
maven { url = 'https://dist.creeper.host/Sponge/maven' }
jcenter()
maven { url = "https://repo.spongepowered.org/maven" }
mavenCentral()
}
@ -54,6 +53,19 @@ minecraft {
}
}
}
server {
workingDirectory file('run')
property 'mixin.env.disableRefMap', 'true'
arg '-mixin.config=bettercontrols.mixins.json'
mods {
bettercontrols {
source sourceSets.main
}
}
}
}
}

View File

@ -1,6 +1,10 @@
package chylex.bettercontrols;
import chylex.bettercontrols.config.BetterControlsConfig;
import chylex.bettercontrols.gui.BetterControlsScreen;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.screen.Screen;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.fml.DistExecutor;
import net.minecraftforge.fml.ExtensionPoint;
import net.minecraftforge.fml.ModLoadingContext;
import net.minecraftforge.fml.common.Mod;
@ -10,10 +14,20 @@ import org.apache.commons.lang3.tuple.Pair;
@Mod("bettercontrols")
public final class BetterControlsMod{
public static final BetterControlsConfig config = BetterControlsConfig.load(FMLPaths.CONFIGDIR.get().resolve("BetterControls.json"));
public static final BetterControlsConfig config = DistExecutor.safeCallWhenOn(Dist.CLIENT, () -> ClientLoader::loadConfig);
public BetterControlsMod(){
ModLoadingContext.get().registerExtensionPoint(ExtensionPoint.CONFIGGUIFACTORY, () -> (mc, parentScreen) -> new BetterControlsScreen(parentScreen));
ModLoadingContext.get().registerExtensionPoint(ExtensionPoint.CONFIGGUIFACTORY, () -> ClientLoader::createScreen);
ModLoadingContext.get().registerExtensionPoint(ExtensionPoint.DISPLAYTEST, () -> Pair.of(() -> FMLNetworkConstants.IGNORESERVERONLY, (a, b) -> true));
}
private static final class ClientLoader {
public static BetterControlsConfig loadConfig() {
return BetterControlsConfig.load(FMLPaths.CONFIGDIR.get().resolve("BetterControls.json"));
}
public static BetterControlsScreen createScreen(final Minecraft mc, final Screen parentScreen) {
return new BetterControlsScreen(parentScreen);
}
}
}

View File

@ -7,7 +7,7 @@ issueTrackerURL = "https://github.com/chylex/Better-Controls/issues"
[[mods]]
modId = "bettercontrols"
version = "1.2.0"
version = "1.2.0a"
displayName = "Better Controls"
logoFile = "icon.png"
description = '''

View File

@ -3,7 +3,7 @@
"minVersion": "0.8",
"package": "chylex.bettercontrols.mixin",
"compatibilityLevel": "JAVA_8",
"mixins": [
"client": [
"AccessCameraFields",
"AccessClientPlayerFields",
"AccessControlsListCategory",