18384427956

Committed 09 Oct 2025 05:46PM UTC coverage: 53.031% (-0.04%) from 53.071%

Build # 18384427956

Build Type

push

github

Committed by

rubensworks

Commit Message

Merge remote-tracking branch 'origin/master-1.21-lts' into master-1.21

Run Details

2863 of 8762 branches covered (32.68%)

Branch coverage included in aggregate %.

17326 of 29308 relevant lines covered (59.12%)

3.07 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

61.67

/src/main/java/org/cyclops/integrateddynamics/part/aspect/write/AspectWriteBase.java

package org.cyclops.integrateddynamics.part.aspect.write;

import net.minecraft.network.chat.Component;
import net.minecraft.resources.ResourceLocation;
import org.cyclops.cyclopscore.helper.IModHelpers;
import org.cyclops.integrateddynamics.api.evaluate.EvaluationException;
import org.cyclops.integrateddynamics.api.evaluate.variable.IValue;
import org.cyclops.integrateddynamics.api.evaluate.variable.IValueType;
import org.cyclops.integrateddynamics.api.evaluate.variable.IVariable;
import org.cyclops.integrateddynamics.api.network.INetwork;
import org.cyclops.integrateddynamics.api.network.IPartNetwork;
import org.cyclops.integrateddynamics.api.part.IPartState;
import org.cyclops.integrateddynamics.api.part.IPartType;
import org.cyclops.integrateddynamics.api.part.PartTarget;
import org.cyclops.integrateddynamics.api.part.aspect.IAspectWrite;
import org.cyclops.integrateddynamics.api.part.aspect.property.IAspectProperties;
import org.cyclops.integrateddynamics.api.part.write.IPartStateWriter;
import org.cyclops.integrateddynamics.api.part.write.IPartTypeWriter;
import org.cyclops.integrateddynamics.core.evaluate.variable.ValueHelpers;
import org.cyclops.integrateddynamics.core.helper.L10NValues;
import org.cyclops.integrateddynamics.part.aspect.AspectBase;
import org.cyclops.integrateddynamics.part.aspect.Aspects;

/**
 * Base class for write aspects.
 * @author rubensworks
 */
