#479006705

Committed 21 Mar 2024 03:43PM UTC coverage: 39.629% (-0.3%) from 39.919%

Build # #479006705

Build Type

push

github

Committed by

rubensworks

Commit Message

Fix failing unit tests

Run Details

877 of 2213 relevant lines covered (39.63%)

0.4 hits per line

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

0.0

/src/main/java/org/cyclops/commoncapabilities/CommonCapabilities.java

package org.cyclops.commoncapabilities;

import net.neoforged.bus.api.EventPriority;
import net.neoforged.bus.api.IEventBus;
import net.neoforged.fml.common.Mod;
import net.neoforged.fml.event.lifecycle.FMLCommonSetupEvent;
import net.neoforged.fml.event.lifecycle.InterModEnqueueEvent;
import net.neoforged.neoforge.registries.NewRegistryEvent;
import net.neoforged.neoforge.registries.RegisterEvent;
import org.apache.logging.log4j.Level;
import org.cyclops.commoncapabilities.api.capability.recipehandler.IPrototypedIngredientAlternatives;
import org.cyclops.commoncapabilities.api.capability.recipehandler.PrototypedIngredientAlternativesItemStackTag;
import org.cyclops.commoncapabilities.api.capability.recipehandler.PrototypedIngredientAlternativesList;
import org.cyclops.commoncapabilities.api.ingredient.IngredientComponent;
import org.cyclops.commoncapabilities.modcompat.vanilla.VanillaModCompat;
import org.cyclops.commoncapabilities.proxy.ClientProxy;
import org.cyclops.commoncapabilities.proxy.CommonProxy;
import org.cyclops.cyclopscore.config.ConfigHandler;
import org.cyclops.cyclopscore.init.ModBaseVersionable;
import org.cyclops.cyclopscore.modcompat.ModCompatLoader;
import org.cyclops.cyclopscore.proxy.IClientProxy;
import org.cyclops.cyclopscore.proxy.ICommonProxy;

import java.util.Objects;

/**
 * The main mod class of this mod.
 * @author rubensworks (aka kroeserr)
 *
 */
@Mod(Reference.MOD_ID)
public class CommonCapabilities extends ModBaseVersionable<CommonCapabilities> {

    /**
     * The unique instance of this mod.
     */
    public static CommonCapabilities _instance;

    public CommonCapabilities(IEventBus modEventBus) {
        super(Reference.MOD_ID, (instance) -> _instance = instance, modEventBus);
        modEventBus.register(IngredientComponent.class);
        modEventBus.addListener(EventPriority.LOW, this::onRegister);
        modEventBus.addListener(EventPriority.LOW, this::onRegistriesLoad);
        modEventBus.addListener(EventPriority.LOW, this::afterCapabilitiesLoaded);
    }

    @Override
    protected void setup(FMLCommonSetupEvent event) {
        super.setup(event);
        Objects.requireNonNull(IngredientComponent.ITEMSTACK, "Item ingredient component is not initialized");
        Objects.requireNonNull(IngredientComponent.FLUIDSTACK, "Fluid ingredient component is not initialized");
        Objects.requireNonNull(IngredientComponent.ENERGY, "Energy ingredient component is not initialized");
    }

    @Override
    protected void loadModCompats(ModCompatLoader modCompatLoader) {
        super.loadModCompats(modCompatLoader);
        modCompatLoader.addModCompat(new VanillaModCompat());
        // TODO: temporarily disable some mod compats
        //modCompatLoader.addModCompat(new TConstructModCompat());
        //modCompatLoader.addModCompat(new ForestryModCompat());
        //modCompatLoader.addModCompat(new ThermalExpansionModCompat());
        //modCompatLoader.addModCompat(new EnderIOModCompat());
        //modCompatLoader.addModCompat(new Ic2ModCompat());
    }

    @Override
    protected IClientProxy constructClientProxy() {
        return new ClientProxy();
    }

    @Override
    protected ICommonProxy constructCommonProxy() {
        return new CommonProxy();
    }

