Skip to content

Commit 4283182

Browse files
screretscreret
committed
Merge remote-tracking branch 'origin/1.20.1' into 1.21
# Conflicts: # .github/workflows/manage-issue-labels.yml # dependencies.gradle # gradle/libs.versions.toml # gradle/scripts/jars.gradle # gradle/scripts/repositories.gradle # src/generated/resources/assets/gtceu/lang/en_ud.json # src/generated/resources/assets/gtceu/lang/en_us.json # src/main/java/com/gregtechceu/gtceu/api/item/IGTTool.java # src/main/java/com/gregtechceu/gtceu/api/item/component/ElectricStats.java # src/main/java/com/gregtechceu/gtceu/api/material/material/ItemMaterialData.java # src/main/java/com/gregtechceu/gtceu/api/material/material/stack/ItemMaterialInfo.java # src/main/java/com/gregtechceu/gtceu/common/CommonProxy.java # src/main/java/com/gregtechceu/gtceu/common/item/armor/AdvancedNanoMuscleSuite.java # src/main/java/com/gregtechceu/gtceu/common/item/armor/AdvancedQuarkTechSuite.java # src/main/java/com/gregtechceu/gtceu/common/pack/GTDynamicPackContents.java # src/main/java/com/gregtechceu/gtceu/common/pack/GTDynamicResourcePack.java # src/main/java/com/gregtechceu/gtceu/data/datagen/tag/ItemTagLoader.java # src/main/java/com/gregtechceu/gtceu/data/pack/GTDynamicDataPack.java # src/main/java/com/gregtechceu/gtceu/data/recipe/GTRecipes.java # src/main/resources/assets/gtceu/lang/ja_jp.json # src/main/resources/assets/gtceu/lang/uk_ua.json # src/main/resources/assets/gtceu/lang/zh_cn.json # src/main/resources/assets/gtceu/lang/zh_tw.json
2 parents beefe01 + 51167ac commit 4283182

38 files changed

Lines changed: 5998 additions & 5750 deletions

‎.github/workflows/manage-issue-labels.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ jobs:
1818
template: [ 000-bug-report.yml, 001-feature-request.yml ]
1919
steps:
2020
- uses: actions/checkout@v4
21+
2122
- name: Parse issue form
2223
uses: stefanbuck/github-issue-parser@v3
2324
id: issue-parser

‎.github/workflows/manual-autolabel.yml‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
# Manages labels on new issues
2+
name: Retroactively apply Issue Labels
3+
4+
on:
5+
workflow_dispatch:
6+
7+
permissions:
8+
contents: read
9+
10+
jobs:
11+
label-all:
12+
runs-on: ubuntu-latest
13+
permissions:
14+
issues: write # IDK if this is needed to run manage-issue-labels, but it doesn't hurt so
15+
actions: write
16+
steps:
17+
- name: Labelifier
18+
uses: actions/github-script@v7
19+
id: label-em
20+
with:
21+
script: |
22+
github.paginate(github.rest.issues.listForRepo, {
23+
owner: "GregTechCEu",
24+
repo: "GregTech-Modern",
25+
}).then((issues) => {
26+
// issues is an array of all issue objects
27+
issues.forEach((issue) => {
28+
if (issue.pull_request != undefined) {
29+
// if it's a pull request, skip it.
30+
return;
31+
}
32+
octokit.rest.actions.createWorkflowDispatch({
33+
owner: "GregTechCEu",
34+
repo: "GregTech-Modern",
35+
workflow_id: "manage-issue-labels",
36+
ref: ${{ github.ref }},
37+
inputs: {
38+
issue_number: issue.body
39+
}
40+
});
41+
});
42+
});

