clean

.github/ISSUE_TEMPLATE/bug_report.md

@@ -21,6 +21,7 @@ The server software you're using. (Spigot/Paper/Folia)
 
 **Steps to reproduce**
 Write in here the steps needed to reproduce the issue, for example:
+
 - Select origin Phantom
 - Activate your power
 - Look straight up
@@ -30,10 +31,12 @@ Write in here the steps needed to reproduce the issue, for example:
 What was the correct behavior supposed to be, in this example it would be not being hit by a lightning.
 
 **What is happening instead?**
-What is actually happening instead of the correct behavior, in this case, getting struck by a lightning for whatever reason.
+What is actually happening instead of the correct behavior, in this case, getting struck by a lightning for whatever
+reason.
 
 **Stacktrace/Errors on Console**
-If there is an error that shows up in your server's console every time this issue happens, make sure to post it here or upload it to Pastebin or similar websites.
+If there is an error that shows up in your server's console every time this issue happens, make sure to post it here or
+upload it to Pastebin or similar websites.
 
 ```
 # Insert big long spaghetti of letters and symbols for the error

.github/workflows/gradle.yml

@@ -10,38 +10,38 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - name: Checkout code
-      uses: actions/checkout@v2
+      - name: Checkout code
+        uses: actions/checkout@v2
 
-    - name: Set up Java
-      uses: actions/setup-java@v2
-      with:
-        java-version: 21
-        distribution: 'adopt'
+      - name: Set up Java
+        uses: actions/setup-java@v2
+        with:
+          java-version: 21
+          distribution: 'adopt'
 
-    - name: Build and Publish
-      run: |
-        chmod +x ./gradlew
-        ./gradlew build
-      env:
-        GIT_TOKEN: ${{ secrets.GIT_TOKEN }}
-        OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
-        OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
-    - name: Set Commit Hash
-      id: set_commit_hash
-      run: echo "COMMIT_HASH=$(git log --format='%H' -n 1)" >> $GITHUB_ENV
-    - name: Release
-      if: "!contains(github.event.head_commit.message, '--skip') && !contains(github.event.head_commit.commit.message, '--skip')"
-      uses: softprops/action-gh-release@v1
-      with:
-        name: Build ${{ github.run_number }}
-        tag_name: ${{ github.run_number }}
-        body: \"changes\"=${{ github.event.head_commit.message }}
-        token: ${{ secrets.GIT_TOKEN }}
-        files: build/libs/*.jar
-    - name: Notify Discord
-      if: ${{ (success() || failure()) }}
-      uses: Tim203/actions-git-discord-webhook@70f38ded3aca51635ec978ab4e1a58cd4cd0c2ff
-      with:
-        webhook_url: ${{ secrets.DISCORD_WEBHOOK }}
-        status: ${{ job.status }}
+      - name: Build and Publish
+        run: |
+          chmod +x ./gradlew
+          ./gradlew build
+        env:
+          GIT_TOKEN: ${{ secrets.GIT_TOKEN }}
+          OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
+          OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
+      - name: Set Commit Hash
+        id: set_commit_hash
+        run: echo "COMMIT_HASH=$(git log --format='%H' -n 1)" >> $GITHUB_ENV
+      - name: Release
+        if: "!contains(github.event.head_commit.message, '--skip') && !contains(github.event.head_commit.commit.message, '--skip')"
+        uses: softprops/action-gh-release@v1
+        with:
+          name: Build ${{ github.run_number }}
+          tag_name: ${{ github.run_number }}
+          body: \"changes\"=${{ github.event.head_commit.message }}
+          token: ${{ secrets.GIT_TOKEN }}
+          files: build/libs/*.jar
+      - name: Notify Discord
+        if: ${{ (success() || failure()) }}
+        uses: Tim203/actions-git-discord-webhook@70f38ded3aca51635ec978ab4e1a58cd4cd0c2ff
+        with:
+          webhook_url: ${{ secrets.DISCORD_WEBHOOK }}
+          status: ${{ job.status }}

calio/src/main/java/me/dueris/calio/CraftCalio.java

@@ -60,7 +60,8 @@ public void start(boolean debug) {
 		this.isDebugging = debug;
 		debug("Starting CraftCalio parser...");
 		this.keys.stream().sorted(Comparator.comparingInt(AccessorKey::getPriority)).forEach(accessorKey -> datapackDirectoriesToParse.forEach(root -> {
-			packLoop: for (File datapack : root.listFiles()) {
+			packLoop:
+			for (File datapack : root.listFiles()) {
 				try {
 					FileReader fileReader = FileReaderFactory.createFileReader(datapack.toPath());
 					if (fileReader == null) continue;

calio/src/main/java/me/dueris/calio/data/annotations/SourceProvider.java

@@ -4,4 +4,5 @@
 import java.lang.annotation.RetentionPolicy;
 
 @Retention(RetentionPolicy.RUNTIME)
-public @interface SourceProvider {}
+public @interface SourceProvider {
+}

calio/src/main/java/me/dueris/calio/data/types/OptionalInstance.java

@@ -1,3 +1,4 @@
 package me.dueris.calio.data.types;
 
-public class OptionalInstance {}
+public class OptionalInstance {
+}

calio/src/main/java/me/dueris/calio/data/types/ParticleEffect.java

@@ -4,4 +4,5 @@
 
 import java.util.Optional;
 
-public record ParticleEffect(Particle particle, Optional<Particle.DustOptions> dustOptions) {}
+public record ParticleEffect(Particle particle, Optional<Particle.DustOptions> dustOptions) {
+}

calio/src/main/java/me/dueris/calio/data/types/RequiredInstance.java

@@ -1,3 +1,4 @@
 package me.dueris.calio.data.types;
 
-public class RequiredInstance {}
+public class RequiredInstance {
+}

calio/src/main/java/me/dueris/calio/registry/RegistryKey.java

@@ -2,4 +2,5 @@
 
 import org.bukkit.NamespacedKey;
 
-public final record RegistryKey<T extends Registrable>(Class<T> type, NamespacedKey namespacedKey) {}
+public record RegistryKey<T extends Registrable>(Class<T> type, NamespacedKey namespacedKey) {
+}

origins/src/main/java/me/dueris/genesismc/Bootstrap.java

@@ -7,15 +7,9 @@
 import me.dueris.genesismc.util.Util;
 import net.minecraft.core.Registry;
 import net.minecraft.core.registries.BuiltInRegistries;
-import net.minecraft.core.registries.Registries;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraft.tags.TagKey;
-import net.minecraft.world.entity.EquipmentSlot;
-import net.minecraft.world.item.enchantment.Enchantment;
 import org.apache.commons.io.FilenameUtils;
-import org.bukkit.NamespacedKey;
 import org.bukkit.configuration.file.YamlConfiguration;
-import org.bukkit.craftbukkit.util.CraftNamespacedKey;
 import org.jetbrains.annotations.NotNull;
 
 import java.io.*;

origins/src/main/java/me/dueris/genesismc/command/OriginCommand.java

@@ -22,7 +22,10 @@
 import net.minecraft.commands.arguments.ResourceLocationArgument;
 import net.minecraft.network.chat.Component;
 import net.minecraft.server.level.ServerPlayer;
-import org.bukkit.*;
+import org.bukkit.Bukkit;
+import org.bukkit.Material;
+import org.bukkit.NamespacedKey;
+import org.bukkit.Sound;
 import org.bukkit.craftbukkit.entity.CraftPlayer;
 import org.bukkit.craftbukkit.inventory.CraftInventoryCustom;
 import org.bukkit.craftbukkit.inventory.CraftItemStack;
@@ -35,12 +38,14 @@
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.Recipe;
-import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.persistence.PersistentDataType;
 import org.bukkit.scheduler.BukkitRunnable;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
 
 import static com.mojang.brigadier.Command.SINGLE_SUCCESS;
 import static me.dueris.genesismc.storage.OriginConfiguration.getConfiguration;

origins/src/main/java/me/dueris/genesismc/factory/actions/types/EntityActions.java

@@ -19,17 +19,9 @@
 import me.dueris.genesismc.util.RaycastUtils;
 import me.dueris.genesismc.util.Util;
 import me.dueris.genesismc.util.entity.PowerHolderComponent;
-import net.minecraft.advancements.AdvancementHolder;
-import net.minecraft.advancements.AdvancementProgress;
-import net.minecraft.advancements.AdvancementType;
 import net.minecraft.core.particles.ParticleTypes;
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.nbt.CompoundTag;
-import net.minecraft.network.chat.Component;
-import net.minecraft.network.protocol.game.ClientboundAwardStatsPacket;
-import net.minecraft.network.protocol.game.ClientboundUpdateAdvancementsPacket;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.server.PlayerAdvancements;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.world.level.Explosion;
@@ -42,7 +34,6 @@
 import org.bukkit.craftbukkit.entity.CraftEntityType;
 import org.bukkit.craftbukkit.entity.CraftLivingEntity;
 import org.bukkit.craftbukkit.entity.CraftPlayer;
-import org.bukkit.craftbukkit.inventory.CraftItemStack;
 import org.bukkit.craftbukkit.util.CraftLocation;
 import org.bukkit.entity.*;
 import org.bukkit.event.inventory.InventoryType;
@@ -392,7 +383,7 @@ public void register() {
 					"        \"text\": \"" + title + "\"\n" +
 					"      },\n" +
 					"      \"description\": {\n" +
-					"        \"text\": \"" + description +"\"\n" +
+					"        \"text\": \"" + description + "\"\n" +
 					"      },\n" +
 					"      \"background\": \"minecraft:textures/gui/advancements/backgrounds/adventure.png\",\n" +
 					"      \"frame\": \"task\",\n" +

origins/src/main/java/me/dueris/genesismc/factory/conditions/types/EntityConditions.java

@@ -667,12 +667,9 @@ public void registerConditions() {
 
 			double radius = condition.getNumber("radius").getDouble();
 			int countThreshold = switch (comparison) {
-				case EQUAL, LESS_THAN_OR_EQUAL, GREATER_THAN ->
-					compareTo + 1;
-				case LESS_THAN, GREATER_THAN_OR_EQUAL ->
-					compareTo;
-				default ->
-					-1;
+				case EQUAL, LESS_THAN_OR_EQUAL, GREATER_THAN -> compareTo + 1;
+				case LESS_THAN, GREATER_THAN_OR_EQUAL -> compareTo;
+				default -> -1;
 			};
 
 			int count = 0;

origins/src/main/java/me/dueris/genesismc/factory/powers/DontRegister.java

@@ -3,4 +3,5 @@
 /**
  * Meant for powers that are supposed to be registered manually or under certain conditions.
  */
-public interface DontRegister {}
+public interface DontRegister {
+}

origins/src/main/java/me/dueris/genesismc/factory/powers/apoli/ActionOnItemUse.java

@@ -34,7 +34,8 @@ public static FactoryData registerComponents(FactoryData data) {
 	@EventHandler
 	public void entityRightClick(PlayerInteractEvent e) {
 		Player player = e.getPlayer();
-		if (!getPlayers().contains(player) || !e.getAction().isRightClick() || e.getItem() == null || !e.getHand().equals(EquipmentSlot.HAND)) return;
+		if (!getPlayers().contains(player) || !e.getAction().isRightClick() || e.getItem() == null || !e.getHand().equals(EquipmentSlot.HAND))
+			return;
 		if (!isActive(player)) return;
 		if (!ConditionExecutor.testItem(itemCondition, e.getItem())) return;
 		Actions.executeItem(e.getItem(), itemAction);

origins/src/main/java/me/dueris/genesismc/factory/powers/apoli/Cooldown.java

@@ -11,7 +11,6 @@
 import me.dueris.genesismc.util.Util;
 import org.bukkit.Bukkit;
 import org.bukkit.NamespacedKey;
-import org.bukkit.boss.BarStyle;
 import org.bukkit.boss.KeyedBossBar;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -67,11 +66,6 @@ public ResourcePower right() {
 		});
 	}
 
-	@Override
-	public boolean isActive(Player player) {
-		return super.isActive(player) && isInCooldown(player, this);
-	}
-
 	public static boolean isInCooldown(Player player, ResourcePower power) {
 		cooldowns.putIfAbsent(player, new ArrayList<>());
 		for (Pair<KeyedBossBar, ResourcePower> pair : cooldowns.get(player)) {
@@ -80,6 +74,11 @@ public static boolean isInCooldown(Player player, ResourcePower power) {
 		return false;
 	}
 
+	@Override
+	public boolean isActive(Player player) {
+		return super.isActive(player) && isInCooldown(player, this);
+	}
+
 	@EventHandler(priority = EventPriority.HIGH)
 	public void preLoad(ServerLoadEvent e) {
 		GenesisMC.getPlugin().registry.retrieve(Registries.CRAFT_POWER).values().stream()

origins/src/main/java/me/dueris/genesismc/factory/powers/apoli/ModifyJumpPower.java

@@ -9,16 +9,13 @@
 import me.dueris.genesismc.GenesisMC;
 import me.dueris.genesismc.factory.actions.Actions;
 import me.dueris.genesismc.factory.data.types.Modifier;
-import me.dueris.genesismc.factory.powers.holder.PowerType;
 import me.dueris.genesismc.util.DataConverter;
 import org.bukkit.Bukkit;
 import org.bukkit.attribute.Attribute;
 import org.bukkit.attribute.AttributeModifier;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
-import org.bukkit.potion.PotionEffect;
-import org.bukkit.potion.PotionEffectType;
 
 import java.util.ArrayList;
 import java.util.HashMap;

origins/src/main/java/me/dueris/genesismc/factory/powers/apoli/ModifyPlayerSpawnPower.java

@@ -46,13 +46,13 @@
 import java.util.concurrent.atomic.AtomicReference;
 
 public class ModifyPlayerSpawnPower extends PowerType {
+	private static final ArrayList<Player> suspended = new ArrayList<>();
+	private static final PotionEffect suspendedEffect = new PotionEffect(PotionEffectType.SLOWNESS, 5, 255, false, false, false);
 	private final NamespacedKey dimension;
 	private final @Nullable ResourceLocation biome;
 	private final @Nullable ResourceLocation structure;
 	private final SpawnStrategy spawnStrategy;
 	private final float dimensionDistanceMultiplier;
-	private static final ArrayList<Player> suspended = new ArrayList<>();
-	private static final PotionEffect suspendedEffect = new PotionEffect(PotionEffectType.SLOWNESS, 5, 255, false, false, false);
 
 	public ModifyPlayerSpawnPower(String name, String description, boolean hidden, FactoryJsonObject condition, int loading_priority, NamespacedKey dimension, ResourceLocation biome, ResourceLocation structure, SpawnStrategy spawnStrategy, float dimensionDistanceMultiplier) {
 		super(name, description, hidden, condition, loading_priority);

origins/src/main/java/me/dueris/genesismc/factory/powers/apoli/ModifyStatusEffectDurationPower.java

@@ -1,7 +1,6 @@
 package me.dueris.genesismc.factory.powers.apoli;
 
 import com.google.gson.JsonArray;
-import com.mojang.datafixers.util.Pair;
 import me.dueris.calio.data.FactoryData;
 import me.dueris.calio.data.factory.FactoryElement;
 import me.dueris.calio.data.factory.FactoryJsonArray;

origins/src/main/java/me/dueris/genesismc/util/EntityLinkedItemStack.java

@@ -1,11 +1,9 @@
 package me.dueris.genesismc.util;
 
 import io.papermc.paper.event.player.PlayerInventorySlotChangeEvent;
-import me.dueris.genesismc.GenesisMC;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
-import org.bukkit.event.player.AsyncPlayerChatEvent;
 import org.bukkit.event.player.PlayerDropItemEvent;
 import org.bukkit.event.player.PlayerPickupItemEvent;
 import org.bukkit.inventory.ItemStack;