18595223322

Committed 17 Oct 2025 02:07PM UTC coverage: 53.038% (+0.01%) from 53.024%

Build # 18595223322

Build Type

push

github

Committed by

rubensworks

Commit Message

Fix broken block-update-based aspect invalidation

Was caused by 9bdd91138

Run Details

2875 of 8772 branches covered (32.77%)

Branch coverage included in aggregate %.

17335 of 29333 relevant lines covered (59.1%)

3.07 hits per line

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

72.59

/src/main/java/org/cyclops/integrateddynamics/core/network/PartNetworkElement.java

package org.cyclops.integrateddynamics.core.network;

import net.minecraft.core.Direction;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.BlockGetter;
import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.world.level.block.state.BlockState;
import org.cyclops.cyclopscore.datastructure.DimPos;
import org.cyclops.integrateddynamics.api.PartStateException;
import org.cyclops.integrateddynamics.api.network.*;
import org.cyclops.integrateddynamics.api.part.*;
import org.cyclops.integrateddynamics.core.helper.NetworkHelpers;
import org.cyclops.integrateddynamics.core.helper.PartHelpers;

import javax.annotation.Nullable;
import java.util.List;
import java.util.Objects;
import java.util.Optional;

/**
 * A network element for parts.
 * @author rubensworks
 */
