fix

9 files changed, 46 insertions, 74 deletions

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
deleted file mode 100644
index 3a4227e..0000000
--- a/.github/FUNDING.yml
+++ /dev/null
@@ -1 +0,0 @@
-ko_fi: genbyte
\ No newline at end of file
diff --git a/.github/workflows/java-ci.yml b/.github/workflows/java-ci.yml
deleted file mode 100644
index ef2dd67..0000000
--- a/.github/workflows/java-ci.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-name: Java CI
-
-on: [push]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 1.8
-        uses: actions/setup-java@v1
-        with:
-          java-version: 1.8
-      - name: Build with Maven
-        run: mvn -B package --file pom.xml
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index b1fcc78..edd2fa2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,12 +2,12 @@
 .vscode
 .settings
 
-# Java things (?)
+# Java things
 .project
 .classpath
 
 # Maven things
 target/
 
-# Genuinebyte things
+# script things
 *.sh
diff --git a/LICENSE b/LICENSE
index db7f181..60ceb94 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright 2020 Brad Alfirevic <brad@genbyte.dev>
+Copyright 2023 Genny <gen@nyble.dev>
 
 Permission to use, copy, modify, and/or distribute this software for any 
 purpose with or without fee is hereby granted, provided that the above 
diff --git a/README.md b/README.md
index 4002426..02463b8 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,3 @@
-# Inactive; Unmaintined
-
-This plugin is no longer maintined. It might still work for your version of the game. If you plan to use it, I recommend testing it first on an unimportant server. I don't think it'd be able to cause much damage, but it's better to be safe.
-
 # Sunfright
 Inspired by the [404 challenge][404], this is a Spigot plugin that restricts
 your ability to be in sunlight.
@@ -20,7 +16,7 @@ you have a Fire Protection helmet on, the helmet takes half the damage you would
 be dealt and you don't take any damage. There is a table below listing the
 types of helmets, their durability, and the time it would take for this helmet
 to break on the default damage value. Data is pulled from the
-[Minecraft Gamepedia page on Helmets][mcwiki-helmets].
+[minecraft.wiki page on Helmets][mcwiki-helmets].
 
 | Material     | Durability | Time Exposed to Sunlight  |
 | ------------ | ---------- | ------------------------- |
@@ -31,22 +27,9 @@ to break on the default damage value. Data is pulled from the
 | Turtle Shell | 276        | 4 minutes, 36 seconds     |
 | Diamond      | 364        | 6 minutes, 4 seconds      |
 
-[mcwiki-helmets]: https://minecraft.gamepedia.com/Helmet#Durability
-
-## Download
-You can get the latest build from [**Curseforge**][curseforge], [**SpigotMC**][spigot], or on the
-[**GitHub releases page**][github-releases].
-
-[curseforge]: https://www.curseforge.com/minecraft/bukkit-plugins/sunfright
-[spigot]: https://www.spigotmc.org/resources/sunfright.86454
-[github-releases]: https://github.com/genuinebyte/sunfright/releases
+[mcwiki-helmets]: https://minecraft.wiki/w/Durability#Armor_durability
 
 ## Configuration
-Currently there are only three configuration options, but more will be made
-available as the plugin evolves. If you think something should be configurable,
-please [open an issue][issue-tracker]!
-
-[issue-tracker]: https://github.com/genuinebyte/sunfright/issues
 
 **world**  
 Default: `world`
diff --git a/pom.xml b/pom.xml
index 9943429..ac1df3f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,27 +1,27 @@
 <!-- based on https://github.com/sgrayme/SpigotPlugin/blob/master/pom.xml -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>dev.genbyte.sunfright</groupId>
+  <groupId>dev.nyble.sunfright</groupId>
   <artifactId>Sunfright</artifactId>
   <packaging>jar</packaging>
   <version>1.0.0</version>
 
   <name>Sunfright</name>
   <description>Burn me to a crisp, large glowing orb!</description>
