#479011716

Committed 10 Oct 2023 02:56PM UTC coverage: 25.089% (-0.009%) from 25.098%

Build # #479011716

Build Type

push

github-actions

Committed by

rubensworks

Commit Message

Bump mod version

Run Details

706 of 2814 relevant lines covered (25.09%)

0.25 hits per line

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

0.0

/src/main/java/org/cyclops/integratedcrafting/core/PendingCraftingJobResultIndexObserver.java

package org.cyclops.integratedcrafting.core;

import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
import it.unimi.dsi.fastutil.objects.ObjectIterator;
import org.cyclops.commoncapabilities.api.ingredient.IIngredientMatcher;
import org.cyclops.commoncapabilities.api.ingredient.IPrototypedIngredient;
import org.cyclops.commoncapabilities.api.ingredient.IngredientComponent;
import org.cyclops.commoncapabilities.api.ingredient.PrototypedIngredient;
import org.cyclops.commoncapabilities.api.ingredient.storage.IIngredientComponentStorage;
import org.cyclops.cyclopscore.ingredient.collection.IIngredientCollection;
import org.cyclops.cyclopscore.ingredient.collection.IngredientCollectionPrototypeMap;
import org.cyclops.cyclopscore.ingredient.storage.IngredientComponentStorageCollectionWrapper;
import org.cyclops.integratedcrafting.api.crafting.CraftingJob;
import org.cyclops.integratedcrafting.api.network.ICraftingNetwork;
import org.cyclops.integrateddynamics.api.ingredient.IIngredientComponentStorageObservable;
import org.cyclops.integrateddynamics.api.network.IPositionedAddonsNetwork;

import java.util.Iterator;
import java.util.List;
import java.util.ListIterator;
import java.util.Map;

/**
 * An ingredient index observer that tracks crafting job outputs for a certain ingredient component type.
 *
 * It will observe changes and (partially) resolve awaiting crafting job outputs when applicable.
 *
 * @author rubensworks
 */