public class PartNetworkElement<P extends IPartType<P, S>, S extends IPartState<P>> extends NetworkElementBase
        implements IPartNetworkElement<P, S>, IEnergyConsumingNetworkElement {

    private final P part;
    private final PartPos center;

    private S tempState = null;

    public PartNetworkElement(P part, PartPos center) {
        this.part = part;
        this.center = center;
    }

    protected static DimPos getCenterPos(PartTarget target) {
        return target.getCenter().getPos();
    }

    protected static Direction getCenterSide(PartTarget target) {
        return target.getCenter().getSide();
    }

    protected static DimPos getTargetPos(PartTarget target) {
        return target.getTarget().getPos();
    }

    protected static Direction getTargetSide(PartTarget target) {
        return target.getTarget().getSide();
    }

    @Override
    public P getPart() {
        return part;
    }

    @Override
    public PartTarget getTarget() {
        return getPart().getTarget(this.center, getPartState());
    }

    public PartTarget getTarget(S partState) {
        return getPart().getTarget(this.center, partState);
    }

    public S getTempState() {
        return tempState;
    }

    public void setTempState(S tempState) {
        this.tempState = tempState;
    }

    @Override
    public IPartContainer getPartContainer() {
        return PartHelpers.getPartContainerChecked(this.center.getPos(), this.center.getSide());
    }

    public IPartContainer getPartContainer(@Nullable BlockState blockState, @Nullable BlockEntity blockEntity) {
        return PartHelpers.getPartContainerChecked(this.center.getPos(), this.center.getSide(), blockState, blockEntity);
    }

    public Optional<IPartContainer> getPartContainerOptional() {
        return PartHelpers.getPartContainer(this.center.getPos(), this.center.getSide());
    }

    @Override
    public void setPriorityAndChannel(INetwork network, int priority, int channel) {
        //noinspection deprecation
        part.setPriorityAndChannel(network, NetworkHelpers.getPartNetworkChecked(network), getTarget(), getPartState(), priority, channel);
    }

    @Override
    public int getPriority() {
        return hasPartState() ? part.getPriority(getPartState()) : 0;
    }

    @Override
    public int getChannel() {
        return hasPartState() ? part.getChannel(getPartState()) : IPositionedAddonsNetwork.DEFAULT_CHANNEL;
    }

    @Override
    public boolean canRevalidate(INetwork network) {
        return canRevalidatePositioned(network, this.center.getPos());
    }

    @Override
    public void revalidate(INetwork network) {
        super.revalidate(network);
        revalidatePositioned(network, this.center.getPos());
    }

    @Override
    public boolean isLoaded() {
        return this.center.getPos().isLoaded();
    }

    public boolean hasPartState() {
        if (isLoaded()) {
            return getPartContainerOptional()
                    .map(partContainer -> partContainer.hasPart(this.center.getSide()))
                    .orElse(false);
        }
        return false;
    }

    @Override
    public S getPartState() throws PartStateException {
        IPartContainer partContainer = getPartContainer();
        if(partContainer != null) {
            return (S) partContainer.getPartState(this.center.getSide());
        } else {
            throw new PartStateException(this.center.getPos(), this.center.getSide());
        }
    }

    public S getPartState(@Nullable BlockState blockState, @Nullable BlockEntity blockEntity) throws PartStateException {
        IPartContainer partContainer = getPartContainer(blockState, blockEntity);
        if(partContainer != null) {
            return (S) partContainer.getPartState(this.center.getSide());
        } else {
            throw new PartStateException(this.center.getPos(), this.center.getSide());
        }
    }

    @Override
    public int getConsumptionRate() {
        return getPart().getConsumptionRate(getPartState());
    }

    @Override
    public void postUpdate(INetwork network, boolean updated) {
        part.postUpdate(network, NetworkHelpers.getPartNetworkChecked(network), getTarget(), getPartState(), updated);
    }

    @Override
    public int getUpdateInterval() {
        return part.getUpdateInterval(getPartState());
    }

    @Override
    public boolean isUpdate() {
        return part.isUpdate(getPartState());
    }

    @Override
    public void update(INetwork network) {
        part.update(network, NetworkHelpers.getPartNetworkChecked(network), getTarget(), getPartState());
    }

    @Override
    public void beforeNetworkKill(INetwork network, @Nullable BlockState blockState, @Nullable BlockEntity blockEntity) {
        S partState = getPartState(blockState, blockEntity);
        part.beforeNetworkKill(network, NetworkHelpers.getPartNetworkChecked(network), getTarget(partState), partState);
    }

    @Override
    public void afterNetworkAlive(INetwork network) {
        part.afterNetworkAlive(network, NetworkHelpers.getPartNetworkChecked(network), getTarget(), getPartState());
    }

    @Override
    public void afterNetworkReAlive(INetwork network) {
        part.afterNetworkReAlive(network, NetworkHelpers.getPartNetworkChecked(network), getTarget(), getPartState());
    }

    @Override
    public void addDrops(BlockState blockState, BlockEntity blockEntity, List<ItemStack> itemStacks, boolean dropMainElement, boolean saveState) {
        S partState = getPartState(blockState, blockEntity);
        part.addDrops(getTarget(partState), partState, itemStacks, dropMainElement, saveState);
    }

    @Override
    public boolean onNetworkAddition(INetwork network) {
        IPartNetwork partNetwork = NetworkHelpers.getPartNetworkChecked(network);
        boolean res = partNetwork.addPart(getPartState().getId(), this.center);
        if(res) {
            part.onNetworkAddition(network, partNetwork, getTarget(), getPartState());
        }
        return res;
    }

    @Override
    public void onNetworkRemoval(INetwork network, BlockState blockState, BlockEntity blockEntity) {
        IPartNetwork partNetwork = NetworkHelpers.getPartNetworkChecked(network);
        S partState = getPartState(blockState, blockEntity);
        partNetwork.removePart(partState.getId());
        part.onNetworkRemoval(network, partNetwork, getTarget(partState), partState);
    }

    @Override
    public void onPreRemoved(INetwork network) {
        part.onPreRemoved(network, NetworkHelpers.getPartNetworkChecked(network), getTarget(), (tempState = getPartState()));
    }

    @Override
    public void onPostRemoved(INetwork network) {
        part.onPostRemoved(network, NetworkHelpers.getPartNetworkChecked(network), getTarget(tempState), Objects.requireNonNull(tempState));
        tempState = null;
    }

    @Override
    public void onNeighborBlockChange(@Nullable INetwork network, BlockGetter world) {
        part.onBlockNeighborChange(network, NetworkHelpers.getPartNetworkChecked(network), getTarget(), getPartState(), world, null);
    }

    @Override
    public void onNeighborBlockChange(@Nullable INetwork network, BlockGetter world, @Nullable Direction side) {
        part.onBlockNeighborChange(network, NetworkHelpers.getPartNetworkChecked(network), getTarget(), getPartState(), world, side);
    }

    @Override
    public Optional<P> getNetworkEventListener() {
        return Optional.of(getPart());
    }

    public boolean equals(Object o) {
        return o instanceof IPartNetworkElement && compareTo((INetworkElement) o) == 0;
    }

    @Override
    public int hashCode() {
        int result = part.hashCode();
        result = 31 * result + this.center.hashCode();
        return result;
    }

    @Override
    public int compareTo(INetworkElement o) {
        if (o instanceof IPartNetworkElement) {
            IPartNetworkElement p = (IPartNetworkElement) o;
            int compClass = this.getPart().getUniqueName().compareTo(p.getPart().getUniqueName());
            if (compClass == 0) {
                // If this or the other part is not loaded, we IGNORE the priority,
                // because that depends on tile entity data, which requires loading the part/chunk.
                int compPriority = !isLoaded() || !p.isLoaded() ? 0 : -Integer.compare(this.getPriority(), p.getPriority());
                if (compPriority == 0) {
                    int compPart = getPart().getTranslationKey().compareTo(p.getPart().getTranslationKey());
                    if (compPart == 0) {
                        int compPos = this.center.getPos().compareTo(p.getPosition());
                        if (compPos == 0) {
                            return this.center.getSide().compareTo(p.getSide());
                        }
                        return compPos;
                    }
                    return compPart;
                } else {
                    return compPriority;
                }
            } else {
                return compClass;
            }
        }

        return this.getClass().getName().compareTo(o.getClass().getName());
    }

    @Override
    public DimPos getPosition() {
        return this.center.getPos();
    }

    @Override
    public Direction getSide() {
        return this.center.getSide();
    }

    @Override
    public int getId() {
        if (!hasPartState()) {
            return -1;
        }
        return getPartState().getId();
    }

    @Override
    public ResourceLocation getGroup() {
        return IPartNetworkElement.GROUP;
    }
}

