20210191346

Committed 14 Dec 2025 03:32PM UTC coverage: 19.514% (-33.5%) from 53.061%

Build # 20210191346

Build Type

push

github

Committed by

rubensworks

Commit Message

Remove deprecations

Run Details

663 of 8728 branches covered (7.6%)

Branch coverage included in aggregate %.

6786 of 29445 relevant lines covered (23.05%)

1.09 hits per line

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

89.66

/src/main/java/org/cyclops/integrateddynamics/core/evaluate/variable/ValueTypeInteger.java

package org.cyclops.integrateddynamics.core.evaluate.variable;

import lombok.ToString;
import net.minecraft.ChatFormatting;
import net.minecraft.network.chat.Component;
import net.minecraft.network.chat.MutableComponent;
import net.minecraft.world.level.storage.ValueInput;
import net.minecraft.world.level.storage.ValueOutput;
import org.cyclops.cyclopscore.helper.IModHelpers;
import org.cyclops.integrateddynamics.GeneralConfig;
import org.cyclops.integrateddynamics.api.evaluate.EvaluationException;
import org.cyclops.integrateddynamics.api.evaluate.variable.IValueTypeNumber;
import org.cyclops.integrateddynamics.core.helper.L10NValues;

import java.text.NumberFormat;
import java.util.Locale;

/**
 * Value type with values that are integers.
 * The raw value is nullable.
 * @author rubensworks
 */
public class ValueTypeInteger extends ValueTypeBase<ValueTypeInteger.ValueInteger> implements IValueTypeNumber<ValueTypeInteger.ValueInteger> {

    public ValueTypeInteger() {
        super("integer", IModHelpers.get().getBaseHelpers().RGBToInt(243, 150, 4), ChatFormatting.GOLD, ValueTypeInteger.ValueInteger.class);
    }

    @Override
    public ValueInteger getDefault() {
        return ValueInteger.of(0);
    }

    @Override
    public MutableComponent toCompactString(ValueInteger value) {
        return Component.literal(Integer.toString(value.getRawValue()));
    }

    @Override
    public void serialize(ValueOutput valueOutput, ValueInteger value) {
        valueOutput.putInt("v", value.getRawValue());
    }

    @Override
    public ValueInteger deserialize(ValueInput valueInput) {
        return ValueInteger.of(valueInput.getInt("v").orElseThrow());
    }

    @Override
    public String toString(ValueInteger value) {
        return Integer.toString(value.getRawValue());
    }

    @Override
    public ValueInteger parseString(String value) throws EvaluationException {
        try {
            return ValueInteger.of(Integer.parseInt(value));
        } catch (NumberFormatException e) {
            throw new EvaluationException(Component.translatable(L10NValues.OPERATOR_ERROR_PARSE, value,
                    Component.translatable(getTranslationKey())));
        }
    }

    @Override
    public boolean isZero(ValueInteger a) {
        return a.getRawValue() == 0;
    }

    @Override
    public boolean isOne(ValueInteger a) {
        return a.getRawValue() == 1;
    }

    @Override
    public ValueInteger add(ValueInteger a, ValueInteger b) {
        return ValueInteger.of(a.getRawValue() + b.getRawValue());
    }

    @Override
    public ValueInteger subtract(ValueInteger a, ValueInteger b) {
        return ValueInteger.of(a.getRawValue() - b.getRawValue());
    }

    @Override
    public ValueInteger multiply(ValueInteger a, ValueInteger b) {
        return ValueInteger.of(a.getRawValue() * b.getRawValue());
    }

    @Override
    public ValueInteger divide(ValueInteger a, ValueInteger b) {
        return ValueInteger.of(a.getRawValue() / b.getRawValue());
    }

    @Override
    public ValueInteger max(ValueInteger a, ValueInteger b) {
        return ValueInteger.of(Math.max(a.getRawValue(), b.getRawValue()));
    }

    @Override
    public ValueInteger min(ValueInteger a, ValueInteger b) {
        return ValueInteger.of(Math.min(a.getRawValue(), b.getRawValue()));
    }

    @Override
    public ValueInteger increment(ValueInteger a) {
        return ValueInteger.of(a.getRawValue() + 1);
    }

    @Override
    public ValueInteger decrement(ValueInteger a) {
        return ValueInteger.of(a.getRawValue() - 1);
    }

    @Override
    public ValueInteger modulus(ValueInteger a, ValueInteger b) {
        return ValueInteger.of(a.getRawValue() % b.getRawValue());
    }

