From cea3e11f0544d61d96a466db25bdd147a733fd63 Mon Sep 17 00:00:00 2001 From: Matthew Messinger Date: Sat, 1 Jun 2019 15:40:06 -0400 Subject: [PATCH] 1.14.2 and build tweaks --- build.gradle | 47 +++++-------------- gradle.properties | 14 +++--- settings.gradle | 12 +++++ .../minelittlepony/client/MineLPClient.java | 4 +- .../client/gui/GuiPonySettings.java | 2 +- 5 files changed, 35 insertions(+), 44 deletions(-) diff --git a/build.gradle b/build.gradle index cc37c302..b36a1aa4 100644 --- a/build.gradle +++ b/build.gradle @@ -1,34 +1,9 @@ -// Frabric build script -// 24/05/2019 -// https://github.com/FabricMC/fabric-example-mod/blob/master/build.gradle - -buildscript { - repositories { - jcenter() - maven { - name = 'Fabric' - url = 'https://maven.fabricmc.net/' - } - gradlePluginPortal() - } - dependencies { - classpath 'fabric-loom:fabric-loom.gradle.plugin:0.2.2-SNAPSHOT' - classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.4' - classpath 'org.ajoberstar.grgit:grgit-gradle:3.1.1' - } +plugins { + id 'fabric-loom' version '0.2.2-SNAPSHOT' + id 'org.ajoberstar.grgit' version '3.1.1' + id 'com.github.johnrengelman.plugin-shadow' version '2.0.3' } -repositories { - maven { - name = 'Jit' - url = 'https://jitpack.io' - } -} - -apply plugin: 'fabric-loom' -apply plugin: 'com.github.johnrengelman.shadow' -apply plugin: 'org.ajoberstar.grgit' - targetCompatibility = JavaVersion.VERSION_1_8 sourceCompatibility = JavaVersion.VERSION_1_8 @@ -57,6 +32,13 @@ group = project.group description = project.displayname archivesBaseName = project.name +repositories { + maven { + name = 'Jit' + url = 'https://jitpack.io' + } +} + dependencies { minecraft "com.mojang:minecraft:${project.minecraft_version}" mappings "net.fabricmc:yarn:${project.yarn_mappings}" @@ -67,7 +49,7 @@ dependencies { modCompile "com.github.MineLittlePony:Kirin:${project.kirin_version}" include "com.github.MineLittlePony:Kirin:${project.kirin_version}" - + // TODO: HD Skins can be made optional later modCompile "com.github.MineLittlePony:HDSkins:${project.hd_skins_version}" include "com.github.MineLittlePony:HDSkins:${project.hd_skins_version}" @@ -84,6 +66,7 @@ processResources { from(sourceSets.main.resources.srcDirs) { exclude "fabric.mod.json" } + from 'LICENSE' } tasks.withType(JavaCompile) { @@ -96,10 +79,6 @@ task sourcesJar(type: Jar, dependsOn: classes) { from sourceSets.main.allSource } -jar { - from "LICENSE" -} - // // Imports the Background Ponies from the MLP Community Skin Pack // diff --git a/gradle.properties b/gradle.properties index cedd661b..e00b2e40 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,9 +3,10 @@ org.gradle.daemon=false # Fabric Properties # check these on https://fabricmc.net/use - minecraft_version=1.14.1 - yarn_mappings=1.14.1+build.5 - loader_version=0.4.7+build.147 + minecraft_version=1.14.2 + # probably best not to auto-update this + yarn_mappings=1.14.2+build.2 + loader_version=0.4.8+ # Mod Properties group=com.minelittlepony @@ -16,7 +17,6 @@ org.gradle.daemon=false release=SNAPSHOT # Dependencies - # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric - fabric_version=0.3.0-pre+build.156 - kirin_version=09d9d6ddf2 - hd_skins_version=2e276b94cf + fabric_version=0.3.0+ + kirin_version=57995a8ac5 + hd_skins_version=d77033e898 diff --git a/settings.gradle b/settings.gradle index 66cf9de3..b65613d6 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1,13 @@ +pluginManagement { + repositories { + jcenter() + maven { + name = 'Fabric' + url = 'https://maven.fabricmc.net/' + } + gradlePluginPortal() + } +} rootProject.name = 'MineLittlePony' +//includeBuild '../Kirin' +//includeBuild '../HDSkins' \ No newline at end of file diff --git a/src/main/java/com/minelittlepony/client/MineLPClient.java b/src/main/java/com/minelittlepony/client/MineLPClient.java index 8cacf123..87790772 100644 --- a/src/main/java/com/minelittlepony/client/MineLPClient.java +++ b/src/main/java/com/minelittlepony/client/MineLPClient.java @@ -8,7 +8,7 @@ import com.minelittlepony.settings.PonyConfig; import net.minecraft.ChatFormat; import net.minecraft.client.MinecraftClient; -import net.minecraft.client.gui.MainMenuScreen; +import net.minecraft.client.gui.screen.TitleScreen; import net.minecraft.client.options.KeyBinding; import net.minecraft.client.render.entity.EntityRenderDispatcher; import net.minecraft.client.util.InputUtil; @@ -66,7 +66,7 @@ public class MineLPClient extends MineLittlePony { inGame &= minecraft.currentScreen == null; - boolean mainMenu = minecraft.currentScreen instanceof MainMenuScreen; + boolean mainMenu = minecraft.currentScreen instanceof TitleScreen; if (!inGame && mainMenu) { KeyBinding.updatePressedStates(); diff --git a/src/main/java/com/minelittlepony/client/gui/GuiPonySettings.java b/src/main/java/com/minelittlepony/client/gui/GuiPonySettings.java index 66745a2f..ae63e00d 100644 --- a/src/main/java/com/minelittlepony/client/gui/GuiPonySettings.java +++ b/src/main/java/com/minelittlepony/client/gui/GuiPonySettings.java @@ -1,7 +1,7 @@ package com.minelittlepony.client.gui; import net.minecraft.client.gui.Element; -import net.minecraft.client.gui.Screen; +import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.resource.language.I18n; import net.minecraft.network.chat.TranslatableComponent;