Skip to content

Commit affbdd8

Browse files
committed
mekanism compat test
1 parent ced6d21 commit affbdd8

File tree

6 files changed

+38
-1
lines changed

6 files changed

+38
-1
lines changed

build.gradle

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,16 @@ dependencies {
150150
// at runtime, use the full JEI jar for NeoForge
151151
runtimeOnly("mezz.jei:jei-${minecraft_version}-neoforge:${jei_version}")
152152

153+
if (mekanism_enable.toBoolean()) {
154+
compileOnly "mekanism:Mekanism:${mekanism_version}:api"
155+
156+
// If you want to test/use Mekanism & its modules during `runClient` invocation, use the following
157+
implementation("mekanism:Mekanism:${mekanism_version}")// Mekanism
158+
runtimeOnly("mekanism:Mekanism:${mekanism_version}:additions")// Mekanism: Additions
159+
runtimeOnly("mekanism:Mekanism:${mekanism_version}:generators")// Mekanism: Generators
160+
runtimeOnly("mekanism:Mekanism:${mekanism_version}:tools")// Mekanism: Tools
161+
}
162+
153163
if (cc_tweaked_enable.toBoolean()) {
154164
compileOnly("cc.tweaked:cc-tweaked-${cc_tweaked_minecraft_version}-core-api:${cc_tweaked_version}")
155165
compileOnly("cc.tweaked:cc-tweaked-${cc_tweaked_minecraft_version}-forge-api:${cc_tweaked_version}")

gradle.properties

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ cc_tweaked_enable = true
2626
cc_tweaked_minecraft_version = 1.21.1
2727
cc_tweaked_version = 1.115.1
2828

29+
mekanism_enable = true
30+
mekanism_version=1.21.1-10.7.15.81
31+
2932
#read more on this at https://github.com/neoforged/ModDevGradle?tab=readme-ov-file#better-minecraft-parameter-names--javadoc-parchment
3033
# you can also find the latest versions at: https://parchmentmc.org/docs/getting-started
3134
parchment_minecraft_version=1.21.1
@@ -35,7 +38,7 @@ parchment_mappings_version=2024.11.17
3538
# as they do not follow standard versioning conventions.
3639
minecraft_version_range=[1.21.1]
3740
# The Neo version must agree with the Minecraft version to get a valid artifact
38-
neo_version=21.1.152
41+
neo_version=21.1.203
3942
# The Neo version range can use any version of Neo as bounds
4043
neo_version_range=[21.1.152,)
4144
# The loader version range can only use the major version of FML as bounds

src/main/java/com/mrh0/createaddition/CreateAddition.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.mrh0.createaddition;
22

3+
import com.mrh0.createaddition.compat.mekanism.MekanismHeaters;
34
import com.mrh0.createaddition.config.CommonConfig;
45
import com.mrh0.createaddition.index.*;
56
import com.mrh0.createaddition.index.CASounds;
@@ -65,6 +66,7 @@ public class CreateAddition {
6566
public static boolean IE_ACTIVE = false;
6667
public static boolean CC_ACTIVE = false;
6768
public static boolean AE2_ACTIVE = false;
69+
public static boolean MEK_ACTIVE = false;
6870

6971
public static final CreateRegistrate REGISTRATE = CreateRegistrate.create(CreateAddition.MODID)
7072
.defaultCreativeTab((ResourceKey<CreativeModeTab>) null)
@@ -121,6 +123,7 @@ public CreateAddition(IEventBus eventBus, ModContainer container) {
121123
IE_ACTIVE = ModList.get().isLoaded("immersiveengineering");
122124
CC_ACTIVE = ModList.get().isLoaded("computercraft");
123125
AE2_ACTIVE = ModList.get().isLoaded("ae2");
126+
MEK_ACTIVE = ModList.get().isLoaded("mekanism");
124127

125128
REGISTRATE.registerEventListeners(eventBus);
126129
CABlocks.register();
@@ -166,6 +169,10 @@ public void postInit(FMLLoadCompleteEvent evt) {
166169
return 0;
167170
});
168171

172+
//if (MEK_ACTIVE) {
173+
// MekanismHeaters.registerHeaters();
174+
//}
175+
169176
LOGGER.info("Create Crafts & Additions Initialized!");
170177
}
171178

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
package com.mrh0.createaddition.compat.mekanism;
2+
3+
import com.simibubi.create.api.boiler.BoilerHeater;
4+
import mekanism.common.registries.MekanismBlocks;
5+
import mekanism.common.tile.machine.TileEntityResistiveHeater;
6+
import net.minecraft.core.Direction;
7+
import net.minecraft.world.level.block.entity.BlockEntity;
8+
9+
public class MekanismHeaters {
10+
public static void registerHeaters() {
11+
BoilerHeater.REGISTRY.register(MekanismBlocks.RESISTIVE_HEATER.get(), (level, pos, state) -> {
12+
return -1;
13+
});
14+
}
15+
}

src/main/resources/data/createaddition/recipe/compat/tconstruct/pig_iron.json renamed to src/main/resources/data/createaddition/recipe/compat/tconstruct/pig_iron.json.disabled

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"tag": "forge:ingots/iron"
66
},
77
{
8+
"type": "fluid",
89
"fluid": "tconstruct:meat_soup",
910
"amount": 250
1011
},

src/main/resources/data/createaddition/recipe/compat/tconstruct/pig_iron_2.json renamed to src/main/resources/data/createaddition/recipe/compat/tconstruct/pig_iron_2.json.disabled

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
"tag": "forge:ingots/iron"
1515
},
1616
{
17+
"type": "fluid",
1718
"fluid": "tconstruct:meat_soup",
1819
"amount": 250
1920
},

0 commit comments

Comments
 (0)