public class PendingCraftingJobResultIndexObserver<T, M>
        implements IIngredientComponentStorageObservable.IIndexChangeObserver<T, M> {

    private final IngredientComponent<T, M> ingredientComponent;
    private final CraftingJobHandler handler;
    private final ICraftingNetwork craftingNetwork;

    public PendingCraftingJobResultIndexObserver(IngredientComponent<T, M> ingredientComponent, CraftingJobHandler handler, ICraftingNetwork craftingNetwork) {
        this.ingredientComponent = ingredientComponent;
        this.handler = handler;
        this.craftingNetwork = craftingNetwork;
    }

    @Override
    public void onChange(IIngredientComponentStorageObservable.StorageChangeEvent<T, M> event) {
        if (event.getChangeType() == IIngredientComponentStorageObservable.Change.ADDITION
                // If we're still initializing the network, skip addition events.
                // Otherwise, we could incorrectly mark running crafting jobs as finished.
                && !event.isInitialChange()) {
            IIngredientCollection<T, M> addedIngredients = event.getInstances();
            IIngredientComponentStorage<T, M> ingredientsHayStack = null; // A mutable copy of addedIngredients (lazily created)
            IIngredientMatcher<T, M> matcher = ingredientComponent.getMatcher();

            Int2ObjectMap<List<Map<IngredientComponent<?, ?>, List<IPrototypedIngredient<?, ?>>>>> processingJobs = handler.getProcessingCraftingJobsPendingIngredients();
            ObjectIterator<Int2ObjectMap.Entry<List<Map<IngredientComponent<?, ?>, List<IPrototypedIngredient<?, ?>>>>>> jobsEntryIt = processingJobs.int2ObjectEntrySet().iterator();
            while (jobsEntryIt.hasNext()) {
                Int2ObjectMap.Entry<List<Map<IngredientComponent<?, ?>, List<IPrototypedIngredient<?, ?>>>>> jobsEntry = jobsEntryIt.next();
                int craftingJobId = jobsEntry.getIntKey();
                // Only check jobs that have a matching channel with the event
                CraftingJob craftingJob = handler.getAllCraftingJobs().get(jobsEntry.getIntKey());
                if (craftingJob != null
                        && (craftingJob.getChannel() == IPositionedAddonsNetwork.WILDCARD_CHANNEL || craftingJob.getChannel() == event.getChannel())) {
                    Iterator<Map<IngredientComponent<?, ?>, List<IPrototypedIngredient<?, ?>>>> jobEntryIt = jobsEntry.getValue().iterator();
                    while (jobEntryIt.hasNext()) {
                        Map<IngredientComponent<?, ?>, List<IPrototypedIngredient<?, ?>>> jobEntry = jobEntryIt.next();
                        List<IPrototypedIngredient<?, ?>> pendingIngredientsUnsafe = jobEntry.get(ingredientComponent);
                        if (pendingIngredientsUnsafe != null) {
                            // Remove pending ingredients that were added in the event
                            List<IPrototypedIngredient<T, M>> pendingIngredients = (List<IPrototypedIngredient<T, M>>) (Object) pendingIngredientsUnsafe;

                            // Iterate over all pending ingredients for this ingredient component
                            ListIterator<IPrototypedIngredient<T, M>> it = pendingIngredients.listIterator();
                            while (it.hasNext()) {
                                IPrototypedIngredient<T, M> prototypedIngredient = it.next();
                                final long initialQuantity = matcher.getQuantity(prototypedIngredient.getPrototype());
                                long remainingQuantity = initialQuantity;

                                // Lazily create ingredientsHayStack only when needed,
                                // because we need to copy all ingredients from addedIngredients,
                                // which can get expensive
                                // We need to make a copy because multiple crafting jobs can have the same pending instances,
                                // so each instance may only be consumed by a single crafting job.
                                if (ingredientsHayStack == null) {
                                    if (addedIngredients.contains(prototypedIngredient.getPrototype(),
                                            prototypedIngredient.getCondition())) {
                                        IngredientCollectionPrototypeMap<T, M> prototypeMap = new IngredientCollectionPrototypeMap<>(ingredientComponent);
                                        ingredientsHayStack = new IngredientComponentStorageCollectionWrapper<>(prototypeMap);
                                        prototypeMap.addAll(addedIngredients);
                                    } else {
                                        continue;
                                    }
                                }

                                // Iteratively extract the pending ingredient from the hay stack.
                                T extracted;
                                do {
                                    extracted = ingredientsHayStack.extract(prototypedIngredient.getPrototype(),
                                            prototypedIngredient.getCondition(), false);

                                    if (matcher.isEmpty(extracted)) {
                                        // Quickly break when no matches are available anymore
                                        break;
                                    }

                                    remainingQuantity -= matcher.getQuantity(extracted);
                                } while (!matcher.isEmpty(extracted) && remainingQuantity > 0);

                                // Update the list if the prototype has changed.
                                if (remainingQuantity <= 0) {
                                    it.remove();
                                } else if (initialQuantity != remainingQuantity) {
                                    it.set(new PrototypedIngredient<>(ingredientComponent,
                                            matcher.withQuantity(prototypedIngredient.getPrototype(), remainingQuantity),
                                            prototypedIngredient.getCondition()));
                                }
                            }

                            // If no prototypes for this component type for this crafting job for this job entry are pending.
                            if (pendingIngredients.isEmpty()) {
                                // Remove observer (in next tick) when all pending ingredients are resolved
                                handler.getObserversPendingDeletion().add(ingredientComponent);

                                // Remove crafting job if needed.
                                // No ingredients of this ingredient component type are pending
                                jobEntry.remove(ingredientComponent);
                                if (jobEntry.isEmpty()) {
                                    // No ingredients are pending for this non-blocking-mode-entry are pending
                                    handler.onCraftingJobEntryFinished(this.craftingNetwork, craftingJobId);
                                    jobEntryIt.remove();
                                }
                                if (jobsEntry.getValue().isEmpty()) {
                                    // No more entries for this crafting job are pending
                                    handler.onCraftingJobFinished(handler.getAllCraftingJobs().get(craftingJobId));
                                    handler.getProcessingCraftingJobsRaw().remove(craftingJobId);
                                    jobsEntryIt.remove();
                                }
                            }
                        }
                    }
                }
            }
        }
    }


}

