PonyMirrors/MineLittlePony
1
0
Fork 0
mirror of https://github.com/MineLittlePony/MineLittlePony.git synced 2025-03-30 16:27:43 +02:00
Code Issues Projects Releases Packages Wiki Activity

Update Kirin

Browse source
This commit is contained in:
Sollace 2019-08-05 11:32:27 +02:00
parent 5066c7ad64
commit 679869d3c6
4 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gradle.properties
View file

@ -18,5 +18,5 @@ org.gradle.daemon=false
# Dependencies # Dependencies
fabric_version=0.3.0+ fabric_version=0.3.0+
# TODO update kirin before release # TODO update kirin before release
kirin_version=1.14.4-1.4.3-SNAPSHOT kirin_version=1.14.4-1.4.4-SNAPSHOT
hd_skins_version=1.14.4-5.4.2 hd_skins_version=1.14.4-5.4.2

7
src/main/java/com/minelittlepony/client/MineLittlePony.java
View file

@ -12,7 +12,6 @@ import com.minelittlepony.common.event.ClientReadyCallback;
import com.minelittlepony.common.event.ScreenInitCallback; import com.minelittlepony.common.event.ScreenInitCallback;
import com.minelittlepony.common.event.SkinFilterCallback; import com.minelittlepony.common.event.SkinFilterCallback;
import com.minelittlepony.common.util.GamePaths; import com.minelittlepony.common.util.GamePaths;
import com.minelittlepony.common.util.settings.JsonConfig;
import com.minelittlepony.pony.IPonyManager; import com.minelittlepony.pony.IPonyManager;
import com.minelittlepony.settings.PonyConfig; import com.minelittlepony.settings.PonyConfig;
@ -77,7 +76,7 @@ public class MineLittlePony implements ClientModInitializer {
hasHdSkins = FabricLoader.getInstance().isModLoaded("hdskins"); hasHdSkins = FabricLoader.getInstance().isModLoaded("hdskins");
hasModMenu = FabricLoader.getInstance().isModLoaded("modmenu"); hasModMenu = FabricLoader.getInstance().isModLoaded("modmenu");
config = JsonConfig.of(GamePaths.getConfigDirectory().resolve("minelp.json"), ClientPonyConfig::new); config = new ClientPonyConfig(GamePaths.getConfigDirectory().resolve("minelp.json"));
ponyManager = new PonyManager(config); ponyManager = new PonyManager(config);
keyBinding = FabricKeyBinding.Builder.create(new Identifier("minelittlepony", "settings"), InputUtil.Type.KEYSYM, GLFW.GLFW_KEY_F9, "key.categories.misc").build(); keyBinding = FabricKeyBinding.Builder.create(new Identifier("minelittlepony", "settings"), InputUtil.Type.KEYSYM, GLFW.GLFW_KEY_F9, "key.categories.misc").build();
@ -94,8 +93,8 @@ public class MineLittlePony implements ClientModInitializer {
ClientReadyCallback.EVENT.register(this::onClientReady); ClientReadyCallback.EVENT.register(this::onClientReady);
ScreenInitCallback.EVENT.register(this::onScreenInit); ScreenInitCallback.EVENT.register(this::onScreenInit);
config.ponyskulls.onChanged(PonySkullRenderer::resolve); config.ponyskulls.onChanged(PonySkullRenderer::resolve);
// TODO Config is loaded too early for listeners
PonySkullRenderer.resolve(config.ponyskulls.get()); config.load();
if (FabricLoader.getInstance().isModLoaded("hdskins")) { if (FabricLoader.getInstance().isModLoaded("hdskins")) {
IndirectHDSkins.initialize(); IndirectHDSkins.initialize();

5
src/main/java/com/minelittlepony/client/settings/ClientPonyConfig.java
View file

@ -8,6 +8,8 @@ import com.minelittlepony.common.client.gui.VisibilityMode;
import com.minelittlepony.common.util.settings.Setting; import com.minelittlepony.common.util.settings.Setting;
import com.minelittlepony.settings.PonyConfig; import com.minelittlepony.settings.PonyConfig;
import java.nio.file.Path;
public class ClientPonyConfig extends PonyConfig { public class ClientPonyConfig extends PonyConfig {
/** /**
@ -15,7 +17,8 @@ public class ClientPonyConfig extends PonyConfig {
*/ */
public final Setting<VisibilityMode> horseButton = value("horseButton", VisibilityMode.AUTO); public final Setting<VisibilityMode> horseButton = value("horseButton", VisibilityMode.AUTO);
public ClientPonyConfig() { public ClientPonyConfig(Path path) {
super(path);
MobRenderers.registry.forEach(r -> value(r.name().toLowerCase(), true)); MobRenderers.registry.forEach(r -> value(r.name().toLowerCase(), true));
} }

6
src/main/java/com/minelittlepony/settings/PonyConfig.java
View file

@ -6,6 +6,8 @@ import com.minelittlepony.common.util.settings.JsonConfig;
import com.minelittlepony.common.util.settings.Setting; import com.minelittlepony.common.util.settings.Setting;
import com.minelittlepony.pony.meta.Size; import com.minelittlepony.pony.meta.Size;
import java.nio.file.Path;
/** /**
* Storage container for MineLP client settings. * Storage container for MineLP client settings.
*/ */
@ -30,6 +32,10 @@ public class PonyConfig extends JsonConfig {
*/ */
public final Setting<Size> sizeOverride = value("sizeOverride", Size.UNSET); public final Setting<Size> sizeOverride = value("sizeOverride", Size.UNSET);
public PonyConfig(Path path) {
super(path);
}
/** /**
* Gets the current PonyLevel. That is the level of ponies you would like to see. * Gets the current PonyLevel. That is the level of ponies you would like to see.
* *