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

40.74

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

package org.cyclops.integrateddynamics.core.network;

import lombok.Data;
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.core.helper.NetworkHelpers;

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

/**
 * Base implementation for a network element.
 * @author rubensworks
 */
@Data
public abstract class NetworkElementBase implements INetworkElement {

    @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 afterNetworkReAlive(INetwork network) {

    }

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

    }

    @Override
    public boolean onNetworkAddition(INetwork network) {
        return true;
    }

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

    }

    @Override
    public void onPreRemoved(INetwork network) {

    }

    @Override
    public void onPostRemoved(INetwork network) {

    }

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

    }

    @Override
    public void invalidate(INetwork network) {
        network.invalidateElement(this);
    }

    @Override
    public void revalidate(INetwork network) {
        network.revalidateElement(this);
    }

    protected boolean canRevalidatePositioned(INetwork network, DimPos dimPos) {
        return dimPos.isLoaded();
    }

    protected void revalidatePositioned(INetwork network, DimPos dimPos) {
        NetworkHelpers.getNetworkCarrier(dimPos.getLevel(true), dimPos.getBlockPos(), null)
                .ifPresent(networkCarrier -> networkCarrier.setNetwork(network));
    }
}

1	package org.cyclops.integrateddynamics.core.network;
2
3	import lombok.Data;
4	import net.minecraft.world.item.ItemStack;
5	import net.minecraft.world.level.BlockGetter;
6	import net.minecraft.world.level.block.entity.BlockEntity;
7	import net.minecraft.world.level.block.state.BlockState;
8	import org.cyclops.cyclopscore.datastructure.DimPos;
9	import org.cyclops.integrateddynamics.api.network.INetwork;
10	import org.cyclops.integrateddynamics.api.network.INetworkElement;
11	import org.cyclops.integrateddynamics.core.helper.NetworkHelpers;
12
13	import javax.annotation.Nullable;
14	import java.util.List;
15
16	/**
17	* Base implementation for a network element.
18	* @author rubensworks
19	*/
20	@Data	3!
21	public abstract class NetworkElementBase implements INetworkElement {
22
23	@Override
24	public int getUpdateInterval() {
25	return 0;	×
26	}
27
28	@Override
29	public boolean isUpdate() {
30	return false;	2✔
31	}
32
33	@Override
34	public void update(INetwork network) {
35
36	}	×
37
38	@Override
39	public void beforeNetworkKill(INetwork network, @Nullable BlockState blockState, @Nullable BlockEntity blockEntity) {
40
41	}	1✔
42
43	@Override
44	public void afterNetworkAlive(INetwork network) {
45
46	}	1✔
47
48	@Override
49	public void afterNetworkReAlive(INetwork network) {
50
51	}	1✔
52
53	@Override
54	public void addDrops(BlockState blockState, BlockEntity blockEntity, List<ItemStack> itemStacks, boolean dropMainElement, boolean saveState) {
55
56	}	1✔
57
58	@Override
59	public boolean onNetworkAddition(INetwork network) {
60	return true;	2✔
61	}
62
63	@Override
64	public void onNetworkRemoval(INetwork network, BlockState blockState, BlockEntity blockEntity) {
65
66	}	1✔
67
68	@Override
69	public void onPreRemoved(INetwork network) {
70
71	}	×
72
73	@Override
74	public void onPostRemoved(INetwork network) {
75
76	}	×
77
78	@Override
79	public void onNeighborBlockChange(@Nullable INetwork network, BlockGetter world) {
80
81	}	×
82
83	@Override
84	public void invalidate(INetwork network) {
85	network.invalidateElement(this);	3✔
86	}	1✔
87
88	@Override
89	public void revalidate(INetwork network) {
90	network.revalidateElement(this);	×
91	}	×
92
93	protected boolean canRevalidatePositioned(INetwork network, DimPos dimPos) {
94	return dimPos.isLoaded();	3✔
95	}
96
97	protected void revalidatePositioned(INetwork network, DimPos dimPos) {
98	NetworkHelpers.getNetworkCarrier(dimPos.getLevel(true), dimPos.getBlockPos(), null)	×
99	.ifPresent(networkCarrier -> networkCarrier.setNetwork(network));	×
100	}	×
101	}

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