Skip to content

Commit

Permalink
Updated UI for more context
Browse files Browse the repository at this point in the history
  • Loading branch information
@bibi-reden
bibi-reden committed Jun 24, 2024
1 parent 0aa6796 commit 68e5246
Show file tree
Hide file tree
Showing 6 changed files with 69 additions and 10 deletions.
6 changes: 6 additions & 0 deletions src/main/java/com/bibireden/data_attributes/api/attribute/IEntityAttribute.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,12 @@ public interface IEntityAttribute {
* @return The maximum value of the attribute.
*/
double data_attributes$max();

/** Returns the intended minimum fallback of this attribute. */
double data_attributes$min_fallback();

/** Returns the intended maximum fallback of this attribute. */
double data_attributes$max_fallback();

/**
* @return The attribute's {@link StackingFormula}.
Expand Down
11 changes: 11 additions & 0 deletions src/main/java/com/bibireden/data_attributes/mixin/ClampedEntityAttributeMixin.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.Unique;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
Expand Down Expand Up @@ -57,6 +58,16 @@ abstract class ClampedEntityAttributeMixin extends EntityAttributeMixin {
return original.call(value);
}

@Override
public double data_attributes$min_fallback() {
return this.minValue;
}

@Override
public double data_attributes$max_fallback() {
return this.maxValue;
}

@Override
public void data_attributes$clear() {
super.data_attributes$clear();
Expand Down
10 changes: 10 additions & 0 deletions src/main/java/com/bibireden/data_attributes/mixin/EntityAttributeMixin.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,16 @@ abstract class EntityAttributeMixin implements MutableEntityAttribute {
return this.data_max;
}

@Override
public double data_attributes$min_fallback() {
return Double.MIN_VALUE;
}

@Override
public double data_attributes$max_fallback() {
return Double.MAX_VALUE;
}

@Override
public StackingFormula data_attributes$formula() {
return this.data_formula;
Expand Down
48 changes: 39 additions & 9 deletions src/main/kotlin/com/bibireden/data_attributes/config/DataAttributesConfigProviders.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import com.bibireden.data_attributes.api.attribute.StackingFormula
import com.bibireden.data_attributes.config.OverridesConfigModel.AttributeOverrideConfig
import com.bibireden.data_attributes.data.AttributeFunctionConfigData
import com.bibireden.data_attributes.data.EntityTypeData
import com.bibireden.data_attributes.mutable.MutableEntityAttribute
import com.bibireden.data_attributes.utils.round
import com.google.common.base.Predicate
import io.wispforest.owo.config.Option
Expand All @@ -15,16 +16,33 @@ import io.wispforest.owo.ui.component.Components
import io.wispforest.owo.ui.container.Containers
import io.wispforest.owo.ui.container.FlowLayout
import io.wispforest.owo.ui.core.*
import net.minecraft.entity.attribute.ClampedEntityAttribute
import net.minecraft.registry.Registries
import net.minecraft.text.MutableText
import net.minecraft.text.Text
import net.minecraft.util.Formatting
import net.minecraft.util.Identifier

@Suppress("UnstableApiUsage")
object DataAttributesConfigProviders {
fun entityTypeIdentifierToText(id: Identifier): MutableText {
val type = Registries.ENTITY_TYPE[id]
return Text.empty().apply {
append(Text.translatable(type.translationKey).append(" "))
append(Text.literal("($id)").formatted(Formatting.GRAY))
}
}
fun attributeIdentifierToText(id: Identifier): MutableText {
val attribute = Registries.ATTRIBUTE[id]
return Text.empty().apply {
if (attribute != null) {
append(Text.translatable(attribute.translationKey).append(" "))
}
append(Text.literal("($id)").formatted(if (attribute == null) Formatting.RED else Formatting.GRAY))
}
}
fun isAttributeUnregistered(id: Identifier) = !Registries.ATTRIBUTE.containsId(id)
fun isNumeric(str: String) = str.isEmpty() || str.matches("-?\\d+(\\.\\d+)?".toRegex())
fun maybeInvalidText(text: String, invalid: Boolean) = Text.literal(text).apply { formatted(if (invalid) Formatting.RED else Formatting.WHITE) }

val ATTRIBUTE_OVERRIDE_FACTORY = OptionComponentFactory { model, option ->
val provider = AttributeOverrideProvider(option)
Expand All @@ -46,27 +64,37 @@ object DataAttributesConfigProviders {

init {
backing.forEach { (id, override) ->
// extract min & max.
val attribute = Registries.ATTRIBUTE[id] as MutableEntityAttribute?
if (attribute != null) {
override.min_fallback = attribute.`data_attributes$min_fallback`()
override.max_fallback = attribute.`data_attributes$max_fallback`()
}

val isOverrideInvalid = isAttributeUnregistered(id)
Containers.collapsible(Sizing.content(), Sizing.content(), maybeInvalidText("$id", isOverrideInvalid), true)
Containers.collapsible(Sizing.content(), Sizing.content(), attributeIdentifierToText(id), true)
.also {
if (isOverrideInvalid) it.tooltip(Text.translatable("text.config.data_attributes.data_entry.overrides.invalid"))
it.gap(15)
it.child(Containers.horizontalFlow(Sizing.fill(100), Sizing.fixed(20)).also { hf ->
hf.verticalAlignment(VerticalAlignment.CENTER)
hf.gap(6)

hf.child(Components.label(Text.translatable("text.config.data_attributes.data_entry.overrides.enabled"))
.tooltip(Text.translatable("text.config.data_attributes.data_entry.overrides.enabled.desc"))
.sizing(Sizing.content(), Sizing.fixed(20)))

hf.child(ConfigToggleButton().also { b ->
b.enabled(override.enabled).positioning(Positioning.relative(100, 0))
b.onPress {
val enabled = !override.enabled
this.backing.remove(id)
this.backing.put(id, override.copy(enabled = enabled))
this.backing.put(id, override.copy(enabled = !override.enabled))
}
})
})

it.gap(8)

it.child(textBoxComponent(
Text.translatable("text.config.data_attributes.data_entry.overrides.min"),
override.min,
Expand All @@ -87,6 +115,8 @@ object DataAttributesConfigProviders {
}
))

it.gap(8)

it.child(textBoxComponent(
Text.translatable("text.config.data_attributes.data_entry.overrides.min_fallback"),
override.min_fallback,
Expand All @@ -101,7 +131,7 @@ object DataAttributesConfigProviders {

it.child(Containers.horizontalFlow(Sizing.fill(100), Sizing.fixed(30)).also { hf ->
hf.verticalAlignment(VerticalAlignment.CENTER)
hf.gap(6)
hf.gap(4)
hf.child(Components.label(Text.translatable("text.config.data_attributes.data_entry.overrides.smoothness"))
.sizing(Sizing.content(), Sizing.fixed(20)))

Expand Down Expand Up @@ -152,14 +182,14 @@ object DataAttributesConfigProviders {
init {
backing.forEach { (topID, functions) ->
val isFunctionParentUnregistered = isAttributeUnregistered(topID)
Containers.collapsible(Sizing.content(), Sizing.content(), maybeInvalidText("$topID", isFunctionParentUnregistered), true).also { ct ->
Containers.collapsible(Sizing.content(), Sizing.content(), attributeIdentifierToText(topID), true).also { ct ->
ct.gap(15)
if (isFunctionParentUnregistered) {
ct.tooltip(Text.translatable("text.config.data_attributes.data_entry.function_parent.invalid"))
}
functions.forEachIndexed { index, function ->
val isFunctionChildUnregistered = isAttributeUnregistered(function.id)
Containers.collapsible(Sizing.content(), Sizing.content(), maybeInvalidText("${function.id}", isFunctionChildUnregistered), true).also {
Containers.collapsible(Sizing.content(), Sizing.content(), attributeIdentifierToText(function.id), true).also {
it.gap(10)
if (isFunctionChildUnregistered) {
it.tooltip(Text.translatable("text.config.data_attributes.data_entry.function_child.invalid"))
Expand Down Expand Up @@ -212,10 +242,10 @@ object DataAttributesConfigProviders {

init {
backing.forEach { (topID, types) ->
Containers.collapsible(Sizing.content(), Sizing.content(), Text.literal("$topID"), true).also { ct ->
Containers.collapsible(Sizing.content(), Sizing.content(), entityTypeIdentifierToText(topID), true).also { ct ->
ct.gap(15)
types.data.forEach { id, value ->
Containers.collapsible(Sizing.content(), Sizing.content(), Text.literal("[$id]"), true).also {
Containers.collapsible(Sizing.content(), Sizing.content(), attributeIdentifierToText(id), true).also {
it.gap(10)

it.child(textBoxComponent(
Expand Down
2 changes: 2 additions & 0 deletions src/main/resources/assets/data_attributes/lang/en_us.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@
"text.config.data_attributes.data_entry.entity_types.value": "Value",
"text.config.data_attributes.data_entry.entity_types": "Value",

"text.config.data_attributes.data_entry.overrides.enabled.desc": "If this override should be enabled and its modifications applied.",

"text.config.data_attributes.data_entry.unchangeable": "This value is unchangeable.",

"text.config.data_attributes.data_entry.overrides.invalid": "This override does not exist in the attribute registry. It will be ignored.",
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/fabric.mod.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"id": "data_attributes",
"version": "${version}",
"name": "Data Attributes: Directors Cut",
"description": "...",
"description": "This mod serves to overhaul the Entity Attribute system to be a lot more dynamic.",
"authors": [
"Bare Minimum Studios",
"CleverNucleus (original author)"
Expand Down

0 comments on commit 68e5246

Please sign in to comment.