diff --git a/src/main/java/com/troblecodings/signals/animation/SignalAnimation.java b/src/main/java/com/troblecodings/signals/animation/SignalAnimation.java index 39dc783c2..0b7e4e204 100644 --- a/src/main/java/com/troblecodings/signals/animation/SignalAnimation.java +++ b/src/main/java/com/troblecodings/signals/animation/SignalAnimation.java @@ -7,8 +7,6 @@ public interface SignalAnimation extends Predicate> { - public SignalAnimation with(final String model); - public void updateAnimation(); public ModelTranslation getModelTranslation(); diff --git a/src/main/java/com/troblecodings/signals/animation/SignalAnimationRotation.java b/src/main/java/com/troblecodings/signals/animation/SignalAnimationRotation.java index 0162aa2a1..026419399 100644 --- a/src/main/java/com/troblecodings/signals/animation/SignalAnimationRotation.java +++ b/src/main/java/com/troblecodings/signals/animation/SignalAnimationRotation.java @@ -13,7 +13,6 @@ public class SignalAnimationRotation implements SignalAnimation { private AnimationRotionCalc calc; private final Predicate> predicate; - private String model; private final float animationSpeed; private final RotationAxis axis; private final float rotation; @@ -29,12 +28,6 @@ public SignalAnimationRotation(final Predicate> predicat this.pivot = pivot; } - @Override - public SignalAnimation with(final String model) { - this.model = model; - return this; - } - @Override public void updateAnimation() { calc.updateAnimation(); @@ -92,7 +85,7 @@ public boolean test(final Map properties) { @Override public int hashCode() { - return Objects.hash(animationSpeed, axis, model, pivot, calc, rotation); + return Objects.hash(animationSpeed, axis, pivot, calc, rotation); } @Override @@ -105,9 +98,8 @@ public boolean equals(final Object obj) { return false; final SignalAnimationRotation other = (SignalAnimationRotation) obj; return Float.floatToIntBits(animationSpeed) == Float.floatToIntBits(other.animationSpeed) - && axis == other.axis && Objects.equals(model, other.model) - && Objects.equals(pivot, other.pivot) && Objects.equals(calc, other.calc) - && Objects.equals(rotation, other.rotation); + && axis == other.axis && Objects.equals(pivot, other.pivot) + && Objects.equals(calc, other.calc) && Objects.equals(rotation, other.rotation); } } \ No newline at end of file diff --git a/src/main/java/com/troblecodings/signals/animation/SignalAnimationTranslation.java b/src/main/java/com/troblecodings/signals/animation/SignalAnimationTranslation.java index 79136840d..3fa33686a 100644 --- a/src/main/java/com/troblecodings/signals/animation/SignalAnimationTranslation.java +++ b/src/main/java/com/troblecodings/signals/animation/SignalAnimationTranslation.java @@ -23,12 +23,6 @@ public SignalAnimationTranslation(Predicate> predicate, this.dest = dest; } - @Override - public SignalAnimation with(final String model) { - this.model = model; - return this; - } - @Override public void updateAnimation() { calc.updateAnimation(); diff --git a/src/main/java/com/troblecodings/signals/contentpacks/SignalAnimationConfigParser.java b/src/main/java/com/troblecodings/signals/contentpacks/SignalAnimationConfigParser.java index c4931041f..655c74b92 100644 --- a/src/main/java/com/troblecodings/signals/contentpacks/SignalAnimationConfigParser.java +++ b/src/main/java/com/troblecodings/signals/contentpacks/SignalAnimationConfigParser.java @@ -44,7 +44,7 @@ public static void loadAllAnimations() { configs.translationY, configs.translationZ); final List animatinos = new ArrayList<>(); for (final SignalAnimationConfig config : configs.animationConfigs) { - animatinos.add(config.createAnimation(info).with(modelName)); + animatinos.add(config.createAnimation(info)); } if (!animatinos.isEmpty()) modelToAnimation.put(Maps.immutableEntry(modelName, vec), animatinos);