Skip to content

add method to omit commas in IotaType #988

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
TheRobbie73 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

add method to omit commas in IotaType #988

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
8 changes: 7 additions & 1 deletion Common/src/main/java/at/petrak/hexcasting/api/casting/iota/IotaType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import at.petrak.hexcasting.api.HexAPI;
import at.petrak.hexcasting.api.utils.HexUtils;
import at.petrak.hexcasting.common.lib.hex.HexIotaTypes;
import com.mojang.datafixers.util.Pair;
import net.minecraft.ChatFormatting;
import net.minecraft.client.gui.Font;
import net.minecraft.nbt.CompoundTag;
Expand Down Expand Up @@ -53,6 +52,13 @@ public Component typeName() {
.withStyle(style -> style.withColor(TextColor.fromRgb(color())));
}

/**
* If commas should be omitted when the iota is inside of a list iota
*/
public boolean omitCommas() {
return false;
}

public static CompoundTag serialize(Iota iota) {
var type = iota.getType();
var typeId = HexIotaTypes.REGISTRY.getKey(type);
Expand Down
9 changes: 5 additions & 4 deletions Common/src/main/java/at/petrak/hexcasting/api/casting/iota/ListIota.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,12 +132,13 @@ public Component display(Tag tag) {
out.append(IotaType.getDisplay(csub));

// only add a comma between 2 non-patterns (commas don't look good with Inline patterns)
// TODO: maybe add a method on IotaType to allow it to opt out of commas?
if (i < list.size() - 1) {
var thisIotaNeedsComma = IotaType.getTypeFromTag(csub) != PatternIota.TYPE;
var nextIotaNeedsComma = IotaType.getTypeFromTag(HexUtils.downcast(list.get(i+1), CompoundTag.TYPE)) != PatternIota.TYPE;
var thisType = IotaType.getTypeFromTag(csub);
var nextType = IotaType.getTypeFromTag(HexUtils.downcast(list.get(i+1), CompoundTag.TYPE));
var thisIotaOmitsComma = thisType != null && thisType.omitCommas();
var nextIotaOmitsComma = nextType != null && nextType.omitCommas();
var alwaysShowCommas = HexConfig.client() != null && HexConfig.client().alwaysShowListCommas();
if (thisIotaNeedsComma || nextIotaNeedsComma || alwaysShowCommas)
if (!thisIotaOmitsComma || !nextIotaOmitsComma || alwaysShowCommas)
out.append(", ");
}
}
Expand Down
5 changes: 5 additions & 0 deletions Common/src/main/java/at/petrak/hexcasting/api/casting/iota/PatternIota.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,11 @@ public Component display(Tag tag) {
public int color() {
return 0xff_ffaa00;
}

@Override
public boolean omitCommas() {
return true;
}
};

public static PatternIota deserialize(Tag tag) throws IllegalArgumentException {
Expand Down