Anvilcraft/HexCasting
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

colors pretty

Browse source
This commit is contained in:
yrsegal@gmail.com 2022-04-27 17:33:18 -04:00
parent 3faa2787dd
commit 446c10a8c8
1 changed files with 21 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/main/java/at/petrak/hexcasting/client/RegisterClientStuff.java
View file

@ -29,6 +29,7 @@ import net.minecraft.client.renderer.RenderType;
import net.minecraft.client.renderer.entity.EntityRenderers; import net.minecraft.client.renderer.entity.EntityRenderers;
import net.minecraft.client.renderer.item.ItemProperties; import net.minecraft.client.renderer.item.ItemProperties;
import net.minecraft.core.Direction; import net.minecraft.core.Direction;
import net.minecraft.network.chat.Style;
import net.minecraft.network.chat.TextColor; import net.minecraft.network.chat.TextColor;
import net.minecraft.network.chat.TextComponent; import net.minecraft.network.chat.TextComponent;
import net.minecraft.network.chat.TranslatableComponent; import net.minecraft.network.chat.TranslatableComponent;
@ -47,6 +48,7 @@ import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
import java.util.Locale; import java.util.Locale;
import java.util.function.UnaryOperator;
public class RegisterClientStuff { public class RegisterClientStuff {
@ -123,18 +125,18 @@ public class RegisterClientStuff {
float gCol = Math.max(0.0F, Mth.sin((note / 24F + 0.33333334F) * Mth.TWO_PI) * 0.65F + 0.35F); float gCol = Math.max(0.0F, Mth.sin((note / 24F + 0.33333334F) * Mth.TWO_PI) * 0.65F + 0.35F);
float bCol = Math.max(0.0F, Mth.sin((note / 24F + 0.6666667F) * Mth.TWO_PI) * 0.65F + 0.35F); float bCol = Math.max(0.0F, Mth.sin((note / 24F + 0.6666667F) * Mth.TWO_PI) * 0.65F + 0.35F);
int noteColor = 0xFF000000 | ((int) (rCol * 0xFF) << 16) | ((int) (gCol * 0xFF) << 8) | ((int) (bCol * 0xFF)); int noteColor = 0xFF_000000 | Mth.color(rCol, gCol, bCol);
var instrument = state.getValue(NoteBlock.INSTRUMENT); var instrument = state.getValue(NoteBlock.INSTRUMENT);
lines.add(new Pair<>( lines.add(new Pair<>(
new ItemStack(Items.MUSIC_DISC_CHIRP), new ItemStack(Items.MUSIC_DISC_CHIRP),
new TextComponent(String.valueOf(instrument.ordinal())) new TextComponent(String.valueOf(instrument.ordinal()))
.withStyle((style) -> style.withColor(TextColor.fromRgb(instrumentColor(instrument)))))); .withStyle(color(instrumentColor(instrument)))));
lines.add(new Pair<>( lines.add(new Pair<>(
new ItemStack(Items.NOTE_BLOCK), new ItemStack(Items.NOTE_BLOCK),
new TextComponent(String.valueOf(note)) new TextComponent(String.valueOf(note))
.withStyle((style) -> style.withColor(TextColor.fromRgb(noteColor))))); .withStyle(color(noteColor))));
}); });
ScryingLensOverlayRegistry.addDisplayer(HexBlocks.AKASHIC_BOOKSHELF.get(), ScryingLensOverlayRegistry.addDisplayer(HexBlocks.AKASHIC_BOOKSHELF.get(),
@ -172,12 +174,15 @@ public class RegisterClientStuff {
lines.add(new Pair<>( lines.add(new Pair<>(
new ItemStack(Items.REDSTONE), new ItemStack(Items.REDSTONE),
new TextComponent(comparatorValue == -1 ? "" : String.valueOf(comparatorValue)) new TextComponent(comparatorValue == -1 ? "" : String.valueOf(comparatorValue))
.withStyle(ChatFormatting.RED))); .withStyle(redstoneColor(comparatorValue))));
boolean compare = state.getValue(ComparatorBlock.MODE) == ComparatorMode.COMPARE;
lines.add(new Pair<>( lines.add(new Pair<>(
new ItemStack(Items.REDSTONE_TORCH), new ItemStack(Items.REDSTONE_TORCH),
new TextComponent( new TextComponent(
state.getValue(ComparatorBlock.MODE) == ComparatorMode.COMPARE ? ">" : "-") compare ? ">=" : "-")
.withStyle(ChatFormatting.RED))); .withStyle(redstoneColor(compare ? 0 : 15))));
}); });
ScryingLensOverlayRegistry.addDisplayer(Blocks.REPEATER, ScryingLensOverlayRegistry.addDisplayer(Blocks.REPEATER,
@ -200,7 +205,7 @@ public class RegisterClientStuff {
lines.add(0, new Pair<>( lines.add(0, new Pair<>(
new ItemStack(Items.REDSTONE), new ItemStack(Items.REDSTONE),
new TextComponent(String.valueOf(signalStrength)) new TextComponent(String.valueOf(signalStrength))
.withStyle(ChatFormatting.RED))); .withStyle(redstoneColor(signalStrength))));
}); });
ScryingLensOverlayRegistry.addPredicateDisplayer( ScryingLensOverlayRegistry.addPredicateDisplayer(
@ -211,10 +216,18 @@ public class RegisterClientStuff {
new Pair<>( new Pair<>(
new ItemStack(Items.COMPARATOR), new ItemStack(Items.COMPARATOR),
new TextComponent(comparatorValue == -1 ? "" : String.valueOf(comparatorValue)) new TextComponent(comparatorValue == -1 ? "" : String.valueOf(comparatorValue))
.withStyle(ChatFormatting.RED))); .withStyle(redstoneColor(comparatorValue))));
}); });
} }
private static UnaryOperator<Style> color(int color) {
return (style) -> style.withColor(TextColor.fromRgb(color));
}
private static UnaryOperator<Style> redstoneColor(int power) {
return color(RedStoneWireBlock.getColorForPower(Mth.clamp(power, 0, 15)));
}
private static int instrumentColor(NoteBlockInstrument instrument) { private static int instrumentColor(NoteBlockInstrument instrument) {
return switch(instrument) { return switch(instrument) {
case BASEDRUM -> MaterialColor.STONE.col; case BASEDRUM -> MaterialColor.STONE.col;