item texture rework temp 2

common/src/main/java/common/ai/EntityAIControlledByPlayer.java

@@ -174,16 +174,9 @@ public class EntityAIControlledByPlayer extends EntityAIBase
         {
             ItemStack itemstack = entityplayer.getHeldItem();
 
-            if (itemstack != null && itemstack.getItem() == Items.carrot_on_a_stick)
+            if (itemstack != null && itemstack.getItem() == Items.whip)
             {
                 itemstack.damage(1, entityplayer);
-
-                if (itemstack.isEmpty())
-                {
-                    ItemStack itemstack1 = new ItemStack(Items.fishing_rod);
-                    itemstack1.copyData(itemstack);
-                    entityplayer.inventory.mainInventory[entityplayer.inventory.currentItem] = itemstack1;
-                }
             }
         }
 

common/src/main/java/common/block/foliage/BlockPotato.java

@@ -31,7 +31,7 @@ public class BlockPotato extends BlockCrops
         {
             if (((Integer)state.getValue(AGE)).intValue() >= 7 && worldIn.rand.chance(50))
             {
-                dropItem(worldIn, pos, new ItemStack(Items.poisonous_potato));
+                dropItem(worldIn, pos, new ItemStack(Items.stick));
             }
         }
     }

common/src/main/java/common/block/foliage/BlockWart.java

@@ -80,7 +80,7 @@ public class BlockWart extends BlockBush
 
             for (int j = 0; j < i; ++j)
             {
-                dropItem(worldIn, pos, new ItemStack(Items.soul_wart));
+                dropItem(worldIn, pos, new ItemStack(Items.soul_seed));
             }
         }
     }

common/src/main/java/common/color/DyeColor.java

