Skip to content

Commit de1be7f

Browse files
committed
Port support for AllTheModium
1 parent 95e760d commit de1be7f

7 files changed

Lines changed: 90 additions & 8 deletions

File tree

CHANGELOG.md

Lines changed: 2 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+
### Ported
9+
- Support for [Allthemodium]
810

911
## [8.3.0]
1012
### Added

build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,7 @@ dependencies {
195195
localRuntime "maven.modrinth:jade:${version_jade}"
196196

197197
implementation "de.ellpeck:actuallyadditions:${version_actually_additions}+mc${mc_version}"
198+
implementation "curse.maven:allthemodium-364466:${version_allthemodium}"
198199
implementation ("org.appliedenergistics:appliedenergistics2:${version_appliedenergistics}") { transitive = false }
199200
implementation "curse.maven:ars-nouveau-401955:${version_arsnouveau}"
200201
implementation "curse.maven:chipped-456956:${version_chipped}"
@@ -372,7 +373,7 @@ publisher {
372373
curseDepends {
373374
required 'projecte'
374375

375-
optional 'actually-additions', 'applied-energistics-2', 'ars-nouveau',
376+
optional 'actually-additions', 'allthemodium', 'applied-energistics-2', 'ars-nouveau',
376377
'chipped', 'create', 'corail-woodcutter',
377378
'draconic-evolution',
378379
'ender-io', 'evilcraft', 'extended-crafting',

gradle.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,8 @@ version_uranus=6979353
6464

6565
# - Optional
6666
version_actually_additions=1.3.25
67+
# Allthemodium: 3.0.0
68+
version_allthemodium=7468993
6769
version_appliedenergistics=19.2.4
6870
# Ars Nouveau: 5.7.1
6971
version_arsnouveau=6316304

src/generated/resources/.cache/e404e8b58643e62cc093bad11a0fde6c8e79a76c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
// 1.21.1 2026-03-28T10:13:23.6795703 Custom EMC Conversions: projecteintegration
1+
// 1.21.1 2026-03-28T10:32:09.6889045 Custom EMC Conversions: projecteintegration
22
4a651d1033cf4fd608b3f34860e1fe9efcb62e10 data/actuallyadditions/pe_custom_conversions/actuallyadditions_default.json
33
d1f15e84cb795346e65593161b7966cb5e907b2b data/ae2/pe_custom_conversions/ae2_default.json
4+
d3ac01631cfb8e404d8b9138dcf9d5ec08eb6d1f data/allthemodium/pe_custom_conversions/allthemodium_default.json
45
76e53281c614846f852f08f9aa073be974e4f819 data/ars_nouveau/pe_custom_conversions/ars_nouveau_default.json
56
87fe749e7099799cacd8997adb5f3a7f7b9c0c07 data/draconicevolution/pe_custom_conversions/draconicevolution_default.json
67
a457abdf094b8a894abe04649311a20364d85561 data/enderio/pe_custom_conversions/enderio_default.json
Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
{
2+
"comment": "Default ProjectE Conversions for allthemodium by ProjectE Integration",
3+
"values": {
4+
"before": [
5+
{
6+
"type": "projecte:item",
7+
"emc_value": 24000,
8+
"id": "allthemodium:allthemodium_upgrade_smithing_template"
9+
},
10+
{
11+
"type": "projecte:item",
12+
"emc_value": 48000,
13+
"id": "allthemodium:vibranium_upgrade_smithing_template"
14+
},
15+
{
16+
"type": "projecte:item",
17+
"emc_value": 96000,
18+
"id": "allthemodium:unobtainium_upgrade_smithing_template"
19+
},
20+
{
21+
"type": "projecte:item",
22+
"emc_value": 122800,
23+
"id": "allthemodium:allthemodium_ingot"
24+
},
25+
{
26+
"type": "projecte:item",
27+
"emc_value": 245600,
28+
"id": "allthemodium:vibranium_ingot"
29+
},
30+
{
31+
"type": "projecte:item",
32+
"emc_value": 491200,
33+
"id": "allthemodium:unobtainium_ingot"
34+
},
35+
{
36+
"type": "projecte:item",
37+
"emc_value": 16,
38+
"id": "allthemodium:ancient_soulberries"
39+
},
40+
{
41+
"type": "projecte:item",
42+
"emc_value": 1024,
43+
"id": "allthemodium:piglich_heart"
44+
},
45+
{
46+
"type": "projecte:item",
47+
"emc_value": 8,
48+
"id": "allthemodium:ancient_stone"
49+
},
50+
{
51+
"type": "projecte:item",
52+
"emc_value": 8,
53+
"id": "allthemodium:ancient_dirt"
54+
},
55+
{
56+
"type": "projecte:item",
57+
"emc_value": 8,
58+
"id": "allthemodium:ancient_grass"
59+
},
60+
{
61+
"type": "projecte:item",
62+
"emc_value": 8,
63+
"id": "allthemodium:ancient_podzol"
64+
}
65+
]
66+
}
67+
}

old/AllTheModiumAddon.java renamed to src/main/java/com/tagnumelite/projecteintegration/addons/AllTheModiumAddon.java

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2019-2022 TagnumElite
2+
* Copyright (c) 2019-2026 TagnumElite
33
*
44
* Permission is hereby granted, free of charge, to any person obtaining a copy
55
* of this software and associated documentation files (the "Software"), to deal
@@ -27,16 +27,24 @@
2727
import com.thevortex.allthemodium.registry.ModRegistry;
2828
import moze_intel.projecte.api.data.CustomConversionBuilder;
2929

30+
//TODO: Relook at all the EMC values
3031
public class AllTheModiumAddon {
3132
@ConversionProvider("allthemodium")
3233
public static final class ATMConversionProvider extends AConversionProvider {
3334
@Override
3435
public void convert(CustomConversionBuilder builder) {
35-
builder.comment("Default conversions for Allthemodium")
36+
builder.before(ModRegistry.ATM_SMITHING.get(), 24000)
37+
.before(ModRegistry.VIB_SMITHING.get(), 24000 * 2)
38+
.before(ModRegistry.UNO_SMITHING.get(), 24000 * 4)
3639
.before(ModRegistry.ALLTHEMODIUM_INGOT.get(), 122800)
37-
.before(ModRegistry.ANCIENT_CAVEVINES_PLANT_.get(), 16)
38-
.before(ModRegistry.ANCIENT_SOULBERRY.get(), 16)
39-
.before(ModRegistry.ANCIENT_STONE.get(), 8);
40+
.before(ModRegistry.VIBRANIUM_INGOT.get(), 122800 * 2)
41+
.before(ModRegistry.UNOBTAINIUM_INGOT.get(), 122800 * 4)
42+
.before(ModRegistry.ANCIENT_CAVEVINES.get(), 16)
43+
.before(ModRegistry.PIGLICH_HEART.get(), 1024)
44+
.before(ModRegistry.ANCIENT_STONE.get(), 8)
45+
.before(ModRegistry.ANCIENT_DIRT.get(), 8)
46+
.before(ModRegistry.ANCIENT_GRASS.get(), 8)
47+
.before(ModRegistry.ANCIENT_PODZOL.get(), 8);
4048
}
4149
}
4250
}

src/main/java/com/tagnumelite/projecteintegration/datagen/PEICustomConversionProvider.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,8 @@ private Map<AConversionProvider, String> getConversionProviders() {
8888
private AConversionProvider createInstance(String className) {
8989
try {
9090
return Class.forName(className).asSubclass(AConversionProvider.class).getDeclaredConstructor().newInstance();
91-
} catch (ClassNotFoundException | InstantiationException | IllegalAccessException | InvocationTargetException | NoSuchMethodException e) {
91+
} catch (ClassNotFoundException | InstantiationException | IllegalAccessException | InvocationTargetException |
92+
NoSuchMethodException e) {
9293
PEIntegration.LOGGER.error("Failed to load conversion provider: {}", className, e);
9394
}
9495
return null;

0 commit comments

Comments
 (0)