bump mappings, anonymous class to lambda

elytra · Jul 15, 2018 · 6ae4bea · 6ae4bea
1 parent 118946e
commit 6ae4bea
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 12 deletions.
diff --git a/project.gradle b/project.gradle
@@ -15,8 +15,8 @@ ext {
 
 	language = 'java'
 
-	forge = '1.12.2-14.23.3.2655'
-	mappings = 'snapshot_20170908'
+	forge = '1.12.2-14.23.4.2736'
+	mappings = 'snapshot_20180715'
 
 	enforceLicenseHeaders = false
 

diff --git a/src/main/java/com/elytradev/friendshipbracelet/ItemBraceletKeyring.java b/src/main/java/com/elytradev/friendshipbracelet/ItemBraceletKeyring.java
@@ -38,7 +38,7 @@ public class ItemBraceletKeyring extends Item {
 
     public ItemBraceletKeyring() {
         this.name = "bracelet_keyring";
-        setUnlocalizedName(name);
+        setTranslationKey(name);
         setRegistryName(name);
         this.maxStackSize = 1;
         this.tag = new NBTTagCompound();
@@ -61,7 +61,7 @@ public void addCapability(AttachCapabilitiesEvent e) {
                                 (it) -> (it.getItem() == ItemFriendshipBracelet.FRIENDSHIP_BRACELET),
                                 (it) -> (it.getItem() == ItemFriendshipBracelet.FRIENDSHIP_BRACELET),
                                 (it) -> (it.getItem() == ItemFriendshipBracelet.FRIENDSHIP_BRACELET))
-                        .withName(ItemFriendshipBracelet.BRACELET_KEYRING.getUnlocalizedName()+".name");
+                        .withName(ItemFriendshipBracelet.BRACELET_KEYRING.getTranslationKey()+".name");
 
                 inv.listen(() -> {
                     if (!stack.hasTagCompound()) stack.setTagCompound(new NBTTagCompound());

diff --git a/src/main/java/com/elytradev/friendshipbracelet/ItemFriendshipBracelet.java b/src/main/java/com/elytradev/friendshipbracelet/ItemFriendshipBracelet.java
@@ -28,7 +28,7 @@ public class ItemFriendshipBracelet extends Item implements IBauble {
 
     public ItemFriendshipBracelet() {
         this.name = "friendship_bracelet";
-        setUnlocalizedName(name);
+        setTranslationKey(name);
         setRegistryName(name);
         this.maxStackSize = 1;
     }

diff --git a/src/main/java/com/elytradev/friendshipbracelet/proxy/ClientProxy.java b/src/main/java/com/elytradev/friendshipbracelet/proxy/ClientProxy.java
@@ -20,13 +20,10 @@ public void registerItemRenderer(Item item, int meta, String id) {
 
     @Override
     public void postInit() {
-        Minecraft.getMinecraft().getItemColors().registerItemColorHandler(new IItemColor() {
-            @Override
-            public int getColorFromItemstack(ItemStack stack, int tintIndex) {
-                if (stack.getItem() != ItemFriendshipBracelet.FRIENDSHIP_BRACELET || stack.getTagCompound() == null) return -1;
-                String index = "StringColor"+tintIndex;
-                return getDyeColor(stack, index);
-            }
+        Minecraft.getMinecraft().getItemColors().registerItemColorHandler((stack, tintIndex) -> {
+            if (stack.getItem() != ItemFriendshipBracelet.FRIENDSHIP_BRACELET || stack.getTagCompound() == null) return -1;
+            String index = "StringColor"+tintIndex;
+            return getDyeColor(stack, index);
         }, ItemFriendshipBracelet.FRIENDSHIP_BRACELET);
     }