From 560a5e7a98044314343b7bf7ede61b347f1a6992 Mon Sep 17 00:00:00 2001
From: ossian winter <ossianwinter@protonmail.ch>
Date: Tue, 2 Oct 2018 13:38:13 -0500
Subject: [PATCH 1/2] Clean-up build file

---
 build.gradle | 40 ++++++++++++----------------------------
 1 file changed, 12 insertions(+), 28 deletions(-)

diff --git a/build.gradle b/build.gradle
index a9e393f0..d8e73d56 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,14 +1,8 @@
 buildscript {
     repositories {
         jcenter()
-        maven {
-            name = 'forge'
-            url = 'http://files.minecraftforge.net/maven'
-        }
-        maven {
-            name = 'SpongePowered'
-            url = 'http://repo.spongepowered.org/maven'
-        }
+        maven { url = 'http://files.minecraftforge.net/maven' }
+        maven { url = 'http://repo.spongepowered.org/maven' }
     }
     dependencies {
         classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT'
@@ -38,37 +32,27 @@ minecraft {
 }
 
 repositories {
-    maven {
-        name = 'spongepowered-repo'
-        url = 'http://repo.spongepowered.org/maven/'
-    }
-    maven {
-        name = 'impactdevelopment-repo'
-        url = 'https://impactdevelopment.github.io/maven/'
-    }
-    maven {
-        name = 'swt-repo'
-        url = "http://maven-eclipse.github.io/maven"
-    }
-    maven {
-        name = "jitpack.io"
-        url = "https://jitpack.io"
-    }
     mavenCentral()
+    maven { url = 'http://repo.spongepowered.org/maven/' }
+    maven { url = 'https://impactdevelopment.github.io/maven/' }
+    maven { url = 'http://maven-eclipse.github.io/maven' }
+    maven { url = 'https://jitpack.io' }
 }
 
 dependencies {
     //mixin needs to be distributed with the mod, very important
-    compile("org.spongepowered:mixin:0.7.4-SNAPSHOT") {
+    compile('org.spongepowered:mixin:0.7.4-SNAPSHOT') {
         exclude module: 'launchwrapper'
         exclude module: 'guava'
         exclude module: 'gson'
         exclude module: 'commons-io'
     }
-    compile "com.github.ZeroMemes:Alpine:1.5"
+    
+    compile 'com.github.ZeroMemes:Alpine:1.8'
     compile group: 'net.jodah', name: 'typetools', version: '0.5.0'
-    compile group: 'org.yaml', name: 'snakeyaml', version: '1.19'
-    compile(group: 'org.reflections', name: 'reflections', version: '0.9.11') {
+    compile group: 'org.yaml', name: 'snakeyaml', version: '1.23'
+    
+    compile('org.reflections:reflections:0.9.11') {
         exclude group: 'com.google.guava', module: 'guava'
     }
 }

From 116b3d65894c9c3e1c1ffa4f20b0876f7bf7ea47 Mon Sep 17 00:00:00 2001
From: ossian winter <ossianwinter@protonmail.ch>
Date: Tue, 2 Oct 2018 13:46:43 -0500
Subject: [PATCH 2/2] Fix alpine errors caused by dependency update

---
 src/main/java/me/zeroeightsix/kami/KamiMod.java             | 4 ++--
 src/main/java/me/zeroeightsix/kami/event/KamiEvent.java     | 2 +-
 src/main/java/me/zeroeightsix/kami/module/Module.java       | 3 ++-
 src/main/java/me/zeroeightsix/kami/util/LagCompensator.java | 4 ++--
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/main/java/me/zeroeightsix/kami/KamiMod.java b/src/main/java/me/zeroeightsix/kami/KamiMod.java
index 55540678..e4b44848 100644
--- a/src/main/java/me/zeroeightsix/kami/KamiMod.java
+++ b/src/main/java/me/zeroeightsix/kami/KamiMod.java
@@ -1,7 +1,7 @@
 package me.zeroeightsix.kami;
 
-import me.zero.alpine.EventBus;
-import me.zero.alpine.EventManager;
+import me.zero.alpine.bus.EventBus;
+import me.zero.alpine.bus.EventManager;
 import me.zeroeightsix.kami.command.CommandManager;
 import me.zeroeightsix.kami.event.ForgeEventProcessor;
 import me.zeroeightsix.kami.gui.kami.KamiGUI;
diff --git a/src/main/java/me/zeroeightsix/kami/event/KamiEvent.java b/src/main/java/me/zeroeightsix/kami/event/KamiEvent.java
index e15fe554..8f2f9c78 100644
--- a/src/main/java/me/zeroeightsix/kami/event/KamiEvent.java
+++ b/src/main/java/me/zeroeightsix/kami/event/KamiEvent.java
@@ -1,6 +1,6 @@
 package me.zeroeightsix.kami.event;
 
-import me.zero.alpine.type.Cancellable;
+import me.zero.alpine.event.Cancellable;
 import me.zeroeightsix.kami.util.Wrapper;
 
 /**
diff --git a/src/main/java/me/zeroeightsix/kami/module/Module.java b/src/main/java/me/zeroeightsix/kami/module/Module.java
index 85d0f57b..586beb26 100644
--- a/src/main/java/me/zeroeightsix/kami/module/Module.java
+++ b/src/main/java/me/zeroeightsix/kami/module/Module.java
@@ -1,5 +1,6 @@
 package me.zeroeightsix.kami.module;
 
+import me.zero.alpine.listener.Listenable;
 import me.zeroeightsix.kami.KamiMod;
 import me.zeroeightsix.kami.event.events.RenderEvent;
 import me.zeroeightsix.kami.module.modules.movement.Sprint;
@@ -14,7 +15,7 @@ import java.lang.annotation.RetentionPolicy;
 /**
  * Created by 086 on 23/08/2017.
  */
-public class Module extends SettingsClass {
+public class Module extends SettingsClass implements Listenable {
 
     private final String name = getAnnotation().name();
     private final String description = getAnnotation().description();
diff --git a/src/main/java/me/zeroeightsix/kami/util/LagCompensator.java b/src/main/java/me/zeroeightsix/kami/util/LagCompensator.java
index 16cc22c0..ad7ab2f6 100644
--- a/src/main/java/me/zeroeightsix/kami/util/LagCompensator.java
+++ b/src/main/java/me/zeroeightsix/kami/util/LagCompensator.java
@@ -1,6 +1,7 @@
 package me.zeroeightsix.kami.util;
 
 import me.zero.alpine.listener.EventHandler;
+import me.zero.alpine.listener.Listenable;
 import me.zero.alpine.listener.Listener;
 import me.zeroeightsix.kami.KamiMod;
 import me.zeroeightsix.kami.event.events.PacketEvent;
@@ -8,9 +9,8 @@ import net.minecraft.network.play.server.SPacketTimeUpdate;
 import net.minecraft.util.math.MathHelper;
 
 import java.util.Arrays;
-import java.util.EventListener;
 
-public class LagCompensator implements EventListener {
+public class LagCompensator implements Listenable {
 
     public static LagCompensator INSTANCE;