Skip to content

Commit 8ec0db9

Browse files
committed
Revert "Clamped shut"
This reverts commit d0d13f0.
1 parent d0d13f0 commit 8ec0db9

File tree

5 files changed

+10
-12
lines changed

5 files changed

+10
-12
lines changed

src/main/java/com/simibubi/create/content/kinetics/motor/CreativeMotorBlockEntity.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import com.simibubi.create.foundation.blockEntity.behaviour.ValueBoxTransform;
1414
import com.simibubi.create.foundation.blockEntity.behaviour.scrollValue.ScrollValueBehaviour;
1515
import com.simibubi.create.foundation.utility.CreateLang;
16-
import com.simibubi.create.infrastructure.config.AllConfigs;
1716

1817
import dan200.computercraft.api.peripheral.PeripheralCapability;
1918
import dev.engine_room.flywheel.lib.transform.TransformStack;
@@ -30,7 +29,9 @@
3029
import net.neoforged.neoforge.capabilities.RegisterCapabilitiesEvent;
3130

3231
public class CreativeMotorBlockEntity extends GeneratingKineticBlockEntity {
32+
3333
public static final int DEFAULT_SPEED = 16;
34+
public static final int MAX_SPEED = 256;
3435

3536
public ScrollValueBehaviour generatedSpeed;
3637
public AbstractComputerBehaviour computerBehaviour;
@@ -52,7 +53,7 @@ public static void registerCapabilities(RegisterCapabilitiesEvent event) {
5253
@Override
5354
public void addBehaviours(List<BlockEntityBehaviour> behaviours) {
5455
super.addBehaviours(behaviours);
55-
int max = AllConfigs.server().kinetics.maxRotationSpeed.get();
56+
int max = MAX_SPEED;
5657
generatedSpeed = new KineticScrollValueBehaviour(CreateLang.translateDirect("kinetics.creative_motor.rotation_speed"),
5758
this, new MotorValueBox());
5859
generatedSpeed.between(-max, max);
@@ -116,4 +117,5 @@ public void invalidate() {
116117
super.invalidate();
117118
computerBehaviour.removePeripheral();
118119
}
120+
119121
}

src/main/java/com/simibubi/create/content/kinetics/motor/KineticScrollValueBehaviour.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public ValueSettingsBoard createBoard(Player player, BlockHitResult hitResult) {
2828
Component.literal("\u27f2")
2929
.withStyle(ChatFormatting.BOLD));
3030
ValueSettingsFormatter formatter = new ValueSettingsFormatter(this::formatSettings);
31-
return new ValueSettingsBoard(label, 1, 256, 32, rows, formatter);
31+
return new ValueSettingsBoard(label, 256, 32, rows, formatter);
3232
}
3333

3434
@Override

src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/ValueSettingsBoard.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@
44

55
import net.minecraft.network.chat.Component;
66

7-
public record ValueSettingsBoard(Component title, int minValue, int maxValue, int milestoneInterval,
8-
List<Component> rows,
7+
public record ValueSettingsBoard(Component title, int maxValue, int milestoneInterval, List<Component> rows,
98
ValueSettingsFormatter formatter) {
10-
public ValueSettingsBoard(Component title, int maxValue, int milestoneInterval, List<Component> rows, ValueSettingsFormatter formatter) {
11-
this(title, 0, maxValue, milestoneInterval, rows, formatter);
12-
}
139
}

src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/ValueSettingsScreen.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
import com.simibubi.create.foundation.gui.AllIcons;
1717
import com.simibubi.create.foundation.utility.CreateLang;
1818

19-
import net.createmod.catnip.animation.AnimationTickHolder;
2019
import net.createmod.catnip.gui.AbstractSimiScreen;
2120
import net.createmod.catnip.gui.UIRenderHelper;
2221
import net.createmod.catnip.platform.CatnipServices;
22+
import net.createmod.catnip.animation.AnimationTickHolder;
2323
import net.minecraft.client.gui.GuiGraphics;
2424
import net.minecraft.client.resources.sounds.SimpleSoundInstance;
2525
import net.minecraft.core.BlockPos;
@@ -91,7 +91,8 @@ public ValueSettings getClosestCoordinate(int mouseX, int mouseY) {
9191
boolean milestonesOnly = hasShiftDown();
9292

9393
double bestDiff = Double.MAX_VALUE;
94-
for (; row < board.rows().size(); row++) {
94+
for (; row < board.rows()
95+
.size(); row++) {
9596
Vec2 coord = getCoordinateOfValue(row, 0);
9697
double diff = Math.abs(coord.y - mouseY);
9798
if (bestDiff < diff)
@@ -109,7 +110,6 @@ public ValueSettings getClosestCoordinate(int mouseX, int mouseY) {
109110
bestDiff = diff;
110111
}
111112
column -= 1;
112-
column = Math.max(board.minValue(), column);
113113

114114
return new ValueSettings(row,
115115
milestonesOnly ? Math.min(column * board.milestoneInterval(), board.maxValue()) : column);

src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/scrollValue/ScrollValueBehaviour.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import java.util.function.Consumer;
44
import java.util.function.Function;
55
import java.util.function.Supplier;
6-
76
import com.google.common.collect.ImmutableList;
87
import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
98
import com.simibubi.create.foundation.blockEntity.behaviour.BehaviourType;
@@ -31,6 +30,7 @@ public class ScrollValueBehaviour extends BlockEntityBehaviour implements ValueS
3130
public static final BehaviourType<ScrollValueBehaviour> TYPE = new BehaviourType<>();
3231

3332
ValueBoxTransform slotPositioning;
33+
Vec3 textShift;
3434

3535
int min = 0;
3636
protected int max = 1;

0 commit comments

Comments
 (0)