From 2fbb59078731579f184f6cb1a5fc42c9e34df39d Mon Sep 17 00:00:00 2001 From: Guntram Blohm Date: Tue, 20 Jun 2017 21:28:30 +0200 Subject: [PATCH] 1.12 changes --- build.gradle | 154 +++++++++--------- .../durabilityviewer/DurabilityViewer.java | 2 +- .../gui/DurabilityViewerGuiFactory.java | 10 ++ .../durabilityviewer/event/TooltipEvent.java | 2 +- 4 files changed, 89 insertions(+), 79 deletions(-) diff --git a/build.gradle b/build.gradle index 2e1cd8e..192f9a9 100644 --- a/build.gradle +++ b/build.gradle @@ -1,77 +1,77 @@ -buildscript { - repositories { - jcenter() - maven { url = "http://files.minecraftforge.net/maven" } - } - dependencies { - classpath 'net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT' - } -} -apply plugin: 'net.minecraftforge.gradle.forge' -//Only edit below this line, the above code adds and enables the necessary things for Forge to be setup. - - -version = "1.0.0" -group = "de.guntram.mcmod.DurabilityViewer" // http://maven.apache.org/guides/mini/guide-naming-conventions.html -archivesBaseName = "DurabilityViewer" - -sourceCompatibility = targetCompatibility = "1.6" // Need this here so eclipse task generates correctly. -compileJava { - sourceCompatibility = targetCompatibility = "1.6" -} - -minecraft { - version = "1.11.2-13.20.0.2231" - runDir = "run" - - // the mappings can be changed at any time, and must be in the following format. - // snapshot_YYYYMMDD snapshot are built nightly. - // stable_# stables are built at the discretion of the MCP team. - // Use non-default mappings at your own risk. they may not always work. - // simply re-run your setup task after changing the mappings to update your workspace. - mappings = "snapshot_20170228" - // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable. -} - -dependencies { - // you may put jars on which you depend on in ./libs - // or you may define them like so.. - //compile "some.group:artifact:version:classifier" - //compile "some.group:artifact:version" - - // real examples - //compile 'com.mod-buildcraft:buildcraft:6.0.8:dev' // adds buildcraft to the dev env - //compile 'com.googlecode.efficient-java-matrix-library:ejml:0.24' // adds ejml to the dev env - - // the 'provided' configuration is for optional dependencies that exist at compile-time but might not at runtime. - //provided 'com.mod-buildcraft:buildcraft:6.0.8:dev' - - // the deobf configurations: 'deobfCompile' and 'deobfProvided' are the same as the normal compile and provided, - // except that these dependencies get remapped to your current MCP mappings - //deobfCompile 'com.mod-buildcraft:buildcraft:6.0.8:dev' - //deobfProvided 'com.mod-buildcraft:buildcraft:6.0.8:dev' - - // for more info... - // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html - // http://www.gradle.org/docs/current/userguide/dependency_management.html - -} - -processResources { - // this will ensure that this task is redone when the versions change. - inputs.property "version", project.version - inputs.property "mcversion", project.minecraft.version - - // replace stuff in mcmod.info, nothing else - from(sourceSets.main.resources.srcDirs) { - include 'mcmod.info' - - // replace version and mcversion - expand 'version':project.version, 'mcversion':project.minecraft.version - } - - // copy everything else except the mcmod.info - from(sourceSets.main.resources.srcDirs) { - exclude 'mcmod.info' - } -} +buildscript { + repositories { + jcenter() + maven { url = "http://files.minecraftforge.net/maven" } + } + dependencies { + classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT' + } +} +apply plugin: 'net.minecraftforge.gradle.forge' +//Only edit below this line, the above code adds and enables the necessary things for Forge to be setup. + + +version = "1.12-1.0.0" +group = "de.guntram.mcmod.DurabilityViewer" // http://maven.apache.org/guides/mini/guide-naming-conventions.html +archivesBaseName = "DurabilityViewer" + +sourceCompatibility = targetCompatibility = "1.8" // Need this here so eclipse task generates correctly. +compileJava { + sourceCompatibility = targetCompatibility = "1.8" +} + +minecraft { + version = "1.12-14.21.0.2335" + runDir = "run" + + // the mappings can be changed at any time, and must be in the following format. + // snapshot_YYYYMMDD snapshot are built nightly. + // stable_# stables are built at the discretion of the MCP team. + // Use non-default mappings at your own risk. they may not always work. + // simply re-run your setup task after changing the mappings to update your workspace. + mappings = "snapshot_20170618" + // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable. +} + +dependencies { + // you may put jars on which you depend on in ./libs + // or you may define them like so.. + //compile "some.group:artifact:version:classifier" + //compile "some.group:artifact:version" + + // real examples + //compile 'com.mod-buildcraft:buildcraft:6.0.8:dev' // adds buildcraft to the dev env + //compile 'com.googlecode.efficient-java-matrix-library:ejml:0.24' // adds ejml to the dev env + + // the 'provided' configuration is for optional dependencies that exist at compile-time but might not at runtime. + //provided 'com.mod-buildcraft:buildcraft:6.0.8:dev' + + // the deobf configurations: 'deobfCompile' and 'deobfProvided' are the same as the normal compile and provided, + // except that these dependencies get remapped to your current MCP mappings + //deobfCompile 'com.mod-buildcraft:buildcraft:6.0.8:dev' + //deobfProvided 'com.mod-buildcraft:buildcraft:6.0.8:dev' + + // for more info... + // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html + // http://www.gradle.org/docs/current/userguide/dependency_management.html + +} + +processResources { + // this will ensure that this task is redone when the versions change. + inputs.property "version", project.version + inputs.property "mcversion", project.minecraft.version + + // replace stuff in mcmod.info, nothing else + from(sourceSets.main.resources.srcDirs) { + include 'mcmod.info' + + // replace version and mcversion + expand 'version':project.version, 'mcversion':project.minecraft.version + } + + // copy everything else except the mcmod.info + from(sourceSets.main.resources.srcDirs) { + exclude 'mcmod.info' + } +} diff --git a/src/main/java/de/guntram/mcmod/durabilityviewer/DurabilityViewer.java b/src/main/java/de/guntram/mcmod/durabilityviewer/DurabilityViewer.java index 7153421..388a023 100644 --- a/src/main/java/de/guntram/mcmod/durabilityviewer/DurabilityViewer.java +++ b/src/main/java/de/guntram/mcmod/durabilityviewer/DurabilityViewer.java @@ -14,7 +14,7 @@ name = "Durability Viewer", version = DurabilityViewer.VERSION, clientSideOnly = true, - acceptedMinecraftVersions = "[1.11.2]", + acceptedMinecraftVersions = "[1.12]", guiFactory = "de.guntram.mcmod.durabilityviewer.client.gui.DurabilityViewerGuiFactory", dependencies = "") diff --git a/src/main/java/de/guntram/mcmod/durabilityviewer/client/gui/DurabilityViewerGuiFactory.java b/src/main/java/de/guntram/mcmod/durabilityviewer/client/gui/DurabilityViewerGuiFactory.java index 71e50f2..c9cd787 100644 --- a/src/main/java/de/guntram/mcmod/durabilityviewer/client/gui/DurabilityViewerGuiFactory.java +++ b/src/main/java/de/guntram/mcmod/durabilityviewer/client/gui/DurabilityViewerGuiFactory.java @@ -7,6 +7,11 @@ public class DurabilityViewerGuiFactory implements IModGuiFactory { + @Override + public boolean hasConfigGui() { + return true; + } + @Override public void initialize(final Minecraft minecraftInstance) { } @@ -16,6 +21,11 @@ public Class mainConfigGuiClass() { return DurabilityViewerGuiConfig.class; } + @Override + public GuiScreen createConfigGui(GuiScreen parentScreen) { + return new DurabilityViewerGuiConfig(parentScreen); + } + @Override public Set runtimeGuiCategories() { return null; diff --git a/src/main/java/de/guntram/mcmod/durabilityviewer/event/TooltipEvent.java b/src/main/java/de/guntram/mcmod/durabilityviewer/event/TooltipEvent.java index 8021546..21ad52d 100644 --- a/src/main/java/de/guntram/mcmod/durabilityviewer/event/TooltipEvent.java +++ b/src/main/java/de/guntram/mcmod/durabilityviewer/event/TooltipEvent.java @@ -10,7 +10,7 @@ public class TooltipEvent { @SubscribeEvent public void onItemTooltip(final ItemTooltipEvent event) { - if (!event.isShowAdvancedItemTooltips() && !event.getItemStack().isEmpty()) { + if (!event.getFlags().isAdvanced() && !event.getItemStack().isEmpty()) { final ItemStack itemStack = event.getItemStack(); if (itemStack.isItemDamaged()) { final String toolTip = ConfigurationHandler.getInstance().getTooltipColor() +