Continue migration

This commit is contained in:
Aleksey 2021-04-12 16:34:13 +03:00
parent 47ed597358
commit 33dbfbe633
263 changed files with 1450 additions and 1486 deletions

View file

@ -5,7 +5,7 @@ import java.util.Map;
import com.google.common.collect.Maps;
import net.minecraft.world.item.ItemConvertible;
import net.minecraft.world.level.ItemLike;
import ru.betterend.blocks.HydraluxPetalColoredBlock;
import ru.betterend.blocks.complex.ColoredMaterial;
import ru.betterend.registry.EndBlocks;
@ -27,7 +27,7 @@ public class FlamboyantRefabricatedIntegration extends ModIntegration {
*/
Map<Integer, String> colors = Maps.newHashMap();
Map<Integer, ItemConvertible> dyes = Maps.newHashMap();
Map<Integer, ItemLike> dyes = Maps.newHashMap();
/*
* for (Object val: values) { Integer color = (Integer) getFieldValue(fDyeColor,
* "signColor", val); String name = (String) getFieldValue(fDyeColor, "name",
@ -56,7 +56,7 @@ public class FlamboyantRefabricatedIntegration extends ModIntegration {
new ColoredMaterial(HydraluxPetalColoredBlock::new, EndBlocks.HYDRALUX_PETAL_BLOCK, colors, dyes, true);
}
private void addColor(String hex, String name, Map<Integer, String> colors, Map<Integer, ItemConvertible> dyes) {
private void addColor(String hex, String name, Map<Integer, String> colors, Map<Integer, ItemLike> dyes) {
int color = MHelper.color(hex);
colors.put(color, name);
dyes.put(color, getItem(name + "_dye"));