minecraft-mods/mineclass-spigot
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reformat code and remove unused SuppressWarnings

Browse Source
This commit is contained in:
Barazok
2020-11-08 17:31:48 +01:00
parent 2713bfa62d
commit 64db2c9820
11 changed files with 25 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/net/babamod/mineclass/classes/BeastMasterClass.java
View File

@@ -11,7 +11,6 @@ import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream; import java.util.stream.Stream;
@SuppressWarnings("unused")
public class BeastMasterClass extends MineClassImpl { public class BeastMasterClass extends MineClassImpl {
private static final Set<Material> forbiddenItems = private static final Set<Material> forbiddenItems =

1
src/main/java/net/babamod/mineclass/classes/DwarfClass.java
View File

@@ -10,7 +10,6 @@ import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream; import java.util.stream.Stream;
@SuppressWarnings("unused")
public class DwarfClass extends MineClassImpl { public class DwarfClass extends MineClassImpl {
private final Set<Material> forbiddenItems = private final Set<Material> forbiddenItems =

1
src/main/java/net/babamod/mineclass/classes/ElfClass.java
View File

@@ -10,7 +10,6 @@ import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream; import java.util.stream.Stream;
@SuppressWarnings("unused")
public class ElfClass extends MineClassImpl { public class ElfClass extends MineClassImpl {
private static final Set<Material> forbiddenItems = private static final Set<Material> forbiddenItems =

1
src/main/java/net/babamod/mineclass/classes/EnderElfClass.java
View File

@@ -13,7 +13,6 @@ import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream; import java.util.stream.Stream;
@SuppressWarnings("unused")
public class EnderElfClass extends MineClassImpl { public class EnderElfClass extends MineClassImpl {
private static final Set<Material> forbiddenItems = private static final Set<Material> forbiddenItems =

4
src/main/java/net/babamod/mineclass/classes/FireDwarfClass.java
View File

@@ -10,7 +10,6 @@ import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream; import java.util.stream.Stream;
@SuppressWarnings("unused")
public class FireDwarfClass extends MineClassImpl { public class FireDwarfClass extends MineClassImpl {
private static final Set<Material> forbiddenItems = private static final Set<Material> forbiddenItems =
@@ -86,8 +85,7 @@ public class FireDwarfClass extends MineClassImpl {
Material.CROSSBOW, Material.CROSSBOW,
Collections.singletonList(new Pair<>(Enchantment.ARROW_INFINITE, 1))), Collections.singletonList(new Pair<>(Enchantment.ARROW_INFINITE, 1))),
new AbstractMap.SimpleEntry<>( new AbstractMap.SimpleEntry<>(
Material.FLINT_AND_STEEL, new ArrayList<Pair<Enchantment, Integer>>()) Material.FLINT_AND_STEEL, new ArrayList<Pair<Enchantment, Integer>>()))
)
.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)); .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
@Override @Override

8
src/main/java/net/babamod/mineclass/classes/MineClassFactory.java
View File

@@ -1,13 +1,11 @@
package net.babamod.mineclass.classes; package net.babamod.mineclass.classes;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.inventory.meta.ItemMeta;
import org.bukkit.potion.PotionEffect; import org.bukkit.potion.PotionEffect;
import java.util.*; import java.util.*;
import java.util.logging.Level;
public class MineClassFactory { public class MineClassFactory {
/** Instance unique pré-initialisée */ /** Instance unique pré-initialisée */
@@ -70,16 +68,14 @@ public class MineClassFactory {
} }
public synchronized void setClassCode(Player player, String code) { public synchronized void setClassCode(Player player, String code) {
player player.getScoreboardTags().removeAll(availableClasses.keySet());
.getScoreboardTags()
.removeAll(availableClasses.keySet());
player.addScoreboardTag(code); player.addScoreboardTag(code);
} }
public synchronized Optional<MineClass> getRightClass(Player player) { public synchronized Optional<MineClass> getRightClass(Player player) {
for (Map.Entry<String, MineClass> stringMineClassEntry : availableClasses.entrySet()) { for (Map.Entry<String, MineClass> stringMineClassEntry : availableClasses.entrySet()) {
if (getClassCode(player) != null if (getClassCode(player) != null
&& getClassCode(player).equals(stringMineClassEntry.getKey())) { && getClassCode(player).equals(stringMineClassEntry.getKey())) {
return Optional.of(stringMineClassEntry.getValue()); return Optional.of(stringMineClassEntry.getValue());
} }
} }

1
src/main/java/net/babamod/mineclass/classes/MineClassImpl.java
View File

@@ -6,7 +6,6 @@ import org.bukkit.inventory.ItemStack;
import org.bukkit.potion.PotionEffect; import org.bukkit.potion.PotionEffect;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.stream.Collectors;
public abstract class MineClassImpl implements MineClass { public abstract class MineClassImpl implements MineClass {

31
src/main/java/net/babamod/mineclass/commands/CommandClass.java
View File

@@ -3,11 +3,11 @@ package net.babamod.mineclass.commands;
import net.babamod.mineclass.classes.MineClassFactory; import net.babamod.mineclass.classes.MineClassFactory;
import net.babamod.mineclass.utils.InvocationsFinder; import net.babamod.mineclass.utils.InvocationsFinder;
import net.babamod.mineclass.utils.NumberOfInvocations; import net.babamod.mineclass.utils.NumberOfInvocations;
import org.bukkit.attribute.Attribute;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.*; import org.bukkit.entity.Entity;
import org.bukkit.entity.Player;
import org.bukkit.potion.PotionEffect; import org.bukkit.potion.PotionEffect;
import org.bukkit.potion.PotionEffectType; import org.bukkit.potion.PotionEffectType;
@@ -23,14 +23,18 @@ public class CommandClass implements CommandExecutor {
Player player = (Player) sender; Player player = (Player) sender;
if (MineClassFactory.getInstance().getAvailableClassCodes().contains(args[0])) { if (MineClassFactory.getInstance().getAvailableClassCodes().contains(args[0])) {
if (MineClassFactory.getInstance().getClassCode(player).equals("beast_master")) { if (MineClassFactory.getInstance().getClassCode(player).equals("beast_master")) {
InvocationsFinder.findWolfs(player).forEach(entity -> { InvocationsFinder.findWolfs(player)
entity.remove(); .forEach(
NumberOfInvocations.getInstance().decreaseNumber(player); entity -> {
}); entity.remove();
InvocationsFinder.findCats(player).forEach(entity -> { NumberOfInvocations.getInstance().decreaseNumber(player);
entity.remove(); });
NumberOfInvocations.getInstance().decreaseNumber(player); InvocationsFinder.findCats(player)
}); .forEach(
entity -> {
entity.remove();
NumberOfInvocations.getInstance().decreaseNumber(player);
});
InvocationsFinder.findHorses(player).forEach(Entity::remove); InvocationsFinder.findHorses(player).forEach(Entity::remove);
} }
MineClassFactory.clearAllClassEffects(player); MineClassFactory.clearAllClassEffects(player);
@@ -39,7 +43,7 @@ public class CommandClass implements CommandExecutor {
MineClassFactory.getInstance().dropForbiddenItemsForClassByCode(args[0], player); MineClassFactory.getInstance().dropForbiddenItemsForClassByCode(args[0], player);
MineClassFactory.getInstance().setClassCode(player, args[0]); MineClassFactory.getInstance().setClassCode(player, args[0]);
if (!player.hasPotionEffect(PotionEffectType.SATURATION)) { if (!player.hasPotionEffect(PotionEffectType.SATURATION)) {
player.addPotionEffect(new PotionEffect(PotionEffectType.SATURATION,200, 9)); player.addPotionEffect(new PotionEffect(PotionEffectType.SATURATION, 200, 9));
} }
return true; return true;
} }
@@ -49,8 +53,7 @@ public class CommandClass implements CommandExecutor {
return true; return true;
} }
if (args[0].equals("whoami")) { if (args[0].equals("whoami")) {
String classCode = String classCode = MineClassFactory.getInstance().getClassCode(player);
MineClassFactory.getInstance().getClassCode(player);
if (classCode != null) { if (classCode != null) {
player.sendMessage(String.format("You are a %s.", classCode)); player.sendMessage(String.format("You are a %s.", classCode));
} else { } else {
@@ -61,6 +64,4 @@ public class CommandClass implements CommandExecutor {
} }
return false; return false;
} }
} }

6
src/main/java/net/babamod/mineclass/listeners/MineClassListeners.java
View File

@@ -295,9 +295,11 @@ public class MineClassListeners implements Listener {
} }
} }
if (player.isSneaking() if (player.isSneaking()
&& (event.getAction().equals(Action.RIGHT_CLICK_BLOCK) || event.getAction().equals(Action.RIGHT_CLICK_AIR)) && (event.getAction().equals(Action.RIGHT_CLICK_BLOCK)
|| event.getAction().equals(Action.RIGHT_CLICK_AIR))
&& MineClassFactory.getInstance().getClassCode(player).equals("ender_elf") && MineClassFactory.getInstance().getClassCode(player).equals("ender_elf")
&& event.getItem() != null && event.getItem().getType().equals(Material.ENDER_PEARL)) { && event.getItem() != null
&& event.getItem().getType().equals(Material.ENDER_PEARL)) {
player.openInventory(player.getEnderChest()); player.openInventory(player.getEnderChest());
event.setCancelled(true); event.setCancelled(true);
} }

4
src/main/java/net/babamod/mineclass/utils/InvocationsFinder.java
View File

@@ -51,8 +51,8 @@ public class InvocationsFinder {
entity -> entity ->
entity.hasMetadata("beastMasterHorse") entity.hasMetadata("beastMasterHorse")
&& entity.getMetadata("beastMasterHorse").stream() && entity.getMetadata("beastMasterHorse").stream()
.anyMatch( .anyMatch(
metadataValue -> metadataValue.asString().equals(player.getName()))) metadataValue -> metadataValue.asString().equals(player.getName())))
.collect(Collectors.toList()); .collect(Collectors.toList());
} }
} }

1
src/main/java/net/babamod/mineclass/utils/NumberOfInvocations.java
View File

@@ -44,5 +44,4 @@ public class NumberOfInvocations {
} }
numberOfInvocations.put(playerName, integer - 1); numberOfInvocations.put(playerName, integer - 1);
} }
} }