From ea901962501c945143580ab741c1a9b36171f380 Mon Sep 17 00:00:00 2001 From: JozsefA Date: Thu, 11 Mar 2021 01:17:01 -0800 Subject: [PATCH] Clocks are lit. - ClockworkContraptions and BearingContraptions now both use the same lighter type. --- .../bearing/{BearingLighter.java => AnchoredLighter.java} | 5 +++-- .../structureMovement/bearing/BearingContraption.java | 2 +- .../structureMovement/bearing/ClockworkContraption.java | 5 +++++ 3 files changed, 9 insertions(+), 3 deletions(-) rename src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/{BearingLighter.java => AnchoredLighter.java} (69%) diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/BearingLighter.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/AnchoredLighter.java similarity index 69% rename from src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/BearingLighter.java rename to src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/AnchoredLighter.java index ac670ea50..09cfa2a39 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/BearingLighter.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/AnchoredLighter.java @@ -1,11 +1,12 @@ package com.simibubi.create.content.contraptions.components.structureMovement.bearing; +import com.simibubi.create.content.contraptions.components.structureMovement.Contraption; import com.simibubi.create.content.contraptions.components.structureMovement.ContraptionLighter; import com.simibubi.create.foundation.render.backend.light.GridAlignedBB; -public class BearingLighter extends ContraptionLighter { +public class AnchoredLighter extends ContraptionLighter { - public BearingLighter(BearingContraption contraption) { + public AnchoredLighter(Contraption contraption) { super(contraption); } diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/BearingContraption.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/BearingContraption.java index 3c2edd2d2..8e1e60aa6 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/BearingContraption.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/BearingContraption.java @@ -97,6 +97,6 @@ public class BearingContraption extends Contraption { @OnlyIn(Dist.CLIENT) @Override public ContraptionLighter makeLighter() { - return new BearingLighter(this); + return new AnchoredLighter(this); } } diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/ClockworkContraption.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/ClockworkContraption.java index 1dea812eb..c32679a34 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/ClockworkContraption.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/ClockworkContraption.java @@ -4,6 +4,7 @@ import java.util.HashSet; import java.util.Queue; import java.util.Set; +import com.simibubi.create.content.contraptions.components.structureMovement.ContraptionLighter; import org.apache.commons.lang3.tuple.Pair; import com.simibubi.create.content.contraptions.components.structureMovement.AssemblyException; @@ -129,4 +130,8 @@ public class ClockworkContraption extends Contraption { HOUR, MINUTE } + @Override + public ContraptionLighter makeLighter() { + return new AnchoredLighter(this); + } }