public abstract class AspectWriteBase<V extends IValue, T extends IValueType<V>> extends AspectBase<V, T>
        implements IAspectWrite<V, T> {

    protected final String unlocalizedTypeSuffix;

    public AspectWriteBase(String modId, String unlocalizedTypeSuffix, IAspectProperties defaultProperties) {
        super(modId, defaultProperties);
        if(unlocalizedTypeSuffix == null) {
            unlocalizedTypeSuffix = "";
        }
        this.unlocalizedTypeSuffix = unlocalizedTypeSuffix;
        if(IModHelpers.get().getMinecraftHelpers().isClientSide()) {
            registerModelResourceLocation();
        }
    }

    @SuppressWarnings("unchecked")
    @Override
    public <P extends IPartType<P, S>, S extends IPartState<P>> void update(INetwork network, IPartNetwork partNetwork, P partType, PartTarget target, S state) {
        IPartTypeWriter partTypeWriter = (IPartTypeWriter) partType;
        IPartStateWriter writerState = (IPartStateWriter) state;
        IVariable variable = partTypeWriter.getActiveVariable(network, partNetwork, target, writerState);
        if(variable != null && writerState.getErrors(this).isEmpty()) {
            if (ValueHelpers.correspondsTo(variable, getValueType())) {
                if(writerState.isDeactivated() || writerState.checkAndResetFirstTick()) {
                    onActivate(partTypeWriter, target, writerState);
                }
                try {
                    write(partTypeWriter, target, writerState, variable);
                } catch (EvaluationException e) {
                    writerState.addError(this, e.getErrorMessage());
                    writerState.setDeactivated(true);
                    e.addResolutionListeners(() -> writerState.onVariableContentsUpdated(partTypeWriter, target));
                }
            } else {
                // This will only occur in cases where the variable is of any type, and the value type is more precise.
                // In all other cases, type checking will already have happen using the variable facades.
                try {
                    writerState.addError(this, Component.translatable(L10NValues.ASPECT_ERROR_INVALIDTYPE,
                        Component.translatable(getValueType().getTranslationKey()),
                        Component.translatable(variable.getValue().getType().getTranslationKey())));
                } catch (EvaluationException e) {
                    // Fallback to a less precise form of error reporting
                    writerState.addError(this, Component.translatable(L10NValues.ASPECT_ERROR_INVALIDTYPE,
                            Component.translatable(getValueType().getTranslationKey()),
                            Component.translatable(variable.getType().getTranslationKey())));
                }
                writerState.setDeactivated(true);
            }
        } else if(!writerState.isDeactivated()) {
            onDeactivate(partTypeWriter, target, writerState);
        }
    }

    @Override
    public <P extends IPartTypeWriter<P, S>, S extends IPartStateWriter<P>> void onActivate(P partType, PartTarget target, S state) {
        state.setDeactivated(false);
    }

    @Override
    public <P extends IPartTypeWriter<P, S>, S extends IPartStateWriter<P>> void onDeactivate(P partType, PartTarget target, S state) {
        state.setDeactivated(true);
    }

    @Override
    public <P extends IPartType<P, S>, S extends IPartState<P>> void setProperties(P partType, PartTarget target, S state, IAspectProperties properties) {
        onDeactivate((IPartTypeWriter) partType, target, (IPartStateWriter) state);
        super.setProperties(partType, target, state, properties);
        onActivate((IPartTypeWriter) partType, target, (IPartStateWriter) state);
    }

    protected String getUnlocalizedType() {
        return "write" + unlocalizedTypeSuffix;
    }

    protected void registerModelResourceLocation() {
        Aspects.REGISTRY.getClient().registerAspectModel(this,
                ResourceLocation.parse(getModId() + ":aspect/" + getUnlocalizedType().replaceAll("\\.", "/")));
    }

}

