Skip to content

Commit 6c9b212

Browse files
tier940tier940
committed
Add CMMC Server file
1 parent ef06d86 commit 6c9b212

71 files changed

Lines changed: 838 additions & 262 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/preview.yml‎

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ env:
2424
JAVA8_MMC: "${{ github.event.inputs.version }}-Pre-${{ github.event.inputs.preview_version }}-MMC_Java_8"
2525
JAVA8_SERVER: "${{ github.event.inputs.version }}-Pre-${{ github.event.inputs.preview_version }}-Server_Java_8"
2626
JAVA_OPT: "${{ github.event.inputs.version }}-Pre-${{ github.event.inputs.preview_version }}-MMC_Java_25-26"
27+
JAVA_OPT_SERVER: "${{ github.event.inputs.version }}-Pre-${{ github.event.inputs.preview_version }}-Server_Java_25-26"
2728

2829
jobs:
2930
build:
@@ -87,12 +88,30 @@ jobs:
8788
cp -vf icon.png .minecraft/
8889
cp -rvf cmmc/* ./
8990
zip -r artifacts/${{ env.NAME }}-${{ env.JAVA_OPT }}.zip patches/ mmc-pack.json instance.cfg .minecraft/
91+
CLEANROOM_VER=$(jq -r '.components[] | select(.uid == "net.minecraftforge") | .version' cmmc/mmc-pack.json)
92+
sed -i "s/CLEANROOMVERSION/$CLEANROOM_VER/g" serverfiles/cmmc/settings.sh serverfiles/cmmc/settings.bat serverfiles/cmmc/PleaseRead.txt
93+
mv -vf serverfiles/cmmc/* ./
94+
rm -vf .minecraft/mods/CraftPresence-*
95+
rm -vf .minecraft/mods/Controlling-*
96+
rm -vf .minecraft/mods/UniLib-*
97+
rm -vf .minecraft/mods/CustomMainMenu-*
98+
rm -vf .minecraft/mods/Fixeroo-*
99+
rm -vf .minecraft/mods/FpsReducer-*
100+
rm -vf .minecraft/mods/modernsplash-*
101+
rm -vf .minecraft/mods/SmoothFont-*
102+
rm -vf .minecraft/mods/InGameInfoXML-*
103+
rm -vf .minecraft/mods/oauth-*
104+
rm -vf .minecraft/mods/UntranslatedItems-*
105+
mv -vf .minecraft/* ./
106+
zip -r artifacts/${{ env.NAME }}-${{ env.JAVA_OPT_SERVER }}.zip PleaseRead.txt Install.* ServerStart.* settings.* config/ local/ mods/ resources/ scripts/
90107
else
91108
zip -r artifacts/${{ env.NAME }}-${{ env.JAVA8_CF }}.zip manifest.json modlist.html overrides/config/ overrides/local/ overrides/resourcepacks/icons/ overrides/resourcepacks/GTExpert2-* overrides/scripts/
92109
mv overrides/ .minecraft/
93110
cp icon.png .minecraft/
94111
zip -r artifacts/${{ env.NAME }}-${{ env.JAVA8_MMC }}.zip mmc-pack.json instance.cfg .minecraft/
95-
mv serverfiles/* ./
112+
FORGE_VER=$(jq -r '"\(.minecraft.version)-\(.minecraft.modLoaders[0].id | sub("forge-"; ""))"' manifest.json)
113+
sed -i "s/FORGEVERSION/$FORGE_VER/g" serverfiles/java8/settings.sh serverfiles/java8/settings.bat serverfiles/java8/PleaseRead.txt
114+
mv -vf serverfiles/java8/* ./
96115
rm -vf .minecraft/mods/!Red-Core-*
97116
rm -vf .minecraft/mods/Alfheim-*
98117
rm -vf .minecraft/mods/CraftPresence-*
@@ -110,7 +129,7 @@ jobs:
110129
rm -vf .minecraft/mods/oauth-*
111130
rm -vf .minecraft/mods/UntranslatedItems-*
112131
mv -vf .minecraft/* ./
113-
zip -r artifacts/${{ env.NAME }}-${{ env.JAVA8_SERVER }}.zip docker-compose.yml PleaseRead.txt log4j2_112-116.xml Install.* ServerStart.* settings.* TmuxServer.sh config/ local/ mods/ resources/ scripts/
132+
zip -r artifacts/${{ env.NAME }}-${{ env.JAVA8_SERVER }}.zip PleaseRead.txt log4j2_112-116.xml Install.* ServerStart.* settings.* config/ local/ mods/ resources/ scripts/
114133
fi
115134
116135
- name: Upload Artifacts
@@ -165,7 +184,7 @@ jobs:
165184
166185
This preview includes:
167186
- **Java 8** (CurseForge / MultiMC / PrismLauncher / Server)
168-
- **Java 25-26** (MultiMC / PrismLauncher only)
187+
- **Java 25-26** (MultiMC / PrismLauncher / Server)
169188
170189
See installation guide for Java 25-26 [here](https://github.com/GTModpackTeam/GregTech-Expert-2/blob/main/cmmc/).
171190
prerelease: true

‎.github/workflows/release.yml‎

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ env:
2222
JAVA8_MMC: "${{ github.event.inputs.version }}-MMC_Java_8"
2323
JAVA8_SERVER: "${{ github.event.inputs.version }}-Server_Java_8"
2424
JAVA_OPT: "${{ github.event.inputs.version }}-MMC_Java_25-26"
25+
JAVA_OPT_SERVER: "${{ github.event.inputs.version }}-Server_Java_25-26"
2526

2627
jobs:
2728
build:
@@ -84,12 +85,30 @@ jobs:
8485
cp -vf icon.png .minecraft/
8586
cp -rvf cmmc/* ./
8687
zip -r artifacts/${{ env.NAME }}-${{ env.JAVA_OPT }}.zip patches/ mmc-pack.json instance.cfg .minecraft/
88+
CLEANROOM_VER=$(jq -r '.components[] | select(.uid == "net.minecraftforge") | .version' cmmc/mmc-pack.json)
89+
sed -i "s/CLEANROOMVERSION/$CLEANROOM_VER/g" serverfiles/cmmc/settings.sh serverfiles/cmmc/settings.bat serverfiles/cmmc/PleaseRead.txt
90+
mv -vf serverfiles/cmmc/* ./
91+
rm -vf .minecraft/mods/CraftPresence-*
92+
rm -vf .minecraft/mods/Controlling-*
93+
rm -vf .minecraft/mods/UniLib-*
94+
rm -vf .minecraft/mods/CustomMainMenu-*
95+
rm -vf .minecraft/mods/Fixeroo-*
96+
rm -vf .minecraft/mods/FpsReducer-*
97+
rm -vf .minecraft/mods/modernsplash-*
98+
rm -vf .minecraft/mods/SmoothFont-*
99+
rm -vf .minecraft/mods/InGameInfoXML-*
100+
rm -vf .minecraft/mods/oauth-*
101+
rm -vf .minecraft/mods/UntranslatedItems-*
102+
mv -vf .minecraft/* ./
103+
zip -r artifacts/${{ env.NAME }}-${{ env.JAVA_OPT_SERVER }}.zip PleaseRead.txt Install.* ServerStart.* settings.* config/ local/ mods/ resources/ scripts/
87104
else
88105
zip -r artifacts/${{ env.NAME }}-${{ env.JAVA8_CF }}.zip manifest.json modlist.html overrides/config/ overrides/local/ overrides/resourcepacks/ overrides/scripts/
89106
mv overrides/ .minecraft/
90107
cp icon.png .minecraft/
91108
zip -r artifacts/${{ env.NAME }}-${{ env.JAVA8_MMC }}.zip mmc-pack.json instance.cfg .minecraft/
92-
mv serverfiles/* ./
109+
FORGE_VER=$(jq -r '"\(.minecraft.version)-\(.minecraft.modLoaders[0].id | sub("forge-"; ""))"' manifest.json)
110+
sed -i "s/FORGEVERSION/$FORGE_VER/g" serverfiles/java8/settings.sh serverfiles/java8/settings.bat serverfiles/java8/PleaseRead.txt
111+
mv -vf serverfiles/java8/* ./
93112
rm -vf .minecraft/mods/!Red-Core-*
94113
rm -vf .minecraft/mods/Alfheim-*
95114
rm -vf .minecraft/mods/CraftPresence-*
@@ -107,7 +126,7 @@ jobs:
107126
rm -vf .minecraft/mods/oauth-*
108127
rm -vf .minecraft/mods/UntranslatedItems-*
109128
mv -vf .minecraft/* ./
110-
zip -r artifacts/${{ env.NAME }}-${{ env.JAVA8_SERVER }}.zip docker-compose.yml PleaseRead.txt log4j2_112-116.xml Install.* ServerStart.* settings.* TmuxServer.sh config/ local/ mods/ resources/ scripts/
129+
zip -r artifacts/${{ env.NAME }}-${{ env.JAVA8_SERVER }}.zip PleaseRead.txt log4j2_112-116.xml Install.* ServerStart.* settings.* config/ local/ mods/ resources/ scripts/
111130
fi
112131
113132
- name: Upload Artifacts
@@ -164,7 +183,7 @@ jobs:
164183
165184
This preview includes:
166185
- **Java 8** (CurseForge / MultiMC / PrismLauncher / Server)
167-
- **Java 25-26** (MultiMC / PrismLauncher only)
186+
- **Java 25-26** (MultiMC / PrismLauncher / Server)
168187
169188
See installation guide for Java 25-26 [here](https://github.com/GTModpackTeam/GregTech-Expert-2/blob/main/cmmc/).
170189
prerelease: false

‎CHANGELOG_v2.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
- AE2FluidCraft-Rework-Unofficial (2.7.9 -> 2.7.10)
1616
- AE2UEL Wireless Universal Terminal (1.2.8 -> 1.2.10)
1717
- Advanced Backups Patch (1.0.3 -> 1.0.6)
18+
- Better Questing Unofficial (4.2.7 -> 4.3.1)
1819
- Flare (0.7.0 -> 0.8.0)
1920
- GTConsolidate (1.1.3.5 -> 1.1.4)
2021
- GTExpertCore (2.7.4 -> 2.7.6)

‎cmmc/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
# GregTech Expert 2 for Java_25-26 Version - (Powered by [Cleanroom](https://github.com/CleanroomMC/Cleanroom))
1+
# GregTech Expert 2 for Java8+ Version - (Powered by [Cleanroom](https://github.com/CleanroomMC/Cleanroom))
22

33
## About
4-
- This is the first ModPack created(probably) to promote [CleanroomMC](https://github.com/CleanroomMC), which runs on LWJGL version 3 in Minecraft 1.12.2 and aims to run [Azul Zulu Builds of OpenJDK(Java 25+)](https://www.azul.com/downloads/?version=java-21-lts&package=jre#zulu), optimize, and much more.
4+
- This is the first ModPack created(probably) to promote [CleanroomMC](https://github.com/CleanroomMC), which runs on LWJGL version 3 in Minecraft 1.12.2 and aims to run [Azul Zulu Builds of OpenJDK(Java 8+)](https://www.azul.com/downloads/?package=jre#zulu), optimize, and much more.
55

66

77
## How to install

‎manifest.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@
286286
},
287287
{
288288
"projectID": 629629,
289-
"fileID": 7421294,
289+
"fileID": 7859791,
290290
"required": true
291291
},
292292
{
@@ -677,7 +677,7 @@
677677
{
678678
"projectID": 692142,
679679
"fileID": 7857037,
680-
"required": false
680+
"required": true
681681
},
682682
{
683683
"projectID": 1198138,

‎overrides/config/HotOrNotPlus.cfg‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,13 @@ general {
6464
B:"Hot items"=true
6565

6666
# Max durability of Iron Tongs, 0 for infinite durability
67-
I:"Iron Tongs durability"=0
67+
I:"Iron Tongs durability"=512
6868

6969
# If true, hot items make the player yeet them
7070
B:"Item throwing"=false
7171

7272
# Max durability of Mitts, 0 for infinite durability
73-
I:"Mitts durability"=1000
73+
I:"Mitts durability"=256
7474

7575
# How much damage gets applied to the protection item per check
7676
I:"Protection item damage"=1
@@ -82,7 +82,7 @@ general {
8282
B:Tooltips=true
8383

8484
# Max durability of Wooden Tongs, 0 for infinite durability
85-
I:"Wooden Tongs durability"=100
85+
I:"Wooden Tongs durability"=64
8686
}
8787

8888

‎overrides/config/RoughlyEnoughIDs.cfg‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
# Configuration file
2+
3+
general {
4+
5+
debug {
6+
# Enable this to register extra biomes for debugging/testing.
7+
B:Biomes=false
8+
9+
# The amount of biomes to register.
10+
I:"Biomes - Amount"=300
11+
12+
# Enable this to register extra blocks for debugging/testing.
13+
B:Blocks=false
14+
15+
# The amount of blocks to register.
16+
I:"Blocks - Amount"=5000
17+
18+
# Enable this to register extra enchantments for debugging/testing.
19+
B:Enchantments=false
20+
21+
# The amount of enchantments to register.
22+
I:"Enchantments - Amount"=32767
23+
24+
# Enable this to register extra items for debugging/testing.
25+
B:Items=false
26+
27+
# The amount of items to register.
28+
I:"Items - Amount"=40000
29+
30+
# Enable this to register extra potions for debugging/testing.
31+
B:Potions=false
32+
33+
# The amount of potions to register.
34+
I:"Potions - Amount"=300
35+
}
36+
37+
transformers {
38+
# Some mods may generate chunks outside of the expected class and need REID to inject its biome initialization.
39+
# The issue generally manifests as random patches of plains biomes in chunks.
40+
# Specify classes here by their fully qualified class name.
41+
S:"Patch Targets: Chunk biome initialization" <
42+
pregenerator.impl.processor.generator.ChunkHelper
43+
>
44+
}
45+
46+
}
47+
48+

‎overrides/config/betterquesting/DefaultQuests/QuestLines/3.json‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,6 +327,13 @@
327327
"sizeY:3": 24,
328328
"x:3": 104,
329329
"y:3": 192
330+
},
331+
"45:10": {
332+
"id:3": 1086567200,
333+
"sizeX:3": 24,
334+
"sizeY:3": 24,
335+
"x:3": 56,
336+
"y:3": 192
330337
}
331338
}
332-
}
339+
}

‎overrides/config/betterquesting/DefaultQuests/Quests/0/293824100.json‎

Lines changed: 76 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"properties:10": {
33
"betterquesting:10": {
4-
"desc:8": "熱いまたは冷たい物を持つ場合、追加されたアイテムをオフハンドに装備するとダメージを抑えることが出来ます。\nまた注意として軽い気体を持つ場合、体が浮かび上がるので注意が必要です。詳しくはツールチップを確認してください。\n\n種類としては三つありますが違いは耐久値の違いだけで、その中で鉄製トングは耐久値無限となります。\n\n木製トング: 100\nミトン: 1000\n\n後半ではNanoMuscle™スーツやQuarkTech™スーツを着ることでダメージをカットできます。\n\n\n余談その1\nGTE2 v2.7.12にて追加された新要素で、これはGTNHにもある仕様である。\nなおマイナバージョンアップで導入したため、困惑するユーザが多発した。",
4+
"desc:8": "熱いまたは冷たい物を持つ場合、追加されたアイテムをオフハンドに装備するとダメージを抑えることが出来ます。\nまた注意として軽い気体を持つ場合、体が浮かび上がるので注意が必要です。詳しくはツールチップを確認してください。\n\n種類としては三つありますが違いは耐久値の違いだけで、その中で鉄製トングはGregツール同様に素材ごとに耐久値が変わります。\n\n木製トング: 64\nミトン: 256\n\n後半ではNanoMuscle™スーツやQuarkTech™スーツを着ることでダメージをカットできます。\n\n\n余談その1\nGTE2 v2.7.12にて追加された新要素で、これはGTNHにもある仕様である。\nなおマイナバージョンアップで導入したため、困惑するユーザが多発した。\n\n\n余談その2\nHot or Not GTCEuのアップデートにより、各素材に対応した耐久値をもつトングと電動トングが実装されました。\nなおこのアップデートにより旧鉄トングの耐久値が無限ではなくなり、木製やミトンの耐久が大幅にナーフされた。",
55
"icon:10": {
66
"Count:3": 1,
77
"id:8": "hotornot:mitts"
@@ -26,10 +26,83 @@
2626
},
2727
"2:10": {
2828
"Count:3": 1,
29-
"id:8": "hotornot:iron_tongs"
29+
"id:8": "hotornotgt:tongs",
30+
"tag:10": {
31+
"DisallowContainerItem:1": 0,
32+
"GT.Behaviours:10": {},
33+
"GT.Tool:10": {
34+
"AttackDamage:5": 0.0,
35+
"AttackSpeed:5": 0.0,
36+
"Durability:3": 0,
37+
"Material:8": "gregtech:iron",
38+
"MaxDurability:3": 511
39+
},
40+
"HideFlags:3": 2
41+
}
3042
}
3143
},
3244
"taskID:8": "bq_standard:retrieval"
45+
},
46+
"1:10": {
47+
"ignoreNBT:1": 1,
48+
"index:3": 1,
49+
"requiredItems:9": {
50+
"0:10": {
51+
"Count:3": 1,
52+
"id:8": "hotornotgt:tongs_lv",
53+
"tag:10": {
54+
"Charge:4": 2147483647,
55+
"DisallowContainerItem:1": 0,
56+
"GT.Behaviours:10": {},
57+
"GT.Tool:10": {
58+
"AttackDamage:5": 0.0,
59+
"AttackSpeed:5": 0.0,
60+
"Durability:3": 0,
61+
"Material:8": "gregtech:iron",
62+
"MaxDurability:3": 767
63+
},
64+
"HideFlags:3": 2,
65+
"MaxCharge:4": 2147483647
66+
}
67+
},
68+
"1:10": {
69+
"Count:3": 1,
70+
"id:8": "hotornotgt:tongs_hv",
71+
"tag:10": {
72+
"Charge:4": 2147483647,
73+
"DisallowContainerItem:1": 0,
74+
"GT.Behaviours:10": {},
75+
"GT.Tool:10": {
76+
"AttackDamage:5": 0.0,
77+
"AttackSpeed:5": 0.0,
78+
"Durability:3": 0,
79+
"Material:8": "gregtech:iron",
80+
"MaxDurability:3": 1151
81+
},
82+
"HideFlags:3": 2,
83+
"MaxCharge:4": 2147483647
84+
}
85+
},
86+
"2:10": {
87+
"Count:3": 1,
88+
"id:8": "hotornotgt:tongs_iv",
89+
"tag:10": {
90+
"Charge:4": 2147483647,
91+
"DisallowContainerItem:1": 0,
92+
"GT.Behaviours:10": {},
93+
"GT.Tool:10": {
94+
"AttackDamage:5": 0.0,
95+
"AttackSpeed:5": 0.0,
96+
"Durability:3": 0,
97+
"Material:8": "gregtech:iron",
98+
"MaxDurability:3": 1535
99+
},
100+
"HideFlags:3": 2,
101+
"MaxCharge:4": 2147483647
102+
}
103+
}
104+
},
105+
"taskID:8": "bq_standard:optional_retrieval"
33106
}
34107
}
35-
}
108+
}

0 commit comments

Comments
 (0)