Skip to content

Commit 9c93817

Browse files
tier940tier940
committed
Merge commit 'b8708481733d7182e2cd4a9e200595603e61bba7' into 2.9
2 parents 4e96ec9 + b870848 commit 9c93817

14 files changed

Lines changed: 320 additions & 278 deletions

File tree

‎.github/workflows/publish.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,9 @@ jobs:
8282
modrinth-id: ${{ env.MODRINTH_PROJECT_ID }}
8383
modrinth-token: "${{ secrets.MODRINTH_API_KEY }}"
8484
modrinth-dependencies: |
85-
8PB5NZf9(required)
86-
vaQ5bJYU(required)
87-
MeXYT7nJ(required)
85+
G1ckZuWK(required)
86+
tULldUx4(required)
87+
tZiutdLG(required)
8888
curseforge-id: ${{ env.CURSEFORGE_PROJECT_ID }}
8989
curseforge-token: "${{ secrets.CURSEFORGE_API_KEY }}"
9090
curseforge-dependencies: |

‎CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
# v2.4.0
2+
- Disable automatic meal function for helmets [#300](https://github.com/GTModpackTeam/GTExpert-Core/pull/300)
3+
- Removed conflicts with GTWP [#303](https://github.com/GTModpackTeam/GTExpert-Core/pull/303)
4+
5+
* * *
6+
17
# v2.3.2
28
- Fix BlastTemperature of Vacuum Freezer Extended Recipes.
39

‎dependencies.gradle‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,16 @@ dependencies {
5959
devOnlyNonPublishable(rfg.deobf("curse.maven:ae2-extended-life-570458:5411078")) // AE2UEL 0.56.6
6060
}
6161

62+
// Debug GTWoodProcessing
63+
compileOnly rfg.deobf("curse.maven:gtwoodprocessing-1093753:5731776") // GTWoodProcessing 1.2.2
64+
if (project.debug_all.toBoolean() || project.debug_gtwp.toBoolean()) {
65+
runtimeOnlyNonPublishable rfg.deobf("curse.maven:gtwoodprocessing-1093753:5731776")
66+
}
67+
6268
// Debug ImplosionNoBomb
63-
compileOnly rfg.deobf("curse.maven:implosionnobomb-1094386:5680426") // ImplosionNoBomb 1.0.0
69+
compileOnly rfg.deobf("curse.maven:implosionnobomb-1094386:5731331") // ImplosionNoBomb 1.1.0
6470
if (project.debug_all.toBoolean() || project.debug_inb.toBoolean()) {
65-
runtimeOnlyNonPublishable rfg.deobf("curse.maven:implosionnobomb-1094386:5680426")
71+
runtimeOnlyNonPublishable rfg.deobf("curse.maven:implosionnobomb-1094386:5731331")
6672
}
6773

6874
// Debug AE Additions

‎gradle.properties‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ modGroup = gtexpert
77

88
# Version of your mod.
99
# This field can be left empty if you want your mod's version to be determined by the latest git tag instead.
10-
modVersion = 2.3.2-beta
10+
modVersion = 2.4.0-release
1111

1212
# Whether to use the old jar naming structure (modid-mcversion-version) instead of the new version (modid-version)
1313
includeMCVersionJar = true
@@ -27,6 +27,7 @@ useAE2uelExtended = false
2727

2828
# Debug mod compatibility
2929
debug_all = false
30+
debug_gtwp = false
3031
debug_inb = false
3132
debug_aea = false
3233
debug_nae2 = false

‎renovate.json‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,23 @@
33
"extends": [
44
"config:recommended"
55
],
6-
"dependencyDashboard": true,
76
"timezone": "Asia/Tokyo",
87
"schedule": [
98
"every weekend"
109
],
11-
"enabledManagers": [
12-
"gradle"
13-
],
14-
"ignorePaths": [
15-
"build.gradle"
16-
],
17-
"separateMajorMinor": false,
1810
"automerge": false,
1911
"packageRules": [
12+
{
13+
"matchDatasources": ["gradle-version"],
14+
"registryUrls": [
15+
"https://www.cursemaven.com",
16+
"https://api.modrinth.com/maven",
17+
"https://maven.cleanroommc.com",
18+
"https://maven.blamejared.com",
19+
"https://nexus.gtnewhorizons.com/repository/public/",
20+
"https://maven.gtceu.com"
21+
]
22+
},
2023
{
2124
"groupName": "monthly_maintenance",
2225
"matchDepTypes":[ "dependencies" ],

‎src/main/java/gtexpert/GTExpertMod.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@
3535
version = Tags.VERSION,
3636
updateJSON = "https://forge.curseupdate.com/851103/gtexpert",
3737
dependencies = GTInternalTags.DEP_VERSION_STRING + "required-after:" + Mods.Names.MODULRAUI + ";" +
38-
"required-after:" + Mods.Names.MODULRAUI + ";" + "required-after:" + Mods.Names.MIXINBOOTER + ";" +
39-
"required-after:" + Mods.Names.GREGICALITY_MULTIBLOCKS + ";" +
38+
"required-after:" + Mods.Names.MIXINBOOTER + ";" + "required-after:" + Mods.Names.GREGICALITY_MULTIBLOCKS + ";" +
39+
"after:" + Mods.Names.GREGTECH_WOOD_PROCESSING + ";" + "after:" + Mods.Names.IMPLOSION_NO_BOMB + ";" +
4040
"after:" + Mods.Names.GREGTECH_FOOD_OPTION + ";" + "after:" + Mods.Names.APPLIED_ENERGISTICS2 + ";" +
4141
"after:" + Mods.Names.AE_ADDITIONS + ";" + "after:" + Mods.Names.AE2_FLUID_CRAFTING + ";" +
4242
"after:" + Mods.Names.NEEVES_AE2 + ";" + "after:" + Mods.Names.EXTRA_CPUS + ";" +

‎src/main/java/gtexpert/api/util/Mods.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ public enum Mods {
7575
GregTech(Names.GREGTECH),
7676
GregTechFoodOption(Names.GREGTECH_FOOD_OPTION),
7777
GregTechExpertCore(GTEValues.MODID),
78+
GregTechWoodProcessing(Names.GREGTECH_WOOD_PROCESSING),
7879
GroovyScript(Names.GROOVY_SCRIPT),
7980
HWYLA(Names.HWYLA),
8081
ImplosionNoBomb(Names.IMPLOSION_NO_BOMB),
@@ -170,6 +171,7 @@ public static class Names {
170171
public static final String GREGICALITY_MULTIBLOCKS = "gcym";
171172
public static final String GREGTECH = GTValues.MODID;
172173
public static final String GREGTECH_FOOD_OPTION = "gregtechfoodoption";
174+
public static final String GREGTECH_WOOD_PROCESSING = "gtwp";
173175
public static final String GROOVY_SCRIPT = "groovyscript";
174176
public static final String HWYLA = "hwyla";
175177
public static final String IMPLOSION_NO_BOMB = "inb";

‎src/main/java/gtexpert/common/GTEConfigHolder.java‎

Lines changed: 13 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,21 @@ public class GTEConfigHolder {
1111

1212
@Config.Name("GTExpert-Core Options")
1313
@Config.RequiresMcRestart
14-
public static final GTEFlag gteFlag = new GTEFlag();
15-
16-
@Config.Name("GTExpert-Core Feature Options")
17-
@Config.RequiresMcRestart
18-
public static final GTEFeatureFlag gteFeatureFlag = new GTEFeatureFlag();
14+
public static final ModpackFlag gteFlag = new ModpackFlag();
1915

2016
@Config.Name("Gregtech Override")
2117
@Config.RequiresMcRestart
2218
public static final GregtechOverride ceuOverride = new GregtechOverride();
2319

24-
public static class GTEFlag {
20+
public static class ModpackFlag {
21+
22+
@Config.Comment({ "Activate changes in the replacement schedule.",
23+
"1. When enabled, the following structure and mte name changes: ",
24+
"Large Cracking Unit",
25+
"2. When enabled, the recipe of the following items will be changed: ",
26+
"Logic Processor, Calc Processor, Engineer Processor",
27+
"Default: false" })
28+
public boolean featureFlag = false;
2529

2630
@Config.Comment({ "Item name to be CEu standard instead of Primitive",
2731
"Options: true (ULV), false (Primitive)",
@@ -51,40 +55,16 @@ public static class GTEFlag {
5155
public boolean peacefulFlag = false;
5256
}
5357

54-
public static class GTEFeatureFlag {
55-
56-
@Config.Comment({ "Activate changes in the replacement schedule.",
57-
"1. When enabled, the following structure and mte name changes: ",
58-
"Large Cracking Unit",
59-
"1. When enabled, the following mte name changes: ",
60-
"Advanced Gas Collector -> Large Gas Collector",
61-
"Default: false" })
62-
public boolean migrationMachine = false;
63-
64-
@Config.Comment({ "Activate machines under development.",
65-
"Default: false" })
66-
public boolean previewMachines = false;
67-
68-
@Config.Comment({ "Activate items under development.",
69-
"Default: false" })
70-
public boolean previewItems = false;
71-
}
72-
7358
public static class GregtechOverride {
7459

75-
@Config.Comment({ "Making Planks even more difficult.",
76-
"CEu's hardWoodRecipes & nerfWoodCrafting to true to reflect.", "Default: false" })
77-
public boolean moreNerfPlankCrafting = false;
78-
79-
@Config.Comment({ "Making Sticks even more difficult.",
80-
"CEu's harderRods to true to reflect.", "Default: false" })
81-
public boolean moreNerfStickCrafting = false;
82-
8360
@Config.Comment({ "Change to a recipe using Assembly Line.",
8461
"CEu's enableHighTierSolars to true to reflect.", "Default: false" })
8562
public boolean hardSolarPanel = false;
8663

8764
@Config.Comment({ "Raising Terracotta Grinding from ULV to MV.", "Default: false" })
8865
public boolean nerfTerracottaCrafting = false;
66+
67+
@Config.Comment({ "Disable auto eat function of QuarkTech helmet", "Default: true" })
68+
public boolean disableHelmetAutoEat = true;
8969
}
9070
}

‎src/main/java/gtexpert/common/blocks/GTEBlockMetalCasing.java‎

Lines changed: 51 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,51 @@
1-
package gtexpert.common.blocks;
2-
3-
import net.minecraft.block.SoundType;
4-
import net.minecraft.block.state.IBlockState;
5-
import net.minecraft.entity.EntityLiving;
6-
import net.minecraft.util.IStringSerializable;
7-
import net.minecraft.util.math.BlockPos;
8-
import net.minecraft.world.IBlockAccess;
9-
10-
import org.jetbrains.annotations.NotNull;
11-
12-
import gregtech.api.block.VariantBlock;
13-
import gregtech.api.items.toolitem.ToolClasses;
14-
15-
public class GTEBlockMetalCasing extends VariantBlock<GTEBlockMetalCasing.MetalCasingType> {
16-
17-
public GTEBlockMetalCasing() {
18-
super(net.minecraft.block.material.Material.IRON);
19-
setTranslationKey("gte_metal_casing");
20-
setHardness(5.0f);
21-
setResistance(10.0f);
22-
setSoundType(SoundType.METAL);
23-
setHarvestLevel(ToolClasses.WRENCH, 2);
24-
setDefaultState(getState(MetalCasingType.DRACONIUM_CASING));
25-
}
26-
27-
@Override
28-
public boolean canCreatureSpawn(@NotNull IBlockState state, @NotNull IBlockAccess world, @NotNull BlockPos pos,
29-
@NotNull EntityLiving.SpawnPlacementType type) {
30-
return false;
31-
}
32-
33-
public enum MetalCasingType implements IStringSerializable {
34-
35-
VOID_ORE_MINER("void_ore_miner_casing"),
36-
DRACONIUM_CASING("draconium_casing"),
37-
AWAKENED_DRACONIUM_CASING("awakened_draconium_casing");
38-
39-
private final String name;
40-
41-
MetalCasingType(String name) {
42-
this.name = name;
43-
}
44-
45-
@NotNull
46-
@Override
47-
public String getName() {
48-
return this.name;
49-
}
50-
}
51-
}
1+
package gtexpert.common.blocks;
2+
3+
import net.minecraft.block.SoundType;
4+
import net.minecraft.block.state.IBlockState;
5+
import net.minecraft.entity.EntityLiving;
6+
import net.minecraft.util.IStringSerializable;
7+
import net.minecraft.util.math.BlockPos;
8+
import net.minecraft.world.IBlockAccess;
9+
10+
import org.jetbrains.annotations.NotNull;
11+
12+
import gregtech.api.block.VariantBlock;
13+
import gregtech.api.items.toolitem.ToolClasses;
14+
15+
public class GTEBlockMetalCasing extends VariantBlock<GTEBlockMetalCasing.MetalCasingType> {
16+
17+
public GTEBlockMetalCasing() {
18+
super(net.minecraft.block.material.Material.IRON);
19+
setTranslationKey("gte_metal_casing");
20+
setHardness(5.0f);
21+
setResistance(10.0f);
22+
setSoundType(SoundType.METAL);
23+
setHarvestLevel(ToolClasses.WRENCH, 2);
24+
setDefaultState(getState(MetalCasingType.VOID_ORE_MINER));
25+
}
26+
27+
@Override
28+
public boolean canCreatureSpawn(@NotNull IBlockState state, @NotNull IBlockAccess world, @NotNull BlockPos pos,
29+
@NotNull EntityLiving.SpawnPlacementType type) {
30+
return false;
31+
}
32+
33+
public enum MetalCasingType implements IStringSerializable {
34+
35+
VOID_ORE_MINER("void_ore_miner_casing"),
36+
DRACONIUM_CASING("draconium_casing"),
37+
AWAKENED_DRACONIUM_CASING("awakened_draconium_casing");
38+
39+
private final String name;
40+
41+
MetalCasingType(String name) {
42+
this.name = name;
43+
}
44+
45+
@NotNull
46+
@Override
47+
public String getName() {
48+
return this.name;
49+
}
50+
}
51+
}

0 commit comments

Comments
 (0)