1	package org.cyclops.integrateddynamics.part.aspect.write;
2
3	import net.minecraft.network.chat.Component;
4	import net.minecraft.resources.ResourceLocation;
5	import org.cyclops.cyclopscore.helper.IModHelpers;
6	import org.cyclops.integrateddynamics.api.evaluate.EvaluationException;
7	import org.cyclops.integrateddynamics.api.evaluate.variable.IValue;
8	import org.cyclops.integrateddynamics.api.evaluate.variable.IValueType;
9	import org.cyclops.integrateddynamics.api.evaluate.variable.IVariable;
10	import org.cyclops.integrateddynamics.api.network.INetwork;
11	import org.cyclops.integrateddynamics.api.network.IPartNetwork;
12	import org.cyclops.integrateddynamics.api.part.IPartState;
13	import org.cyclops.integrateddynamics.api.part.IPartType;
14	import org.cyclops.integrateddynamics.api.part.PartTarget;
15	import org.cyclops.integrateddynamics.api.part.aspect.IAspectWrite;
16	import org.cyclops.integrateddynamics.api.part.aspect.property.IAspectProperties;
17	import org.cyclops.integrateddynamics.api.part.write.IPartStateWriter;
18	import org.cyclops.integrateddynamics.api.part.write.IPartTypeWriter;
19	import org.cyclops.integrateddynamics.core.evaluate.variable.ValueHelpers;
20	import org.cyclops.integrateddynamics.core.helper.L10NValues;
21	import org.cyclops.integrateddynamics.part.aspect.AspectBase;
22	import org.cyclops.integrateddynamics.part.aspect.Aspects;
23
24	/**
25	* Base class for write aspects.
26	* @author rubensworks
27	*/
28	public abstract class AspectWriteBase<V extends IValue, T extends IValueType<V>> extends AspectBase<V, T>
29	implements IAspectWrite<V, T> {
30
31	protected final String unlocalizedTypeSuffix;
32
33	public AspectWriteBase(String modId, String unlocalizedTypeSuffix, IAspectProperties defaultProperties) {
34	super(modId, defaultProperties);	4✔
35	if(unlocalizedTypeSuffix == null) {	2!
36	unlocalizedTypeSuffix = "";	×
37	}
38	this.unlocalizedTypeSuffix = unlocalizedTypeSuffix;	3✔
39	if(IModHelpers.get().getMinecraftHelpers().isClientSide()) {	4!
40	registerModelResourceLocation();	×
41	}
42	}	1✔
43
44	@SuppressWarnings("unchecked")
45	@Override
46	public <P extends IPartType<P, S>, S extends IPartState<P>> void update(INetwork network, IPartNetwork partNetwork, P partType, PartTarget target, S state) {
47	IPartTypeWriter partTypeWriter = (IPartTypeWriter) partType;	3✔
48	IPartStateWriter writerState = (IPartStateWriter) state;	3✔
49	IVariable variable = partTypeWriter.getActiveVariable(network, partNetwork, target, writerState);	7✔
50	if(variable != null && writerState.getErrors(this).isEmpty()) {	7!
51	if (ValueHelpers.correspondsTo(variable, getValueType())) {	5!
52	if(writerState.isDeactivated() \|\| writerState.checkAndResetFirstTick()) {	6!
53	onActivate(partTypeWriter, target, writerState);	5✔
54	}
55	try {
56	write(partTypeWriter, target, writerState, variable);	6✔
57	} catch (EvaluationException e) {	×
58	writerState.addError(this, e.getErrorMessage());	×
59	writerState.setDeactivated(true);	×
60	e.addResolutionListeners(() -> writerState.onVariableContentsUpdated(partTypeWriter, target));	×
61	}	1✔
62	} else {
63	// This will only occur in cases where the variable is of any type, and the value type is more precise.
64	// In all other cases, type checking will already have happen using the variable facades.
65	try {
66	writerState.addError(this, Component.translatable(L10NValues.ASPECT_ERROR_INVALIDTYPE,	×
67	Component.translatable(getValueType().getTranslationKey()),	×
68	Component.translatable(variable.getValue().getType().getTranslationKey())));	×
69	} catch (EvaluationException e) {	×
70	// Fallback to a less precise form of error reporting
71	writerState.addError(this, Component.translatable(L10NValues.ASPECT_ERROR_INVALIDTYPE,	×
72	Component.translatable(getValueType().getTranslationKey()),	×
73	Component.translatable(variable.getType().getTranslationKey())));	×
74	}	×
75	writerState.setDeactivated(true);	×
76	}
77	} else if(!writerState.isDeactivated()) {	3✔
78	onDeactivate(partTypeWriter, target, writerState);	5✔
79	}
80	}	1✔
81
82	@Override
83	public <P extends IPartTypeWriter<P, S>, S extends IPartStateWriter<P>> void onActivate(P partType, PartTarget target, S state) {
84	state.setDeactivated(false);	3✔
85	}	1✔
86
87	@Override
88	public <P extends IPartTypeWriter<P, S>, S extends IPartStateWriter<P>> void onDeactivate(P partType, PartTarget target, S state) {
89	state.setDeactivated(true);	3✔
90	}	1✔
91
92	@Override
93	public <P extends IPartType<P, S>, S extends IPartState<P>> void setProperties(P partType, PartTarget target, S state, IAspectProperties properties) {
94	onDeactivate((IPartTypeWriter) partType, target, (IPartStateWriter) state);	7✔
95	super.setProperties(partType, target, state, properties);	6✔
96	onActivate((IPartTypeWriter) partType, target, (IPartStateWriter) state);	7✔
97	}	1✔
98
99	protected String getUnlocalizedType() {
100	return "write" + unlocalizedTypeSuffix;	4✔
101	}
102
103	protected void registerModelResourceLocation() {
104	Aspects.REGISTRY.getClient().registerAspectModel(this,	×
105	ResourceLocation.parse(getModId() + ":aspect/" + getUnlocalizedType().replaceAll("\\.", "/")));	×
106	}	×
107
108	}

CyclopsMC / IntegratedDynamics / 18384427956

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous