diff --git a/build.gradle b/build.gradle index b13978a..b376804 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ plugins { id 'com.github.johnrengelman.shadow' version '4.0.4' } -group 'me.loganb1max' +group 'pw.hamzantal' version '1.0-SNAPSHOT' sourceCompatibility = 1.8 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e34a6a6..44e7c4d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Fri Apr 17 13:30:53 ICT 2020 -distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-all.zip distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-bin.zip zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew old mode 100644 new mode 100755 diff --git a/src/main/java/me/loganb1max/minionsplus/MinionsPlus.java b/src/main/java/pw/hamzantal/minionsplus/MinionsPlus.java similarity index 86% rename from src/main/java/me/loganb1max/minionsplus/MinionsPlus.java rename to src/main/java/pw/hamzantal/minionsplus/MinionsPlus.java index 65663d7..4eb9129 100644 --- a/src/main/java/me/loganb1max/minionsplus/MinionsPlus.java +++ b/src/main/java/pw/hamzantal/minionsplus/MinionsPlus.java @@ -1,14 +1,15 @@ -package me.loganb1max.minionsplus; +package pw.hamzantal.minionsplus; import com.earth2me.essentials.Essentials; import lombok.Getter; -import me.loganb1max.minionsplus.command.MinionCommand; -import me.loganb1max.minionsplus.manager.LinkingManager; -import me.loganb1max.minionsplus.manager.MinionManager; -import me.loganb1max.minionsplus.model.Fuel; +import pw.hamzantal.minionsplus.command.MinionCommand; +import pw.hamzantal.minionsplus.manager.LinkingManager; +import pw.hamzantal.minionsplus.manager.MinionManager; +import pw.hamzantal.minionsplus.model.Fuel; import net.milkbowl.vault.economy.Economy; import org.bukkit.plugin.RegisteredServiceProvider; import org.bukkit.plugin.java.JavaPlugin; + import java.util.Set; import java.util.stream.Collectors; diff --git a/src/main/java/me/loganb1max/minionsplus/command/MinionCommand.java b/src/main/java/pw/hamzantal/minionsplus/command/MinionCommand.java similarity index 92% rename from src/main/java/me/loganb1max/minionsplus/command/MinionCommand.java rename to src/main/java/pw/hamzantal/minionsplus/command/MinionCommand.java index 8739857..d4de6da 100644 --- a/src/main/java/me/loganb1max/minionsplus/command/MinionCommand.java +++ b/src/main/java/pw/hamzantal/minionsplus/command/MinionCommand.java @@ -1,17 +1,19 @@ -package me.loganb1max.minionsplus.command; +package pw.hamzantal.minionsplus.command; import com.google.common.collect.ImmutableList; -import me.loganb1max.minionsplus.MinionsPlus; -import me.loganb1max.minionsplus.model.Minion; +import pw.hamzantal.minionsplus.MinionsPlus; +import pw.hamzantal.minionsplus.model.Minion; import me.loganb1max.minionsplus.model.minions.*; -import me.loganb1max.minionsplus.util.ItemUtil; -import me.loganb1max.minionsplus.util.Text; +import pw.hamzantal.minionsplus.model.minions.*; +import pw.hamzantal.minionsplus.util.ItemUtil; +import pw.hamzantal.minionsplus.util.Text; import org.bukkit.Bukkit; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; import org.bukkit.command.TabCompleter; import org.bukkit.entity.Player; + import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; diff --git a/src/main/java/me/loganb1max/minionsplus/manager/LinkingManager.java b/src/main/java/pw/hamzantal/minionsplus/manager/LinkingManager.java similarity index 92% rename from src/main/java/me/loganb1max/minionsplus/manager/LinkingManager.java rename to src/main/java/pw/hamzantal/minionsplus/manager/LinkingManager.java index 5caaa28..87248c2 100644 --- a/src/main/java/me/loganb1max/minionsplus/manager/LinkingManager.java +++ b/src/main/java/pw/hamzantal/minionsplus/manager/LinkingManager.java @@ -1,8 +1,8 @@ -package me.loganb1max.minionsplus.manager; +package pw.hamzantal.minionsplus.manager; -import me.loganb1max.minionsplus.MinionsPlus; -import me.loganb1max.minionsplus.model.Minion; -import me.loganb1max.minionsplus.util.Text; +import pw.hamzantal.minionsplus.MinionsPlus; +import pw.hamzantal.minionsplus.model.Minion; +import pw.hamzantal.minionsplus.util.Text; import org.bukkit.Bukkit; import org.bukkit.block.Block; import org.bukkit.entity.Player; diff --git a/src/main/java/me/loganb1max/minionsplus/manager/MinionManager.java b/src/main/java/pw/hamzantal/minionsplus/manager/MinionManager.java similarity index 93% rename from src/main/java/me/loganb1max/minionsplus/manager/MinionManager.java rename to src/main/java/pw/hamzantal/minionsplus/manager/MinionManager.java index 1e6929b..0e5a2bd 100644 --- a/src/main/java/me/loganb1max/minionsplus/manager/MinionManager.java +++ b/src/main/java/pw/hamzantal/minionsplus/manager/MinionManager.java @@ -1,14 +1,13 @@ -package me.loganb1max.minionsplus.manager; +package pw.hamzantal.minionsplus.manager; import com.google.gson.*; import lombok.Getter; -import me.loganb1max.minionsplus.MinionsPlus; -import me.loganb1max.minionsplus.menu.MinionMenu; -import me.loganb1max.minionsplus.model.Minion; -import me.loganb1max.minionsplus.model.minions.ButcherMinion; -import me.loganb1max.minionsplus.model.minions.MinerMinion; -import me.loganb1max.minionsplus.util.ItemUtil; -import me.loganb1max.minionsplus.util.Text; +import pw.hamzantal.minionsplus.MinionsPlus; +import pw.hamzantal.minionsplus.menu.MinionMenu; +import pw.hamzantal.minionsplus.model.Minion; +import pw.hamzantal.minionsplus.model.minions.ButcherMinion; +import pw.hamzantal.minionsplus.util.ItemUtil; +import pw.hamzantal.minionsplus.util.Text; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.entity.ArmorStand; diff --git a/src/main/java/me/loganb1max/minionsplus/menu/MinionMenu.java b/src/main/java/pw/hamzantal/minionsplus/menu/MinionMenu.java similarity index 93% rename from src/main/java/me/loganb1max/minionsplus/menu/MinionMenu.java rename to src/main/java/pw/hamzantal/minionsplus/menu/MinionMenu.java index 01ffcf8..213a1ff 100644 --- a/src/main/java/me/loganb1max/minionsplus/menu/MinionMenu.java +++ b/src/main/java/pw/hamzantal/minionsplus/menu/MinionMenu.java @@ -1,10 +1,10 @@ -package me.loganb1max.minionsplus.menu; +package pw.hamzantal.minionsplus.menu; -import me.loganb1max.minionsplus.MinionsPlus; -import me.loganb1max.minionsplus.model.Fuel; -import me.loganb1max.minionsplus.model.Minion; -import me.loganb1max.minionsplus.util.ItemBuilder; -import me.loganb1max.minionsplus.util.Text; +import pw.hamzantal.minionsplus.MinionsPlus; +import pw.hamzantal.minionsplus.model.Fuel; +import pw.hamzantal.minionsplus.model.Minion; +import pw.hamzantal.minionsplus.util.ItemBuilder; +import pw.hamzantal.minionsplus.util.Text; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.entity.Player; @@ -18,6 +18,7 @@ import org.bukkit.event.inventory.InventoryCloseEvent; import org.bukkit.event.inventory.InventoryType; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; + import java.util.HashMap; import java.util.Map; import java.util.Set; diff --git a/src/main/java/me/loganb1max/minionsplus/model/Fuel.java b/src/main/java/pw/hamzantal/minionsplus/model/Fuel.java similarity index 90% rename from src/main/java/me/loganb1max/minionsplus/model/Fuel.java rename to src/main/java/pw/hamzantal/minionsplus/model/Fuel.java index eb558af..ca29379 100644 --- a/src/main/java/me/loganb1max/minionsplus/model/Fuel.java +++ b/src/main/java/pw/hamzantal/minionsplus/model/Fuel.java @@ -1,8 +1,8 @@ -package me.loganb1max.minionsplus.model; +package pw.hamzantal.minionsplus.model; import lombok.AllArgsConstructor; import lombok.Getter; -import me.loganb1max.minionsplus.util.ItemUtil; +import pw.hamzantal.minionsplus.util.ItemUtil; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.inventory.ItemStack; diff --git a/src/main/java/me/loganb1max/minionsplus/model/Minion.java b/src/main/java/pw/hamzantal/minionsplus/model/Minion.java similarity index 98% rename from src/main/java/me/loganb1max/minionsplus/model/Minion.java rename to src/main/java/pw/hamzantal/minionsplus/model/Minion.java index 9456ac8..4b7054a 100644 --- a/src/main/java/me/loganb1max/minionsplus/model/Minion.java +++ b/src/main/java/pw/hamzantal/minionsplus/model/Minion.java @@ -1,4 +1,4 @@ -package me.loganb1max.minionsplus.model; +package pw.hamzantal.minionsplus.model; import com.google.gson.Gson; import com.google.gson.JsonElement; @@ -6,7 +6,7 @@ import com.google.gson.JsonObject; import lombok.AccessLevel; import lombok.Getter; import lombok.Setter; -import me.loganb1max.minionsplus.MinionsPlus; +import pw.hamzantal.minionsplus.MinionsPlus; import me.loganb1max.minionsplus.model.minions.*; import me.loganb1max.minionsplus.util.*; import org.bukkit.Bukkit; @@ -18,6 +18,9 @@ import org.bukkit.entity.ArmorStand; import org.bukkit.entity.EntityType; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; +import pw.hamzantal.minionsplus.model.minions.*; +import pw.hamzantal.minionsplus.util.*; + import java.text.DecimalFormat; import java.util.*; diff --git a/src/main/java/me/loganb1max/minionsplus/model/minions/BreederMinion.java b/src/main/java/pw/hamzantal/minionsplus/model/minions/BreederMinion.java similarity index 90% rename from src/main/java/me/loganb1max/minionsplus/model/minions/BreederMinion.java rename to src/main/java/pw/hamzantal/minionsplus/model/minions/BreederMinion.java index fe7d295..3260217 100644 --- a/src/main/java/me/loganb1max/minionsplus/model/minions/BreederMinion.java +++ b/src/main/java/pw/hamzantal/minionsplus/model/minions/BreederMinion.java @@ -1,11 +1,12 @@ -package me.loganb1max.minionsplus.model.minions; +package pw.hamzantal.minionsplus.model.minions; -import me.loganb1max.minionsplus.MinionsPlus; -import me.loganb1max.minionsplus.model.Minion; -import me.loganb1max.minionsplus.util.Replacer; +import pw.hamzantal.minionsplus.MinionsPlus; +import pw.hamzantal.minionsplus.model.Minion; +import pw.hamzantal.minionsplus.util.Replacer; import org.bukkit.Location; import org.bukkit.block.Block; import org.bukkit.entity.*; + import java.text.DecimalFormat; import java.util.Set; import java.util.UUID; diff --git a/src/main/java/me/loganb1max/minionsplus/model/minions/ButcherMinion.java b/src/main/java/pw/hamzantal/minionsplus/model/minions/ButcherMinion.java similarity index 90% rename from src/main/java/me/loganb1max/minionsplus/model/minions/ButcherMinion.java rename to src/main/java/pw/hamzantal/minionsplus/model/minions/ButcherMinion.java index 6e54332..0971b05 100644 --- a/src/main/java/me/loganb1max/minionsplus/model/minions/ButcherMinion.java +++ b/src/main/java/pw/hamzantal/minionsplus/model/minions/ButcherMinion.java @@ -1,13 +1,14 @@ -package me.loganb1max.minionsplus.model.minions; +package pw.hamzantal.minionsplus.model.minions; -import me.loganb1max.minionsplus.MinionsPlus; -import me.loganb1max.minionsplus.model.Minion; -import me.loganb1max.minionsplus.util.Replacer; +import pw.hamzantal.minionsplus.MinionsPlus; +import pw.hamzantal.minionsplus.model.Minion; +import pw.hamzantal.minionsplus.util.Replacer; import org.bukkit.Location; import org.bukkit.block.Block; import org.bukkit.entity.Entity; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; + import java.text.DecimalFormat; import java.util.*; diff --git a/src/main/java/me/loganb1max/minionsplus/model/minions/CollectorMinion.java b/src/main/java/pw/hamzantal/minionsplus/model/minions/CollectorMinion.java similarity index 92% rename from src/main/java/me/loganb1max/minionsplus/model/minions/CollectorMinion.java rename to src/main/java/pw/hamzantal/minionsplus/model/minions/CollectorMinion.java index ad5deff..13f87eb 100644 --- a/src/main/java/me/loganb1max/minionsplus/model/minions/CollectorMinion.java +++ b/src/main/java/pw/hamzantal/minionsplus/model/minions/CollectorMinion.java @@ -1,8 +1,8 @@ -package me.loganb1max.minionsplus.model.minions; +package pw.hamzantal.minionsplus.model.minions; -import me.loganb1max.minionsplus.MinionsPlus; -import me.loganb1max.minionsplus.model.Minion; -import me.loganb1max.minionsplus.util.Replacer; +import pw.hamzantal.minionsplus.MinionsPlus; +import pw.hamzantal.minionsplus.model.Minion; +import pw.hamzantal.minionsplus.util.Replacer; import org.bukkit.Location; import org.bukkit.block.Block; import org.bukkit.entity.Entity; @@ -10,6 +10,7 @@ import org.bukkit.entity.Item; import org.bukkit.inventory.InventoryHolder; import org.bukkit.inventory.ItemStack; import org.bukkit.metadata.FixedMetadataValue; + import java.text.DecimalFormat; import java.util.*; diff --git a/src/main/java/me/loganb1max/minionsplus/model/minions/FarmerMinion.java b/src/main/java/pw/hamzantal/minionsplus/model/minions/FarmerMinion.java similarity index 93% rename from src/main/java/me/loganb1max/minionsplus/model/minions/FarmerMinion.java rename to src/main/java/pw/hamzantal/minionsplus/model/minions/FarmerMinion.java index 5161dc8..f5c55f2 100644 --- a/src/main/java/me/loganb1max/minionsplus/model/minions/FarmerMinion.java +++ b/src/main/java/pw/hamzantal/minionsplus/model/minions/FarmerMinion.java @@ -1,9 +1,9 @@ -package me.loganb1max.minionsplus.model.minions; +package pw.hamzantal.minionsplus.model.minions; -import me.loganb1max.minionsplus.MinionsPlus; -import me.loganb1max.minionsplus.model.Minion; -import me.loganb1max.minionsplus.util.ItemBuilder; -import me.loganb1max.minionsplus.util.Replacer; +import pw.hamzantal.minionsplus.MinionsPlus; +import pw.hamzantal.minionsplus.model.Minion; +import pw.hamzantal.minionsplus.util.ItemBuilder; +import pw.hamzantal.minionsplus.util.Replacer; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.block.Block; diff --git a/src/main/java/me/loganb1max/minionsplus/model/minions/FisherMinion.java b/src/main/java/pw/hamzantal/minionsplus/model/minions/FisherMinion.java similarity index 92% rename from src/main/java/me/loganb1max/minionsplus/model/minions/FisherMinion.java rename to src/main/java/pw/hamzantal/minionsplus/model/minions/FisherMinion.java index 95ee3be..48c8fbf 100644 --- a/src/main/java/me/loganb1max/minionsplus/model/minions/FisherMinion.java +++ b/src/main/java/pw/hamzantal/minionsplus/model/minions/FisherMinion.java @@ -1,14 +1,15 @@ -package me.loganb1max.minionsplus.model.minions; +package pw.hamzantal.minionsplus.model.minions; -import me.loganb1max.minionsplus.MinionsPlus; -import me.loganb1max.minionsplus.model.Minion; -import me.loganb1max.minionsplus.util.ItemBuilder; -import me.loganb1max.minionsplus.util.Replacer; +import pw.hamzantal.minionsplus.MinionsPlus; +import pw.hamzantal.minionsplus.model.Minion; +import pw.hamzantal.minionsplus.util.ItemBuilder; +import pw.hamzantal.minionsplus.util.Replacer; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.inventory.InventoryHolder; import org.bukkit.inventory.ItemStack; + import java.text.DecimalFormat; import java.util.*; import java.util.concurrent.ThreadLocalRandom; diff --git a/src/main/java/me/loganb1max/minionsplus/model/minions/MinerMinion.java b/src/main/java/pw/hamzantal/minionsplus/model/minions/MinerMinion.java similarity index 94% rename from src/main/java/me/loganb1max/minionsplus/model/minions/MinerMinion.java rename to src/main/java/pw/hamzantal/minionsplus/model/minions/MinerMinion.java index 443a90f..befb183 100644 --- a/src/main/java/me/loganb1max/minionsplus/model/minions/MinerMinion.java +++ b/src/main/java/pw/hamzantal/minionsplus/model/minions/MinerMinion.java @@ -1,14 +1,11 @@ -package me.loganb1max.minionsplus.model.minions; +package pw.hamzantal.minionsplus.model.minions; -import lombok.val; -import me.loganb1max.minionsplus.MinionsPlus; -import me.loganb1max.minionsplus.model.Minion; -import me.loganb1max.minionsplus.util.Replacer; -import org.bukkit.Bukkit; +import pw.hamzantal.minionsplus.MinionsPlus; +import pw.hamzantal.minionsplus.model.Minion; +import pw.hamzantal.minionsplus.util.Replacer; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.block.Block; -import org.bukkit.block.BlockFace; import org.bukkit.inventory.InventoryHolder; import org.bukkit.inventory.ItemStack; diff --git a/src/main/java/me/loganb1max/minionsplus/model/minions/SellerMinion.java b/src/main/java/pw/hamzantal/minionsplus/model/minions/SellerMinion.java similarity index 93% rename from src/main/java/me/loganb1max/minionsplus/model/minions/SellerMinion.java rename to src/main/java/pw/hamzantal/minionsplus/model/minions/SellerMinion.java index 77f114e..dda4a8f 100644 --- a/src/main/java/me/loganb1max/minionsplus/model/minions/SellerMinion.java +++ b/src/main/java/pw/hamzantal/minionsplus/model/minions/SellerMinion.java @@ -1,14 +1,15 @@ -package me.loganb1max.minionsplus.model.minions; +package pw.hamzantal.minionsplus.model.minions; -import me.loganb1max.minionsplus.MinionsPlus; -import me.loganb1max.minionsplus.model.Minion; -import me.loganb1max.minionsplus.util.Replacer; +import pw.hamzantal.minionsplus.MinionsPlus; +import pw.hamzantal.minionsplus.model.Minion; +import pw.hamzantal.minionsplus.util.Replacer; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.block.Chest; import org.bukkit.inventory.ItemStack; + import java.text.DecimalFormat; import java.util.Set; import java.util.UUID; diff --git a/src/main/java/me/loganb1max/minionsplus/util/ItemBuilder.java b/src/main/java/pw/hamzantal/minionsplus/util/ItemBuilder.java similarity index 97% rename from src/main/java/me/loganb1max/minionsplus/util/ItemBuilder.java rename to src/main/java/pw/hamzantal/minionsplus/util/ItemBuilder.java index d60c15e..6242356 100644 --- a/src/main/java/me/loganb1max/minionsplus/util/ItemBuilder.java +++ b/src/main/java/pw/hamzantal/minionsplus/util/ItemBuilder.java @@ -1,4 +1,4 @@ -package me.loganb1max.minionsplus.util; +package pw.hamzantal.minionsplus.util; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; diff --git a/src/main/java/me/loganb1max/minionsplus/util/ItemUtil.java b/src/main/java/pw/hamzantal/minionsplus/util/ItemUtil.java similarity index 99% rename from src/main/java/me/loganb1max/minionsplus/util/ItemUtil.java rename to src/main/java/pw/hamzantal/minionsplus/util/ItemUtil.java index 8de0675..ba426cb 100644 --- a/src/main/java/me/loganb1max/minionsplus/util/ItemUtil.java +++ b/src/main/java/pw/hamzantal/minionsplus/util/ItemUtil.java @@ -1,4 +1,4 @@ -package me.loganb1max.minionsplus.util; +package pw.hamzantal.minionsplus.util; import org.bukkit.Color; import org.bukkit.Material; diff --git a/src/main/java/me/loganb1max/minionsplus/util/Replacer.java b/src/main/java/pw/hamzantal/minionsplus/util/Replacer.java similarity index 95% rename from src/main/java/me/loganb1max/minionsplus/util/Replacer.java rename to src/main/java/pw/hamzantal/minionsplus/util/Replacer.java index 73ceb58..175efe4 100644 --- a/src/main/java/me/loganb1max/minionsplus/util/Replacer.java +++ b/src/main/java/pw/hamzantal/minionsplus/util/Replacer.java @@ -1,4 +1,4 @@ -package me.loganb1max.minionsplus.util; +package pw.hamzantal.minionsplus.util; import java.util.HashMap; import java.util.List; diff --git a/src/main/java/me/loganb1max/minionsplus/util/SkullCreator.java b/src/main/java/pw/hamzantal/minionsplus/util/SkullCreator.java similarity index 99% rename from src/main/java/me/loganb1max/minionsplus/util/SkullCreator.java rename to src/main/java/pw/hamzantal/minionsplus/util/SkullCreator.java index 5cd5283..822469f 100644 --- a/src/main/java/me/loganb1max/minionsplus/util/SkullCreator.java +++ b/src/main/java/pw/hamzantal/minionsplus/util/SkullCreator.java @@ -1,4 +1,4 @@ -package me.loganb1max.minionsplus.util; +package pw.hamzantal.minionsplus.util; import org.bukkit.Bukkit; import org.bukkit.Material; diff --git a/src/main/java/me/loganb1max/minionsplus/util/Text.java b/src/main/java/pw/hamzantal/minionsplus/util/Text.java similarity index 81% rename from src/main/java/me/loganb1max/minionsplus/util/Text.java rename to src/main/java/pw/hamzantal/minionsplus/util/Text.java index ce0111a..d0b213f 100644 --- a/src/main/java/me/loganb1max/minionsplus/util/Text.java +++ b/src/main/java/pw/hamzantal/minionsplus/util/Text.java @@ -1,4 +1,4 @@ -package me.loganb1max.minionsplus.util; +package pw.hamzantal.minionsplus.util; import org.bukkit.ChatColor; diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 87a39ce..a8a9142 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,8 +1,8 @@ name: MinionsPlus -main: me.loganb1max.minionsplus.MinionsPlus -version: 1.0-SNAPSHOT +main: pw.hamzantal.minionsplus.MinionsPlus +version: 1.0 description: Minions Plugin for Skyblock Servers -author: loganb1max +author: hamzantal load: POSTWORLD depend: [Vault, Essentials] commands: