Skip to content

Commit 72aa6ff

Browse files
committed
color registries
1 parent ca2231d commit 72aa6ff

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

src/main/java/de/dafuqs/spectrum/api/color/ColorRegistry.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,10 @@ public static void registerColorRegistries() {
1414
FLUID_COLORS = new FluidColors();
1515
}
1616

17-
public abstract void registerColorMapping(T object, DyeColor dyeColor);
17+
public abstract void registerColorMapping(T element, DyeColor dyeColor);
1818

1919
public abstract Optional<DyeColor> getMapping(T element);
2020

21+
public abstract DyeColor getMapping(T element, DyeColor defaultColor);
22+
2123
}

src/main/java/de/dafuqs/spectrum/api/color/FluidColors.java

+4
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,8 @@ public Optional<DyeColor> getMapping(Fluid fluid) {
2626
}
2727
}
2828

29+
public DyeColor getMapping(Fluid fluid, DyeColor defaultColor) {
30+
return COLORS.getOrDefault(fluid, defaultColor);
31+
}
32+
2933
}

src/main/java/de/dafuqs/spectrum/api/color/ItemColors.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -277,8 +277,8 @@ public Optional<DyeColor> getMapping(Item item) {
277277
}
278278
}
279279

280-
public Optional<DyeColor> getMapping(Item item, DyeColor defaultColor) {
281-
return Optional.of(COLORS.getOrDefault(item, defaultColor));
280+
public DyeColor getMapping(Item item, DyeColor defaultColor) {
281+
return COLORS.getOrDefault(item, defaultColor);
282282
}
283283

284284
}

0 commit comments

Comments
 (0)