    @Override
    protected boolean hasDefaultCreativeModeTab() {
        return false;
    }

    @Override
    protected void onConfigsRegister(ConfigHandler configHandler) {
        super.onConfigsRegister(configHandler);

        configHandler.addConfigurable(new GeneralConfig());
    }

    public void onRegister(NewRegistryEvent event) {
        IPrototypedIngredientAlternatives.SERIALIZERS.put(
                PrototypedIngredientAlternativesList.SERIALIZER.getId(),
                PrototypedIngredientAlternativesList.SERIALIZER);
        IPrototypedIngredientAlternatives.SERIALIZERS.put(
                PrototypedIngredientAlternativesItemStackTag.SERIALIZER.getId(),
                PrototypedIngredientAlternativesItemStackTag.SERIALIZER);
    }

    public void onRegistriesLoad(RegisterEvent event) {
        event.register(IngredientComponent.REGISTRY.key(), IngredientComponents.ITEMSTACK.getName(), () -> IngredientComponents.ITEMSTACK);
        event.register(IngredientComponent.REGISTRY.key(), IngredientComponents.FLUIDSTACK.getName(), () -> IngredientComponents.FLUIDSTACK);
        event.register(IngredientComponent.REGISTRY.key(), IngredientComponents.ENERGY.getName(), () -> IngredientComponents.ENERGY);
    }

    public void afterCapabilitiesLoaded(InterModEnqueueEvent event) {
        IngredientComponents.registerStorageWrapperHandlers();
    }

    /**
     * Log a new info message for this mod.
     * @param message The message to show.
     */
    public static void clog(String message) {
        clog(Level.INFO, message);
    }

    /**
     * Log a new message of the given level for this mod.
     * @param level The level in which the message must be shown.
     * @param message The message to show.
     */
    public static void clog(Level level, String message) {
        CommonCapabilities._instance.getLoggerHelper().log(level, message);
    }

}

