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 <[email protected]>
GregTechCEu · Dec 3, 2023 · cc7dc27 · cc7dc27
1 parent 6795c6c
commit cc7dc27
Show file tree

Hide file tree

Showing 28 changed files with 65 additions and 49 deletions.
diff --git 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
+* 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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<Block, BlockSt
         super.createBlockStateDefinition(builder);
         builder.add(FACING);
     }
+
+    @Override
+    public String getDescriptionId() {
+        return super.getDescriptionId();
+    }
+
+    @Override
+    public MutableComponent getName() {
+        return Component.translatable("block.surface_rock", material.getLocalizedName());
+    }
 }
diff --git a/common/src/main/java/com/gregtechceu/gtceu/data/lang/LangHandler.java b/common/src/main/java/com/gregtechceu/gtceu/data/lang/LangHandler.java
@@ -432,6 +432,7 @@ public static void init(RegistrateLangProvider provider) {
         replace(provider, GTMaterials.HastelloyC276.getUnlocalizedName(), "Hastelloy C-276");
 
         provider.add("item.netherrack_nether_quartz", "Nether Quartz Ore");
+        provider.add("block.surface_rock", "%s Surface Rock");
 
         provider.add("item.gunpowder_tiny_dust", "Tiny Pile of Gunpowder");
         provider.add("item.gunpowder_small_dust", "Small Pile of Gunpowder");

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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/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