Clamped shut

- Add support for minValue in ValueSettingsBoard
- Fix creative motor showing 1 twice in the speed picking UI #9406
- Dynamically set max creative motor speed with the config option maxRotationSpeed

Author: IThundxr

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

@@ -13,6 +13,7 @@
 import com.simibubi.create.foundation.blockEntity.behaviour.ValueBoxTransform;
 import com.simibubi.create.foundation.blockEntity.behaviour.scrollValue.ScrollValueBehaviour;
 import com.simibubi.create.foundation.utility.CreateLang;
+import com.simibubi.create.infrastructure.config.AllConfigs;
 
 import dan200.computercraft.api.peripheral.PeripheralCapability;
 import dev.engine_room.flywheel.lib.transform.TransformStack;
@@ -29,9 +30,7 @@
 import net.neoforged.neoforge.capabilities.RegisterCapabilitiesEvent;
 
 public class CreativeMotorBlockEntity extends GeneratingKineticBlockEntity {
-
 	public static final int DEFAULT_SPEED = 16;
-	public static final int MAX_SPEED = 256;
 
 	public ScrollValueBehaviour generatedSpeed;
 	public AbstractComputerBehaviour computerBehaviour;
@@ -53,7 +52,7 @@ public static void registerCapabilities(RegisterCapabilitiesEvent event) {
 	@Override
 	public void addBehaviours(List<BlockEntityBehaviour> behaviours) {
 		super.addBehaviours(behaviours);
-		int max = MAX_SPEED;
+		int max = AllConfigs.server().kinetics.maxRotationSpeed.get();
 		generatedSpeed = new KineticScrollValueBehaviour(CreateLang.translateDirect("kinetics.creative_motor.rotation_speed"),
 			this, new MotorValueBox());
 		generatedSpeed.between(-max, max);
@@ -117,5 +116,4 @@ public void invalidate() {
 		super.invalidate();
 		computerBehaviour.removePeripheral();
 	}
-
 }

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

@@ -28,7 +28,7 @@ public ValueSettingsBoard createBoard(Player player, BlockHitResult hitResult) {
 			Component.literal("\u27f2")
 				.withStyle(ChatFormatting.BOLD));
 		ValueSettingsFormatter formatter = new ValueSettingsFormatter(this::formatSettings);
-		return new ValueSettingsBoard(label, 256, 32, rows, formatter);
+		return new ValueSettingsBoard(label, 1, 256, 32, rows, formatter);
 	}
 
 	@Override

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

@@ -4,6 +4,10 @@
 
 import net.minecraft.network.chat.Component;
 
-public record ValueSettingsBoard(Component title, int maxValue, int milestoneInterval, List<Component> rows,
+public record ValueSettingsBoard(Component title, int minValue, int maxValue, int milestoneInterval,
+								 List<Component> rows,
 	ValueSettingsFormatter formatter) {
+	public ValueSettingsBoard(Component title, int maxValue, int milestoneInterval, List<Component> rows, ValueSettingsFormatter formatter) {
+		this(title, 0, maxValue, milestoneInterval, rows, formatter);
+	}
 }

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

@@ -16,10 +16,10 @@
 import com.simibubi.create.foundation.gui.AllIcons;
 import com.simibubi.create.foundation.utility.CreateLang;
 
+import net.createmod.catnip.animation.AnimationTickHolder;
 import net.createmod.catnip.gui.AbstractSimiScreen;
 import net.createmod.catnip.gui.UIRenderHelper;
 import net.createmod.catnip.platform.CatnipServices;
-import net.createmod.catnip.animation.AnimationTickHolder;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.resources.sounds.SimpleSoundInstance;
 import net.minecraft.core.BlockPos;
@@ -91,8 +91,7 @@ public ValueSettings getClosestCoordinate(int mouseX, int mouseY) {
 		boolean milestonesOnly = hasShiftDown();
 
 		double bestDiff = Double.MAX_VALUE;
-		for (; row < board.rows()
-			.size(); row++) {
+		for (; row < board.rows().size(); row++) {
 			Vec2 coord = getCoordinateOfValue(row, 0);
 			double diff = Math.abs(coord.y - mouseY);
 			if (bestDiff < diff)
@@ -110,6 +109,7 @@ public ValueSettings getClosestCoordinate(int mouseX, int mouseY) {
 			bestDiff = diff;
 		}
 		column -= 1;
+		column = Math.max(board.minValue(), column);
 
 		return new ValueSettings(row,
 			milestonesOnly ? Math.min(column * board.milestoneInterval(), board.maxValue()) : column);

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

@@ -3,6 +3,7 @@
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.function.Supplier;
+
 import com.google.common.collect.ImmutableList;
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
 import com.simibubi.create.foundation.blockEntity.behaviour.BehaviourType;
@@ -30,7 +31,6 @@ public class ScrollValueBehaviour extends BlockEntityBehaviour implements ValueS
 	public static final BehaviourType<ScrollValueBehaviour> TYPE = new BehaviourType<>();
 
 	ValueBoxTransform slotPositioning;
-	Vec3 textShift;
 
 	int min = 0;
 	protected int max = 1;