    @Override
    public boolean greaterThan(ValueInteger a, ValueInteger b) {
        return a.getRawValue() > b.getRawValue();
    }

    @Override
    public boolean lessThan(ValueInteger a, ValueInteger b) {
        return a.getRawValue() < b.getRawValue();
    }

    @Override
    public ValueInteger round(ValueInteger a) {
        return a;
    }

    @Override
    public ValueInteger ceil(ValueInteger a) {
        return a;
    }

    @Override
    public ValueInteger floor(ValueInteger a) {
        return a;
    }

    @Override
    public ValueTypeString.ValueString compact(ValueInteger a) {
        NumberFormat nf = NumberFormat.getCompactNumberInstance(
            Locale.US,
            GeneralConfig.numberCompactUseLongStyle ? NumberFormat.Style.LONG : NumberFormat.Style.SHORT
        );
        nf.setMinimumFractionDigits(GeneralConfig.numberCompactMinimumFractionDigits);
        nf.setMaximumFractionDigits(GeneralConfig.numberCompactMaximumFractionDigits);
        nf.setMinimumIntegerDigits(GeneralConfig.numberCompactMinimumIntegerDigits);
        nf.setMaximumIntegerDigits(GeneralConfig.numberCompactMaximumIntegerDigits);
        return ValueTypeString.ValueString.of(nf.format(a.getRawValue()));
    }

    @Override
    public String getName(ValueInteger a) {
        return toCompactString(a).getString();
    }

    @ToString
    public static class ValueInteger extends ValueBase {

        private final int value;

        private ValueInteger(int value) {
            super(ValueTypes.INTEGER);
            this.value = value;
        }

        public static ValueInteger of(int value) {
            return new ValueInteger(value);
        }

        public int getRawValue() {
            return value;
        }

        @Override
        public boolean equals(Object o) {
            return o instanceof ValueInteger && ((ValueInteger) o).value == this.value;
        }

        @Override
        public int hashCode() {
            return getType().hashCode() + value;
        }
    }

}

