From 6ddc2767746161950d1fc7d114c778601b23962f Mon Sep 17 00:00:00 2001
From: Ellpeck <megamaximal@gmail.com>
Date: Mon, 6 Feb 2017 13:43:38 +0100
Subject: [PATCH] fix worms moonwalking

---
 .../actuallyadditions/mod/entity/RenderWorm.java |   6 +++++-
 .../actuallyadditions/mod/items/ItemWorm.java    |  15 +++++++++++++++
 .../models/item/item_snail.json                  |   6 ++++++
 .../actuallyadditions/models/item/item_worm.json |   8 +++++++-
 .../textures/items/item_snail.png                | Bin 0 -> 3730 bytes
 .../textures/items/item_snail.png.mcmeta         |   6 ++++++
 6 files changed, 39 insertions(+), 2 deletions(-)
 create mode 100644 src/main/resources/assets/actuallyadditions/models/item/item_snail.json
 create mode 100644 src/main/resources/assets/actuallyadditions/textures/items/item_snail.png
 create mode 100644 src/main/resources/assets/actuallyadditions/textures/items/item_snail.png.mcmeta

diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/entity/RenderWorm.java b/src/main/java/de/ellpeck/actuallyadditions/mod/entity/RenderWorm.java
index 1e725a662..39d13bf3d 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/entity/RenderWorm.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/entity/RenderWorm.java
@@ -32,6 +32,7 @@ public class RenderWorm extends Render<EntityWorm>{
             return new RenderWorm(manager);
         }
     };
+
     private static final ItemStack STACK = new ItemStack(InitItems.itemWorm);
 
     protected RenderWorm(RenderManager renderManager){
@@ -48,9 +49,12 @@ public class RenderWorm extends Render<EntityWorm>{
         GlStateManager.pushMatrix();
         GlStateManager.translate(x, y+0.7F, z);
         double boop = Minecraft.getSystemTime()/70D;
-        GlStateManager.rotate((float)((boop%360)), 0, 1, 0);
+        GlStateManager.rotate(-(float)((boop%360)), 0, 1, 0);
         GlStateManager.translate(0, 0, 0.4);
+
+        STACK.setStackDisplayName(entity.getCustomNameTag());
         AssetUtil.renderItemInWorld(STACK);
+
         GlStateManager.popMatrix();
     }
 }
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWorm.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWorm.java
index 8df8fb676..59e79db12 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWorm.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWorm.java
@@ -13,22 +13,28 @@ package de.ellpeck.actuallyadditions.mod.items;
 import de.ellpeck.actuallyadditions.mod.config.values.ConfigBoolValues;
 import de.ellpeck.actuallyadditions.mod.entity.EntityWorm;
 import de.ellpeck.actuallyadditions.mod.items.base.ItemBase;
+import de.ellpeck.actuallyadditions.mod.util.ModUtil;
 import de.ellpeck.actuallyadditions.mod.util.StackUtil;
 import net.minecraft.block.BlockGrass;
 import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.EnumRarity;
+import net.minecraft.item.IItemPropertyGetter;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumActionResult;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.EnumHand;
+import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.entity.player.UseHoeEvent;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
 
 import java.util.List;
 
@@ -38,6 +44,14 @@ public class ItemWorm extends ItemBase{
         super(name);
 
         MinecraftForge.EVENT_BUS.register(this);
+
+        this.addPropertyOverride(new ResourceLocation(ModUtil.MOD_ID, "snail"), new IItemPropertyGetter(){
+            @Override
+            @SideOnly(Side.CLIENT)
+            public float apply(ItemStack stack, World world, EntityLivingBase entity){
+                return "snail mail".equalsIgnoreCase(stack.getDisplayName()) ? 1F : 0F;
+            }
+        });
     }
 
     @Override
@@ -50,6 +64,7 @@ public class ItemWorm extends ItemBase{
                 if(!world.isRemote){
                     EntityWorm worm = new EntityWorm(world);
                     worm.setPosition(pos.getX()+0.5, pos.getY()+0.5, pos.getZ()+0.5);
+                    worm.setCustomNameTag(stack.getDisplayName());
                     world.spawnEntity(worm);
 
                     if(!player.capabilities.isCreativeMode){
diff --git a/src/main/resources/assets/actuallyadditions/models/item/item_snail.json b/src/main/resources/assets/actuallyadditions/models/item/item_snail.json
new file mode 100644
index 000000000..c0e4bade1
--- /dev/null
+++ b/src/main/resources/assets/actuallyadditions/models/item/item_snail.json
@@ -0,0 +1,6 @@
+{
+  "parent": "actuallyadditions:item/standard_item",
+  "textures": {
+    "layer0": "actuallyadditions:items/item_snail"
+  }
+}
diff --git a/src/main/resources/assets/actuallyadditions/models/item/item_worm.json b/src/main/resources/assets/actuallyadditions/models/item/item_worm.json
index 6643fee97..5a589ea7b 100644
--- a/src/main/resources/assets/actuallyadditions/models/item/item_worm.json
+++ b/src/main/resources/assets/actuallyadditions/models/item/item_worm.json
@@ -2,5 +2,11 @@
   "parent": "actuallyadditions:item/standard_item",
   "textures": {
     "layer0": "actuallyadditions:items/item_worm"
-  }
+  },
+  "overrides": [{
+    "predicate": {
+      "actuallyadditions:snail": 1
+    },
+    "model": "actuallyadditions:item/item_snail"
+  }]
 }
diff --git a/src/main/resources/assets/actuallyadditions/textures/items/item_snail.png b/src/main/resources/assets/actuallyadditions/textures/items/item_snail.png
new file mode 100644
index 0000000000000000000000000000000000000000..3b401546877b9b73dcc06c1734e45a92321a97a0
GIT binary patch
literal 3730
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

literal 0
HcmV?d00001

diff --git a/src/main/resources/assets/actuallyadditions/textures/items/item_snail.png.mcmeta b/src/main/resources/assets/actuallyadditions/textures/items/item_snail.png.mcmeta
new file mode 100644
index 000000000..84934a9d9
--- /dev/null
+++ b/src/main/resources/assets/actuallyadditions/textures/items/item_snail.png.mcmeta
@@ -0,0 +1,6 @@
+{
+  "animation": 
+  {
+    "frametime": 3
+  }
+}