Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PneumaticCraft Pressure Conduits #849

Open
wants to merge 3 commits into
base: dev/1.21.1
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions buildSrc/shared.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ repositories {
includeGroup("mcjty.theoneprobe")
includeGroup("appeng")
includeGroup("mekanism")
includeGroup("me.desht.pneumaticcraft")
includeGroup("blusunrize.immersiveengineering")
}
}

Expand Down
14 changes: 14 additions & 0 deletions enderio-conduits-modded/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,13 @@ dependencies {

//Laserio
compileOnly("curse.maven:laserio-${curseforge_laserio_id}:${curseforge_laserio_file}")

//Pneumaticcraft
compileOnly("me.desht.pneumaticcraft:pneumaticcraft-repressurized:8.1.4+mc1.21.1") {
isTransitive = false
}
compileOnly("blusunrize.immersiveengineering:ImmersiveEngineering:1.21.1-11.6.1-181.62")
compileOnly("curse.maven:curios-continuation-1037991:5765721")
}

neoForge {
Expand All @@ -69,6 +76,13 @@ neoForge {
runtimeOnly("appeng:appliedenergistics2:${ae2Version}")
runtimeOnly("mekanism:Mekanism:${mekanismMinecraftVersion}-${mekanismVersion}")
runtimeOnly("com.refinedmods.refinedstorage:refinedstorage-neoforge:${refinedstorageVersion}")

//Pneumaticcraft
runtimeOnly("me.desht.pneumaticcraft:pneumaticcraft-repressurized:8.1.4+mc1.21.1") {
isTransitive = false
}
runtimeOnly("curse.maven:curios-continuation-1037991:5765721")
runtimeOnly("blusunrize.immersiveengineering:ImmersiveEngineering:1.21.1-11.6.1-181.62")
}

programArguments.addAll(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
{
"item.enderio.chemical_filter": "Chemical Filter",
"item.enderio.conduit.advanced_pressure": "Advanced Pressure Conduit",
"item.enderio.conduit.basic_pressure": "Basic Pressure Conduit",
"item.enderio.conduit.chemical": "Chemical Conduit",
"item.enderio.conduit.chemical.multi": "Allows multiple chemical types to be transported on the same line",
"item.enderio.conduit.dense_me": "Dense ME Conduit",
"item.enderio.conduit.ender_chemical": "Ender Chemical Conduit",
"item.enderio.conduit.heat": "Heat Conduit",
"item.enderio.conduit.me": "ME Conduit",
"item.enderio.conduit.pressurized_chemical": "Pressurized Chemical Conduit",
"item.enderio.conduit.reinforced_pressure": "Reinforced Pressure Conduit",
"item.enderio.rs": "Refined Storage Conduit"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"neoforge:conditions": [
{
"type": "neoforge:mod_loaded",
"modid": "pneumaticcraft"
}
],
"parent": "minecraft:recipes/root",
"criteria": {
"has_ingredient": {
"conditions": {
"items": [
{
"items": "enderio:conduit_binder"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "enderio:pnc_advanced_pressure_tube"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_the_recipe",
"has_ingredient"
]
],
"rewards": {
"recipes": [
"enderio:pnc_advanced_pressure_tube"
]
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"neoforge:conditions": [
{
"type": "neoforge:mod_loaded",
"modid": "pneumaticcraft"
}
],
"parent": "minecraft:recipes/root",
"criteria": {
"has_ingredient": {
"conditions": {
"items": [
{
"items": "enderio:conduit_binder"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "enderio:pnc_pressure_tube"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_the_recipe",
"has_ingredient"
]
],
"rewards": {
"recipes": [
"enderio:pnc_pressure_tube"
]
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"neoforge:conditions": [
{
"type": "neoforge:mod_loaded",
"modid": "pneumaticcraft"
}
],
"parent": "minecraft:recipes/root",
"criteria": {
"has_ingredient": {
"conditions": {
"items": [
{
"items": "enderio:conduit_binder"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "enderio:pnc_reinforced_pressure_tube"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_the_recipe",
"has_ingredient"
]
],
"rewards": {
"recipes": [
"enderio:pnc_reinforced_pressure_tube"
]
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"neoforge:conditions": [
{
"type": "neoforge:mod_loaded",
"modid": "pneumaticcraft"
}
],
"type": "enderio:pressure",
"description": {
"translate": "item.enderio.conduit.advanced_pressure"
},
"pressure_tier": {
"critical": 25.0,
"danger": 20.0
},
"texture": "enderio:block/conduit/advanced_pressure"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"neoforge:conditions": [
{
"type": "neoforge:mod_loaded",
"modid": "pneumaticcraft"
}
],
"type": "enderio:pressure",
"description": {
"translate": "item.enderio.conduit.basic_pressure"
},
"pressure_tier": {
"critical": 7.0,
"danger": 5.0
},
"texture": "enderio:block/conduit/basic_pressure"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"neoforge:conditions": [
{
"type": "neoforge:mod_loaded",
"modid": "pneumaticcraft"
}
],
"type": "enderio:pressure",
"description": {
"translate": "item.enderio.conduit.advanced_pressure"
},
"pressure_tier": {
"critical": 12.0,
"danger": 10.0
},
"texture": "enderio:block/conduit/reinforced_pressure"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"neoforge:conditions": [
{
"type": "neoforge:mod_loaded",
"modid": "pneumaticcraft"
}
],
"type": "minecraft:crafting_shaped",
"category": "building",
"key": {
"B": {
"item": "enderio:conduit_binder"
},
"I": {
"item": "pneumaticcraft:advanced_pressure_tube"
}
},
"pattern": [
"BBB",
"III",
"BBB"
],
"result": {
"components": {
"enderio:conduit": "enderio:advanced_pressure"
},
"count": 3,
"id": "enderio:conduit"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"neoforge:conditions": [
{
"type": "neoforge:mod_loaded",
"modid": "pneumaticcraft"
}
],
"type": "minecraft:crafting_shaped",
"category": "building",
"key": {
"B": {
"item": "enderio:conduit_binder"
},
"I": {
"item": "pneumaticcraft:pressure_tube"
}
},
"pattern": [
"BBB",
"III",
"BBB"
],
"result": {
"components": {
"enderio:conduit": "enderio:basic_pressure"
},
"count": 3,
"id": "enderio:conduit"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"neoforge:conditions": [
{
"type": "neoforge:mod_loaded",
"modid": "pneumaticcraft"
}
],
"type": "minecraft:crafting_shaped",
"category": "building",
"key": {
"B": {
"item": "enderio:conduit_binder"
},
"I": {
"item": "pneumaticcraft:reinforced_pressure_tube"
}
},
"pattern": [
"BBB",
"III",
"BBB"
],
"result": {
"components": {
"enderio:conduit": "enderio:reinforced_pressure"
},
"count": 3,
"id": "enderio:conduit"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import com.enderio.modconduits.mods.appeng.AE2ConduitsModule;
import com.enderio.modconduits.data.ModConduitRecipeProvider;
import com.enderio.modconduits.mods.mekanism.MekanismModule;
import com.enderio.modconduits.mods.pneumaticcraft.PneumaticModule;
import com.enderio.modconduits.mods.refinedstorage.RefinedStorageModule;
import com.enderio.regilite.Regilite;
import net.minecraft.core.RegistrySetBuilder;
Expand Down Expand Up @@ -39,7 +40,8 @@ public class ModdedConduits {
private static final Map<String, Supplier<ConduitModule>> CONDUIT_MODULES = Map.ofEntries(
entry("ae2", () -> AE2ConduitsModule.INSTANCE),
entry("mekanism", () -> MekanismModule.INSTANCE),
entry("refinedstorage", () -> RefinedStorageModule.INSTANCE)
entry("refinedstorage", () -> RefinedStorageModule.INSTANCE),
entry("pneumaticcraft", () -> PneumaticModule.INSTANCE)
);

public static IEventBus modEventBus;
Expand Down
Loading