1	package org.cyclops.commoncapabilities;
2
3	import net.neoforged.bus.api.EventPriority;
4	import net.neoforged.bus.api.IEventBus;
5	import net.neoforged.fml.common.Mod;
6	import net.neoforged.fml.event.lifecycle.FMLCommonSetupEvent;
7	import net.neoforged.fml.event.lifecycle.InterModEnqueueEvent;
8	import net.neoforged.neoforge.registries.NewRegistryEvent;
9	import net.neoforged.neoforge.registries.RegisterEvent;
10	import org.apache.logging.log4j.Level;
11	import org.cyclops.commoncapabilities.api.capability.recipehandler.IPrototypedIngredientAlternatives;
12	import org.cyclops.commoncapabilities.api.capability.recipehandler.PrototypedIngredientAlternativesItemStackTag;
13	import org.cyclops.commoncapabilities.api.capability.recipehandler.PrototypedIngredientAlternativesList;
14	import org.cyclops.commoncapabilities.api.ingredient.IngredientComponent;
15	import org.cyclops.commoncapabilities.modcompat.vanilla.VanillaModCompat;
16	import org.cyclops.commoncapabilities.proxy.ClientProxy;
17	import org.cyclops.commoncapabilities.proxy.CommonProxy;
18	import org.cyclops.cyclopscore.config.ConfigHandler;
19	import org.cyclops.cyclopscore.init.ModBaseVersionable;
20	import org.cyclops.cyclopscore.modcompat.ModCompatLoader;
21	import org.cyclops.cyclopscore.proxy.IClientProxy;
22	import org.cyclops.cyclopscore.proxy.ICommonProxy;
23
24	import java.util.Objects;
25
26	/**
27	* The main mod class of this mod.
28	* @author rubensworks (aka kroeserr)
29	*
30	*/
31	@Mod(Reference.MOD_ID)
32	public class CommonCapabilities extends ModBaseVersionable<CommonCapabilities> {
33
34	/**
35	* The unique instance of this mod.
36	*/
37	public static CommonCapabilities _instance;
38
39	public CommonCapabilities(IEventBus modEventBus) {
40	super(Reference.MOD_ID, (instance) -> _instance = instance, modEventBus);	×
41	modEventBus.register(IngredientComponent.class);	×
42	modEventBus.addListener(EventPriority.LOW, this::onRegister);	×
43	modEventBus.addListener(EventPriority.LOW, this::onRegistriesLoad);	×
44	modEventBus.addListener(EventPriority.LOW, this::afterCapabilitiesLoaded);	×
45	}	×
46
47	@Override
48	protected void setup(FMLCommonSetupEvent event) {
49	super.setup(event);	×
50	Objects.requireNonNull(IngredientComponent.ITEMSTACK, "Item ingredient component is not initialized");	×
51	Objects.requireNonNull(IngredientComponent.FLUIDSTACK, "Fluid ingredient component is not initialized");	×
52	Objects.requireNonNull(IngredientComponent.ENERGY, "Energy ingredient component is not initialized");	×
53	}	×
54
55	@Override
56	protected void loadModCompats(ModCompatLoader modCompatLoader) {
57	super.loadModCompats(modCompatLoader);	×
58	modCompatLoader.addModCompat(new VanillaModCompat());	×
59	// TODO: temporarily disable some mod compats
60	//modCompatLoader.addModCompat(new TConstructModCompat());
61	//modCompatLoader.addModCompat(new ForestryModCompat());
62	//modCompatLoader.addModCompat(new ThermalExpansionModCompat());
63	//modCompatLoader.addModCompat(new EnderIOModCompat());
64	//modCompatLoader.addModCompat(new Ic2ModCompat());
65	}	×
66
67	@Override
68	protected IClientProxy constructClientProxy() {
69	return new ClientProxy();	×
70	}
71
72	@Override
73	protected ICommonProxy constructCommonProxy() {
74	return new CommonProxy();	×
75	}
76
77	@Override
78	protected boolean hasDefaultCreativeModeTab() {
79	return false;	×
80	}
81
82	@Override
83	protected void onConfigsRegister(ConfigHandler configHandler) {
84	super.onConfigsRegister(configHandler);	×
85
86	configHandler.addConfigurable(new GeneralConfig());	×
87	}	×
88
89	public void onRegister(NewRegistryEvent event) {
90	IPrototypedIngredientAlternatives.SERIALIZERS.put(	×
91	PrototypedIngredientAlternativesList.SERIALIZER.getId(),	×
92	PrototypedIngredientAlternativesList.SERIALIZER);
93	IPrototypedIngredientAlternatives.SERIALIZERS.put(	×
94	PrototypedIngredientAlternativesItemStackTag.SERIALIZER.getId(),	×
95	PrototypedIngredientAlternativesItemStackTag.SERIALIZER);
96	}	×
97
98	public void onRegistriesLoad(RegisterEvent event) {
99	event.register(IngredientComponent.REGISTRY.key(), IngredientComponents.ITEMSTACK.getName(), () -> IngredientComponents.ITEMSTACK);	×
100	event.register(IngredientComponent.REGISTRY.key(), IngredientComponents.FLUIDSTACK.getName(), () -> IngredientComponents.FLUIDSTACK);	×
101	event.register(IngredientComponent.REGISTRY.key(), IngredientComponents.ENERGY.getName(), () -> IngredientComponents.ENERGY);	×
102	}	×
103
104	public void afterCapabilitiesLoaded(InterModEnqueueEvent event) {
105	IngredientComponents.registerStorageWrapperHandlers();	×
106	}	×
107
108	/**
109	* Log a new info message for this mod.
110	* @param message The message to show.
111	*/
112	public static void clog(String message) {
113	clog(Level.INFO, message);	×
114	}	×
115
116	/**
117	* Log a new message of the given level for this mod.
118	* @param level The level in which the message must be shown.
119	* @param message The message to show.
120	*/
121	public static void clog(Level level, String message) {
122	CommonCapabilities._instance.getLoggerHelper().log(level, message);	×
123	}	×
124
125	}

CyclopsMC / CommonCapabilities / #479006705

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