@@ -20,7 +20,7 @@ public enum DyeColor implements Identifyable, Displayable {
 	PURPLE("purple", "Violett", "Violettes", "Violetter", "Violette", null, "Violetter Farbstoff", 8339378, TextColor.DMAGENTA),
 	BLUE("blue", "Blau", "Blaues", "Blauer", "Blaue", "lapis_lazuli", "Lapislazuli", 3361970, TextColor.MIDNIGHT),
 	BROWN("brown", "Braun", "Braunes", "Brauner", "Braune", "cocoa_powder", "Gemahlene Kakaobohnen", 6704179, TextColor.BROWN),
-	GREEN("green", "Grün", "Grünes", "Grüner", "Grüne", "cactus_green", "Kaktusgrün", 6717235, TextColor.DGREEN),
+	GREEN("green", "Grün", "Grünes", "Grüner", "Grüne", null, "Kaktusgrün", 6717235, TextColor.DGREEN),
 	RED("red", "Rot", "Rotes", "Roter", "Rote", null, "Roter Farbstoff", 10040115, TextColor.DRED),
 	BLACK("black", "Schwarz", "Schwarzes", "Schwarzer", "Schwarze", "ink_sack", "Tintenbeutel", 1644825, TextColor.BLACK);
 

common/src/main/java/common/entity/animal/EntityHorse.java

@@ -830,7 +830,7 @@ public class EntityHorse extends EntityAnimal implements IInvBasic {
                         j = 60;
                         k = 3;
                     }
-                    else if (itemstack.getItem() == Items.golden_carrot)
+                    else if (itemstack.getItem() == Items.carrot)
                     {
                         hp = 4;
                         j = 60;

common/src/main/java/common/entity/animal/EntityPig.java

@@ -34,7 +34,6 @@ public class EntityPig extends EntityAnimal
         this.tasks.addTask(1, new EntityAIPanic(this, 1.25D));
         this.tasks.addTask(2, this.aiControlledByPlayer = new EntityAIControlledByPlayer(this, 0.3F));
         this.tasks.addTask(3, new EntityAIMate(this, 1.0D));
-        this.tasks.addTask(4, new EntityAITempt(this, 1.2D, Items.carrot_on_a_stick, false));
         this.tasks.addTask(4, new EntityAITempt(this, 1.2D, Items.carrot, false));
         this.tasks.addTask(5, new EntityAIFollowParent(this, 1.1D));
         this.tasks.addTask(6, new EntityAIWander(this, 1.0D));
@@ -56,7 +55,7 @@ public class EntityPig extends EntityAnimal
     public boolean canBeSteered()
     {
         ItemStack itemstack = ((EntityNPC)this.passenger).getHeldItem();
-        return itemstack != null && itemstack.getItem() == Items.carrot_on_a_stick;
+        return itemstack != null && itemstack.getItem() == Items.whip;
     }
 
     protected void entityInit()

common/src/main/java/common/entity/animal/EntityRabbit.java

@@ -63,7 +63,7 @@ public class EntityRabbit extends EntityAnimal {
 		this.navigator.setHeightRequirement(2.5F);
 		this.tasks.addTask(1, new EntityAISwimming(this));
 		this.tasks.addTask(1, new EntityRabbit.AIPanic(this, 1.33D));
-		this.tasks.addTask(2, new EntityAITempt(this, 1.0D, stack -> stack.getItem() == Items.carrot || stack.getItem() == Items.golden_carrot || stack.getItem().getBlock() instanceof BlockFlower, false));
+		this.tasks.addTask(2, new EntityAITempt(this, 1.0D, stack -> stack.getItem() == Items.carrot || stack.getItem().getBlock() instanceof BlockFlower, false));
 		this.tasks.addTask(3, new EntityAIMate(this, 0.8D) {
 		    protected int getMatingCooldown() {
 		    	return EntityRabbit.this.rand.excl(50, 200);
@@ -265,7 +265,7 @@ public class EntityRabbit extends EntityAnimal {
 	}
 
 	private boolean isRabbitBreedingItem(Item itemIn) {
-		return itemIn == Items.carrot || itemIn == Items.golden_carrot || itemIn.getBlock() instanceof BlockFlower;
+		return itemIn == Items.carrot || itemIn.getBlock() instanceof BlockFlower;
 	}
 
 	public EntityRabbit createChild(EntityLiving ageable) {

common/src/main/java/common/init/BlockRegistry.java

@@ -302,6 +302,7 @@ public abstract class BlockRegistry {
         registerFluid("blood", "Blut", false, LiquidType.COLD, false, 0, 10, 0.0f, 2, 1);
 		registerFluid("spring_water", "Klares Wasser", true, LiquidType.COLD, false, 0, 5, 0.0f, 1, 1);
 		registerFluid("swamp_water", "Sumpfwasser", true, LiquidType.COLD, false, 0, 5, 0.0f, TextureAnimation.SWAMP_WATER_STILL, TextureAnimation.SWAMP_WATER_FLOW);
+		registerFluid("milk", "Milch", false, LiquidType.COLD, true, 0, 5, 0.0f, 1, 1);
         
 
 		register("coal_ore", (new BlockOre()).setHardness(3.0F).setResistance(5.0F).setSound(SoundType.STONE).setDisplay("Steinkohle"));
@@ -471,7 +472,7 @@ public abstract class BlockRegistry {
 		register("wheats", (new BlockCrops()).setDisplay("Getreide"));
 		register("carrots", (new BlockCarrot()).setDisplay("Karotten"));
 		register("potatoes", (new BlockPotato()).setDisplay("Kartoffeln"));
-		register("soul_warts", (new BlockWart()).setDisplay("Seelenwarze"));
+		register("soul_grass", (new BlockWart()).setDisplay("Seelenwarze"));
 		
 		
 

common/src/main/java/common/init/Blocks.java

@@ -459,7 +459,7 @@ public abstract class Blocks {
 	public static final BlockMetalOre sodium_ore = get("sodium_ore");
 	public static final BlockSoulFire soul_fire = get("soul_fire");
 	public static final BlockSoulSand soul_sand = get("soul_sand");
-	public static final BlockWart soul_warts = get("soul_warts");
+	public static final BlockWart soul_grass = get("soul_grass");
 	public static final Block sponge = get("sponge");
 	public static final BlockStaticLiquid spring_water = get("spring_water");
 	public static final BlockDoor spruce_door = get("spruce_door");
@@ -615,6 +615,8 @@ public abstract class Blocks {
 	public static final BlockPortal light_portal = get("light_portal");
 	public static final BlockPortal radiating_portal = get("radiating_portal");
 	public static final BlockPortal shining_portal = get("shining_portal");
+	public static final BlockStaticLiquid milk = get("milk");
+	public static final BlockDynamicLiquid flowing_milk = get("flowing_milk");
     
     private static <T extends Block> T get(String id) {
     	T block = (T)BlockRegistry.byNameExact(id);