deploy fixed, tab instead of spaces

master
Benjamin Kraft 2 years ago
parent c078c2a35d
commit f06ea8cd73
  1. 2
      .idea/misc.xml
  2. 2
      scripts/deploy.sh
  3. 2
      src/main/java/com/benjocraeft/sharehealth/Commands.java
  4. 3
      src/main/java/com/benjocraeft/sharehealth/FileManager.java
  5. 1
      src/main/java/com/benjocraeft/sharehealth/HealthManager.java
  6. 9
      src/main/java/com/benjocraeft/sharehealth/Sharehealth.java
  7. 4
      src/main/java/com/benjocraeft/sharehealth/Statistics.java
  8. 4
      src/main/java/com/benjocraeft/sharehealth/TotemManager.java

@ -5,7 +5,7 @@
<item index="0" class="java.lang.String" itemvalue="org.bukkit.event.EventHandler" /> <item index="0" class="java.lang.String" itemvalue="org.bukkit.event.EventHandler" />
</list> </list>
</component> </component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_16" project-jdk-name="openjdk-18" project-jdk-type="JavaSDK"> <component name="ProjectRootManager" version="2" languageLevel="JDK_16" project-jdk-name="temurin-18" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" /> <output url="file://$PROJECT_DIR$/out" />
</component> </component>
</project> </project>

@ -1,4 +1,4 @@
#!/usr/bin/bash #!/usr/bin/bash
cp out/artifacts/Sharehealth/Sharehealth.jar server/plugins cp out/artifacts/Sharehealth/Sharehealth.jar server/plugins
scp out/artifacts/Sharehealth/Sharehealth.jar minecraft@130.61.179.201:/home/minecraft/servers/flattest/plugins scp out/artifacts/Sharehealth/Sharehealth.jar benjamin@130.61.179.201:/home/benjamin/minecraft/servers/flattest/plugins