-  <url>https://genbyte.dev</url><!-- TODO: add URL -->
+  <url>https://nyble.dev</url>  <!-- TODO: add URL -->
 
   <developers>
     <developer>
-      <name>Genuinebyte</name>
-      <url>https://genbyte.dev</url>
+      <name>Genny</name>
+      <url>https://nyble.dev</url>
     </developer>
   </developers>
 
   <properties>
-    <author>Genuinebyte</author>
-    <mainClass>dev.genbyte.sunfright.Sunfright</mainClass>
+    <author>Genny</author>
+    <mainClass>dev.nyble.sunfright.Sunfright</mainClass>
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>
   </properties>
@@ -39,7 +39,7 @@
     <dependency>
       <groupId>org.spigotmc</groupId>
       <artifactId>spigot-api</artifactId>
-      <version>1.16.4-R0.1-SNAPSHOT</version>
+      <version>1.17.1-R0.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>
diff --git a/src/main/java/dev/genbyte/sunfright/Damager.java b/src/main/java/dev/nyble/sunfright/Damager.java
index 4ee7615..890bb98 100644
--- a/src/main/java/dev/genbyte/sunfright/Damager.java
+++ b/src/main/java/dev/nyble/sunfright/Damager.java
@@ -1,4 +1,4 @@
-package dev.genbyte.sunfright;
+package dev.nyble.sunfright;
 
 import java.util.Collection;
 import java.util.Random;