1	package org.cyclops.integrateddynamics.core.evaluate.variable;
2
3	import lombok.ToString;
4	import net.minecraft.ChatFormatting;
5	import net.minecraft.network.chat.Component;
6	import net.minecraft.network.chat.MutableComponent;
7	import net.minecraft.world.level.storage.ValueInput;
8	import net.minecraft.world.level.storage.ValueOutput;
9	import org.cyclops.cyclopscore.helper.IModHelpers;
10	import org.cyclops.integrateddynamics.GeneralConfig;
11	import org.cyclops.integrateddynamics.api.evaluate.EvaluationException;
12	import org.cyclops.integrateddynamics.api.evaluate.variable.IValueTypeNumber;
13	import org.cyclops.integrateddynamics.core.helper.L10NValues;
14
15	import java.text.NumberFormat;
16	import java.util.Locale;
17
18	/**
19	* Value type with values that are integers.
20	* The raw value is nullable.
21	* @author rubensworks
22	*/
23	public class ValueTypeInteger extends ValueTypeBase<ValueTypeInteger.ValueInteger> implements IValueTypeNumber<ValueTypeInteger.ValueInteger> {
24
25	public ValueTypeInteger() {
26	super("integer", IModHelpers.get().getBaseHelpers().RGBToInt(243, 150, 4), ChatFormatting.GOLD, ValueTypeInteger.ValueInteger.class);	11✔
27	}	1✔
28
29	@Override
30	public ValueInteger getDefault() {
31	return ValueInteger.of(0);	3✔
32	}
33
34	@Override
35	public MutableComponent toCompactString(ValueInteger value) {
36	return Component.literal(Integer.toString(value.getRawValue()));	5✔
37	}
38
39	@Override
40	public void serialize(ValueOutput valueOutput, ValueInteger value) {
41	valueOutput.putInt("v", value.getRawValue());	5✔
42	}	1✔
43
44	@Override
45	public ValueInteger deserialize(ValueInput valueInput) {
46	return ValueInteger.of(valueInput.getInt("v").orElseThrow());	8✔
47	}
48
49	@Override
50	public String toString(ValueInteger value) {
51	return Integer.toString(value.getRawValue());	4✔
52	}
53
54	@Override
55	public ValueInteger parseString(String value) throws EvaluationException {
56	try {
57	return ValueInteger.of(Integer.parseInt(value));	4✔
58	} catch (NumberFormatException e) {	×
59	throw new EvaluationException(Component.translatable(L10NValues.OPERATOR_ERROR_PARSE, value,	×
60	Component.translatable(getTranslationKey())));	×
61	}
62	}
63
64	@Override
65	public boolean isZero(ValueInteger a) {
66	return a.getRawValue() == 0;	7✔
67	}
68
69	@Override
70	public boolean isOne(ValueInteger a) {
71	return a.getRawValue() == 1;	8✔
72	}
73
74	@Override
75	public ValueInteger add(ValueInteger a, ValueInteger b) {
76	return ValueInteger.of(a.getRawValue() + b.getRawValue());	7✔
77	}
78
79	@Override
80	public ValueInteger subtract(ValueInteger a, ValueInteger b) {
81	return ValueInteger.of(a.getRawValue() - b.getRawValue());	7✔
82	}
83
84	@Override
85	public ValueInteger multiply(ValueInteger a, ValueInteger b) {
86	return ValueInteger.of(a.getRawValue() * b.getRawValue());	7✔
87	}
88
89	@Override
90	public ValueInteger divide(ValueInteger a, ValueInteger b) {
91	return ValueInteger.of(a.getRawValue() / b.getRawValue());	7✔
92	}
93
94	@Override
95	public ValueInteger max(ValueInteger a, ValueInteger b) {
96	return ValueInteger.of(Math.max(a.getRawValue(), b.getRawValue()));	7✔
97	}
98
99	@Override
100	public ValueInteger min(ValueInteger a, ValueInteger b) {
101	return ValueInteger.of(Math.min(a.getRawValue(), b.getRawValue()));	7✔
102	}
103
104	@Override
105	public ValueInteger increment(ValueInteger a) {
106	return ValueInteger.of(a.getRawValue() + 1);	6✔
107	}
108
109	@Override
110	public ValueInteger decrement(ValueInteger a) {
111	return ValueInteger.of(a.getRawValue() - 1);	6✔
112	}
113
114	@Override
115	public ValueInteger modulus(ValueInteger a, ValueInteger b) {
116	return ValueInteger.of(a.getRawValue() % b.getRawValue());	7✔
117	}
118
119	@Override
120	public boolean greaterThan(ValueInteger a, ValueInteger b) {
121	return a.getRawValue() > b.getRawValue();	9✔
122	}
123
124	@Override
125	public boolean lessThan(ValueInteger a, ValueInteger b) {
126	return a.getRawValue() < b.getRawValue();	9✔
127	}
128
129	@Override
130	public ValueInteger round(ValueInteger a) {
131	return a;	2✔
132	}
133
134	@Override
135	public ValueInteger ceil(ValueInteger a) {
136	return a;	2✔
137	}
138
139	@Override
140	public ValueInteger floor(ValueInteger a) {
141	return a;	2✔
142	}
143
144	@Override
145	public ValueTypeString.ValueString compact(ValueInteger a) {
146	NumberFormat nf = NumberFormat.getCompactNumberInstance(	3✔
147	Locale.US,
148	GeneralConfig.numberCompactUseLongStyle ? NumberFormat.Style.LONG : NumberFormat.Style.SHORT	3!
149	);
150	nf.setMinimumFractionDigits(GeneralConfig.numberCompactMinimumFractionDigits);	3✔
151	nf.setMaximumFractionDigits(GeneralConfig.numberCompactMaximumFractionDigits);	3✔
152	nf.setMinimumIntegerDigits(GeneralConfig.numberCompactMinimumIntegerDigits);	3✔
153	nf.setMaximumIntegerDigits(GeneralConfig.numberCompactMaximumIntegerDigits);	3✔
154	return ValueTypeString.ValueString.of(nf.format(a.getRawValue()));	7✔
155	}
156
157	@Override
158	public String getName(ValueInteger a) {
159	return toCompactString(a).getString();	5✔
160	}
161
162	@ToString	×
163	public static class ValueInteger extends ValueBase {
164
165	private final int value;
166
167	private ValueInteger(int value) {
168	super(ValueTypes.INTEGER);	3✔
169	this.value = value;	3✔
170	}	1✔
171
172	public static ValueInteger of(int value) {
173	return new ValueInteger(value);	5✔
174	}
175
176	public int getRawValue() {
177	return value;	3✔
178	}
179
180	@Override
181	public boolean equals(Object o) {
182	return o instanceof ValueInteger && ((ValueInteger) o).value == this.value;	13!
183	}
184
185	@Override
186	public int hashCode() {
187	return getType().hashCode() + value;	7✔
188	}
189	}
190
191	}

CyclopsMC / IntegratedDynamics / 20210191346

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