‎dependencies.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,10 @@ dependencies {
5555
// GameStages
5656
compileOnly(forge.gamestages)
5757

58-
// Standard runtime s //
58+
// Standard runtime mods //
5959
runtimeOnly(forge.jade)
6060
runtimeOnly(forge.ae2)
61-
runtimeOnly(forge.kotlinforforge)
61+
runtimeOnly(forge.spark)
6262

6363
// Runtime Recipe Viewers - uncomment whichever one you want to use //
6464
runtimeOnly(forge.emi)
@@ -92,7 +92,7 @@ dependencies {
9292
transitive = false
9393
}
9494

95-
extraRuntimeOnly(forge.spark)
95+
extraRuntimeOnly(forge.kotlinforforge)
9696
extraRuntimeOnly(forge.observable)
9797
//////////////////////////
9898

‎gradle/libs.versions.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ loader = "4"
55
parchment = "2024.11.17" # https://parchmentmc.org/docs/getting-started
66
shadow = "8.3.5"
77
spotless = "7.0.2"
8-
modDevGradle = "2.0.80"
8+
modDevGradle = "2.0.86"
99
machete = "2.0.1"
1010
lombok = "8.13.1"
1111
jetbrains-annotations = "26.0.1"

‎gradle/scripts/jars.gradle‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
tasks.register('slimJar', Jar) {
2+
dependsOn("classes")
23
archiveClassifier = "slim"
34
from sourceSets.main.output
45
}
56

6-
// Add slim and sources jar to components.java
7+
// Add sources jar to components.java
78
java {
89
withSourcesJar()
910
}

‎gradle/scripts/moddevgradle.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ neoForge {
7070
server {
7171
server()
7272
sourceSet = sourceSets.main
73-
ideName = "Server"
73+
ideName = "Clean Server"
7474

7575
gameDirectory.set(file('run/server'))
7676
programArgument '--nogui'

‎gradle/scripts/repositories.gradle‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,6 @@ repositories {
22
mavenLocal()
33
mavenCentral()
44

5-
maven { // KubeJS and Rhino
6-
name = "Saps.dev Maven"
7-
url = "https://maven.latvian.dev/releases/"
8-
}
9-
105
maven { // JEI
116
name = "Jared's Maven"
127
url = "https://maven.blamejared.com/"
@@ -22,6 +17,13 @@ repositories {
2217
url = "https://maven.firstdarkdev.xyz/snapshots/"
2318
}
2419

20+
exclusiveContent { // KubeJS and Rhino
21+
forRepository { maven { url = "https://maven.latvian.dev/releases" } }
22+
filter {
23+
includeGroup("dev.latvian.mods")
24+
includeGroup("dev.latvian.apps")
25+
}
26+
}
2527
exclusiveContent { // Configuration
2628
forRepository { maven { url = "https://api.repsy.io/mvn/toma/public/" } }
2729
filter { includeGroup('dev.toma.configuration') }

‎src/generated/resources/data/forge/tags/items/coral_blocks.json‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"values": [
3+
"minecraft:brain_coral_block",
4+
"minecraft:bubble_coral_block",
5+
"minecraft:fire_coral_block",
6+
"minecraft:tube_coral_block",
7+
"minecraft:horn_coral_block",
8+
"minecraft:dead_brain_coral_block",
9+
"minecraft:dead_bubble_coral_block",
10+
"minecraft:dead_fire_coral_block",
11+
"minecraft:dead_tube_coral_block",
12+
"minecraft:dead_horn_coral_block"
13+
]
14+
}

‎src/generated/resources/data/forge/tags/items/corals.json‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
{
2+
"values": [
3+
"minecraft:brain_coral",
4+
"minecraft:bubble_coral",
5+
"minecraft:fire_coral",
6+
"minecraft:tube_coral",
7+
"minecraft:horn_coral",
8+
"minecraft:dead_brain_coral",
9+
"minecraft:dead_bubble_coral",
10+
"minecraft:dead_fire_coral",
11+
"minecraft:dead_tube_coral",
12+
"minecraft:dead_horn_coral",
13+
"minecraft:brain_coral_fan",
14+
"minecraft:bubble_coral_fan",
15+
"minecraft:fire_coral_fan",
16+
"minecraft:tube_coral_fan",
17+
"minecraft:horn_coral_fan",
18+
"minecraft:dead_brain_coral_fan",
19+
"minecraft:dead_bubble_coral_fan",
20+
"minecraft:dead_fire_coral_fan",
21+
"minecraft:dead_tube_coral_fan",
22+
"minecraft:dead_horn_coral_fan"
23+
]
24+
}

‎src/main/java/com/gregtechceu/gtceu/api/item/IGTTool.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.gregtechceu.gtceu.api.item;
22

3-
import com.gregtechceu.gtceu.api.GTValues;
43
import com.gregtechceu.gtceu.api.capability.GTCapabilityHelper;
54
import com.gregtechceu.gtceu.api.item.capability.ElectricItem;
65
import com.gregtechceu.gtceu.api.item.component.ElectricStats;
@@ -549,10 +548,8 @@ default int getTotalHarvestLevel() {
549548

550549
// electric info
551550
if (this.isElectric()) {
552-
tooltip.add(Component.translatable("metaitem.generic.electric_item.tooltip",
553-
FormattingUtil.formatNumbers(getCharge(stack)),
554-
FormattingUtil.formatNumbers(getMaxCharge(stack)),
555-
GTValues.VNF[getElectricTier()]));
551+
ElectricStats.addCurrentChargeTooltip(tooltip, getCharge(stack), getMaxCharge(stack), getElectricTier(),
552+
false);
556553
}
557554

558555
// durability info

0 commit comments

Comments
 (0)