fix: Streamline description key to LSHIFT

ROMVoid95 · web-flow · commit ba90ca62e13d · 2022-08-29T21:44:28.000-05:00
diff --git a/src/main/java/micdoodle8/mods/galacticraft/core/items/ItemBlockDesc.java b/src/main/java/micdoodle8/mods/galacticraft/core/items/ItemBlockDesc.java
@@ -58,7 +58,7 @@ public void addInformation(ItemStack stack, @Nullable World worldIn, List<String
     {
         if (this.getBlock() instanceof IShiftDescription && ((IShiftDescription) this.getBlock()).showDescription(stack.getItemDamage()))
         {
-            if (GameSettings.isKeyDown(FMLClientHandler.instance().getClient().gameSettings.keyBindSneak))
+            if (Keyboard.isKeyDown(Keyboard.KEY_LSHIFT))
             {
                 info.addAll(FMLClientHandler.instance().getClient().fontRenderer.listFormattedStringToWidth(((IShiftDescription) this.getBlock()).getShiftDescription(stack.getItemDamage()), 150));
             } else
@@ -86,7 +86,7 @@ public void addInformation(ItemStack stack, @Nullable World worldIn, List<String
                         }
                     }
                 }
-                info.add(GCCoreUtil.translateWithFormat("item_desc.shift.name", GameSettings.getKeyDisplayString(FMLClientHandler.instance().getClient().gameSettings.keyBindSneak.getKeyCode())));
+                info.add(GCCoreUtil.translateWithFormat("item_desc.shift.name", GameSettings.getKeyDisplayString(Keyboard.KEY_LSHIFT)));
             }
         }
     }
diff --git a/src/main/java/micdoodle8/mods/galacticraft/core/items/ItemDesc.java b/src/main/java/micdoodle8/mods/galacticraft/core/items/ItemDesc.java
@@ -22,12 +22,12 @@ public void addInformation(ItemStack stack, @Nullable World worldIn, List<String
     {
         if (this.showDescription(stack.getItemDamage()))
         {
-            if (Keyboard.isKeyDown(FMLClientHandler.instance().getClient().gameSettings.keyBindSneak.getKeyCode()))
+            if (Keyboard.isKeyDown(Keyboard.KEY_LSHIFT))
             {
                 info.addAll(FMLClientHandler.instance().getClient().fontRenderer.listFormattedStringToWidth(this.getShiftDescription(stack.getItemDamage()), 150));
             } else
             {
-                info.add(GCCoreUtil.translateWithFormat("item_desc.shift.name", GameSettings.getKeyDisplayString(FMLClientHandler.instance().getClient().gameSettings.keyBindSneak.getKeyCode())));
+                info.add(GCCoreUtil.translateWithFormat("item_desc.shift.name", GameSettings.getKeyDisplayString(Keyboard.KEY_LSHIFT)));
             }
         }
     }
diff --git a/src/main/java/micdoodle8/mods/galacticraft/planets/venus/items/ItemVolcanicPickaxe.java b/src/main/java/micdoodle8/mods/galacticraft/planets/venus/items/ItemVolcanicPickaxe.java
@@ -53,7 +53,7 @@ public void addInformation(ItemStack stack, @Nullable World worldIn, List<String
                 info.addAll(FMLClientHandler.instance().getClient().fontRenderer.listFormattedStringToWidth(this.getShiftDescription(stack.getItemDamage()), 150));
             } else
             {
-                info.add(GCCoreUtil.translateWithFormat("item_desc.shift.name", GameSettings.getKeyDisplayString(FMLClientHandler.instance().getClient().gameSettings.keyBindSneak.getKeyCode())));
+                info.add(GCCoreUtil.translateWithFormat("item_desc.shift.name", GameSettings.getKeyDisplayString(Keyboard.KEY_LSHIFT)));
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ public void addInformation(ItemStack stack, @Nullable World worldIn, List<String`
`58`	`58`	`{`
`59`	`59`	`if (this.getBlock() instanceof IShiftDescription && ((IShiftDescription) this.getBlock()).showDescription(stack.getItemDamage()))`
`60`	`60`	`{`
`61`		`- if (GameSettings.isKeyDown(FMLClientHandler.instance().getClient().gameSettings.keyBindSneak))`
	`61`	`+ if (Keyboard.isKeyDown(Keyboard.KEY_LSHIFT))`
`62`	`62`	`{`
`63`	`63`	`info.addAll(FMLClientHandler.instance().getClient().fontRenderer.listFormattedStringToWidth(((IShiftDescription) this.getBlock()).getShiftDescription(stack.getItemDamage()), 150));`
`64`	`64`	`} else`
`@@ -86,7 +86,7 @@ public void addInformation(ItemStack stack, @Nullable World worldIn, List<String`
`86`	`86`	`}`
`87`	`87`	`}`
`88`	`88`	`}`
`89`		`- info.add(GCCoreUtil.translateWithFormat("item_desc.shift.name", GameSettings.getKeyDisplayString(FMLClientHandler.instance().getClient().gameSettings.keyBindSneak.getKeyCode())));`
	`89`	`+ info.add(GCCoreUtil.translateWithFormat("item_desc.shift.name", GameSettings.getKeyDisplayString(Keyboard.KEY_LSHIFT)));`
`90`	`90`	`}`
`91`	`91`	`}`
`92`	`92`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,12 +22,12 @@ public void addInformation(ItemStack stack, @Nullable World worldIn, List<String`
`22`	`22`	`{`
`23`	`23`	`if (this.showDescription(stack.getItemDamage()))`
`24`	`24`	`{`
`25`		`- if (Keyboard.isKeyDown(FMLClientHandler.instance().getClient().gameSettings.keyBindSneak.getKeyCode()))`
	`25`	`+ if (Keyboard.isKeyDown(Keyboard.KEY_LSHIFT))`
`26`	`26`	`{`
`27`	`27`	`info.addAll(FMLClientHandler.instance().getClient().fontRenderer.listFormattedStringToWidth(this.getShiftDescription(stack.getItemDamage()), 150));`
`28`	`28`	`} else`
`29`	`29`	`{`
`30`		`- info.add(GCCoreUtil.translateWithFormat("item_desc.shift.name", GameSettings.getKeyDisplayString(FMLClientHandler.instance().getClient().gameSettings.keyBindSneak.getKeyCode())));`
	`30`	`+ info.add(GCCoreUtil.translateWithFormat("item_desc.shift.name", GameSettings.getKeyDisplayString(Keyboard.KEY_LSHIFT)));`
`31`	`31`	`}`
`32`	`32`	`}`
`33`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public void addInformation(ItemStack stack, @Nullable World worldIn, List<String`
`53`	`53`	`info.addAll(FMLClientHandler.instance().getClient().fontRenderer.listFormattedStringToWidth(this.getShiftDescription(stack.getItemDamage()), 150));`
`54`	`54`	`} else`
`55`	`55`	`{`
`56`		`- info.add(GCCoreUtil.translateWithFormat("item_desc.shift.name", GameSettings.getKeyDisplayString(FMLClientHandler.instance().getClient().gameSettings.keyBindSneak.getKeyCode())));`
	`56`	`+ info.add(GCCoreUtil.translateWithFormat("item_desc.shift.name", GameSettings.getKeyDisplayString(Keyboard.KEY_LSHIFT)));`
`57`	`57`	`}`
`58`	`58`	`}`
`59`	`59`	`}`