Skip to content

Add a wider V/C range. #653

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
xujunhao6082 wants to merge 1 commit into
base: architectury-1.20.1/dev
Choose a base branch
from
+15 −9
Open

Add a wider V/C range. #653

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/java/org/patryk3211/powergrid/electricity/creative/CreativeSourceBlockEntity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ public void addBehaviours(List<BlockEntityBehaviour> behaviours) {

value = new CreativeSourceValueBehaviour(label, this, multiplier, new CreativeSourceBoxTransform());
value.withCallback(i -> {
if(!overwrite)
setValue(i * multiplier);
if (!overwrite)
setValue(((i >> 2) * ((i & 1) > 0 ? 1 : (i & 2) > 0 ? 0.001f : 1000)) * multiplier);
});
behaviours.add(value);
}
Expand Down
20 changes: 13 additions & 7 deletions ...main/java/org/patryk3211/powergrid/electricity/creative/CreativeSourceValueBehaviour.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,20 @@ public class CreativeSourceValueBehaviour extends ScrollValueBehaviour {
public CreativeSourceValueBehaviour(Component label, SmartBlockEntity be, float multiplier, ValueBoxTransform slot) {
super(label, be, slot);
this.multiplier = multiplier;
between(-250, 250);
withFormatter(i -> String.format("%.1f", Math.abs(i) * multiplier));
between(-1000, 1002);
withFormatter(i -> String.format("%.1f%s", Math.abs(i >> 2) * multiplier,
(i & 1) > 0 ? "" : (i & 2) > 0 ? "m" : "k"));
setValue(1);
}

public ValueSettingsBoard createBoard(Player player, BlockHitResult hitResult) {
ImmutableList<Component> rows = ImmutableList.of(
Component.literal("+"),//.formatted(Formatting.BOLD),
Component.literal("-")//.formatted(Formatting.BOLD)
Component.literal("+k"),//.formatted(Formatting.BOLD),
Component.literal("+1"),//.formatted(Formatting.BOLD),
Component.literal("+m"),//.formatted(Formatting.BOLD),
Component.literal("-k"),//.formatted(Formatting.BOLD),
Component.literal("-1"),//.formatted(Formatting.BOLD),
Component.literal("-m")//.formatted(Formatting.BOLD)
);
ValueSettingsFormatter formatter = new ValueSettingsFormatter(this::formatSettings);
return new ValueSettingsBoard(this.label, 250, 20, rows, formatter);
Expand All @@ -52,12 +58,12 @@ public void setValueSettings(Player player, ValueSettingsBehaviour.ValueSettings
if (!valueSetting.equals(this.getValueSettings())) {
this.playFeedbackSound(this);
}

this.setValue(valueSetting.row() == 0 ? value : -value);
int row = valueSetting.row();
this.setValue(value != 0 ? ((row < 3 ? value : -value) << 2) | row % 3 : 1);
}

public ValueSettingsBehaviour.ValueSettings getValueSettings() {
return new ValueSettingsBehaviour.ValueSettings(this.value < 0 ? 1 : 0, Math.abs(this.value));
return new ValueSettingsBehaviour.ValueSettings((this.value < 0 ? 3 : 0) + (this.value & 3), Math.abs(this.value >> 2));
}

public MutableComponent formatSettings(ValueSettingsBehaviour.ValueSettings settings) {
Expand Down