1	package org.cyclops.integrateddynamics.core.network;
2
3	import net.minecraft.core.Direction;
4	import net.minecraft.resources.ResourceLocation;
5	import net.minecraft.world.item.ItemStack;
6	import net.minecraft.world.level.BlockGetter;
7	import net.minecraft.world.level.block.entity.BlockEntity;
8	import net.minecraft.world.level.block.state.BlockState;
9	import org.cyclops.cyclopscore.datastructure.DimPos;
10	import org.cyclops.integrateddynamics.api.PartStateException;
11	import org.cyclops.integrateddynamics.api.network.*;
12	import org.cyclops.integrateddynamics.api.part.*;
13	import org.cyclops.integrateddynamics.core.helper.NetworkHelpers;
14	import org.cyclops.integrateddynamics.core.helper.PartHelpers;
15
16	import javax.annotation.Nullable;
17	import java.util.List;
18	import java.util.Objects;
19	import java.util.Optional;
20
21	/**
22	* A network element for parts.
23	* @author rubensworks
24	*/
25	public class PartNetworkElement<P extends IPartType<P, S>, S extends IPartState<P>> extends NetworkElementBase
26	implements IPartNetworkElement<P, S>, IEnergyConsumingNetworkElement {
27
28	private final P part;
29	private final PartPos center;
30
31	private S tempState = null;	3✔
32
33	public PartNetworkElement(P part, PartPos center) {	2✔
34	this.part = part;	3✔
35	this.center = center;	3✔
36	}	1✔
37
38	protected static DimPos getCenterPos(PartTarget target) {
39	return target.getCenter().getPos();	×
40	}
41
42	protected static Direction getCenterSide(PartTarget target) {
43	return target.getCenter().getSide();	×
44	}
45
46	protected static DimPos getTargetPos(PartTarget target) {
47	return target.getTarget().getPos();	×
48	}
49
50	protected static Direction getTargetSide(PartTarget target) {
51	return target.getTarget().getSide();	×
52	}
53
54	@Override
55	public P getPart() {
56	return part;	3✔
57	}
58
59	@Override
60	public PartTarget getTarget() {
61	return getPart().getTarget(this.center, getPartState());	8✔
62	}
63
64	public PartTarget getTarget(S partState) {
65	return getPart().getTarget(this.center, partState);	7✔
66	}
67
68	public S getTempState() {
69	return tempState;	×
70	}
71
72	public void setTempState(S tempState) {
73	this.tempState = tempState;	×
74	}	×
75
76	@Override
77	public IPartContainer getPartContainer() {
78	return PartHelpers.getPartContainerChecked(this.center.getPos(), this.center.getSide());	8✔
79	}
80
81	public IPartContainer getPartContainer(@Nullable BlockState blockState, @Nullable BlockEntity blockEntity) {
82	return PartHelpers.getPartContainerChecked(this.center.getPos(), this.center.getSide(), blockState, blockEntity);	10✔
83	}
84
85	public Optional<IPartContainer> getPartContainerOptional() {
86	return PartHelpers.getPartContainer(this.center.getPos(), this.center.getSide());	8✔
87	}
88
89	@Override
90	public void setPriorityAndChannel(INetwork network, int priority, int channel) {
91	//noinspection deprecation
92	part.setPriorityAndChannel(network, NetworkHelpers.getPartNetworkChecked(network), getTarget(), getPartState(), priority, channel);	×
93	}	×
94
95	@Override
96	public int getPriority() {
97	return hasPartState() ? part.getPriority(getPartState()) : 0;	11✔
98	}
99
100	@Override
101	public int getChannel() {
102	return hasPartState() ? part.getChannel(getPartState()) : IPositionedAddonsNetwork.DEFAULT_CHANNEL;	×
103	}
104
105	@Override
106	public boolean canRevalidate(INetwork network) {
107	return canRevalidatePositioned(network, this.center.getPos());	7✔
108	}
109
110	@Override
111	public void revalidate(INetwork network) {
112	super.revalidate(network);	×
113	revalidatePositioned(network, this.center.getPos());	×
114	}	×
115
116	@Override
117	public boolean isLoaded() {
118	return this.center.getPos().isLoaded();	5✔
119	}
120
121	public boolean hasPartState() {
122	if (isLoaded()) {	3!
123	return getPartContainerOptional()	5✔
124	.map(partContainer -> partContainer.hasPart(this.center.getSide()))	9✔
125	.orElse(false);	4✔
126	}
127	return false;	×
128	}
129
130	@Override
131	public S getPartState() throws PartStateException {
132	IPartContainer partContainer = getPartContainer();	3✔
133	if(partContainer != null) {	2!
134	return (S) partContainer.getPartState(this.center.getSide());	6✔
135	} else {
136	throw new PartStateException(this.center.getPos(), this.center.getSide());	×
137	}
138	}
139
140	public S getPartState(@Nullable BlockState blockState, @Nullable BlockEntity blockEntity) throws PartStateException {
141	IPartContainer partContainer = getPartContainer(blockState, blockEntity);	5✔
142	if(partContainer != null) {	2!
143	return (S) partContainer.getPartState(this.center.getSide());	6✔
144	} else {
145	throw new PartStateException(this.center.getPos(), this.center.getSide());	×
146	}
147	}
148
149	@Override
150	public int getConsumptionRate() {
151	return getPart().getConsumptionRate(getPartState());	6✔
152	}
153
154	@Override
155	public void postUpdate(INetwork network, boolean updated) {
156	part.postUpdate(network, NetworkHelpers.getPartNetworkChecked(network), getTarget(), getPartState(), updated);	11✔
157	}	1✔
158
159	@Override
160	public int getUpdateInterval() {
161	return part.getUpdateInterval(getPartState());	6✔
162	}
163
164	@Override
165	public boolean isUpdate() {
166	return part.isUpdate(getPartState());	6✔
167	}
168
169	@Override
170	public void update(INetwork network) {
171	part.update(network, NetworkHelpers.getPartNetworkChecked(network), getTarget(), getPartState());	10✔
172	}	1✔
173
174	@Override
175	public void beforeNetworkKill(INetwork network, @Nullable BlockState blockState, @Nullable BlockEntity blockEntity) {
176	S partState = getPartState(blockState, blockEntity);	5✔
177	part.beforeNetworkKill(network, NetworkHelpers.getPartNetworkChecked(network), getTarget(partState), partState);	10✔
178	}	1✔
179
180	@Override
181	public void afterNetworkAlive(INetwork network) {
182	part.afterNetworkAlive(network, NetworkHelpers.getPartNetworkChecked(network), getTarget(), getPartState());	10✔
183	}	1✔
184
185	@Override
186	public void afterNetworkReAlive(INetwork network) {
187	part.afterNetworkReAlive(network, NetworkHelpers.getPartNetworkChecked(network), getTarget(), getPartState());	10✔
188	}	1✔
189
190	@Override
191	public void addDrops(BlockState blockState, BlockEntity blockEntity, List<ItemStack> itemStacks, boolean dropMainElement, boolean saveState) {
192	S partState = getPartState(blockState, blockEntity);	5✔
193	part.addDrops(getTarget(partState), partState, itemStacks, dropMainElement, saveState);	10✔
194	}	1✔
195
196	@Override
197	public boolean onNetworkAddition(INetwork network) {
198	IPartNetwork partNetwork = NetworkHelpers.getPartNetworkChecked(network);	3✔
199	boolean res = partNetwork.addPart(getPartState().getId(), this.center);	8✔
200	if(res) {	2!
201	part.onNetworkAddition(network, partNetwork, getTarget(), getPartState());	9✔
202	}
203	return res;	2✔
204	}
205
206	@Override
207	public void onNetworkRemoval(INetwork network, BlockState blockState, BlockEntity blockEntity) {
208	IPartNetwork partNetwork = NetworkHelpers.getPartNetworkChecked(network);	3✔
209	S partState = getPartState(blockState, blockEntity);	5✔
210	partNetwork.removePart(partState.getId());	4✔
211	part.onNetworkRemoval(network, partNetwork, getTarget(partState), partState);	9✔
212	}	1✔
213
214	@Override
215	public void onPreRemoved(INetwork network) {
216	part.onPreRemoved(network, NetworkHelpers.getPartNetworkChecked(network), getTarget(), (tempState = getPartState()));	13✔
217	}	1✔
218
219	@Override
220	public void onPostRemoved(INetwork network) {
221	part.onPostRemoved(network, NetworkHelpers.getPartNetworkChecked(network), getTarget(tempState), Objects.requireNonNull(tempState));	14✔
222	tempState = null;	3✔
223	}	1✔
224
225	@Override
226	public void onNeighborBlockChange(@Nullable INetwork network, BlockGetter world) {
227	part.onBlockNeighborChange(network, NetworkHelpers.getPartNetworkChecked(network), getTarget(), getPartState(), world, null);	×
228	}	×
229
230	@Override
231	public void onNeighborBlockChange(@Nullable INetwork network, BlockGetter world, @Nullable Direction side) {
232	part.onBlockNeighborChange(network, NetworkHelpers.getPartNetworkChecked(network), getTarget(), getPartState(), world, side);	12✔
233	}	1✔
234
235	@Override
236	public Optional<P> getNetworkEventListener() {
237	return Optional.of(getPart());	4✔
238	}
239
240	public boolean equals(Object o) {
241	return o instanceof IPartNetworkElement && compareTo((INetworkElement) o) == 0;	11!
242	}
243
244	@Override
245	public int hashCode() {
246	int result = part.hashCode();	4✔
247	result = 31 * result + this.center.hashCode();	8✔
248	return result;	2✔
249	}
250
251	@Override
252	public int compareTo(INetworkElement o) {
253	if (o instanceof IPartNetworkElement) {	3✔
254	IPartNetworkElement p = (IPartNetworkElement) o;	3✔
255	int compClass = this.getPart().getUniqueName().compareTo(p.getPart().getUniqueName());	8✔
256	if (compClass == 0) {	2✔
257	// If this or the other part is not loaded, we IGNORE the priority,
258	// because that depends on tile entity data, which requires loading the part/chunk.
259	int compPriority = !isLoaded() \|\| !p.isLoaded() ? 0 : -Integer.compare(this.getPriority(), p.getPriority());	15!
260	if (compPriority == 0) {	2!
261	int compPart = getPart().getTranslationKey().compareTo(p.getPart().getTranslationKey());	8✔
262	if (compPart == 0) {	2!
263	int compPos = this.center.getPos().compareTo(p.getPosition());	7✔
264	if (compPos == 0) {	2✔
265	return this.center.getSide().compareTo(p.getSide());	7✔
266	}
267	return compPos;	2✔
268	}
269	return compPart;	×
270	} else {
271	return compPriority;	×
272	}
273	} else {
274	return compClass;	2✔
275	}
276	}
277
278	return this.getClass().getName().compareTo(o.getClass().getName());	8✔
279	}
280
281	@Override
282	public DimPos getPosition() {
283	return this.center.getPos();	4✔
284	}
285
286	@Override
287	public Direction getSide() {
288	return this.center.getSide();	4✔
289	}
290
291	@Override
292	public int getId() {
293	if (!hasPartState()) {	×
294	return -1;	×
295	}
296	return getPartState().getId();	×
297	}
298
299	@Override
300	public ResourceLocation getGroup() {
301	return IPartNetworkElement.GROUP;	×
302	}
303	}

CyclopsMC / IntegratedDynamics / 18595223322

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