From f7a1f3141975e3a39d727c99d7d3a3330415f5de Mon Sep 17 00:00:00 2001 From: Rezel Date: Sat, 8 Aug 2020 04:30:00 -0600 Subject: [PATCH] Updated injectors for all commands to call service layers Added Lang Repository injectors to commands Converted Lang to Repository and injected it. Registry for commands is still completely broken and needs to be implemented correctly. Converted DataStorage to DataHandler as it is only reading and writing data Injected InfoLogger & updated calls accordingly Injected DataStorage (DataHandler) & calls accordingly Injected DataColl. Moved Lang to a repository and injected it accordingly. Cleaned up file structure and moved POJO's to entities Cleaned up Core file as a lot of the singletons are no longer needed due to injection Fixed Minor issue in Desti where it got revert Updated CreatePortalSubCommand No idea where to put WarpEffectREgistry, maybe repository? Registry is very screwy right now it looks like it may have gotten corrupted by hd fail Ignore it for now. fixored build.gradle --- build.gradle | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index 522edcf..fc903a4 100644 --- a/build.gradle +++ b/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'fabric-loom' version '0.2.0-SNAPSHOT' +} + apply plugin: 'java' apply plugin: 'maven' apply plugin: 'idea' @@ -22,9 +26,11 @@ configurations { } repositories { - maven { url "https://repo.maven.apache.org/maven2" } + maven { url "http://repo.maven.apache.org/maven2" } maven { url "https://hub.spigotmc.org/nexus/content/repositories/snapshots/" } - maven { url "https://oss.sonatype.org/content/repositories/snapshots/" } +} + +minecraft { } // includeLibs just says to include the library in the final jar @@ -33,14 +39,14 @@ dependencies { compile group: 'com.google.code.gson', name: 'gson', version:'2.8.2' includeLibs group: 'com.google.inject', name: 'guice', version:'4.0' compile group: 'com.google.inject', name: 'guice', version:'4.0' - compile group: 'com.google.guava', name: 'guava', version: '29.0-jre' + compile "org.bukkit:bukkit:1.13-R0.1-SNAPSHOT" + minecraft "com.mojang:minecraft:19w03c" + mappings "net.fabricmc:yarn:19w03c.6" + modCompile "net.fabricmc:fabric-loader:0.3.3.101" - // For spigot api - implementation "org.spigotmc:spigot-api:1.16.1-R0.1-SNAPSHOT" - - // For bukkit api - implementation "net.md-5:bungeecord-api:1.15-SNAPSHOT" + // Fabric API. This is technically optional, but you probably want it anyway. + modCompile "net.fabricmc:fabric:0.1.4.78" } jar {