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

47.92

/src/main/java/org/cyclops/integrateddynamics/network/EnergyBatteryNetworkElement.java

package org.cyclops.integrateddynamics.network;

import lombok.Data;
import lombok.EqualsAndHashCode;
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.network.INetwork;
import org.cyclops.integrateddynamics.api.network.INetworkElement;
import org.cyclops.integrateddynamics.api.network.IPositionedAddonsNetwork;
import org.cyclops.integrateddynamics.api.part.PartPos;
import org.cyclops.integrateddynamics.core.helper.NetworkHelpers;
import org.cyclops.integrateddynamics.core.network.NetworkElementBase;

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

/**
 * Network element for variable stores.
 * @author rubensworks
 */
@EqualsAndHashCode(callSuper = false)
@Data
public class EnergyBatteryNetworkElement extends NetworkElementBase {

    private final DimPos pos;

    @Override
    public int getUpdateInterval() {
        return 0;
    }

    @Override
    public boolean isUpdate() {
        return false;
    }

    @Override
    public void update(INetwork network) {

    }

    @Override
    public void beforeNetworkKill(INetwork network, @Nullable BlockState blockState, @Nullable BlockEntity blockEntity) {

    }

    @Override
    public void afterNetworkAlive(INetwork network) {

    }

    @Override
    public void addDrops(BlockState blockState, BlockEntity blockEntity, List<ItemStack> itemStacks, boolean dropMainElement, boolean saveState) {

    }

    @Override
    public boolean onNetworkAddition(INetwork network) {
        PartPos pos = PartPos.of(getPos(), null);
        boolean added = NetworkHelpers.getEnergyNetworkChecked(network).addPosition(pos, 0, IPositionedAddonsNetwork.DEFAULT_CHANNEL);
        scheduleNetworkObservation(network, pos);
        return added;
    }

    @Override
    public void onNetworkRemoval(INetwork network, BlockState blockState, BlockEntity blockEntity) {
        PartPos pos = PartPos.of(getPos(), null);
        scheduleNetworkObservation(network, pos);
        NetworkHelpers.getEnergyNetworkChecked(network).removePosition(pos);
    }

    protected void scheduleNetworkObservation(INetwork network, PartPos pos) {
        NetworkHelpers.getEnergyNetwork(network)
                .ifPresent(energyNetwork -> energyNetwork.scheduleObservationForced(IPositionedAddonsNetwork.DEFAULT_CHANNEL, pos));
    }

    @Override
    public void onPreRemoved(INetwork network) {

    }

    @Override
    public void onNeighborBlockChange(@Nullable INetwork network, BlockGetter world) {

    }

    @Override
    public void setPriorityAndChannel(INetwork network, int priority, int channel) {

    }

    @Override
    public int getPriority() {
        return 0;
    }

    @Override
    public int getChannel() {
        return IPositionedAddonsNetwork.DEFAULT_CHANNEL;
    }

    @Override
    public boolean canRevalidate(INetwork network) {
        return canRevalidatePositioned(network, pos);
    }

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

    @Override
    public int compareTo(INetworkElement o) {
        if(o instanceof EnergyBatteryNetworkElement) {
            return getPos().compareTo(((EnergyBatteryNetworkElement) o).getPos());
        }
        return this.getClass().getCanonicalName().compareTo(o.getClass().getCanonicalName());
    }

}

1	package org.cyclops.integrateddynamics.network;
2
3	import lombok.Data;
4	import lombok.EqualsAndHashCode;
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.network.INetwork;
11	import org.cyclops.integrateddynamics.api.network.INetworkElement;
12	import org.cyclops.integrateddynamics.api.network.IPositionedAddonsNetwork;
13	import org.cyclops.integrateddynamics.api.part.PartPos;
14	import org.cyclops.integrateddynamics.core.helper.NetworkHelpers;
15	import org.cyclops.integrateddynamics.core.network.NetworkElementBase;
16
17	import javax.annotation.Nullable;
18	import java.util.List;
19
20	/**
21	* Network element for variable stores.
22	* @author rubensworks
23	*/
24	@EqualsAndHashCode(callSuper = false)	×
25	@Data	6✔
26	public class EnergyBatteryNetworkElement extends NetworkElementBase {
27
28	private final DimPos pos;	3✔
29
30	@Override
31	public int getUpdateInterval() {
32	return 0;	×
33	}
34
35	@Override
36	public boolean isUpdate() {
37	return false;	2✔
38	}
39
40	@Override
41	public void update(INetwork network) {
42
43	}	×
44
45	@Override
46	public void beforeNetworkKill(INetwork network, @Nullable BlockState blockState, @Nullable BlockEntity blockEntity) {
47
48	}	1✔
49
50	@Override
51	public void afterNetworkAlive(INetwork network) {
52
53	}	1✔
54
55	@Override
56	public void addDrops(BlockState blockState, BlockEntity blockEntity, List<ItemStack> itemStacks, boolean dropMainElement, boolean saveState) {
57
58	}	1✔
59
60	@Override
61	public boolean onNetworkAddition(INetwork network) {
62	PartPos pos = PartPos.of(getPos(), null);	5✔
63	boolean added = NetworkHelpers.getEnergyNetworkChecked(network).addPosition(pos, 0, IPositionedAddonsNetwork.DEFAULT_CHANNEL);	7✔
64	scheduleNetworkObservation(network, pos);	4✔
65	return added;	2✔
66	}
67
68	@Override
69	public void onNetworkRemoval(INetwork network, BlockState blockState, BlockEntity blockEntity) {
70	PartPos pos = PartPos.of(getPos(), null);	5✔
71	scheduleNetworkObservation(network, pos);	4✔
72	NetworkHelpers.getEnergyNetworkChecked(network).removePosition(pos);	4✔
73	}	1✔
74
75	protected void scheduleNetworkObservation(INetwork network, PartPos pos) {
76	NetworkHelpers.getEnergyNetwork(network)	4✔
77	.ifPresent(energyNetwork -> energyNetwork.scheduleObservationForced(IPositionedAddonsNetwork.DEFAULT_CHANNEL, pos));	6✔
78	}	1✔
79
80	@Override
81	public void onPreRemoved(INetwork network) {
82
83	}	×
84
85	@Override
86	public void onNeighborBlockChange(@Nullable INetwork network, BlockGetter world) {
87
88	}	×
89
90	@Override
91	public void setPriorityAndChannel(INetwork network, int priority, int channel) {
92
93	}	×
94
95	@Override
96	public int getPriority() {
97	return 0;	×
98	}
99
100	@Override
101	public int getChannel() {
102	return IPositionedAddonsNetwork.DEFAULT_CHANNEL;	×
103	}
104
105	@Override
106	public boolean canRevalidate(INetwork network) {
107	return canRevalidatePositioned(network, pos);	6✔
108	}
109
110	@Override
111	public void revalidate(INetwork network) {
112	super.revalidate(network);	×
113	revalidatePositioned(network, pos);	×
114	}	×
115
116	@Override
117	public int compareTo(INetworkElement o) {
118	if(o instanceof EnergyBatteryNetworkElement) {	3✔
119	return getPos().compareTo(((EnergyBatteryNetworkElement) o).getPos());	7✔
120	}
121	return this.getClass().getCanonicalName().compareTo(o.getClass().getCanonicalName());	8✔
122	}
123
124	}

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