From cc7dc27aea452064bc9b1c87bd17664eec1149aa Mon Sep 17 00:00:00 2001 From: Mikerooni <139889766+mikerooni@users.noreply.github.com> Date: Sun, 3 Dec 2023 19:31:40 +0100 Subject: [PATCH] Release prep for 1.0.17 (#605) * refactor: extract material layer color resolution * fix: add displayname for surface rocks * chore: changelog * run data * chore: revert to jade in-dev & update it to make it actually work * refactor: remove unnecessary override --------- Co-authored-by: screret <68943070+screret@users.noreply.github.com> --- CHANGELOG.md | 16 ++++++++++------ .../gtceu/api/block/MaterialBlock.java | 12 +----------- .../api/data/chemical/material/Material.java | 15 ++++++++++++++- .../gtceu/api/item/MaterialBlockItem.java | 6 +----- .../gtceu/api/item/TagPrefixItem.java | 12 +----------- .../gtceu/common/block/SurfaceRockBlock.java | 12 ++++++++++++ .../gregtechceu/gtceu/data/lang/LangHandler.java | 1 + .../gtceu/compass/nodes/materials/raw.json | 3 +++ .../resources/assets/gtceu/lang/en_ud.json | 1 + .../resources/assets/gtceu/lang/en_us.json | 1 + .../compass/nodes/materials/chipped_gem.json | 2 +- .../compass/nodes/materials/dense_plate.json | 2 +- .../compass/nodes/materials/double_plate.json | 2 +- .../compass/nodes/materials/exquisite_gem.json | 2 +- .../gtceu/compass/nodes/materials/fine_wire.json | 2 +- .../compass/nodes/materials/flawed_gem.json | 2 +- .../compass/nodes/materials/flawless_gem.json | 2 +- .../gtceu/compass/nodes/materials/hot_ingot.json | 2 +- .../compass/nodes/materials/impure_dust.json | 2 +- .../gtceu/compass/nodes/materials/pure_dust.json | 2 +- .../gtceu/compass/nodes/materials/raw.json | 3 +++ .../compass/nodes/materials/small_dust.json | 2 +- .../compass/nodes/materials/small_gear.json | 2 +- .../compass/nodes/materials/small_spring.json | 2 +- .../gtceu/compass/nodes/materials/tiny_dust.json | 2 +- .../resources/assets/gtceu/lang/en_ud.json | 1 + .../resources/assets/gtceu/lang/en_us.json | 1 + settings.gradle | 2 +- 28 files changed, 65 insertions(+), 49 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 024505a4dc..89ae8d63f7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,13 +2,17 @@ Version: 1.0.17 +* add solar panels * add shimmer integration for bloom effects -* add man-made compass pages -* add byproduct limiting * add most of the secondary colors to material items -* improve textures +* add man-made compass pages +* add ore indicators +* bump the ldlib version up +* reduce nesting of generated tags * improve zh-cn Localization -* fix steam boiler can accept steam -* fix: changing parallel amount doesn't update recipe logic +* fix missing items for Ruridit and Ultimet +* fix steam boiler being ble to accept steam +* fix changing parallel amount not updating the recipe * fix preview data precision while sodium/rubidium/embeddium installed -* bump the ldlib version up \ No newline at end of file +* fix language issues +* fix item filter mode button in filter covers diff --git a/common/src/main/java/com/gregtechceu/gtceu/api/block/MaterialBlock.java b/common/src/main/java/com/gregtechceu/gtceu/api/block/MaterialBlock.java index 4b97025b47..9491c3b6ac 100644 --- a/common/src/main/java/com/gregtechceu/gtceu/api/block/MaterialBlock.java +++ b/common/src/main/java/com/gregtechceu/gtceu/api/block/MaterialBlock.java @@ -53,17 +53,7 @@ public MaterialBlock(Properties properties, TagPrefix tagPrefix, Material materi public static BlockColor tintedColor() { return (state, reader, pos, tintIndex) -> { if (state.getBlock() instanceof MaterialBlock block) { - return switch (tintIndex) { - case 0, -101 -> block.material.getMaterialARGB(); - case 1, -111 -> { - if (block.material.getMaterialSecondaryARGB() != -1) { - yield block.material.getMaterialSecondaryARGB(); - } else { - yield block.material.getMaterialARGB(); - } - } - default -> -1; - }; + return block.material.getLayerARGB(tintIndex); } return -1; }; diff --git a/common/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/Material.java b/common/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/Material.java index bf57a186e5..b1c4eb1ccd 100644 --- a/common/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/Material.java +++ b/common/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/Material.java @@ -7,7 +7,6 @@ import com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlag; import com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags; import com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialIconSet; -import com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialIconType; import com.gregtechceu.gtceu.api.data.chemical.material.properties.*; import com.gregtechceu.gtceu.api.data.chemical.material.stack.MaterialStack; import com.gregtechceu.gtceu.api.fluids.FluidBuilder; @@ -277,6 +276,20 @@ public void setMaterialRGB(int materialRGB) { materialInfo.color = materialRGB; } + public int getLayerARGB(int layerIndex) { + return switch (layerIndex) { + case 0, -101 -> this.getMaterialARGB(); + case 1, -111 -> { + if (this.getMaterialSecondaryARGB() != -1) { + yield this.getMaterialSecondaryARGB(); + } else { + yield this.getMaterialARGB(); + } + } + default -> -1; + }; + } + public int getMaterialARGB() { return materialInfo.color | 0xff000000; } diff --git a/common/src/main/java/com/gregtechceu/gtceu/api/item/MaterialBlockItem.java b/common/src/main/java/com/gregtechceu/gtceu/api/item/MaterialBlockItem.java index c2305180c2..21cd3bd921 100644 --- a/common/src/main/java/com/gregtechceu/gtceu/api/item/MaterialBlockItem.java +++ b/common/src/main/java/com/gregtechceu/gtceu/api/item/MaterialBlockItem.java @@ -47,11 +47,7 @@ public MaterialBlock getBlock() { public static ItemColor tintColor() { return (itemStack, index) -> { if (itemStack.getItem() instanceof MaterialBlockItem materialBlockItem) { - if (index == 1 && materialBlockItem.getBlock().material.getMaterialSecondaryARGB() != -1) { - return materialBlockItem.getBlock().material.getMaterialSecondaryARGB(); - } else { - return materialBlockItem.getBlock().material.getMaterialARGB(); - } + return materialBlockItem.getBlock().material.getLayerARGB(index); } return -1; }; diff --git a/common/src/main/java/com/gregtechceu/gtceu/api/item/TagPrefixItem.java b/common/src/main/java/com/gregtechceu/gtceu/api/item/TagPrefixItem.java index f775c66dd8..e7c6cd7394 100644 --- a/common/src/main/java/com/gregtechceu/gtceu/api/item/TagPrefixItem.java +++ b/common/src/main/java/com/gregtechceu/gtceu/api/item/TagPrefixItem.java @@ -59,17 +59,7 @@ public void onRegister() { public static ItemColor tintColor() { return (itemStack, index) -> { if (itemStack.getItem() instanceof TagPrefixItem tagPrefixItem) { - return switch (index) { - case 0 -> tagPrefixItem.material.getMaterialARGB(); - case 1 -> { - if (tagPrefixItem.material.getMaterialSecondaryARGB() != -1) { - yield tagPrefixItem.material.getMaterialSecondaryARGB(); - } else { - yield tagPrefixItem.material.getMaterialARGB(); - } - } - default -> -1; - }; + return tagPrefixItem.material.getLayerARGB(index); } return -1; }; diff --git a/common/src/main/java/com/gregtechceu/gtceu/common/block/SurfaceRockBlock.java b/common/src/main/java/com/gregtechceu/gtceu/common/block/SurfaceRockBlock.java index cba2222247..5f2dff4387 100644 --- a/common/src/main/java/com/gregtechceu/gtceu/common/block/SurfaceRockBlock.java +++ b/common/src/main/java/com/gregtechceu/gtceu/common/block/SurfaceRockBlock.java @@ -10,6 +10,8 @@ import net.minecraft.client.color.block.BlockColor; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; +import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.MutableComponent; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.player.Player; @@ -123,4 +125,14 @@ protected void createBlockStateDefinition(StateDefinition.Builder