@ -14,6 +14,7 @@ import java.util.function.BiConsumer;
public class Commands implements TabExecutor { public class Commands implements TabExecutor {
final private Map<List<String>, Pair<BiConsumer<CommandSender, String>, String>> commands = new HashMap<>(); final private Map<List<String>, Pair<BiConsumer<CommandSender, String>, String>> commands = new HashMap<>();
{ {
addCommand("get", (sender, arg) -> commandGetHealth(sender), "Displays current health value."); addCommand("get", (sender, arg) -> commandGetHealth(sender), "Displays current health value.");
addCommand("reset", (sender, arg) -> commandReset(sender), "Gives every player full health and resets 'isFailed' to false. GameMode becomes Survival."); addCommand("reset", (sender, arg) -> commandReset(sender), "Gives every player full health and resets 'isFailed' to false. GameMode becomes Survival.");
@ -40,6 +41,7 @@ public class Commands implements TabExecutor {
final private List<String> mainSchema; final private List<String> mainSchema;
final private List<String> hasSecondSchema; final private List<String> hasSecondSchema;
final private List<List<String>> secondSchema; final private List<List<String>> secondSchema;
{ {
//This is a mess, no idea how to expand it for 3 part commands //This is a mess, no idea how to expand it for 3 part commands
Map<String, List<String>> mapping = new HashMap<>(); Map<String, List<String>> mapping = new HashMap<>();

@ -162,7 +162,8 @@ public class FileManager {
String[] split = line.split("="); String[] split = line.split("=");
map.put(split[0], split.length == 2 ? split[1] : ""); map.put(split[0], split.length == 2 ? split[1] : "");
} }
} catch (NullPointerException ignore){} } catch (NullPointerException ignore) {
}
reader.close(); reader.close();
input.close(); input.close();

@ -31,6 +31,7 @@ public class HealthManager {
public HealthManager() { public HealthManager() {
} }
public void updatePlayer(Player player) { public void updatePlayer(Player player) {
if (player.getGameMode().equals(GameMode.SURVIVAL)) { if (player.getGameMode().equals(GameMode.SURVIVAL)) {
player.setHealth(health); player.setHealth(health);

@ -25,21 +25,25 @@ public class Sharehealth extends JavaPlugin {
} }
private HealthManager healthManager; private HealthManager healthManager;
public HealthManager getHealthManager() { public HealthManager getHealthManager() {
return healthManager; return healthManager;
} }
private TotemManager totemManager; private TotemManager totemManager;
public TotemManager getTotemManager() { public TotemManager getTotemManager() {
return totemManager; return totemManager;
} }
private Messenger messenger; private Messenger messenger;
public Messenger getMessenger() { public Messenger getMessenger() {
return messenger; return messenger;
} }
private Statistics statistics; private Statistics statistics;
public Statistics getStatistics() { public Statistics getStatistics() {
return statistics; return statistics;
} }
@ -48,6 +52,7 @@ public class Sharehealth extends JavaPlugin {
boolean isFailed = false; boolean isFailed = false;
private final Map<String, Object> defaultStatus = new HashMap<>(); private final Map<String, Object> defaultStatus = new HashMap<>();
{ {
defaultStatus.put("health", 20.); defaultStatus.put("health", 20.);
defaultStatus.put("isFailed", false); defaultStatus.put("isFailed", false);
@ -153,12 +158,14 @@ public class Sharehealth extends JavaPlugin {
saveStatus(); saveStatus();
} }
void onPlayerGotDamageByEntity(Player player, double damage, Entity damagingEntity, double absorbedDamage) { void onPlayerGotDamageByEntity(Player player, double damage, Entity damagingEntity, double absorbedDamage) {
if (isFailed) if (isFailed)
return; return;
messenger.onPlayerGotDamageMessage(player, damage + absorbedDamage, damagingEntity); messenger.onPlayerGotDamageMessage(player, damage + absorbedDamage, damagingEntity);
} }
void onPlayerGotDamageByBlock(Player player, double damage, Block damagingBlock, double absorbedDamage) { void onPlayerGotDamageByBlock(Player player, double damage, Block damagingBlock, double absorbedDamage) {
if (isFailed) if (isFailed)
return; return;
@ -232,11 +239,13 @@ public class Sharehealth extends JavaPlugin {
} }
private static List<UUID> ActiveUUIDs = new ArrayList<>(); private static List<UUID> ActiveUUIDs = new ArrayList<>();
static List<Player> GetPlayers() { static List<Player> GetPlayers() {
List<Player> players = new ArrayList<>(Bukkit.getOnlinePlayers()); List<Player> players = new ArrayList<>(Bukkit.getOnlinePlayers());
players.removeIf(p -> !ActiveUUIDs.contains(p.getUniqueId())); players.removeIf(p -> !ActiveUUIDs.contains(p.getUniqueId()));
return players; return players;
} }
static List<Player> GetPlayers(Player except) { static List<Player> GetPlayers(Player except) {
List<Player> players = GetPlayers(); List<Player> players = GetPlayers();
players.remove(except); players.remove(except);

@ -9,6 +9,7 @@ import java.util.UUID;
public class Statistics { public class Statistics {
final private Map<UUID, Pair<Double, Double>> statistics = new HashMap<>(); final private Map<UUID, Pair<Double, Double>> statistics = new HashMap<>();
public Map<UUID, Pair<Double, Double>> getStatistics() { public Map<UUID, Pair<Double, Double>> getStatistics() {
return statistics; return statistics;
} }
@ -16,6 +17,7 @@ public class Statistics {
public static Double Rounded(Double value, int afterComma) { public static Double Rounded(Double value, int afterComma) {
return Math.round(value * Math.pow(10, afterComma)) / Math.pow(10, afterComma); return Math.round(value * Math.pow(10, afterComma)) / Math.pow(10, afterComma);
} }
public static Double Rounded(Double value) { public static Double Rounded(Double value) {
return Rounded(value, 2); return Rounded(value, 2);
} }
@ -26,9 +28,11 @@ public class Statistics {
} }
final private Map<UUID, Boolean> settings = new HashMap<>(); final private Map<UUID, Boolean> settings = new HashMap<>();
public Map<UUID, Boolean> getSettings() { public Map<UUID, Boolean> getSettings() {
return settings; return settings;
} }
public void setSettings(UUID uuid, boolean hasLogging) { public void setSettings(UUID uuid, boolean hasLogging) {
settings.put(uuid, hasLogging); settings.put(uuid, hasLogging);
} }

@ -14,15 +14,18 @@ public class TotemManager {
private Mode mode = Mode.All; private Mode mode = Mode.All;
public void setMode(Mode mode) { public void setMode(Mode mode) {
this.mode = mode; this.mode = mode;
} }
public Mode getMode() { public Mode getMode() {
return mode; return mode;
} }
//between 0 and 1 //between 0 and 1
private double fractionNeeded; private double fractionNeeded;
public void setFractionNeeded(double value) { public void setFractionNeeded(double value) {
if (value < 0) if (value < 0)
value = 0; value = 0;
@ -30,6 +33,7 @@ public class TotemManager {
value = 1; value = 1;
fractionNeeded = value; fractionNeeded = value;
} }
public double getFractionNeeded() { public double getFractionNeeded() {
return fractionNeeded; return fractionNeeded;
} }

Loading…
Cancel
Save