Skip to content

Commit dccd05d

Browse files
committed
Removed support for Pams HC2 Crops
The emc on seeds and crops tags was causing problems for other mods emc
1 parent 4e3d1c5 commit dccd05d

6 files changed

Lines changed: 22 additions & 45 deletions

File tree

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
55
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
66

77
## [Unreleased]
8+
### Removed
9+
- Support for [Pams HarvestCraft 2: Crops] because the emc on crops and seeds was causing problems with other mods.
810

911
## [8.1.1]
1012
Tried to fix publications again, thanks GithubPackages, I'm thinking of just removing you.
@@ -882,6 +884,7 @@ Added support for 18 more mods
882884
[Mystical Agriculture]: https://www.curseforge.com/minecraft/mc-mods/mystical-agriculture
883885
[Natures Aura]: https://www.curseforge.com/minecraft/mc-mods/natures-aura
884886
[Occultism]: https://www.curseforge.com/minecraft/mc-mods/occultism
887+
[Pams HarvestCraft 2: Crops]: https://www.curseforge.com/minecraft/mc-mods/pams-harvestcraft-2-crops
885888
[PneumaticCraft: Repressurized]: https://www.curseforge.com/minecraft/mc-mods/pneumaticcraft-repressurized
886889
[Psi]: https://www.curseforge.com/minecraft/mc-mods/psi
887890
[Tinkers Construct]: https://www.curseforge.com/minecraft/mc-mods/tinkers-construct