1	package org.cyclops.integratedcrafting.core;
2
3	import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
4	import it.unimi.dsi.fastutil.objects.ObjectIterator;
5	import org.cyclops.commoncapabilities.api.ingredient.IIngredientMatcher;
6	import org.cyclops.commoncapabilities.api.ingredient.IPrototypedIngredient;
7	import org.cyclops.commoncapabilities.api.ingredient.IngredientComponent;
8	import org.cyclops.commoncapabilities.api.ingredient.PrototypedIngredient;
9	import org.cyclops.commoncapabilities.api.ingredient.storage.IIngredientComponentStorage;
10	import org.cyclops.cyclopscore.ingredient.collection.IIngredientCollection;
11	import org.cyclops.cyclopscore.ingredient.collection.IngredientCollectionPrototypeMap;
12	import org.cyclops.cyclopscore.ingredient.storage.IngredientComponentStorageCollectionWrapper;
13	import org.cyclops.integratedcrafting.api.crafting.CraftingJob;
14	import org.cyclops.integratedcrafting.api.network.ICraftingNetwork;
15	import org.cyclops.integrateddynamics.api.ingredient.IIngredientComponentStorageObservable;
16	import org.cyclops.integrateddynamics.api.network.IPositionedAddonsNetwork;
17
18	import java.util.Iterator;
19	import java.util.List;
20	import java.util.ListIterator;
21	import java.util.Map;
22
23	/**
24	* An ingredient index observer that tracks crafting job outputs for a certain ingredient component type.
25	*
26	* It will observe changes and (partially) resolve awaiting crafting job outputs when applicable.
27	*
28	* @author rubensworks
29	*/
30	public class PendingCraftingJobResultIndexObserver<T, M>
31	implements IIngredientComponentStorageObservable.IIndexChangeObserver<T, M> {
32
33	private final IngredientComponent<T, M> ingredientComponent;
34	private final CraftingJobHandler handler;
35	private final ICraftingNetwork craftingNetwork;
36
37	public PendingCraftingJobResultIndexObserver(IngredientComponent<T, M> ingredientComponent, CraftingJobHandler handler, ICraftingNetwork craftingNetwork) {	×
38	this.ingredientComponent = ingredientComponent;	×
39	this.handler = handler;	×
40	this.craftingNetwork = craftingNetwork;	×
41	}	×
42
43	@Override
44	public void onChange(IIngredientComponentStorageObservable.StorageChangeEvent<T, M> event) {
45	if (event.getChangeType() == IIngredientComponentStorageObservable.Change.ADDITION	×
46	// If we're still initializing the network, skip addition events.
47	// Otherwise, we could incorrectly mark running crafting jobs as finished.
48	&& !event.isInitialChange()) {	×
49	IIngredientCollection<T, M> addedIngredients = event.getInstances();	×
50	IIngredientComponentStorage<T, M> ingredientsHayStack = null; // A mutable copy of addedIngredients (lazily created)	×
51	IIngredientMatcher<T, M> matcher = ingredientComponent.getMatcher();	×
52
53	Int2ObjectMap<List<Map<IngredientComponent<?, ?>, List<IPrototypedIngredient<?, ?>>>>> processingJobs = handler.getProcessingCraftingJobsPendingIngredients();	×
54	ObjectIterator<Int2ObjectMap.Entry<List<Map<IngredientComponent<?, ?>, List<IPrototypedIngredient<?, ?>>>>>> jobsEntryIt = processingJobs.int2ObjectEntrySet().iterator();	×
55	while (jobsEntryIt.hasNext()) {	×
56	Int2ObjectMap.Entry<List<Map<IngredientComponent<?, ?>, List<IPrototypedIngredient<?, ?>>>>> jobsEntry = jobsEntryIt.next();	×
57	int craftingJobId = jobsEntry.getIntKey();	×
58	// Only check jobs that have a matching channel with the event
59	CraftingJob craftingJob = handler.getAllCraftingJobs().get(jobsEntry.getIntKey());	×
60	if (craftingJob != null	×
61	&& (craftingJob.getChannel() == IPositionedAddonsNetwork.WILDCARD_CHANNEL \|\| craftingJob.getChannel() == event.getChannel())) {	×
62	Iterator<Map<IngredientComponent<?, ?>, List<IPrototypedIngredient<?, ?>>>> jobEntryIt = jobsEntry.getValue().iterator();	×
63	while (jobEntryIt.hasNext()) {	×
64	Map<IngredientComponent<?, ?>, List<IPrototypedIngredient<?, ?>>> jobEntry = jobEntryIt.next();	×
65	List<IPrototypedIngredient<?, ?>> pendingIngredientsUnsafe = jobEntry.get(ingredientComponent);	×
66	if (pendingIngredientsUnsafe != null) {	×
67	// Remove pending ingredients that were added in the event
68	List<IPrototypedIngredient<T, M>> pendingIngredients = (List<IPrototypedIngredient<T, M>>) (Object) pendingIngredientsUnsafe;	×
69
70	// Iterate over all pending ingredients for this ingredient component
71	ListIterator<IPrototypedIngredient<T, M>> it = pendingIngredients.listIterator();	×
72	while (it.hasNext()) {	×
73	IPrototypedIngredient<T, M> prototypedIngredient = it.next();	×
74	final long initialQuantity = matcher.getQuantity(prototypedIngredient.getPrototype());	×
75	long remainingQuantity = initialQuantity;	×
76
77	// Lazily create ingredientsHayStack only when needed,
78	// because we need to copy all ingredients from addedIngredients,
79	// which can get expensive
80	// We need to make a copy because multiple crafting jobs can have the same pending instances,
81	// so each instance may only be consumed by a single crafting job.
82	if (ingredientsHayStack == null) {	×
83	if (addedIngredients.contains(prototypedIngredient.getPrototype(),	×
84	prototypedIngredient.getCondition())) {	×
85	IngredientCollectionPrototypeMap<T, M> prototypeMap = new IngredientCollectionPrototypeMap<>(ingredientComponent);	×
86	ingredientsHayStack = new IngredientComponentStorageCollectionWrapper<>(prototypeMap);	×
87	prototypeMap.addAll(addedIngredients);	×
88	} else {
89	continue;
90	}
91	}
92
93	// Iteratively extract the pending ingredient from the hay stack.
94	T extracted;
95	do {
96	extracted = ingredientsHayStack.extract(prototypedIngredient.getPrototype(),	×
97	prototypedIngredient.getCondition(), false);	×
98
99	if (matcher.isEmpty(extracted)) {	×
100	// Quickly break when no matches are available anymore
101	break;	×
102	}
103
104	remainingQuantity -= matcher.getQuantity(extracted);	×
105	} while (!matcher.isEmpty(extracted) && remainingQuantity > 0);	×
106
107	// Update the list if the prototype has changed.
108	if (remainingQuantity <= 0) {	×
109	it.remove();	×
110	} else if (initialQuantity != remainingQuantity) {	×
111	it.set(new PrototypedIngredient<>(ingredientComponent,	×
112	matcher.withQuantity(prototypedIngredient.getPrototype(), remainingQuantity),	×
113	prototypedIngredient.getCondition()));	×
114	}
115	}	×
116
117	// If no prototypes for this component type for this crafting job for this job entry are pending.
118	if (pendingIngredients.isEmpty()) {	×
119	// Remove observer (in next tick) when all pending ingredients are resolved
120	handler.getObserversPendingDeletion().add(ingredientComponent);	×
121
122	// Remove crafting job if needed.
123	// No ingredients of this ingredient component type are pending
124	jobEntry.remove(ingredientComponent);	×
125	if (jobEntry.isEmpty()) {	×
126	// No ingredients are pending for this non-blocking-mode-entry are pending
127	handler.onCraftingJobEntryFinished(this.craftingNetwork, craftingJobId);	×
128	jobEntryIt.remove();	×
129	}
130	if (jobsEntry.getValue().isEmpty()) {	×
131	// No more entries for this crafting job are pending
132	handler.onCraftingJobFinished(handler.getAllCraftingJobs().get(craftingJobId));	×
133	handler.getProcessingCraftingJobsRaw().remove(craftingJobId);	×
134	jobsEntryIt.remove();	×
135	}
136	}
137	}
138	}	×
139	}
140	}	×
141	}
142	}	×
143
144
145	}

CyclopsMC / IntegratedCrafting / #479011716

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