From a9a7191ebf755f7bcb1a1724cb1f400121a6830b Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Mon, 12 Nov 2018 01:35:02 +0100 Subject: [PATCH] rename this to be more generically applicable --- .../de/ellpeck/naturesaura/api/aura/type/BasicAuraType.java | 2 +- .../java/de/ellpeck/naturesaura/api/aura/type/IAuraType.java | 2 +- src/main/java/de/ellpeck/naturesaura/items/ItemAuraBottle.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/de/ellpeck/naturesaura/api/aura/type/BasicAuraType.java b/src/main/java/de/ellpeck/naturesaura/api/aura/type/BasicAuraType.java index 7a35c78a..78918ffc 100644 --- a/src/main/java/de/ellpeck/naturesaura/api/aura/type/BasicAuraType.java +++ b/src/main/java/de/ellpeck/naturesaura/api/aura/type/BasicAuraType.java @@ -33,7 +33,7 @@ public class BasicAuraType implements IAuraType { } @Override - public int getBottledColor() { + public int getColor() { return this.color; } } diff --git a/src/main/java/de/ellpeck/naturesaura/api/aura/type/IAuraType.java b/src/main/java/de/ellpeck/naturesaura/api/aura/type/IAuraType.java index 0d2ba8ea..8ef160b9 100644 --- a/src/main/java/de/ellpeck/naturesaura/api/aura/type/IAuraType.java +++ b/src/main/java/de/ellpeck/naturesaura/api/aura/type/IAuraType.java @@ -17,5 +17,5 @@ public interface IAuraType { boolean isPresentInWorld(World world); - int getBottledColor(); + int getColor(); } diff --git a/src/main/java/de/ellpeck/naturesaura/items/ItemAuraBottle.java b/src/main/java/de/ellpeck/naturesaura/items/ItemAuraBottle.java index 58690afb..f5a3b256 100644 --- a/src/main/java/de/ellpeck/naturesaura/items/ItemAuraBottle.java +++ b/src/main/java/de/ellpeck/naturesaura/items/ItemAuraBottle.java @@ -93,6 +93,6 @@ public class ItemAuraBottle extends ItemImpl implements IColorProvidingItem { @Override @SideOnly(Side.CLIENT) public IItemColor getItemColor() { - return (stack, tintIndex) -> tintIndex > 0 ? getType(stack).getBottledColor() : 0xFFFFFF; + return (stack, tintIndex) -> tintIndex > 0 ? getType(stack).getColor() : 0xFFFFFF; } }