From 1dbd21045acf11e515b6202003e727ea993f223a Mon Sep 17 00:00:00 2001 From: Barazok Date: Sun, 8 Nov 2020 16:55:37 +0100 Subject: [PATCH] Revert usage of reflections library --- build.gradle | 26 +++---------------- .../mineclass/classes/MineClassFactory.java | 15 ++++------- 2 files changed, 8 insertions(+), 33 deletions(-) diff --git a/build.gradle b/build.gradle index e0de860..678809e 100644 --- a/build.gradle +++ b/build.gradle @@ -1,16 +1,5 @@ import org.apache.tools.ant.filters.ReplaceTokens -import com.github.jengelman.gradle.plugins.shadow.tasks.ConfigureShadowRelocation -buildscript { - repositories { - jcenter() - } - dependencies { - classpath 'com.github.jengelman.gradle.plugins:shadow:5.1.0' - } -} - -apply plugin: 'com.github.johnrengelman.shadow' apply plugin: 'java' group = 'net.babamod' @@ -33,7 +22,6 @@ repositories { dependencies { compileOnly 'org.spigotmc:spigot-api:1.16.3-R0.1-SNAPSHOT' - compile group: 'org.reflections', name: 'reflections', version: '0.9.10' } processResources { @@ -42,14 +30,6 @@ processResources { } } -shadowJar { - archiveBaseName.set('mineclass') - archiveClassifier.set('') - archiveVersion.set('') -} - -task relocateShadowJar(type: ConfigureShadowRelocation) { - target = tasks.shadowJar -} - -tasks.shadowJar.dependsOn tasks.relocateShadowJar \ No newline at end of file +jar { + archiveName "MineClass.jar" +} \ No newline at end of file diff --git a/src/main/java/net/babamod/mineclass/classes/MineClassFactory.java b/src/main/java/net/babamod/mineclass/classes/MineClassFactory.java index 85c0948..8b356ee 100644 --- a/src/main/java/net/babamod/mineclass/classes/MineClassFactory.java +++ b/src/main/java/net/babamod/mineclass/classes/MineClassFactory.java @@ -5,7 +5,6 @@ import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.potion.PotionEffect; -import org.reflections.Reflections; import java.util.*; import java.util.logging.Level; @@ -19,15 +18,11 @@ public class MineClassFactory { /** Constructeur privé */ private MineClassFactory() { availableClasses = new HashMap<>(); - // Reflecting all MineClass classes and instantiates them with there codes - for (Class aClass : new Reflections().getSubTypesOf(MineClassImpl.class)) { - try { - MineClass mineClass = aClass.newInstance(); - availableClasses.put(mineClass.getCode(), mineClass); - } catch (InstantiationException | IllegalAccessException e) { - Bukkit.getLogger().log(Level.WARNING, e.getMessage()); - } - } + availableClasses.put("dwarf", new DwarfClass()); + availableClasses.put("elf", new ElfClass()); + availableClasses.put("fire_dwarf", new FireDwarfClass()); + availableClasses.put("ender_elf", new EnderElfClass()); + availableClasses.put("beast_master", new BeastMasterClass()); } /** Point d'accès pour l'instance unique du singleton */