From 94ece847063c485b3085add62dde50c0421164d6 Mon Sep 17 00:00:00 2001 From: yourfriendoss <81387799+yourfriendoss@users.noreply.github.com> Date: Mon, 17 Apr 2023 21:19:50 +0300 Subject: [PATCH] bunch o' bugfixes --- readme.md | 6 --- src/main/java/lv/pi/animalrp/AnimalRP.java | 2 + .../java/lv/pi/animalrp/animals/Animal.java | 2 - src/main/java/lv/pi/animalrp/animals/Bee.java | 7 ---- src/main/java/lv/pi/animalrp/animals/Cat.java | 7 ---- src/main/java/lv/pi/animalrp/animals/Fox.java | 7 ---- .../java/lv/pi/animalrp/animals/Phantom.java | 7 ---- .../pi/animalrp/commands/ChatModCommand.java | 37 +++++++++++++++++++ .../lv/pi/animalrp/util/TextDestroyer.java | 11 +++--- 9 files changed, 45 insertions(+), 41 deletions(-) create mode 100644 src/main/java/lv/pi/animalrp/commands/ChatModCommand.java diff --git a/readme.md b/readme.md index 44c061d..034d526 100644 --- a/readme.md +++ b/readme.md @@ -46,12 +46,6 @@ public class MyCoolAnimal extends Animal { public String chatTransformations(String message) { return this.destroyer.destroy(message); } - - @Override - public Location movementTransformations(Location location) { - return location; - } - } ``` 3. Change the info in the TextDestroyer initialization diff --git a/src/main/java/lv/pi/animalrp/AnimalRP.java b/src/main/java/lv/pi/animalrp/AnimalRP.java index ce212aa..880bb85 100644 --- a/src/main/java/lv/pi/animalrp/AnimalRP.java +++ b/src/main/java/lv/pi/animalrp/AnimalRP.java @@ -62,6 +62,7 @@ import net.kyori.adventure.text.minimessage.MiniMessage; public class AnimalRP extends JavaPlugin { public static HashMap users = new HashMap(); + public static HashMap isChatModOff = new HashMap(); public static HashMap cooldowns = new HashMap(); public static HashMap animals = new HashMap(); public static Emote emotes; @@ -114,6 +115,7 @@ public class AnimalRP extends JavaPlugin { animals.put("fox", new Fox()); animals.put("bee", new Bee()); // animals.put("phantom", new Phantom()); // finish Phantom + animals.forEach((z,b) -> { pm.registerEvents(b, this); }); diff --git a/src/main/java/lv/pi/animalrp/animals/Animal.java b/src/main/java/lv/pi/animalrp/animals/Animal.java index e4e7b74..6334a84 100644 --- a/src/main/java/lv/pi/animalrp/animals/Animal.java +++ b/src/main/java/lv/pi/animalrp/animals/Animal.java @@ -3,7 +3,6 @@ package lv.pi.animalrp.animals; import java.util.ArrayList; import java.util.HashMap; -import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; @@ -53,5 +52,4 @@ public abstract class Animal implements Listener { } public abstract String chatTransformations(String message); - public abstract Location movementTransformations(Location location); } diff --git a/src/main/java/lv/pi/animalrp/animals/Bee.java b/src/main/java/lv/pi/animalrp/animals/Bee.java index 3fc577c..3677529 100644 --- a/src/main/java/lv/pi/animalrp/animals/Bee.java +++ b/src/main/java/lv/pi/animalrp/animals/Bee.java @@ -3,7 +3,6 @@ package lv.pi.animalrp.animals; import java.util.ArrayList; import java.util.UUID; -import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.Sound; import org.bukkit.block.BlockFace; @@ -93,10 +92,4 @@ public class Bee extends Animal { public String chatTransformations(String message) { return destroyer.destroy(message); } - - @Override - public Location movementTransformations(Location location) { - return location; - } - } \ No newline at end of file diff --git a/src/main/java/lv/pi/animalrp/animals/Cat.java b/src/main/java/lv/pi/animalrp/animals/Cat.java index 90f60a0..8090fbd 100644 --- a/src/main/java/lv/pi/animalrp/animals/Cat.java +++ b/src/main/java/lv/pi/animalrp/animals/Cat.java @@ -1,6 +1,5 @@ package lv.pi.animalrp.animals; -import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.Sound; import org.bukkit.entity.Player; @@ -59,10 +58,4 @@ public class Cat extends Animal { public String chatTransformations(String message) { return destroyer.destroy(message); } - - @Override - public Location movementTransformations(Location location) { - return location; - } - } \ No newline at end of file diff --git a/src/main/java/lv/pi/animalrp/animals/Fox.java b/src/main/java/lv/pi/animalrp/animals/Fox.java index 7c2de2c..f227c80 100644 --- a/src/main/java/lv/pi/animalrp/animals/Fox.java +++ b/src/main/java/lv/pi/animalrp/animals/Fox.java @@ -2,7 +2,6 @@ package lv.pi.animalrp.animals; import java.util.Random; -import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.Sound; import org.bukkit.entity.EntityType; @@ -63,10 +62,4 @@ public class Fox extends Animal { public String chatTransformations(String message) { return this.destroyer.destroy(message); } - - @Override - public Location movementTransformations(Location location) { - return location; - } - } \ No newline at end of file diff --git a/src/main/java/lv/pi/animalrp/animals/Phantom.java b/src/main/java/lv/pi/animalrp/animals/Phantom.java index 24a630c..8b84e8a 100644 --- a/src/main/java/lv/pi/animalrp/animals/Phantom.java +++ b/src/main/java/lv/pi/animalrp/animals/Phantom.java @@ -2,7 +2,6 @@ package lv.pi.animalrp.animals; import java.util.Random; -import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.Sound; @@ -41,10 +40,4 @@ public class Phantom extends Animal { public String chatTransformations(String message) { return this.destroyer.destroy(message); } - - @Override - public Location movementTransformations(Location location) { - return location; - } - } \ No newline at end of file diff --git a/src/main/java/lv/pi/animalrp/commands/ChatModCommand.java b/src/main/java/lv/pi/animalrp/commands/ChatModCommand.java new file mode 100644 index 0000000..470721c --- /dev/null +++ b/src/main/java/lv/pi/animalrp/commands/ChatModCommand.java @@ -0,0 +1,37 @@ +package lv.pi.animalrp.commands; + +import java.util.stream.Collectors; + +import org.bukkit.command.Command; +import org.bukkit.command.CommandExecutor; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; +import org.jetbrains.annotations.NotNull; + +import lv.pi.animalrp.AnimalRP; + +// TODO: Unfinished +public class ChatModCommand implements CommandExecutor { + @Override + public boolean onCommand(@NotNull CommandSender arg0, @NotNull Command arg1, @NotNull String arg2, @NotNull String[] arg3) { + if(!(arg0 instanceof Player)) { + arg0.sendMessage(AnimalRP.mm.deserialize("I'm sorry console. :(")); + return true; + } + + Player player = (Player)arg0; + + if(arg3.length == 0) { + options(player); + return true; + } + + boolean off = false; + if(arg2.endsWith("off")) { + off = true; + } + + return true; + } + +} diff --git a/src/main/java/lv/pi/animalrp/util/TextDestroyer.java b/src/main/java/lv/pi/animalrp/util/TextDestroyer.java index 266fc6f..ff55de9 100644 --- a/src/main/java/lv/pi/animalrp/util/TextDestroyer.java +++ b/src/main/java/lv/pi/animalrp/util/TextDestroyer.java @@ -20,15 +20,16 @@ public class TextDestroyer { Random y = new Random(); for (String word : words) { - if(y.nextBoolean()){ - out.add(word); - continue; - }; - if(word.startsWith("[") && word.endsWith("]")) { + if((word.startsWith("[") && word.endsWith("]")) || word.startsWith("@")) { out.add(word); continue; } + if(y.nextBoolean()){ + out.add(word); + continue; + }; + for(String[] replacing: this.replaces) { word = word.replace(replacing[0], replacing[1]); }