Small cleanup (#100)

* Use llamalad's `@ModifyReturnValue`

* Prefix mixin methods with "kubatech$"

* Address some warnings

* Remove dead code

4 files changed, 7 insertions, 7 deletions

diff --git a/src/main/java/kubatech/mixin/mixins/minecraft/LanguageRegistryMixin.java b/src/main/java/kubatech/mixin/mixins/minecraft/LanguageRegistryMixin.java
index 77d99d2ab4..02546dd258 100644
--- a/src/main/java/kubatech/mixin/mixins/minecraft/LanguageRegistryMixin.java
+++ b/src/main/java/kubatech/mixin/mixins/minecraft/LanguageRegistryMixin.java
@@ -16,12 +16,12 @@ import cpw.mods.fml.relauncher.Side;
 public class LanguageRegistryMixin {
 
     @Inject(method = "loadLanguagesFor", at = @At(value = "HEAD"), remap = false, require = 1)
-    private void loadLanguagesForHEAD(ModContainer container, Side side, CallbackInfo callbackInfo) {
+    private void kubatech$loadLanguagesForHEAD(ModContainer container, Side side, CallbackInfo callbackInfo) {
         currentlyTranslating = container.getModId();
     }
 
     @Inject(method = "loadLanguagesFor", at = @At(value = "RETURN"), remap = false, require = 1)
-    private void loadLanguagesForRETURN(ModContainer container, Side side, CallbackInfo callbackInfo) {
+    private void kubatech$loadLanguagesForRETURN(ModContainer container, Side side, CallbackInfo callbackInfo) {
         currentlyTranslating = null;
     }
 }
diff --git a/src/main/java/kubatech/mixin/mixins/minecraft/LocaleMixin.java b/src/main/java/kubatech/mixin/mixins/minecraft/LocaleMixin.java
index e591878c32..e903a3e139 100644
--- a/src/main/java/kubatech/mixin/mixins/minecraft/LocaleMixin.java
+++ b/src/main/java/kubatech/mixin/mixins/minecraft/LocaleMixin.java
@@ -25,7 +25,7 @@ public class LocaleMixin {
             target = "Lnet/minecraft/client/resources/IResourceManager;getAllResources(Lnet/minecraft/util/ResourceLocation;)Ljava/util/List;"),
         index = 0,
         require = 1)
-    private ResourceLocation loadLocaleDataFiles(ResourceLocation resourceLocation) {
+    private ResourceLocation kubatech$loadLocaleDataFiles(ResourceLocation resourceLocation) {
         currentlyTranslating = resourceLocation.getResourceDomain();
         return resourceLocation;
     }
@@ -37,7 +37,7 @@ public class LocaleMixin {
             target = "Ljava/util/regex/Matcher;replaceAll(Ljava/lang/String;)Ljava/lang/String;",
             remap = false),
         require = 1)
-    private String replaceAll(Matcher matcher, String replace) {
+    private String kubatech$replaceAll(Matcher matcher, String replace) {
         if (currentlyTranslating != null && currentlyTranslating.equals(Tags.MODID) && matcher.find()) {
             return matcher.replaceFirst(matcher.group());
         }
diff --git a/src/main/java/kubatech/mixin/mixins/minecraft/StringTranslateMixin.java b/src/main/java/kubatech/mixin/mixins/minecraft/StringTranslateMixin.java
index 2841ccc0c0..6a0bc4af62 100644
--- a/src/main/java/kubatech/mixin/mixins/minecraft/StringTranslateMixin.java
+++ b/src/main/java/kubatech/mixin/mixins/minecraft/StringTranslateMixin.java
@@ -24,7 +24,7 @@ public class StringTranslateMixin {
             remap = false),
         remap = false,
         require = 1)
-    private static String replaceAll(Matcher matcher, String replace) {
+    private static String kubatech$replaceAll(Matcher matcher, String replace) {
         if (currentlyTranslating != null && currentlyTranslating.equals(Tags.MODID) && matcher.find()) {
             return matcher.replaceFirst(matcher.group());
         }
diff --git a/src/main/java/kubatech/mixin/mixins/minecraft/WorldMixin.java b/src/main/java/kubatech/mixin/mixins/minecraft/WorldMixin.java
index ed28dc60c4..42c71cadbd 100644
--- a/src/main/java/kubatech/mixin/mixins/minecraft/WorldMixin.java
+++ b/src/main/java/kubatech/mixin/mixins/minecraft/WorldMixin.java
@@ -6,7 +6,7 @@ import net.minecraft.world.World;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 
-import com.gtnewhorizon.mixinextras.injector.ModifyReturnValue;
+import com.llamalad7.mixinextras.injector.ModifyReturnValue;
 
 import kubatech.loaders.BlockLoader;
 
@@ -16,7 +16,7 @@ public class WorldMixin {
 
     @SuppressWarnings("ConstantConditions")
     @ModifyReturnValue(method = "getBlock", at = @At("RETURN"), require = 1)
-    private Block getBlockDetector(Block block, int x, int y, int z) {
+    private Block kubatech$getBlockDetector(Block block, int x, int y, int z) {
         if (block == BlockLoader.kubaBlock) BlockLoader.kubaBlock.setLastBlockAccess((World) (Object) this, x, y, z);
         return block;
     }