build.gradle

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,11 @@ base {
2828
// Mojang ships Java 21 to end users starting in 1.20.5, so mods should target Java 21.
2929
java.toolchain.languageVersion = JavaLanguageVersion.of(21)
3030

31+
java {
32+
withJavadocJar()
33+
withSourcesJar()
34+
}
35+
3136
//println "Java: ${System.getProperty 'java.version'}, JVM: ${System.getProperty 'java.vm.version'} (${System.getProperty 'java.vendor'}), Arch: ${System.getProperty 'os.arch'}"
3237
neoForge {
3338
version = project.neo_version
@@ -224,7 +229,7 @@ dependencies {
224229
exclude group: '*'
225230
}
226231
implementation "curse.maven:pams-harvestcraft-2-food-core-372534:${version_pamsharvestcraftfoodcore}"
227-
implementation "curse.maven:pams-harvestcraft-2-crops-361385:${version_pamsharvestcraftcrops}"
232+
//implementation "curse.maven:pams-harvestcraft-2-crops-361385:${version_pamsharvestcraftcrops}"
228233
implementation "curse.maven:pams-harvestcraft-2-food-extended-402231:${version_pamsharvestcraftfoodextended}"
229234
implementation "me.desht.pneumaticcraft:pneumaticcraft-repressurized:${version_pneumaticcraft}"
230235
//implementation "vazkii.psi:Psi:${version_psi}"
@@ -246,19 +251,6 @@ javadoc {
246251
options.addStringOption('Xdoclint:none', '-quiet')
247252
}
248253

249-
tasks.register('sourcesJar', Jar) {
250-
from sourceSets.main.allSource
251-
archiveBaseName.set(project.archivesBaseName)
252-
archiveVersion.set("${project.version}")
253-
archiveClassifier.set('sources')
254-
}
255-
256-
tasks.register('javadocJar', Jar) {
257-
dependsOn javadoc
258-
from javadoc.destinationDir
259-
archiveClassifier.set('javadoc')
260-
}
261-
262254
artifacts {
263255
archives jar, sourcesJar, javadocJar
264256
}
@@ -411,7 +403,7 @@ if (System.getenv().CURSEFORGE_API_KEY != null) {
411403
'natures-aura',
412404
'occultism',
413405
'pams-harvestcraft-2-food-core',
414-
'pams-harvestcraft-2-crops',
406+
//'pams-harvestcraft-2-crops',
415407
'pams-harvestcraft-2-food-extended',
416408
'pneumaticcraft-repressurized',
417409
// 'psi',
Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 1.21.1 2025-04-20T17:56:42.6432526 Custom EMC Conversions: projecteintegration
1+
// 1.21.1 2025-04-28T14:53:12.5242589 Custom EMC Conversions: projecteintegration
22
582f60235625f3671a0fc445c2f60bafe5eed32b data/ae2/pe_custom_conversions/ae2_default.json
33
98f4158f81ea5ff1a3605c9d61013cee2448602d data/ars_nouveau/pe_custom_conversions/ars_nouveau_default.json
44
ce7c5c230d09a26f49f96bbb62edf266d03878b1 data/evilcraft/pe_custom_conversions/evilcraft_default.json
@@ -8,9 +8,8 @@ abc64a1c14abf45dcd20f35cffc24eb3f1382b24 data/immersiveengineering/pe_custom_con
88
21b45c68ffe38f2146c0851c55f351deabc9cab6 data/mysticalagriculture/pe_custom_conversions/mysticalagriculture_default.json
99
a2bf3ec84efefa25c6875d717731c9129873b335 data/naturesaura/pe_custom_conversions/naturesaura_default.json
1010
17623360224190f27e74cb581deb9bc50069a0e2 data/occultism/pe_custom_conversions/occultism_default.json
11-
b84d5441b8342cb2b19f3dde8f23a02857cf6322 data/pamhc2crops/pe_custom_conversions/pamhc2crops_default.json
1211
33f7697bdca63d5321bc12179bbcec654f193c3c data/pamhc2foodcore/pe_custom_conversions/pamhc2foodcore_default.json
13-
a03ed37da49974d19cc5f454c2ac9c0e6b09a4d9 data/pamhc2foodexpanded/pe_custom_conversions/pamhc2foodexpanded_default.json
12+
eae9e99ad9dd183231e628a74caeee811a8ef6ab data/pamhc2foodexpanded/pe_custom_conversions/pamhc2foodexpanded_default.json
1413
c88ba06b124bafe15fff0fe61e72c126eb5af726 data/pneumaticcraft/pe_custom_conversions/pneumaticcraft_default.json
1514
517edda7d6ad67ef3ee50fea7d90b1b674da03ab data/projecteintegration/pe_custom_conversions/pei_fluids.json
1615
0ec5f09b10d76de0262bd42035bb590443359a40 data/projecteintegration/pe_custom_conversions/pei_metals.json

src/generated/resources/data/pamhc2crops/pe_custom_conversions/pamhc2crops_default.json

Lines changed: 0 additions & 17 deletions
This file was deleted.

src/generated/resources/data/pamhc2foodexpanded/pe_custom_conversions/pamhc2foodexpanded_default.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"comment": "Sets default conversions for Pam's HarvestCraft: Crops",
2+
"comment": "Sets default conversions for Pam's HarvestCraft: Food Extended",
33
"values": {
44
"before": [
55
{

src/main/java/com/tagnumelite/projecteintegration/addons/PamsHarvestcraftAddon.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,13 @@ public void convert(CustomConversionBuilder builder) {
5353
}
5454
}
5555

56-
@ConversionProvider(MODID_CROPS)
57-
public static class PHCCropsConversionProvider extends AConversionProvider {
58-
@Override
59-
public void convert(CustomConversionBuilder builder) {
60-
builder.comment("Sets default conversions for Pam's HarvestCraft: Crops")
61-
.before(commonTag("crops"), 16)
62-
.before(commonTag("seeds"), 16);
63-
}
64-
}
56+
//@ConversionProvider(MODID_CROPS)
57+
//public static class PHCCropsConversionProvider extends AConversionProvider {
58+
// @Override
59+
// public void convert(CustomConversionBuilder builder) {
60+
// builder.comment("Sets default conversions for Pam's HarvestCraft: Crops")
61+
// .before(commonTag("crops"), 16)
62+
// .before(commonTag("seeds"), 16);
63+
// }
64+
//}
6565
}

0 commit comments

Comments
 (0)