diff --git a/src/main/java/techreborn/client/gui/GuiFusionReactor.java b/src/main/java/techreborn/client/gui/GuiFusionReactor.java index 4b27bc009..7dc6e8ceb 100644 --- a/src/main/java/techreborn/client/gui/GuiFusionReactor.java +++ b/src/main/java/techreborn/client/gui/GuiFusionReactor.java @@ -40,12 +40,12 @@ import reborncore.client.multiblock.MultiblockRenderEvent; import reborncore.client.multiblock.MultiblockSet; import reborncore.common.network.NetworkManager; import reborncore.common.powerSystem.PowerSystem; +import reborncore.common.util.Color; import reborncore.common.util.Torus; import techreborn.init.TRContent; import techreborn.packets.ServerboundPackets; import techreborn.blockentity.fusionReactor.FusionControlComputerBlockEntity; -import java.awt.*; import java.util.List; import java.util.Optional; @@ -82,9 +82,9 @@ public class GuiFusionReactor extends GuiBase { builder.drawProgressBar(this, blockEntity.getProgressScaled(100), 100, 105, 51, mouseX, mouseY, GuiBuilder.ProgressDirection.LEFT, layer); if (blockEntity.getCoilStatus() > 0) { addHologramButton(6, 4, 212, layer).clickHandler(this::hologramToggle); - drawCentredString(blockEntity.getStateString(), 20, Color.BLUE.darker().getRGB(), layer); + drawCentredString(blockEntity.getStateString(), 20, Color.BLUE.darker().getColor(), layer); if(blockEntity.state == 2){ - drawCentredString( PowerSystem.getLocaliszedPowerFormatted((int) blockEntity.getPowerChange()) + "/t", 30, Color.GREEN.darker().getRGB(), layer); + drawCentredString( PowerSystem.getLocaliszedPowerFormatted((int) blockEntity.getPowerChange()) + "/t", 30, Color.GREEN.darker().getColor(), layer); } } else { builder.drawMultiblockMissingBar(this, layer); diff --git a/src/main/java/techreborn/client/render/DynamicBucketBakedModel.java b/src/main/java/techreborn/client/render/DynamicBucketBakedModel.java index 3bfa8be2c..0245791a8 100644 --- a/src/main/java/techreborn/client/render/DynamicBucketBakedModel.java +++ b/src/main/java/techreborn/client/render/DynamicBucketBakedModel.java @@ -48,10 +48,10 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import net.minecraft.world.ExtendedBlockView; import reborncore.common.fluid.container.ItemFluidInfo; +import reborncore.common.util.Color; import techreborn.TechReborn; import javax.annotation.Nullable; -import java.awt.*; import java.util.Collections; import java.util.List; import java.util.Random; @@ -91,7 +91,7 @@ public class DynamicBucketBakedModel implements BakedModel, FabricBakedModel { BakedModel fluidModel = bakedModelManager.getModel(BUCKET_FLUID); int fluidColor = fluidRenderHandler.getFluidColor(MinecraftClient.getInstance().world, MinecraftClient.getInstance().player.getBlockPos(), fluid.getDefaultState()); Sprite fluidSprite = fluidRenderHandler.getFluidSprites(MinecraftClient.getInstance().world, BlockPos.ORIGIN, fluid.getDefaultState())[0]; - int color = new Color((float) (fluidColor >> 16 & 255) / 255.0F, (float) (fluidColor >> 8 & 255) / 255.0F, (float) (fluidColor & 255) / 255.0F).getRGB(); + int color = new Color((float) (fluidColor >> 16 & 255) / 255.0F, (float) (fluidColor >> 8 & 255) / 255.0F, (float) (fluidColor & 255) / 255.0F).getColor(); context.pushTransform(quad -> { quad.nominalFace(GeometryHelper.lightFace(quad)); quad.spriteColor(0, color, color, color, color); diff --git a/src/main/java/techreborn/client/render/DynamicCellBakedModel.java b/src/main/java/techreborn/client/render/DynamicCellBakedModel.java index 9998d6c35..0cc66e492 100644 --- a/src/main/java/techreborn/client/render/DynamicCellBakedModel.java +++ b/src/main/java/techreborn/client/render/DynamicCellBakedModel.java @@ -48,10 +48,10 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import net.minecraft.world.ExtendedBlockView; import reborncore.common.fluid.container.ItemFluidInfo; +import reborncore.common.util.Color; import techreborn.TechReborn; import javax.annotation.Nullable; -import java.awt.*; import java.util.Collections; import java.util.List; import java.util.Random; @@ -86,7 +86,7 @@ public class DynamicCellBakedModel implements BakedModel, FabricBakedModel { BakedModel fluidModel = bakedModelManager.getModel(CELL_FLUID); int fluidColor = fluidRenderHandler.getFluidColor(MinecraftClient.getInstance().world, MinecraftClient.getInstance().player.getBlockPos(), fluid.getDefaultState()); Sprite fluidSprite = fluidRenderHandler.getFluidSprites(MinecraftClient.getInstance().world, BlockPos.ORIGIN, fluid.getDefaultState())[0]; - int color = new Color((float) (fluidColor >> 16 & 255) / 255.0F, (float) (fluidColor >> 8 & 255) / 255.0F, (float) (fluidColor & 255) / 255.0F).getRGB(); + int color = new Color((float) (fluidColor >> 16 & 255) / 255.0F, (float) (fluidColor >> 8 & 255) / 255.0F, (float) (fluidColor & 255) / 255.0F).getColor(); context.pushTransform(quad -> { quad.nominalFace(GeometryHelper.lightFace(quad)); quad.spriteColor(0, color, color, color, color);