@@ -37,21 +37,22 @@ public class Damager extends BukkitRunnable {
 			int y = loc.getBlockY();
 			int z = loc.getBlockZ();
 			// Returns one lower than it should?
-			int highestY = sunnedWorld.getHighestBlockAt(loc).getLocation().getBlockY()+1;
+			int highestY = sunnedWorld.getHighestBlockAt(loc).getLocation().getBlockY() + 1;
 
 			for (int i = y; i < highestY; ++i) {
 				Block current = sunnedWorld.getBlockAt(x, i, z);
 
 				if (!blockShouldDamage(current.getType())) {
-					/* player rulled to be safe. Remove their helmet if it's the one we gave, but
-					   only do so if the skylight is less than three. This will keep us from
-					   removing the starter helmet if they're just chopping down a tree */
+					/*
+					 * player rulled to be safe. Remove their helmet if it's the one we gave, but
+					 * only do so if the skylight is less than three. This will keep us from
+					 * removing the starter helmet if they're just chopping down a tree
+					 */
 					if (player.getInventory().getHelmet() != null &&
-					    player.getLocation().getBlock().getLightFromSky() > 3 &&
-					    player.getInventory().getHelmet().getEnchantmentLevel(Enchantment.VANISHING_CURSE) == 2)
-				   	{
-					   player.getInventory().setHelmet(new ItemStack(Material.AIR));
-				   	}
+							player.getLocation().getBlock().getLightFromSky() > 3 &&
+							player.getInventory().getHelmet().getEnchantmentLevel(Enchantment.VANISHING_CURSE) == 2) {
+						player.getInventory().setHelmet(new ItemStack(Material.AIR));
+					}
 
 					return;
 				}
@@ -67,11 +68,12 @@ public class Damager extends BukkitRunnable {
 		long time = sunnedWorld.getTime();
 		boolean storming = sunnedWorld.hasStorm();
 		boolean thundering = sunnedWorld.isThundering();
-		
-		// Times are pulled from Minecraft Gamepedia page on Light, specifically the internal light
+
+		// Times are pulled from Minecraft Gamepedia page on Light, specifically the
+		// internal light
 		// level section. https://minecraft.gamepedia.com/Light
 		// Times correspond to when the light level is over 8.
-		 if (storming && !thundering) {
+		if (storming && !thundering) {
 			if (time >= 12734 && time <= 23266) {
 				return false;
 			}
@@ -86,20 +88,24 @@ public class Damager extends BukkitRunnable {
 	}
 
 	/*
-	Material.isTransparent() is buggy and awful and only gives true for some things. This function
-	checks if a material lets light pass and should damage the player.
-	I've never seen it give a false positive, only a false negative, so it is one of the first
-	things we check.
-	*/
+	 * Material.isTransparent() is buggy and awful and only gives true for some
+	 * things. This function
+	 * checks if a material lets light pass and should damage the player.
+	 * I've never seen it give a false positive, only a false negative, so it is one
+	 * of the first
+	 * things we check.
+	 */
 	@SuppressWarnings("deprecation")
 	private boolean blockShouldDamage(Material mat) {
 		String key = mat.getKey().getKey().toLowerCase();
-		
+
 		if (mat == Material.BLACK_STAINED_GLASS) {
 			return false;
 		}
 
-		return mat.isTransparent() || key.indexOf("glass") != -1 || key.indexOf("leaves") != -1 || key.indexOf("sign") != -1 || key.indexOf("trapdoor") != -1 || key.indexOf("fence") != -1 || key.indexOf("bed") != -1 || mat == Material.ICE || mat == Material.HOPPER || mat == Material.COBWEB;
+		return mat.isTransparent() || key.indexOf("glass") != -1 || key.indexOf("leaves") != -1
+				|| key.indexOf("sign") != -1 || key.indexOf("trapdoor") != -1 || key.indexOf("fence") != -1
+				|| key.indexOf("bed") != -1 || mat == Material.ICE || mat == Material.HOPPER || mat == Material.COBWEB;
 	}
 
 	private class DoDamage extends BukkitRunnable {
@@ -146,8 +152,8 @@ public class Damager extends BukkitRunnable {
 						// Origintal is 60 + (40 / (level+1)) but we subtract one from fireProtLevel
 						// so the +1 cancels
 						int chanceToDamage = 60 + (40 / (fireProtLevel));
-						
-						if (rand.nextInt(99)+1 <= chanceToDamage) {
+
+						if (rand.nextInt(99) + 1 <= chanceToDamage) {
 							int calculatedDamage = (int) Math.ceil(damage / 2);
 							helmetDamageable.setDamage(helmetDamage + calculatedDamage);
 							helmet.setItemMeta((ItemMeta) helmetDamageable);
diff --git a/src/main/java/dev/genbyte/sunfright/Sunfright.java b/src/main/java/dev/nyble/sunfright/Sunfright.java
index 13dfa69..6661ab6 100644
--- a/src/main/java/dev/genbyte/sunfright/Sunfright.java
+++ b/src/main/java/dev/nyble/sunfright/Sunfright.java
@@ -1,4 +1,4 @@
-package dev.genbyte.sunfright;
+package dev.nyble.sunfright;
 
 import java.util.logging.Level;
 
@@ -6,7 +6,7 @@ import org.bukkit.World;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.scheduler.BukkitTask;
 
-import dev.genbyte.sunfright.events.HelmetHandler;
+import dev.nyble.sunfright.events.HelmetHandler;
 
 public class Sunfright extends JavaPlugin {
     public World sunnedWorld;
diff --git a/src/main/java/dev/genbyte/sunfright/events/HelmetHandler.java b/src/main/java/dev/nyble/sunfright/events/HelmetHandler.java
index 6c8afc9..e744a33 100644
--- a/src/main/java/dev/genbyte/sunfright/events/HelmetHandler.java
+++ b/src/main/java/dev/nyble/sunfright/events/HelmetHandler.java
@@ -1,4 +1,4 @@
-package dev.genbyte.sunfright.events;
+package dev.nyble.sunfright.events;
 
 import org.bukkit.Material;
 import org.bukkit.enchantments.Enchantment;
@@ -11,7 +11,7 @@ import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.PlayerInventory;
 
-import dev.genbyte.sunfright.Sunfright;
+import dev.nyble.sunfright.Sunfright;
 
 public class HelmetHandler implements Listener {
 	private final Sunfright sf;