From 471b586b6c359ee897bbc87ac82cb3d842489e2d Mon Sep 17 00:00:00 2001 From: Connor Peach Date: Tue, 28 Nov 2023 19:37:06 -0700 Subject: [PATCH] add nonbinary gender --- src/com/dogonfire/gods/commands/CommandHelp.java | 1 + src/com/dogonfire/gods/managers/AltarManager.java | 6 +++++- src/com/dogonfire/gods/managers/GodManager.java | 5 ++++- src/com/dogonfire/gods/managers/LanguageManager.java | 2 +- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/com/dogonfire/gods/commands/CommandHelp.java b/src/com/dogonfire/gods/commands/CommandHelp.java index 3e9b085..6c94a0a 100644 --- a/src/com/dogonfire/gods/commands/CommandHelp.java +++ b/src/com/dogonfire/gods/commands/CommandHelp.java @@ -129,6 +129,7 @@ private void helpAltar(CommandSender sender) sender.sendMessage(ChatColor.WHITE + " 1 - Place a block"); sender.sendMessage(ChatColor.WHITE + " 2a - Place a torch on top for a male god"); sender.sendMessage(ChatColor.WHITE + " 2b - Place a redstone torch on top for a female god"); + sender.sendMessage(ChatColor.WHITE + " 2c - Place a soul torch on top for a nonbinary god"); sender.sendMessage(ChatColor.WHITE + " 3 - Place a sign on the side of the block"); sender.sendMessage(ChatColor.WHITE + " 4 - Write the name of your God on the sign"); sender.sendMessage(""); diff --git a/src/com/dogonfire/gods/managers/AltarManager.java b/src/com/dogonfire/gods/managers/AltarManager.java index e9d5c93..0684d3d 100644 --- a/src/com/dogonfire/gods/managers/AltarManager.java +++ b/src/com/dogonfire/gods/managers/AltarManager.java @@ -165,6 +165,10 @@ public GodManager.GodGender getGodGenderFromAltarBlock(Block block) { return GodManager.GodGender.Female; } + if (block.getRelative(BlockFace.UP).getType().equals(Material.SOUL_TORCH)) + { + return GodManager.GodGender.Nonbinary; + } return GodManager.GodGender.Male; } @@ -580,4 +584,4 @@ public void setAltarBlockTypeForGodType(GodType godType, Material blockMaterial) this.altarBlockTypes.put(blockMaterial, godTypes); } -} \ No newline at end of file +} diff --git a/src/com/dogonfire/gods/managers/GodManager.java b/src/com/dogonfire/gods/managers/GodManager.java index 938f79c..48ff107 100644 --- a/src/com/dogonfire/gods/managers/GodManager.java +++ b/src/com/dogonfire/gods/managers/GodManager.java @@ -48,7 +48,7 @@ public class GodManager { public static enum GodGender { - None, Male, Female; + None, Male, Female, Nonbinary; } public static enum GodMood { @@ -1257,6 +1257,9 @@ public String getLanguageFileForGod(String godName) case 1: godGender = GodGender.Female; break; + case 2: + godGender = GodGender.Nonbinary; + break; } } diff --git a/src/com/dogonfire/gods/managers/LanguageManager.java b/src/com/dogonfire/gods/managers/LanguageManager.java index 7694169..63cdead 100644 --- a/src/com/dogonfire/gods/managers/LanguageManager.java +++ b/src/com/dogonfire/gods/managers/LanguageManager.java @@ -48,7 +48,7 @@ private LanguageManager() private void downloadLanguageFile(String fileName) throws IOException { - BufferedInputStream in = new BufferedInputStream(new URL("https://raw.githubusercontent.com/DogOnFire/Gods/master/lang/" + fileName).openStream()); + BufferedInputStream in = new BufferedInputStream(new URL("https://raw.githubusercontent.com/Connorppeach/Gods/master/lang/" + fileName).openStream()); FileOutputStream fos = new FileOutputStream(Gods.instance().getDataFolder() + "/lang/" + fileName);