From 6901608e66e24cdee3346f265c0fec3a5424ab83 Mon Sep 17 00:00:00 2001 From: Timo Ley Date: Wed, 6 Dec 2023 22:36:17 +0100 Subject: [PATCH] feat: antimatter tweaks --- build.gradle | 13 ++++++++++++- .../ntx4core/recipes/InputReplacements.java | 11 +++++++++-- .../ntx4core/recipes/RecipeReplacements.java | 5 +++-- .../data/ntx4core/recipes/animatter_12g.json | 2 +- .../data/ntx4core/recipes/animatter_4g.json | 2 +- .../data/ntx4core/recipes/animatter_ftb.json | 2 +- .../ntx4core/recipes/antimatter_creation.json | 16 ++++++++++++++++ .../data/ntx4core/recipes/rift_orb.json | 2 +- .../lategame/antimatter/from_pellet.json} | 4 ++-- .../lategame/antimatter_pellet/from_gas.json | 11 +++++++++++ 10 files changed, 57 insertions(+), 11 deletions(-) create mode 100644 src/main/resources/data/ntx4core/recipes/antimatter_creation.json rename src/main/resources/{data/ntx4core/recipes/animatter_500mg.json => datapacks/ntx4core_tweaks/data/mekanism/recipes/processing/lategame/antimatter/from_pellet.json} (67%) create mode 100644 src/main/resources/datapacks/ntx4core_tweaks/data/mekanism/recipes/processing/lategame/antimatter_pellet/from_gas.json diff --git a/build.gradle b/build.gradle index 83f1a6c..f4b10e3 100644 --- a/build.gradle +++ b/build.gradle @@ -79,5 +79,16 @@ publishing { } } - repositories {} + repositories { + if (project.hasProperty("mvnURL")) { + maven { + credentials { + username findProperty("mvnUsername") + password findProperty("mvnPassword") + } + url = findProperty("mvnURL") + } + } + mavenLocal() + } } diff --git a/src/main/java/net/anvilcraft/ntx4core/recipes/InputReplacements.java b/src/main/java/net/anvilcraft/ntx4core/recipes/InputReplacements.java index 8103228..b6ed5fe 100644 --- a/src/main/java/net/anvilcraft/ntx4core/recipes/InputReplacements.java +++ b/src/main/java/net/anvilcraft/ntx4core/recipes/InputReplacements.java @@ -25,14 +25,14 @@ public class InputReplacements implements IEventBusRegisterable { ev.mapRecipeID( new Identifier("projecte", "relay_mk1"), new InputReplaceRecipeMapper().replace( - "#forge:storage_blocks/diamond", "mekanism:pellet_antimatter" + "#forge:storage_blocks/diamond", "ftbic:antimatter" ) ); ev.mapRecipeID( new Identifier("projecte", "collector_mk1"), new InputReplaceRecipeMapper().replace( - "#forge:storage_blocks/diamond", "mekanism:pellet_antimatter" + "#forge:storage_blocks/diamond", "ftbic:antimatter" ) ); @@ -57,6 +57,13 @@ public class InputReplacements implements IEventBusRegisterable { ) ); + ev.mapRecipeID( + new Identifier("ftbic", "shaped/antimatter_fabricator"), + new InputReplaceRecipeMapper().replace( + "minecraft:nether_star", "draconicevolution:awakened_core" + ) + ); + var philosopherStoneMapper = new InputReplaceRecipeMapper() .replace("#forge:gems/diamond", "ae2:singularity") diff --git a/src/main/java/net/anvilcraft/ntx4core/recipes/RecipeReplacements.java b/src/main/java/net/anvilcraft/ntx4core/recipes/RecipeReplacements.java index 536936e..0bb0ae8 100644 --- a/src/main/java/net/anvilcraft/ntx4core/recipes/RecipeReplacements.java +++ b/src/main/java/net/anvilcraft/ntx4core/recipes/RecipeReplacements.java @@ -155,7 +155,7 @@ public class RecipeReplacements implements IEventBusRegisterable { -> new ShapedRecipeBuilder(Ntx4Core.id("dark_matter"), r.getOutput()) .pattern("DFD", "FSF", "DFD") .ingredient('F', "projecte:aeternalis_fuel") - .ingredient('S', "mekanism:pellet_antimatter") + .ingredient('S', "ftbic:antimatter") .ingredient('D', "#forge:ingots/draconium") .build() ); @@ -164,10 +164,11 @@ public class RecipeReplacements implements IEventBusRegisterable { new Identifier("projecte", "red_matter"), r -> new ShapedRecipeBuilder(Ntx4Core.id("red_matter"), r.getOutput()) - .pattern("CDC", "QSE", "CDC") + .pattern("CAC", "QSE", "CDC") .ingredient('D', "projecte:dark_matter") .ingredient('Q', "assemblylinemachines:quark_matter") .ingredient('E', "dmlreforged:pristine_matter_dragon") + .ingredient('A', "ftbic:antimatter") .ingredient('S', "ae2:singularity") .ingredient('C', "powah:crystal_nitro") .build() diff --git a/src/main/resources/data/ntx4core/recipes/animatter_12g.json b/src/main/resources/data/ntx4core/recipes/animatter_12g.json index 26b717c..fa8d293 100644 --- a/src/main/resources/data/ntx4core/recipes/animatter_12g.json +++ b/src/main/resources/data/ntx4core/recipes/animatter_12g.json @@ -7,6 +7,6 @@ }, "output": { "gas": "mekanism:antimatter", - "amount": 1200 + "amount": 12 } } \ No newline at end of file diff --git a/src/main/resources/data/ntx4core/recipes/animatter_4g.json b/src/main/resources/data/ntx4core/recipes/animatter_4g.json index f53dd65..d8030f9 100644 --- a/src/main/resources/data/ntx4core/recipes/animatter_4g.json +++ b/src/main/resources/data/ntx4core/recipes/animatter_4g.json @@ -7,6 +7,6 @@ }, "output": { "gas": "mekanism:antimatter", - "amount": 400 + "amount": 4 } } \ No newline at end of file diff --git a/src/main/resources/data/ntx4core/recipes/animatter_ftb.json b/src/main/resources/data/ntx4core/recipes/animatter_ftb.json index ee58323..748c07e 100644 --- a/src/main/resources/data/ntx4core/recipes/animatter_ftb.json +++ b/src/main/resources/data/ntx4core/recipes/animatter_ftb.json @@ -7,6 +7,6 @@ }, "output": { "gas": "mekanism:antimatter", - "amount": 10 + "amount": 50 } } \ No newline at end of file diff --git a/src/main/resources/data/ntx4core/recipes/antimatter_creation.json b/src/main/resources/data/ntx4core/recipes/antimatter_creation.json new file mode 100644 index 0000000..8094d3c --- /dev/null +++ b/src/main/resources/data/ntx4core/recipes/antimatter_creation.json @@ -0,0 +1,16 @@ +{ + "type": "mekanism:nucleosynthesizing", + "itemInput": { + "ingredient": { + "item": "ae2:matter_ball" + } + }, + "gasInput": { + "amount": 50, + "gas": "mekanism:antimatter" + }, + "output": { + "item": "ftbic:antimatter" + }, + "duration": 400 +} diff --git a/src/main/resources/data/ntx4core/recipes/rift_orb.json b/src/main/resources/data/ntx4core/recipes/rift_orb.json index f1f11e4..077ca51 100644 --- a/src/main/resources/data/ntx4core/recipes/rift_orb.json +++ b/src/main/resources/data/ntx4core/recipes/rift_orb.json @@ -14,7 +14,7 @@ "item": "powah:crystal_nitro" }, { - "item": "mekanism:pellet_antimatter" + "item": "ftbic:antimatter" }, { "item": "fluxnetworks:flux_dust" diff --git a/src/main/resources/data/ntx4core/recipes/animatter_500mg.json b/src/main/resources/datapacks/ntx4core_tweaks/data/mekanism/recipes/processing/lategame/antimatter/from_pellet.json similarity index 67% rename from src/main/resources/data/ntx4core/recipes/animatter_500mg.json rename to src/main/resources/datapacks/ntx4core_tweaks/data/mekanism/recipes/processing/lategame/antimatter/from_pellet.json index c65a071..cc4c9e4 100644 --- a/src/main/resources/data/ntx4core/recipes/animatter_500mg.json +++ b/src/main/resources/datapacks/ntx4core_tweaks/data/mekanism/recipes/processing/lategame/antimatter/from_pellet.json @@ -2,11 +2,11 @@ "type": "mekanism:oxidizing", "input": { "ingredient": { - "item": "nuclearscience:cellantimattersmall" + "tag": "forge:pellets/antimatter" } }, "output": { "gas": "mekanism:antimatter", - "amount": 50 + "amount": 10 } } \ No newline at end of file diff --git a/src/main/resources/datapacks/ntx4core_tweaks/data/mekanism/recipes/processing/lategame/antimatter_pellet/from_gas.json b/src/main/resources/datapacks/ntx4core_tweaks/data/mekanism/recipes/processing/lategame/antimatter_pellet/from_gas.json new file mode 100644 index 0000000..4d3ccf3 --- /dev/null +++ b/src/main/resources/datapacks/ntx4core_tweaks/data/mekanism/recipes/processing/lategame/antimatter_pellet/from_gas.json @@ -0,0 +1,11 @@ +{ + "type": "mekanism:crystallizing", + "chemicalType": "gas", + "input": { + "amount": 10, + "gas": "mekanism:antimatter" + }, + "output": { + "item": "mekanism:pellet_antimatter" + } + } \ No newline at end of file