Updated to 1.15.1

Added input mode indicator to Add Server, Edit Book, Create World, Server List screens
rlj1202 · Dec 18, 2019 · 6cc938b · 6cc938b
1 parent ce3597f
commit 6cc938b
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 14 deletions.
diff --git a/build.gradle b/build.gradle
@@ -13,9 +13,9 @@ apply plugin: 'net.minecraftforge.gradle'
 apply plugin: 'eclipse'
 apply plugin: 'maven-publish'
 
-version = '1.0.0'
+version = '1.1.0'
 group = 'redlaboratory.hangulinput' // http://maven.apache.org/guides/mini/guide-naming-conventions.html
-archivesBaseName = 'hangulinput'
+archivesBaseName = 'HangulInput'
 
 sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
 
@@ -43,7 +43,7 @@ minecraft {
             property 'forge.logging.console.level', 'debug'
 
             mods {
-                examplemod {
+                hangulinput {
                     source sourceSets.main
                 }
             }
@@ -59,7 +59,7 @@ minecraft {
             property 'forge.logging.console.level', 'debug'
 
             mods {
-                examplemod {
+                hangulinput {
                     source sourceSets.main
                 }
             }
@@ -74,10 +74,10 @@ minecraft {
             // Recommended logging level for the console
             property 'forge.logging.console.level', 'debug'
 
-            args '--mod', 'examplemod', '--all', '--output', file('src/generated/resources/')
+            args '--mod', 'hangulinput', '--all', '--output', file('src/generated/resources/')
 
             mods {
-                examplemod {
+                hangulinput {
                     source sourceSets.main
                 }
             }
@@ -94,7 +94,8 @@ dependencies {
     // Specify the version of Minecraft to use, If this is any group other then 'net.minecraft' it is assumed
     // that the dep is a ForgeGradle 'patcher' dependency. And it's patches will be applied.
     // The userdev artifact is a special name and will get all sorts of transformations applied to it.
-    minecraft 'net.minecraftforge:forge:1.14.4-28.0.55'
+    // minecraft 'net.minecraftforge:forge:1.14.4-28.0.55'
+    minecraft 'net.minecraftforge:forge:1.15.1-30.0.7'
 
     // You may put jars on which you depend on in ./libs or you may define them like so..
     // compile "some.group:artifact:version:classifier"

diff --git a/src/main/java/redlaboratory/hangulinput/HangulInput.java b/src/main/java/redlaboratory/hangulinput/HangulInput.java
@@ -1,8 +1,6 @@
 package redlaboratory.hangulinput;
 
-import net.minecraft.client.gui.screen.ChatScreen;
-import net.minecraft.client.gui.screen.EditSignScreen;
-import net.minecraft.client.gui.screen.WorldSelectionScreen;
+import net.minecraft.client.gui.screen.*;
 import net.minecraft.client.gui.screen.inventory.AnvilScreen;
 import net.minecraft.client.gui.screen.inventory.CreativeScreen;
 import net.minecraftforge.api.distmarker.Dist;
@@ -70,6 +68,32 @@ public void onGuiInitPost(GuiScreenEvent.InitGuiEvent.Post event) {
                     25,
                     12, 12, "", HANGUL_BUILDER
             ));
+        } else if (event.getGui() instanceof AddServerScreen) {
+            event.addWidget(new InputModeIndicatorWidget(
+                    guiwidth / 2 - 120,
+                    70,
+                    12, 12, "", HANGUL_BUILDER
+            ));
+        } else if (event.getGui() instanceof EditBookScreen) {
+            event.addWidget(new InputModeIndicatorWidget(
+                    guiwidth / 2 - 100,
+                    30,
+                    12, 12, "", HANGUL_BUILDER
+            ));
+        } else if (event.getGui() instanceof CreateWorldScreen) {
+            event.addWidget(new InputModeIndicatorWidget(
+                    guiwidth / 2 - 120,
+                    64,
+                    12 ,12, "", HANGUL_BUILDER
+            ));
+        } else if (event.getGui() instanceof ServerListScreen) {
+            event.addWidget(new InputModeIndicatorWidget(
+                    guiwidth / 2 - 120,
+                    119,
+                    12, 12, "", HANGUL_BUILDER
+            ));
+        } else {
+            LOGGER.info(event.getGui().getClass().getName());
         }
     }
 

diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml
@@ -6,15 +6,15 @@
 # The name of the mod loader type to load - for regular FML @Mod mods it should be javafml
 modLoader="javafml" #mandatory
 # A version range to match for said mod loader - for regular FML @Mod it will be the forge version
-loaderVersion="[28,)" #mandatory (26 is current forge version)
+loaderVersion="[30,)" #mandatory (26 is current forge version)
 # A URL to refer people to when problems occur with this mod
 #issueTrackerURL="http://my.issue.tracker/" #optional
 # A list of mods - how many allowed here is determined by the individual mod loader
 [[mods]] #mandatory
 # The modid of the mod
 modId="hangulinput" #mandatory
 # The version number of the mod - there's a few well known ${} variables useable here or just hardcode it
-version="1.0.0"
+version="1.1.0"
 #version="${file.jarVersion}" #mandatory
 # A display name for the mod
 displayName="Hangul Input" #mandatory
@@ -39,7 +39,7 @@ Converts latin strokes into korean alphabet strokes
     # Does this dependency have to exist - if not, ordering below must be specified
     mandatory=true #mandatory
     # The version range of the dependency
-    versionRange="[28,)" #mandatory
+    versionRange="[30,)" #mandatory
     # An ordering relationship for the dependency - BEFORE or AFTER required if the relationship is not mandatory
     ordering="NONE"
     # Side this dependency is applied on - BOTH, CLIENT or SERVER
@@ -48,6 +48,6 @@ Converts latin strokes into korean alphabet strokes
 [[dependencies.hangulinput]]
     modId="minecraft"
     mandatory=true
-    versionRange="[1.14.4]"
+    versionRange="[1.15.1]"
     ordering="NONE"
     side="CLIENT"