From b3fdb895f26a6b44d95078e9311e899298b10a43 Mon Sep 17 00:00:00 2001 From: mikerooni <139889766+mikerooni@users.noreply.github.com> Date: Sun, 3 Dec 2023 17:24:23 +0100 Subject: [PATCH 1/6] refactor: extract material layer color resolution --- .../gtceu/api/block/MaterialBlock.java | 12 +----------- .../api/data/chemical/material/Material.java | 15 ++++++++++++++- .../gtceu/api/item/MaterialBlockItem.java | 6 +----- .../gregtechceu/gtceu/api/item/TagPrefixItem.java | 12 +----------- 4 files changed, 17 insertions(+), 28 deletions(-) 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; }; From 96d6ffd130c2aaeaadcd5cda488b961cd549f7cb Mon Sep 17 00:00:00 2001 From: mikerooni <139889766+mikerooni@users.noreply.github.com> Date: Sun, 3 Dec 2023 18:28:55 +0100 Subject: [PATCH 2/6] fix: add displayname for surface rocks --- .../gregtechceu/gtceu/common/block/SurfaceRockBlock.java | 7 +++++++ .../java/com/gregtechceu/gtceu/data/lang/LangHandler.java | 1 + forge/build.gradle | 4 ++-- 3 files changed, 10 insertions(+), 2 deletions(-) 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..8141cd0e29 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,9 @@ protected void createBlockStateDefinition(StateDefinition.Builder Date: Sun, 3 Dec 2023 18:50:10 +0100 Subject: [PATCH 3/6] chore: changelog --- CHANGELOG.md | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 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 From cbd5a5f8407dcac18abe24aee9126583e3d3e926 Mon Sep 17 00:00:00 2001 From: screret <68943070+screret@users.noreply.github.com> Date: Sun, 3 Dec 2023 19:52:43 +0200 Subject: [PATCH 4/6] run data --- .../resources/assets/gtceu/compass/nodes/materials/raw.json | 3 +++ fabric/src/generated/resources/assets/gtceu/lang/en_ud.json | 1 + fabric/src/generated/resources/assets/gtceu/lang/en_us.json | 1 + .../assets/gtceu/compass/nodes/materials/chipped_gem.json | 2 +- .../assets/gtceu/compass/nodes/materials/dense_plate.json | 2 +- .../assets/gtceu/compass/nodes/materials/double_plate.json | 2 +- .../assets/gtceu/compass/nodes/materials/exquisite_gem.json | 2 +- .../assets/gtceu/compass/nodes/materials/fine_wire.json | 2 +- .../assets/gtceu/compass/nodes/materials/flawed_gem.json | 2 +- .../assets/gtceu/compass/nodes/materials/flawless_gem.json | 2 +- .../assets/gtceu/compass/nodes/materials/hot_ingot.json | 2 +- .../assets/gtceu/compass/nodes/materials/impure_dust.json | 2 +- .../assets/gtceu/compass/nodes/materials/pure_dust.json | 2 +- .../resources/assets/gtceu/compass/nodes/materials/raw.json | 3 +++ .../assets/gtceu/compass/nodes/materials/small_dust.json | 2 +- .../assets/gtceu/compass/nodes/materials/small_gear.json | 2 +- .../assets/gtceu/compass/nodes/materials/small_spring.json | 2 +- .../assets/gtceu/compass/nodes/materials/tiny_dust.json | 2 +- forge/src/generated/resources/assets/gtceu/lang/en_ud.json | 1 + forge/src/generated/resources/assets/gtceu/lang/en_us.json | 1 + 20 files changed, 24 insertions(+), 14 deletions(-) diff --git a/fabric/src/generated/resources/assets/gtceu/compass/nodes/materials/raw.json b/fabric/src/generated/resources/assets/gtceu/compass/nodes/materials/raw.json index 57e6b338e9..9129162948 100644 --- a/fabric/src/generated/resources/assets/gtceu/compass/nodes/materials/raw.json +++ b/fabric/src/generated/resources/assets/gtceu/compass/nodes/materials/raw.json @@ -3,6 +3,9 @@ "type": "item", "res": "gtceu:raw_aluminium" }, + "items": [ + "#c:raw_ores" + ], "page": "gtceu:materials/raw", "position": [ -350, diff --git a/fabric/src/generated/resources/assets/gtceu/lang/en_ud.json b/fabric/src/generated/resources/assets/gtceu/lang/en_ud.json index 165d92406a..e5d1a862f1 100644 --- a/fabric/src/generated/resources/assets/gtceu/lang/en_ud.json +++ b/fabric/src/generated/resources/assets/gtceu/lang/en_ud.json @@ -1307,6 +1307,7 @@ "block.gtceu.zpm_transformer_2a": "ɹǝɯɹoɟsuɐɹ⟘ )xᄅ( dɯⱯ-ıH ǝbɐʇןoΛ WԀZ", "block.gtceu.zpm_transformer_4a": "ɹǝɯɹoɟsuɐɹ⟘ )xㄣ( dɯⱯ-ıH ǝbɐʇןoΛ WԀZ", "block.gtceu.zpm_wiremill": "ɹ§III ןןıɯǝɹıM ǝʇıןƎɔ§", + "block.surface_rock": "ʞɔoᴚ ǝɔɐɟɹnS %s", "compass.node.gtceu.batteries/energy_cluster": "ɹǝʇsnןƆ ʎbɹǝuƎ", "compass.node.gtceu.batteries/energy_crystal": "ןɐʇsʎɹƆ ʎbɹǝuƎ", "compass.node.gtceu.batteries/energy_module": "ǝןnpoW ʎbɹǝuƎ", diff --git a/fabric/src/generated/resources/assets/gtceu/lang/en_us.json b/fabric/src/generated/resources/assets/gtceu/lang/en_us.json index d4d1f3e838..c6659d9bd9 100644 --- a/fabric/src/generated/resources/assets/gtceu/lang/en_us.json +++ b/fabric/src/generated/resources/assets/gtceu/lang/en_us.json @@ -1307,6 +1307,7 @@ "block.gtceu.zpm_transformer_2a": "ZPM Voltage Hi-Amp (2x) Transformer", "block.gtceu.zpm_transformer_4a": "ZPM Voltage Hi-Amp (4x) Transformer", "block.gtceu.zpm_wiremill": "§cElite Wiremill III§r", + "block.surface_rock": "%s Surface Rock", "compass.node.gtceu.batteries/energy_cluster": "Energy Cluster", "compass.node.gtceu.batteries/energy_crystal": "Energy Crystal", "compass.node.gtceu.batteries/energy_module": "Energy Module", diff --git a/forge/src/generated/resources/assets/gtceu/compass/nodes/materials/chipped_gem.json b/forge/src/generated/resources/assets/gtceu/compass/nodes/materials/chipped_gem.json index 13afb9bdf1..fc17c0f6a2 100644 --- a/forge/src/generated/resources/assets/gtceu/compass/nodes/materials/chipped_gem.json +++ b/forge/src/generated/resources/assets/gtceu/compass/nodes/materials/chipped_gem.json @@ -4,7 +4,7 @@ "res": "gtceu:almandine_chipped_gem" }, "items": [ - "#forge:gems/chipped" + "#forge:chipped_gems" ], "page": "gtceu:materials/chipped_gem", "position": [ diff --git a/forge/src/generated/resources/assets/gtceu/compass/nodes/materials/dense_plate.json b/forge/src/generated/resources/assets/gtceu/compass/nodes/materials/dense_plate.json index 535119b1af..5b789c4611 100644 --- a/forge/src/generated/resources/assets/gtceu/compass/nodes/materials/dense_plate.json +++ b/forge/src/generated/resources/assets/gtceu/compass/nodes/materials/dense_plate.json @@ -4,7 +4,7 @@ "res": "gtceu:darmstadtium_dense_plate" }, "items": [ - "#forge:plates/dense" + "#forge:dense_plates" ], "page": "gtceu:materials/dense_plate", "position": [ diff --git a/forge/src/generated/resources/assets/gtceu/compass/nodes/materials/double_plate.json b/forge/src/generated/resources/assets/gtceu/compass/nodes/materials/double_plate.json index eabecdacc7..9e0c8e7cbd 100644 --- a/forge/src/generated/resources/assets/gtceu/compass/nodes/materials/double_plate.json +++ b/forge/src/generated/resources/assets/gtceu/compass/nodes/materials/double_plate.json @@ -4,7 +4,7 @@ "res": "gtceu:aluminium_double_plate" }, "items": [ - "#forge:plates/double" + "#forge:double_plates" ], "page": "gtceu:materials/double_plate", "position": [ diff --git a/forge/src/generated/resources/assets/gtceu/compass/nodes/materials/exquisite_gem.json b/forge/src/generated/resources/assets/gtceu/compass/nodes/materials/exquisite_gem.json index d60cd42d0a..a0b1ed0464 100644 --- a/forge/src/generated/resources/assets/gtceu/compass/nodes/materials/exquisite_gem.json +++ b/forge/src/generated/resources/assets/gtceu/compass/nodes/materials/exquisite_gem.json @@ -4,7 +4,7 @@ "res": "gtceu:almandine_exquisite_gem" }, "items": [ - "#forge:gems/exquisite" + "#forge:exquisite_gems" ], "page": "gtceu:materials/exquisite_gem", "position": [ diff --git a/forge/src/generated/resources/assets/gtceu/compass/nodes/materials/fine_wire.json b/forge/src/generated/resources/assets/gtceu/compass/nodes/materials/fine_wire.json index 0346760392..6edd4ecde2 100644 --- a/forge/src/generated/resources/assets/gtceu/compass/nodes/materials/fine_wire.json +++ b/forge/src/generated/resources/assets/gtceu/compass/nodes/materials/fine_wire.json @@ -4,7 +4,7 @@ "res": "gtceu:aluminium_fine_wire" }, "items": [ - "#forge:wires/fine" + "#forge:fine_wires" ], "page": "gtceu:materials/fine_wire", "position": [ diff --git a/forge/src/generated/resources/assets/gtceu/compass/nodes/materials/flawed_gem.json b/forge/src/generated/resources/assets/gtceu/compass/nodes/materials/flawed_gem.json index eabd803c7e..3f327c4c4a 100644 --- a/forge/src/generated/resources/assets/gtceu/compass/nodes/materials/flawed_gem.json +++ b/forge/src/generated/resources/assets/gtceu/compass/nodes/materials/flawed_gem.json @@ -4,7 +4,7 @@ "res": "gtceu:almandine_flawed_gem" }, "items": [ - "#forge:gems/flawed" + "#forge:flawed_gems" ], "page": "gtceu:materials/flawed_gem", "position": [ diff --git a/forge/src/generated/resources/assets/gtceu/compass/nodes/materials/flawless_gem.json b/forge/src/generated/resources/assets/gtceu/compass/nodes/materials/flawless_gem.json index c43de254bb..35432547a7 100644 --- a/forge/src/generated/resources/assets/gtceu/compass/nodes/materials/flawless_gem.json +++ b/forge/src/generated/resources/assets/gtceu/compass/nodes/materials/flawless_gem.json @@ -4,7 +4,7 @@ "res": "gtceu:almandine_flawless_gem" }, "items": [ - "#forge:gems/flawless" + "#forge:flawless_gems" ], "page": "gtceu:materials/flawless_gem", "position": [ diff --git a/forge/src/generated/resources/assets/gtceu/compass/nodes/materials/hot_ingot.json b/forge/src/generated/resources/assets/gtceu/compass/nodes/materials/hot_ingot.json index 0adee1b6ec..304cbff6c4 100644 --- a/forge/src/generated/resources/assets/gtceu/compass/nodes/materials/hot_ingot.json +++ b/forge/src/generated/resources/assets/gtceu/compass/nodes/materials/hot_ingot.json @@ -4,7 +4,7 @@ "res": "gtceu:europium_hot_ingot" }, "items": [ - "#forge:ingots/hot" + "#forge:hot_ingots" ], "page": "gtceu:materials/hot_ingot", "position": [ diff --git a/forge/src/generated/resources/assets/gtceu/compass/nodes/materials/impure_dust.json b/forge/src/generated/resources/assets/gtceu/compass/nodes/materials/impure_dust.json index 4225d5d1d8..ed5e155bf4 100644 --- a/forge/src/generated/resources/assets/gtceu/compass/nodes/materials/impure_dust.json +++ b/forge/src/generated/resources/assets/gtceu/compass/nodes/materials/impure_dust.json @@ -4,7 +4,7 @@ "res": "gtceu:aluminium_impure_dust" }, "items": [ - "#forge:dusts/impure" + "#forge:impure_dusts" ], "page": "gtceu:materials/impure_dust", "position": [ diff --git a/forge/src/generated/resources/assets/gtceu/compass/nodes/materials/pure_dust.json b/forge/src/generated/resources/assets/gtceu/compass/nodes/materials/pure_dust.json index 3a96cbc026..09c5d094eb 100644 --- a/forge/src/generated/resources/assets/gtceu/compass/nodes/materials/pure_dust.json +++ b/forge/src/generated/resources/assets/gtceu/compass/nodes/materials/pure_dust.json @@ -4,7 +4,7 @@ "res": "gtceu:aluminium_pure_dust" }, "items": [ - "#forge:dusts/pure" + "#forge:pure_dusts" ], "page": "gtceu:materials/pure_dust", "position": [ diff --git a/forge/src/generated/resources/assets/gtceu/compass/nodes/materials/raw.json b/forge/src/generated/resources/assets/gtceu/compass/nodes/materials/raw.json index 57e6b338e9..4b94933fde 100644 --- a/forge/src/generated/resources/assets/gtceu/compass/nodes/materials/raw.json +++ b/forge/src/generated/resources/assets/gtceu/compass/nodes/materials/raw.json @@ -3,6 +3,9 @@ "type": "item", "res": "gtceu:raw_aluminium" }, + "items": [ + "#forge:raw_materials" + ], "page": "gtceu:materials/raw", "position": [ -350, diff --git a/forge/src/generated/resources/assets/gtceu/compass/nodes/materials/small_dust.json b/forge/src/generated/resources/assets/gtceu/compass/nodes/materials/small_dust.json index 7ea204b75e..313b00f52a 100644 --- a/forge/src/generated/resources/assets/gtceu/compass/nodes/materials/small_dust.json +++ b/forge/src/generated/resources/assets/gtceu/compass/nodes/materials/small_dust.json @@ -4,7 +4,7 @@ "res": "gtceu:aluminium_small_dust" }, "items": [ - "#forge:dusts/small" + "#forge:small_dusts" ], "page": "gtceu:materials/small_dust", "position": [ diff --git a/forge/src/generated/resources/assets/gtceu/compass/nodes/materials/small_gear.json b/forge/src/generated/resources/assets/gtceu/compass/nodes/materials/small_gear.json index 21730e6ae7..e840994fea 100644 --- a/forge/src/generated/resources/assets/gtceu/compass/nodes/materials/small_gear.json +++ b/forge/src/generated/resources/assets/gtceu/compass/nodes/materials/small_gear.json @@ -4,7 +4,7 @@ "res": "gtceu:aluminium_small_gear" }, "items": [ - "#forge:gears/small" + "#forge:small_gears" ], "page": "gtceu:materials/small_gear", "position": [ diff --git a/forge/src/generated/resources/assets/gtceu/compass/nodes/materials/small_spring.json b/forge/src/generated/resources/assets/gtceu/compass/nodes/materials/small_spring.json index 18a36f5a0b..fdda488937 100644 --- a/forge/src/generated/resources/assets/gtceu/compass/nodes/materials/small_spring.json +++ b/forge/src/generated/resources/assets/gtceu/compass/nodes/materials/small_spring.json @@ -4,7 +4,7 @@ "res": "gtceu:aluminium_small_spring" }, "items": [ - "#forge:springs/small" + "#forge:small_springs" ], "page": "gtceu:materials/small_spring", "position": [ diff --git a/forge/src/generated/resources/assets/gtceu/compass/nodes/materials/tiny_dust.json b/forge/src/generated/resources/assets/gtceu/compass/nodes/materials/tiny_dust.json index 3bda684fdd..bd94156393 100644 --- a/forge/src/generated/resources/assets/gtceu/compass/nodes/materials/tiny_dust.json +++ b/forge/src/generated/resources/assets/gtceu/compass/nodes/materials/tiny_dust.json @@ -4,7 +4,7 @@ "res": "gtceu:aluminium_tiny_dust" }, "items": [ - "#forge:dusts/tiny" + "#forge:tiny_dusts" ], "page": "gtceu:materials/tiny_dust", "position": [ diff --git a/forge/src/generated/resources/assets/gtceu/lang/en_ud.json b/forge/src/generated/resources/assets/gtceu/lang/en_ud.json index 165d92406a..e5d1a862f1 100644 --- a/forge/src/generated/resources/assets/gtceu/lang/en_ud.json +++ b/forge/src/generated/resources/assets/gtceu/lang/en_ud.json @@ -1307,6 +1307,7 @@ "block.gtceu.zpm_transformer_2a": "ɹǝɯɹoɟsuɐɹ⟘ )xᄅ( dɯⱯ-ıH ǝbɐʇןoΛ WԀZ", "block.gtceu.zpm_transformer_4a": "ɹǝɯɹoɟsuɐɹ⟘ )xㄣ( dɯⱯ-ıH ǝbɐʇןoΛ WԀZ", "block.gtceu.zpm_wiremill": "ɹ§III ןןıɯǝɹıM ǝʇıןƎɔ§", + "block.surface_rock": "ʞɔoᴚ ǝɔɐɟɹnS %s", "compass.node.gtceu.batteries/energy_cluster": "ɹǝʇsnןƆ ʎbɹǝuƎ", "compass.node.gtceu.batteries/energy_crystal": "ןɐʇsʎɹƆ ʎbɹǝuƎ", "compass.node.gtceu.batteries/energy_module": "ǝןnpoW ʎbɹǝuƎ", diff --git a/forge/src/generated/resources/assets/gtceu/lang/en_us.json b/forge/src/generated/resources/assets/gtceu/lang/en_us.json index d4d1f3e838..c6659d9bd9 100644 --- a/forge/src/generated/resources/assets/gtceu/lang/en_us.json +++ b/forge/src/generated/resources/assets/gtceu/lang/en_us.json @@ -1307,6 +1307,7 @@ "block.gtceu.zpm_transformer_2a": "ZPM Voltage Hi-Amp (2x) Transformer", "block.gtceu.zpm_transformer_4a": "ZPM Voltage Hi-Amp (4x) Transformer", "block.gtceu.zpm_wiremill": "§cElite Wiremill III§r", + "block.surface_rock": "%s Surface Rock", "compass.node.gtceu.batteries/energy_cluster": "Energy Cluster", "compass.node.gtceu.batteries/energy_crystal": "Energy Crystal", "compass.node.gtceu.batteries/energy_module": "Energy Module", From 83fb1f39b55c39d111c8ba5426b8576ff8693854 Mon Sep 17 00:00:00 2001 From: mikerooni <139889766+mikerooni@users.noreply.github.com> Date: Sun, 3 Dec 2023 19:22:59 +0100 Subject: [PATCH 5/6] chore: revert to jade in-dev & update it to make it actually work --- forge/build.gradle | 4 ++-- settings.gradle | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/forge/build.gradle b/forge/build.gradle index ef43143403..f2cb0bb321 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -147,10 +147,10 @@ dependencies { modCompileOnly forge.emi // TOP - modImplementation(forge.theoneprobe) { transitive = false } + modCompileOnly(forge.theoneprobe) { transitive = false } // Jade - modCompileOnly(forge.jade) + modImplementation(forge.jade) // AE2 modImplementation(forge.ae2) { transitive = false } diff --git a/settings.gradle b/settings.gradle index a2d5583fc5..7f0da52bbc 100644 --- a/settings.gradle +++ b/settings.gradle @@ -45,7 +45,7 @@ dependencyResolutionManagement { def createForgeVersion = "0.5.1.d-9" def flywheelForgeVersion = "0.6.9-5" def topForgeVersion = "1.20.1-10.0.1-3" - def jadeForgeVersion = "11.1.4" + def jadeForgeVersion = "11.6.3" def worldStripperForgeFile = "4578579" // Libs From 90b234c3e35cfe11a08d3d69e3b21553c0618a87 Mon Sep 17 00:00:00 2001 From: mikerooni <139889766+mikerooni@users.noreply.github.com> Date: Sun, 3 Dec 2023 19:26:58 +0100 Subject: [PATCH 6/6] refactor: remove unnecessary override --- .../com/gregtechceu/gtceu/common/block/SurfaceRockBlock.java | 5 +++++ 1 file changed, 5 insertions(+) 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 8141cd0e29..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 @@ -126,6 +126,11 @@ protected void createBlockStateDefinition(StateDefinition.Builder