diff --git a/src/overrides/config/modularmachinery/machinery/converter.json b/src/overrides/config/modularmachinery/machinery/converter.json deleted file mode 100644 index f4fc6c2..0000000 --- a/src/overrides/config/modularmachinery/machinery/converter.json +++ /dev/null @@ -1,70 +0,0 @@ -{ - "registryname": "converter", - "localizedname": "Energy Converter", - "color": "FF1111", - "parts": [ - { - "x": -3, - "y": 0, - "z": 3, - "elements": [ - "modularmachinery:blockoutputbus" - ] - }, - { - "x": -2, - "y": 0, - "z": 3, - "elements": [ - "minecraft:end_rod@5" - ] - }, - { - "x": 0, - "y": 0, - "z": 1, - "elements": [ - "minecraft:end_rod@3" - ] - }, - { - "x": 0, - "y": 0, - "z": 3, - "elements": [ - "projecte:condenser_mk1@2" - ] - }, - { - "x": 2, - "y": 0, - "z": 3, - "elements": [ - "minecraft:end_rod@4" - ] - }, - { - "x": 0, - "y": 0, - "z": 5, - "elements": [ - "minecraft:end_rod@2" - ] - }, - { - "x": 0, - "y": 0, - "z": 6, - "elements": [ - "projecte:matter_block@1" - ] - }, - { - "x": 3, - "y": 0, - "z": 3, - "elements": [ - "modularmachinery:blockinputbus" - ] - } - ]} diff --git a/src/overrides/config/modularmachinery/machinery/dimextractor.json b/src/overrides/config/modularmachinery/machinery/dimextractor.json index 611c29c..bbbe4e2 100644 --- a/src/overrides/config/modularmachinery/machinery/dimextractor.json +++ b/src/overrides/config/modularmachinery/machinery/dimextractor.json @@ -1,38 +1,52 @@ { - "registryname": "dimextractor", - "localizedname": "Dimensional Extractor", - "color": "52525B", + "registryname": "dimextractor", + "localizedname": "Quantum Battery", + "color": "52525B", "parts": [ { - "x": 0, - "y": 2, - "z": 2, + "x": -1, + "y": 0, + "z": 0, "elements": [ - "modularmachinery:blockcasing@0" + "enderio:block_alloy@6" ] }, { - "x": 0, - "y": 1, - "z": 1, - "elements": [ - "dimdoors:iron_dimensional_door@0" - ] - }, - { - "x": 0, + "x": -1, "y": 0, "z": 1, "elements": [ - "modularmachinery:blockcasing@0" + "modularmachinery:blockinputbus", + "modularmachinery:blockoutputbus", + "modularmachinery:blockcasing", + "modularmachinery:blockenergyoutputhatch" ] }, { - "x": 0, - "y": 1, + "x": 1, + "y": 0, + "z": 0, + "elements": [ + "enderio:block_alloy@6" + ] + }, + { + "x": -1, + "y": 0, "z": 2, - "elements": [ - "modularmachinery:blockoutputbus" + "elements": [ + "enderio:block_alloy@6" + ] + }, + { + "x": 1, + "y": 0, + "z": 1, + "elements": [ + "modularmachinery:blockinputbus", + "modularmachinery:blockoutputbus", + "modularmachinery:blockcasing", + "modularmachinery:blockenergyoutputhatch" ] }, { @@ -40,47 +54,50 @@ "y": 0, "z": 2, "elements": [ - "modularmachinery:blockcasing@0" + "modularmachinery:blockinputbus", + "modularmachinery:blockoutputbus", + "modularmachinery:blockcasing", + "modularmachinery:blockenergyoutputhatch" ] }, { - "x": 0, - "y": 3, - "z": 0, - "elements": [ - "modularmachinery:blockcasing@0" - ] - }, - { - "x": 0, - "y": 3, - "z": 1, - "elements": [ - "modularmachinery:blockcasing@0" - ] - }, - { - "x": 0, - "y": 2, - "z": 0, - "elements": [ - "modularmachinery:blockcasing@0" - ] - }, - { - "x": 0, - "y": 3, + "x": 1, + "y": 0, "z": 2, "elements": [ - "modularmachinery:blockcasing@0" + "enderio:block_alloy@6" + ] + }, + { + "x": 1, + "y": -1, + "z": 0, + "elements": [ + "enderio:block_alloy@6" ] }, { "x": 0, - "y": 2, - "z": 1, + "y": -1, + "z": 0, "elements": [ - "dimdoors:iron_dimensional_door@8" + "enderio:block_alloy@6" + ] + }, + { + "x": -1, + "y": 1, + "z": 0, + "elements": [ + "enderio:block_alloy@6" + ] + }, + { + "x": -1, + "y": -1, + "z": 0, + "elements": [ + "enderio:block_alloy@6" ] }, { @@ -88,7 +105,117 @@ "y": 1, "z": 0, "elements": [ - "modularmachinery:blockinputbus" + "enderio:block_alloy@6" + ] + }, + { + "x": -1, + "y": 1, + "z": 1, + "elements": [ + "enderio:block_alloy@6" + ] + }, + { + "x": 0, + "y": 1, + "z": 1, + "elements": [ + "modularmachinery:blockinputbus", + "modularmachinery:blockoutputbus", + "modularmachinery:blockcasing", + "modularmachinery:blockenergyoutputhatch" + ] + }, + { + "x": 1, + "y": 1, + "z": 0, + "elements": [ + "enderio:block_alloy@6" + ] + }, + { + "x": -1, + "y": 1, + "z": 2, + "elements": [ + "enderio:block_alloy@6" + ] + }, + { + "x": 0, + "y": 1, + "z": 2, + "elements": [ + "enderio:block_alloy@6" + ] + }, + { + "x": 1, + "y": 1, + "z": 1, + "elements": [ + "enderio:block_alloy@6" + ] + }, + { + "x": -1, + "y": -1, + "z": 1, + "elements": [ + "enderio:block_alloy@6" + ] + }, + { + "x": 1, + "y": 1, + "z": 2, + "elements": [ + "enderio:block_alloy@6" + ] + }, + { + "x": 0, + "y": -1, + "z": 1, + "elements": [ + "modularmachinery:blockinputbus", + "modularmachinery:blockoutputbus", + "modularmachinery:blockcasing", + "modularmachinery:blockenergyoutputhatch" + ] + }, + { + "x": -1, + "y": -1, + "z": 2, + "elements": [ + "enderio:block_alloy@6" + ] + }, + { + "x": 0, + "y": -1, + "z": 2, + "elements": [ + "enderio:block_alloy@6" + ] + }, + { + "x": 1, + "y": -1, + "z": 1, + "elements": [ + "enderio:block_alloy@6" + ] + }, + { + "x": 1, + "y": -1, + "z": 2, + "elements": [ + "enderio:block_alloy@6" ] } ]} diff --git a/src/overrides/config/modularmachinery/machinery/engine.json b/src/overrides/config/modularmachinery/machinery/engine.json deleted file mode 100644 index ff205d1..0000000 --- a/src/overrides/config/modularmachinery/machinery/engine.json +++ /dev/null @@ -1,392 +0,0 @@ -{ - "registryname": "engine", - "localizedname": "Electrical Engine", - "color": "52525B", - "parts": [ - { - "x": -1, - "y": 0, - "z": 0, - "elements": [ - "modularmachinery:blockoutputbus" - ] - }, - { - "x": -1, - "y": 0, - "z": 1, - "elements": [ - "gregtech:wire_coil" - ] - }, - { - "x": -2, - "y": 0, - "z": 2, - - "elements": [ - "modularmachinery:blockcasing" - ] - }, - { - "x": 0, - "y": 0, - "z": 1, - "elements": [ - "gregtech:wire_coil" - ] - }, - { - "x": 1, - "y": 0, - "z": 0, - "elements": [ - "modularmachinery:blockinputbus" - ] - }, - { - "x": -2, - "y": 0, - "z": 0, - - "elements": [ - "modularmachinery:blockcasing" - ] - }, - { - "x": -1, - "y": 0, - "z": 2, - "elements": [ - "modularmachinery:blockcasing" - ] - }, - { - "x": 1, - "y": 0, - "z": 1, - "elements": [ - "gregtech:wire_coil" - ] - }, - { - "x": 0, - "y": 0, - "z": 2, - "elements": [ - "modularmachinery:blockcasing" - ] - }, - { - "x": 2, - "y": 0, - "z": 0, - - "elements": [ - "modularmachinery:blockcasing" - ] - }, - { - "x": 2, - "y": 0, - "z": 1, - "elements": [ - "modularmachinery:blockenergyinputhatch" - ] - }, - { - "x": 1, - "y": 0, - "z": 2, - "elements": [ - "modularmachinery:blockcasing" - ] - }, - { - "x": 2, - "y": 0, - "z": 2, - - "elements": [ - "modularmachinery:blockcasing" - ] - }, - { - "x": 2, - "y": -1, - "z": 0, - - "elements": [ - "modularmachinery:blockcasing" - ] - }, - { - "x": 1, - "y": -1, - "z": 0, - - "elements": [ - "modularmachinery:blockcasing" - ] - }, - { - "x": -2, - "y": 1, - "z": 0, - - "elements": [ - "modularmachinery:blockcasing" - ] - }, - { - "x": 0, - "y": -1, - "z": 0, - - "elements": [ - "modularmachinery:blockcasing" - ] - }, - { - "x": -1, - "y": 1, - "z": 0, - - "elements": [ - "modularmachinery:blockcasing" - ] - }, - { - "x": -2, - "y": 1, - "z": 1, - - "elements": [ - "modularmachinery:blockcasing" - ] - }, - { - "x": -1, - "y": -1, - "z": 0, - - "elements": [ - "modularmachinery:blockcasing" - ] - }, - { - "x": 0, - "y": 1, - "z": 0, - - "elements": [ - "modularmachinery:blockcasing" - ] - }, - { - "x": -1, - "y": 1, - "z": 1, - - "elements": [ - "modularmachinery:blockcasing" - ] - }, - { - "x": -2, - "y": 1, - "z": 2, - - "elements": [ - "modularmachinery:blockcasing" - ] - }, - { - "x": 0, - "y": 1, - "z": 1, - - "elements": [ - "modularmachinery:blockcasing" - ] - }, - { - "x": 1, - "y": 1, - "z": 0, - - "elements": [ - "modularmachinery:blockcasing" - ] - }, - { - "x": -2, - "y": -1, - "z": 0, - - "elements": [ - "modularmachinery:blockcasing" - ] - }, - { - "x": -2, - "y": -1, - "z": 1, - - "elements": [ - "modularmachinery:blockcasing" - ] - }, - { - "x": -1, - "y": 1, - "z": 2, - - "elements": [ - "modularmachinery:blockcasing" - ] - }, - { - "x": 0, - "y": 1, - "z": 2, - - "elements": [ - "modularmachinery:blockcasing" - ] - }, - { - "x": 1, - "y": 1, - "z": 1, - - "elements": [ - "modularmachinery:blockcasing" - ] - }, - { - "x": -1, - "y": -1, - "z": 1, - - "elements": [ - "modularmachinery:blockcasing" - ] - }, - { - "x": 2, - "y": 1, - "z": 0, - - "elements": [ - "modularmachinery:blockcasing" - ] - }, - { - "x": -2, - "y": -1, - "z": 2, - - "elements": [ - "modularmachinery:blockcasing" - ] - }, - { - "x": 1, - "y": 1, - "z": 2, - - "elements": [ - "modularmachinery:blockcasing" - ] - }, - { - "x": 0, - "y": -1, - "z": 1, - - "elements": [ - "modularmachinery:blockcasing" - ] - }, - { - "x": 2, - "y": 1, - "z": 1, - - "elements": [ - "modularmachinery:blockcasing" - ] - }, - { - "x": -1, - "y": -1, - "z": 2, - - "elements": [ - "modularmachinery:blockcasing" - ] - }, - { - "x": 2, - "y": 1, - "z": 2, - - "elements": [ - "modularmachinery:blockcasing" - ] - }, - { - "x": 0, - "y": -1, - "z": 2, - - "elements": [ - "modularmachinery:blockcasing" - ] - }, - { - "x": 1, - "y": -1, - "z": 1, - - "elements": [ - "modularmachinery:blockcasing" - ] - }, - { - "x": 1, - "y": -1, - "z": 2, - - "elements": [ - "modularmachinery:blockcasing" - ] - }, - { - "x": 2, - "y": -1, - "z": 1, - - "elements": [ - "modularmachinery:blockcasing" - ] - }, - { - "x": 2, - "y": -1, - "z": 2, - - "elements": [ - "modularmachinery:blockcasing" - ] - }, - { - "x": -2, - "y": 0, - "z": 1, - "elements": [ - "modulardiversity:blockmystmechoutput" - ] - } - ]} diff --git a/src/overrides/config/modularmachinery/machinery/lightmaker.json b/src/overrides/config/modularmachinery/machinery/lightmaker.json deleted file mode 100644 index 8bb118e..0000000 --- a/src/overrides/config/modularmachinery/machinery/lightmaker.json +++ /dev/null @@ -1,86 +0,0 @@ -{ - "registryname": "lightmaker", - "localizedname": "Starlight Provider", - "color": "FFFFFF", - "parts": [ - { - "x": -1, - "y": -2, - "z": 1, - "elements": [ - "astralsorcery:blockmarble@0" - ] - }, - { - "x": 0, - "y": -2, - "z": 1, - "elements": [ - "astralsorcery:blockmarble@0" - ] - }, - { - "x": 1, - "y": -2, - "z": 1, - "elements": [ - "astralsorcery:blockmarble@0" - ] - }, - { - "x": 1, - "y": -2, - "z": 0, - "elements": [ - "astralsorcery:blockmarble@0" - ] - }, - { - "x": 1, - "y": -2, - "z": -1, - "elements": [ - "astralsorcery:blockmarble@0" - ] - }, - { - "x": 0, - "y": -2, - "z": 0, - "elements": [ - "modularmagic:blockstarlightprovideroutput@0" - ] - }, - { - "x": 0, - "y": -2, - "z": -1, - "elements": [ - "astralsorcery:blockmarble@0" - ] - }, - { - "x": -1, - "y": -2, - "z": 0, - "elements": [ - "astralsorcery:blockmarble@0" - ] - }, - { - "x": -1, - "y": -2, - "z": -1, - "elements": [ - "astralsorcery:blockmarble@0" - ] - }, - { - "x": 0, - "y": 1, - "z": 0, - "elements": [ - "modulardiversity:blockmanainputhatch@0" - ] - } - ]} diff --git a/src/overrides/config/modularmachinery/machinery/mill.json b/src/overrides/config/modularmachinery/machinery/mill.json deleted file mode 100644 index d846269..0000000 --- a/src/overrides/config/modularmachinery/machinery/mill.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "registryname": "mill", - "localizedname": "Mechanical Mill", - "color": "52525B", - "parts": [ - { - "x": -1, - "y": 0, - "z": 1, - "elements": [ - "modularmachinery:blockcasing@0" - ] - }, - { - "x": 0, - "y": 1, - "z": 1, - "elements": [ - "extrautils2:passivegenerator@7" - ] - }, - { - "x": 0, - "y": 0, - "z": 1, - "elements": [ - "modulardiversity:blockmystmechinput@0" - ] - }, - { - "x": 1, - "y": 0, - "z": 1, - "elements": [ - "modularmachinery:blockcasing@0" - ] - }, - { - "x": 0, - "y": 0, - "z": 2, - "elements": [ - "modularmagic:blockgridprovideroutput@0" - ] - } - ]} diff --git a/src/overrides/config/modularmachinery/machinery/portal.json b/src/overrides/config/modularmachinery/machinery/portal.json index 2e94938..51185dc 100644 --- a/src/overrides/config/modularmachinery/machinery/portal.json +++ b/src/overrides/config/modularmachinery/machinery/portal.json @@ -95,7 +95,7 @@ "x": 4, "y": 0, "z": 2, - "nbt": {"Size":"1","Items":[{"Slot":"0","id":"contenttweaker:cluster_boss","Count":"1b","Damage":"0s"}],"id":"minecraft:ec_pedestal"}, + "nbt": {"Size":"1","Items":[{"Slot":"0","id":"contenttweaker:cluster_overworld","Count":"1b","Damage":"0s"}],"id":"minecraft:ec_pedestal"}, "elements": [ "extendedcrafting:pedestal@0" ] @@ -239,6 +239,14 @@ "mystcraft:blockcrystal@0" ] }, + { + "x": 2, + "y": 0, + "z": 2, + "elements": [ + "extrautils2:klein" + ] + }, { "x": 0, "y": -1, diff --git a/src/overrides/resources/contenttweaker/lang/en_us.lang b/src/overrides/resources/contenttweaker/lang/en_us.lang index ec6c8c8..39b0404 100644 --- a/src/overrides/resources/contenttweaker/lang/en_us.lang +++ b/src/overrides/resources/contenttweaker/lang/en_us.lang @@ -9,4 +9,7 @@ item.contenttweaker.cluster_midnight.name=Midnight Cluster item.contenttweaker.cluster_twilight.name=Twilight Forest Cluster item.contenttweaker.cluster_between.name=Betweenlands Cluster item.contenttweaker.cluster_cavern.name=Cavern Cluster -item.contenttweaker.cluster_abyss.name=Abyssalcraft Cluster \ No newline at end of file +item.contenttweaker.cluster_abyss.name=Abyssalcraft Cluster +item.contenttweaker.frag_time.name=Time Monolith Fragment +item.contenttweaker.frag_space.name=Space Monolith Fragment +item.contenttweaker.frag_creation.name=Creation Monolith Fragment \ No newline at end of file diff --git a/src/overrides/resources/contenttweaker/models/item/frag_creation.json b/src/overrides/resources/contenttweaker/models/item/frag_creation.json new file mode 100644 index 0000000..ca34715 --- /dev/null +++ b/src/overrides/resources/contenttweaker/models/item/frag_creation.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "contenttweaker:items/frag_creation" + } +} diff --git a/src/overrides/resources/contenttweaker/models/item/frag_space.json b/src/overrides/resources/contenttweaker/models/item/frag_space.json new file mode 100644 index 0000000..7e3632b --- /dev/null +++ b/src/overrides/resources/contenttweaker/models/item/frag_space.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "contenttweaker:items/frag_space" + } +} diff --git a/src/overrides/resources/contenttweaker/models/item/frag_time.json b/src/overrides/resources/contenttweaker/models/item/frag_time.json new file mode 100644 index 0000000..c2c3067 --- /dev/null +++ b/src/overrides/resources/contenttweaker/models/item/frag_time.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "contenttweaker:items/frag_time" + } +} diff --git a/src/overrides/resources/contenttweaker/textures/items/frag_creation.png b/src/overrides/resources/contenttweaker/textures/items/frag_creation.png new file mode 100644 index 0000000..5ff5f22 Binary files /dev/null and b/src/overrides/resources/contenttweaker/textures/items/frag_creation.png differ diff --git a/src/overrides/resources/contenttweaker/textures/items/frag_space.png b/src/overrides/resources/contenttweaker/textures/items/frag_space.png new file mode 100644 index 0000000..f873cc9 Binary files /dev/null and b/src/overrides/resources/contenttweaker/textures/items/frag_space.png differ diff --git a/src/overrides/resources/contenttweaker/textures/items/frag_time.png b/src/overrides/resources/contenttweaker/textures/items/frag_time.png new file mode 100644 index 0000000..a23077b Binary files /dev/null and b/src/overrides/resources/contenttweaker/textures/items/frag_time.png differ diff --git a/src/overrides/scripts/darkhold.zs b/src/overrides/scripts/darkhold.zs index 772ce8f..dc41439 100644 --- a/src/overrides/scripts/darkhold.zs +++ b/src/overrides/scripts/darkhold.zs @@ -1,26 +1,31 @@ recipes.remove(); recipes.remove(); recipes.remove(); -recipes.remove(); +recipes.remove(); +recipes.remove(); recipes.remove(); + recipes.remove(); recipes.remove(); recipes.remove(); recipes.remove(); recipes.remove(); -recipes.remove(); -recipes.remove(); +recipes.remove(); +recipes.remove(); -recipes.addShaped( * 4, [[, , ],[, .reuse(), ], [, , ]]); +recipes.addShaped( * 4, [[, , ],[, .reuse(), ], [, , ]]); recipes.addShaped( * 4, [[, , ],[, .reuse(), ], [, , ]]); - -recipes.addShaped(, [[, null, ],[null, , null], [, null, ]]); -recipes.addShapeless(, [.reuse(),.reuse(),.reuse(), ]); -recipes.addShaped(, [[, , ],[, , ], [, , ]]); -recipes.addShapeless(, [.reuse(), ]); -recipes.addShaped(, [[, , ],[, , ], [, , ]]); -recipes.addShaped(, [[, , ],[, , ], [, , ]]); -recipes.addShaped(, [[, , ],[, , ], [, , ]]); +recipes.addShapeless(, [, ]); +recipes.addShaped(, [[, , ],[, , ], [, , ]]); +recipes.addShaped(, [[, , ],[, , ], [, , ]]); +recipes.addShaped(, [[, , ],[, , ], [, , ]]); -recipes.addShaped(.withTag({"akashictome:is_morphing": 1 as byte, "akashictome:data": {tconstruct: {ForgeCaps: {"astralsorcery:cap_item_amulet_holder": {}}, id: "tconstruct:book", Count: 1 as byte, tag: {"akashictome:definedMod": "tconstruct"}, Damage: 0 as short}, cyclicmagic1: {ForgeCaps: {"astralsorcery:cap_item_amulet_holder": {AS_Amulet_HolderLeast: -6745258256678342408 as long, AS_Amulet_HolderMost: -4726178680506464381 as long}}, id: "cyclicmagic:book_ender", Count: 1 as byte, tag: {location_back: "7777,-62.0,70.0,291.0,0,", backCounter: 469, "akashictome:displayName": "Ender Book", "akashictome:definedMod": "cyclicmagic1", "akashictome:is_morphing": 1 as byte, display: {Name: "§rAkashic Tome (§aEnder Book§r)"}, loc_largest: 2}, Damage: 0 as short}, lightningcraft: {ForgeCaps: {"astralsorcery:cap_item_amulet_holder": {}}, id: "lightningcraft:guide", Count: 1 as byte, tag: {"akashictome:definedMod": "lightningcraft"}, Damage: 0 as short}, astralsorcery: {ForgeCaps: {"astralsorcery:cap_item_amulet_holder": {}}, id: "astralsorcery:itemjournal", Count: 1 as byte, tag: {"akashictome:definedMod": "astralsorcery"}, Damage: 0 as short}, conarm: {ForgeCaps: {"astralsorcery:cap_item_amulet_holder": {}}, id: "conarm:book", Count: 1 as byte, tag: {"akashictome:definedMod": "conarm"}, Damage: 0 as short}, ftbquests: {ForgeCaps: {"astralsorcery:cap_item_amulet_holder": {AS_Amulet_HolderLeast: -6745258256678342408 as long, AS_Amulet_HolderMost: -4726178680506464381 as long}}, id: "ftbquests:book", Count: 1 as byte, tag: {"akashictome:displayName": "Quest Book", "akashictome:definedMod": "ftbquests", "akashictome:is_morphing": 1 as byte, display: {Name: "§rAkashic Tome (§aQuest Book§r)"}}, Damage: 0 as short}, wizardry: {ForgeCaps: {"astralsorcery:cap_item_amulet_holder": {}}, id: "wizardry:book", Count: 1 as byte, tag: {"akashictome:definedMod": "wizardry"}, Damage: 0 as short}, gbook: {ForgeCaps: {"astralsorcery:cap_item_amulet_holder": {}}, id: "gbook:guidebook", Count: 1 as byte, tag: {"akashictome:definedMod": "gbook", Book: "gbook:dimensions.xml"}, Damage: 0 as short}, rftools: {ForgeCaps: {"astralsorcery:cap_item_amulet_holder": {}}, id: "rftools:rftools_manual", Count: 1 as byte, tag: {"akashictome:definedMod": "rftools"}, Damage: 0 as short}, deepmoblearning: {ForgeCaps: {"astralsorcery:cap_item_amulet_holder": {}}, id: "patchouli:guide_book", Count: 1 as byte, tag: {"akashictome:definedMod": "deepmoblearning", "patchouli:book": "deepmoblearning:book"}, Damage: 0 as short}, ebwizardry: {ForgeCaps: {"astralsorcery:cap_item_amulet_holder": {}}, id: "ebwizardry:wizard_handbook", Count: 1 as byte, tag: {"akashictome:definedMod": "ebwizardry"}, Damage: 0 as short}, rftools1: {ForgeCaps: {"astralsorcery:cap_item_amulet_holder": {}}, id: "rftools:rftools_shape_manual", Count: 1 as byte, tag: {"akashictome:definedMod": "rftools1"}, Damage: 0 as short}, rftools2: {ForgeCaps: {"astralsorcery:cap_item_amulet_holder": {}}, id: "rftoolsdim:rftoolsdim_manual", Count: 1 as byte, tag: {"akashictome:definedMod": "rftools2"}, Damage: 0 as short}, aether_legacy: {ForgeCaps: {"astralsorcery:cap_item_amulet_holder": {}}, id: "aether_legacy:lore_book", Count: 1 as byte, tag: {"akashictome:definedMod": "aether_legacy"}, Damage: 0 as short}, botania: {ForgeCaps: {"astralsorcery:cap_item_amulet_holder": {AS_Amulet_HolderLeast: -6745258256678342408 as long, AS_Amulet_HolderMost: -4726178680506464381 as long}}, id: "botania:lexicon", Count: 1 as byte, tag: {"knowledge.minecraft": 1 as byte, "akashictome:displayName": "Lexica Botania", "akashictome:definedMod": "botania", "akashictome:is_morphing": 1 as byte, display: {Name: "§rAkashic Tome (§aLexica Botania§r)"}, "knowledge.alfheim": 1 as byte, "knowledge.dream": 1 as byte, "knowledge.relic": 1 as byte}, Damage: 0 as short}, thaumcraft: {ForgeCaps: {"astralsorcery:cap_item_amulet_holder": {}}, id: "thaumcraft:thaumonomicon", Count: 1 as byte, tag: {"akashictome:definedMod": "thaumcraft"}, Damage: 0 as short}, extrautils2: {ForgeCaps: {"astralsorcery:cap_item_amulet_holder": {}}, id: "extrautils2:book", Count: 1 as byte, tag: {"akashictome:definedMod": "extrautils2"}, Damage: 0 as short}, thermalfoundation: {ForgeCaps: {"astralsorcery:cap_item_amulet_holder": {AS_Amulet_HolderLeast: -6745258256678342408 as long, AS_Amulet_HolderMost: -4726178680506464381 as long}}, id: "thermalfoundation:tome_lexicon", Count: 1 as byte, tag: {"akashictome:displayName": "Forge Lexicon", "akashictome:definedMod": "thermalfoundation", "akashictome:is_morphing": 1 as byte, display: {Name: "§rAkashic Tome (§aForge Lexicon§r)"}, Inventory: {}}, Damage: 0 as short}, actuallyadditions: {ForgeCaps: {"astralsorcery:cap_item_amulet_holder": {}}, id: "actuallyadditions:item_booklet", Count: 1 as byte, tag: {"akashictome:definedMod": "actuallyadditions"}, Damage: 0 as short}, bloodmagic: {ForgeCaps: {"astralsorcery:cap_item_amulet_holder": {}}, id: "guideapi:bloodmagic-guide", Count: 1 as byte, tag: {"akashictome:definedMod": "bloodmagic"}, Damage: 0 as short}, abyssalcraft: {ForgeCaps: {"astralsorcery:cap_item_amulet_holder": {AS_Amulet_HolderLeast: -6745258256678342408 as long, AS_Amulet_HolderMost: -4726178680506464381 as long}}, id: "abyssalcraft:abyssalnomicon", Count: 1 as byte, tag: {owner: "tilera", "akashictome:displayName": "Abyssalnomicon", "akashictome:definedMod": "abyssalcraft", "akashictome:is_morphing": 1 as byte, display: {Name: "§rAkashic Tome (§aAbyssalnomicon§r)"}, PotEnergy: 0.0 as float}, Damage: 0 as short}, cyclicmagic: {ForgeCaps: {"astralsorcery:cap_item_amulet_holder": {}}, id: "guideapi:cyclicmagic-guide", Count: 1 as byte, tag: {"akashictome:definedMod": "cyclicmagic"}, Damage: 0 as short}, openblocks: {id: "openblocks:info_book", Count: 1 as byte, tag: {"akashictome:definedMod": "openblocks"}, Damage: 0 as short}, lordcraft: {ForgeCaps: {"astralsorcery:cap_item_amulet_holder": {}}, id: "lordcraft:knowledge_book", Count: 1 as byte, tag: {"akashictome:definedMod": "lordcraft", tile_unlocked_17: 0 as byte, tile_unlocked_16: 0 as byte, tile_unlocked_19: 0 as byte, tile_unlocked_18: 0 as byte, tile_unlocked_31: 0 as byte, tile_unlocked_30: 0 as byte, tile_unlocked_11: 0 as byte, tile_unlocked_33: 0 as byte, tile_unlocked_10: 0 as byte, tile_unlocked_32: 0 as byte, tile_unlocked_13: 0 as byte, tile_unlocked_35: 0 as byte, tile_unlocked_12: 0 as byte, tile_unlocked_34: 0 as byte, tile_unlocked_15: 0 as byte, tile_unlocked_14: 0 as byte, tile_unlocked_8: 0 as byte, tile_unlocked_7: 0 as byte, tile_unlocked_9: 0 as byte, tile_unlocked_4: 0 as byte, tile_unlocked_3: 0 as byte, tile_unlocked_6: 0 as byte, tile_unlocked_5: 0 as byte, tile_unlocked_0: 0 as byte, tile_unlocked_28: 0 as byte, tile_unlocked_27: 0 as byte, tile_unlocked_2: 0 as byte, tile_unlocked_1: 0 as byte, tile_unlocked_29: 0 as byte, tile_unlocked_20: 0 as byte, tile_unlocked_22: 0 as byte, tile_unlocked_21: 0 as byte, tile_unlocked_24: 0 as byte, tile_unlocked_23: 0 as byte, tile_unlocked_26: 0 as byte, research_prog: -1, tile_unlocked_25: 0 as byte, research_ord: -1}, Damage: 0 as short}}}), [[, , ],[, , ], [, , ]]); +recipes.addShaped(.withTag({"akashictome:is_morphing": 1 as byte, "akashictome:data": {tconstruct: {ForgeCaps: {"astralsorcery:cap_item_amulet_holder": {}}, id: "tconstruct:book", Count: 1 as byte, tag: {"akashictome:definedMod": "tconstruct"}, Damage: 0 as short}, cyclicmagic1: {ForgeCaps: {"astralsorcery:cap_item_amulet_holder": {AS_Amulet_HolderLeast: -6745258256678342408 as long, AS_Amulet_HolderMost: -4726178680506464381 as long}}, id: "cyclicmagic:book_ender", Count: 1 as byte, tag: {location_back: "7777,-62.0,70.0,291.0,0,", backCounter: 469, "akashictome:displayName": "Ender Book", "akashictome:definedMod": "cyclicmagic1", "akashictome:is_morphing": 1 as byte, display: {Name: "§rAkashic Tome (§aEnder Book§r)"}, loc_largest: 2}, Damage: 0 as short}, lightningcraft: {ForgeCaps: {"astralsorcery:cap_item_amulet_holder": {}}, id: "lightningcraft:guide", Count: 1 as byte, tag: {"akashictome:definedMod": "lightningcraft"}, Damage: 0 as short}, astralsorcery: {ForgeCaps: {"astralsorcery:cap_item_amulet_holder": {}}, id: "astralsorcery:itemjournal", Count: 1 as byte, tag: {"akashictome:definedMod": "astralsorcery"}, Damage: 0 as short}, conarm: {ForgeCaps: {"astralsorcery:cap_item_amulet_holder": {}}, id: "conarm:book", Count: 1 as byte, tag: {"akashictome:definedMod": "conarm"}, Damage: 0 as short}, ftbquests: {ForgeCaps: {"astralsorcery:cap_item_amulet_holder": {AS_Amulet_HolderLeast: -6745258256678342408 as long, AS_Amulet_HolderMost: -4726178680506464381 as long}}, id: "ftbquests:book", Count: 1 as byte, tag: {"akashictome:displayName": "Quest Book", "akashictome:definedMod": "ftbquests", "akashictome:is_morphing": 1 as byte, display: {Name: "§rAkashic Tome (§aQuest Book§r)"}}, Damage: 0 as short}, wizardry: {ForgeCaps: {"astralsorcery:cap_item_amulet_holder": {}}, id: "wizardry:book", Count: 1 as byte, tag: {"akashictome:definedMod": "wizardry"}, Damage: 0 as short}, gbook: {ForgeCaps: {"astralsorcery:cap_item_amulet_holder": {}}, id: "gbook:guidebook", Count: 1 as byte, tag: {"akashictome:definedMod": "gbook", Book: "gbook:dimensions.xml"}, Damage: 0 as short}, rftools: {ForgeCaps: {"astralsorcery:cap_item_amulet_holder": {}}, id: "rftools:rftools_manual", Count: 1 as byte, tag: {"akashictome:definedMod": "rftools"}, Damage: 0 as short}, deepmoblearning: {ForgeCaps: {"astralsorcery:cap_item_amulet_holder": {}}, id: "patchouli:guide_book", Count: 1 as byte, tag: {"akashictome:definedMod": "deepmoblearning", "patchouli:book": "deepmoblearning:book"}, Damage: 0 as short}, ebwizardry: {ForgeCaps: {"astralsorcery:cap_item_amulet_holder": {}}, id: "ebwizardry:wizard_handbook", Count: 1 as byte, tag: {"akashictome:definedMod": "ebwizardry"}, Damage: 0 as short}, rftools1: {ForgeCaps: {"astralsorcery:cap_item_amulet_holder": {}}, id: "rftools:rftools_shape_manual", Count: 1 as byte, tag: {"akashictome:definedMod": "rftools1"}, Damage: 0 as short}, rftools2: {ForgeCaps: {"astralsorcery:cap_item_amulet_holder": {}}, id: "rftoolsdim:rftoolsdim_manual", Count: 1 as byte, tag: {"akashictome:definedMod": "rftools2"}, Damage: 0 as short}, aether_legacy: {ForgeCaps: {"astralsorcery:cap_item_amulet_holder": {}}, id: "aether_legacy:lore_book", Count: 1 as byte, tag: {"akashictome:definedMod": "aether_legacy"}, Damage: 0 as short}, botania: {ForgeCaps: {"astralsorcery:cap_item_amulet_holder": {AS_Amulet_HolderLeast: -6745258256678342408 as long, AS_Amulet_HolderMost: -4726178680506464381 as long}}, id: "botania:lexicon", Count: 1 as byte, tag: {"knowledge.minecraft": 1 as byte, "akashictome:displayName": "Lexica Botania", "akashictome:definedMod": "botania", "akashictome:is_morphing": 1 as byte, display: {Name: "§rAkashic Tome (§aLexica Botania§r)"}, "knowledge.alfheim": 1 as byte, "knowledge.dream": 1 as byte, "knowledge.relic": 1 as byte}, Damage: 0 as short}, thaumcraft: {ForgeCaps: {"astralsorcery:cap_item_amulet_holder": {}}, id: "thaumcraft:thaumonomicon", Count: 1 as byte, tag: {"akashictome:definedMod": "thaumcraft"}, Damage: 0 as short}, extrautils2: {ForgeCaps: {"astralsorcery:cap_item_amulet_holder": {}}, id: "extrautils2:book", Count: 1 as byte, tag: {"akashictome:definedMod": "extrautils2"}, Damage: 0 as short}, thermalfoundation: {ForgeCaps: {"astralsorcery:cap_item_amulet_holder": {AS_Amulet_HolderLeast: -6745258256678342408 as long, AS_Amulet_HolderMost: -4726178680506464381 as long}}, id: "thermalfoundation:tome_lexicon", Count: 1 as byte, tag: {"akashictome:displayName": "Forge Lexicon", "akashictome:definedMod": "thermalfoundation", "akashictome:is_morphing": 1 as byte, display: {Name: "§rAkashic Tome (§aForge Lexicon§r)"}, Inventory: {}}, Damage: 0 as short}, actuallyadditions: {ForgeCaps: {"astralsorcery:cap_item_amulet_holder": {}}, id: "actuallyadditions:item_booklet", Count: 1 as byte, tag: {"akashictome:definedMod": "actuallyadditions"}, Damage: 0 as short}, bloodmagic: {ForgeCaps: {"astralsorcery:cap_item_amulet_holder": {}}, id: "guideapi:bloodmagic-guide", Count: 1 as byte, tag: {"akashictome:definedMod": "bloodmagic"}, Damage: 0 as short}, abyssalcraft: {ForgeCaps: {"astralsorcery:cap_item_amulet_holder": {AS_Amulet_HolderLeast: -6745258256678342408 as long, AS_Amulet_HolderMost: -4726178680506464381 as long}}, id: "abyssalcraft:necronomicon_omt", Count: 1 as byte, tag: {owner: "tilera", "akashictome:displayName": "Omothol Necronomicon", "akashictome:definedMod": "abyssalcraft", "akashictome:is_morphing": 1 as byte, display: {Name: "§rAkashic Tome (§aOmothol Necronomicon§r)"}, PotEnergy: 0.0 as float}, Damage: 0 as short}, cyclicmagic: {ForgeCaps: {"astralsorcery:cap_item_amulet_holder": {}}, id: "guideapi:cyclicmagic-guide", Count: 1 as byte, tag: {"akashictome:definedMod": "cyclicmagic"}, Damage: 0 as short}, openblocks: {id: "openblocks:info_book", Count: 1 as byte, tag: {"akashictome:definedMod": "openblocks"}, Damage: 0 as short}, lordcraft: {ForgeCaps: {"astralsorcery:cap_item_amulet_holder": {}}, id: "lordcraft:knowledge_book", Count: 1 as byte, tag: {"akashictome:definedMod": "lordcraft", tile_unlocked_17: 0 as byte, tile_unlocked_16: 0 as byte, tile_unlocked_19: 0 as byte, tile_unlocked_18: 0 as byte, tile_unlocked_31: 0 as byte, tile_unlocked_30: 0 as byte, tile_unlocked_11: 0 as byte, tile_unlocked_33: 0 as byte, tile_unlocked_10: 0 as byte, tile_unlocked_32: 0 as byte, tile_unlocked_13: 0 as byte, tile_unlocked_35: 0 as byte, tile_unlocked_12: 0 as byte, tile_unlocked_34: 0 as byte, tile_unlocked_15: 0 as byte, tile_unlocked_14: 0 as byte, tile_unlocked_8: 0 as byte, tile_unlocked_7: 0 as byte, tile_unlocked_9: 0 as byte, tile_unlocked_4: 0 as byte, tile_unlocked_3: 0 as byte, tile_unlocked_6: 0 as byte, tile_unlocked_5: 0 as byte, tile_unlocked_0: 0 as byte, tile_unlocked_28: 0 as byte, tile_unlocked_27: 0 as byte, tile_unlocked_2: 0 as byte, tile_unlocked_1: 0 as byte, tile_unlocked_29: 0 as byte, tile_unlocked_20: 0 as byte, tile_unlocked_22: 0 as byte, tile_unlocked_21: 0 as byte, tile_unlocked_24: 0 as byte, tile_unlocked_23: 0 as byte, tile_unlocked_26: 0 as byte, research_prog: -1 as long, tile_unlocked_25: 0 as byte, research_ord: -1 as long}, Damage: 0 as short}}}), [[, , ],[, , ], [, , ]]); + + +recipes.addShaped(, [[, , ],[, , ], [, , ]]); +recipes.addShaped(, [[, , ],[, , ], [, , ]]); +recipes.addShaped(, [[, , ],[, , ], [, , ]]); +recipes.addShaped(, [[, , ],[, , ], [, , ]]); +recipes.addShaped(, [[null, , null],[, , ], [null, , null]]); diff --git a/src/overrides/scripts/dims.zs b/src/overrides/scripts/dims.zs index 9b902e2..d8a92d9 100644 --- a/src/overrides/scripts/dims.zs +++ b/src/overrides/scripts/dims.zs @@ -86,8 +86,11 @@ midnight.build(); var abyss = mods.modularmachinery.RecipeBuilder.newBuilder("abyss", "dimextractor", 60); abyss.addItemOutput(); abyss.addItemInput( * 5); -abyss.addItemInput(); abyss.addItemInput(); +abyss.addItemInput(); +abyss.addItemInput(); +abyss.addItemInput(); +abyss.addItemInput(); abyss.addDimensionRequirement([53]); abyss.build(); @@ -122,5 +125,21 @@ overworld.addItemInput( * 5); overworld.addItemInput(); overworld.addItemInput(); overworld.addItemInput(); +overworld.addItemInput( * 32); overworld.addDimensionRequirement([0]); overworld.build(); + +var rift = mods.modularmachinery.RecipeBuilder.newBuilder("rift", "dimextractor", 60); +rift.addItemOutput(); +rift.addEnergyPerTickOutput(4096); +rift.addItemInput(); +rift.addItemInput(); +rift.addItemInput(); +rift.build(); + +var dark = mods.modularmachinery.RecipeBuilder.newBuilder("dark", "dimextractor", 120); +dark.addItemOutput(); +dark.addItemOutput(); +dark.addEnergyPerTickOutput(1024); +dark.addItemInput(); +dark.build(); diff --git a/src/overrides/scripts/engine.zs b/src/overrides/scripts/engine.zs deleted file mode 100644 index f057569..0000000 --- a/src/overrides/scripts/engine.zs +++ /dev/null @@ -1,10 +0,0 @@ -var i = 32; -while i > 0 { - var eng = mods.modularmachinery.RecipeBuilder.newBuilder("engine" + i, "engine", 1200, 33 - i); - eng.addEnergyPerTickInput(4 * i); - eng.addItemOutput( * i); - eng.addItemInput( * i); - eng.addMysticalMechanicsOutput(10 * i, 1200); - eng.build(); - i -= 1; -} diff --git a/src/overrides/scripts/items.zs b/src/overrides/scripts/items.zs index e5056a6..95e5930 100644 --- a/src/overrides/scripts/items.zs +++ b/src/overrides/scripts/items.zs @@ -63,3 +63,18 @@ var bossCluster = VanillaFactory.createItem("cluster_overworld"); bossCluster.maxStackSize = 1; bossCluster.rarity = "rare"; bossCluster.register(); + +var spaceFrag = VanillaFactory.createItem("frag_space"); +spaceFrag.maxStackSize = 16; +spaceFrag.rarity = "common"; +spaceFrag.register(); + +var timeFrag = VanillaFactory.createItem("frag_time"); +timeFrag.maxStackSize = 16; +timeFrag.rarity = "common"; +timeFrag.register(); + +var creationFrag = VanillaFactory.createItem("frag_creation"); +creationFrag.maxStackSize = 16; +creationFrag.rarity = "common"; +creationFrag.register(); diff --git a/src/overrides/scripts/names.zs b/src/overrides/scripts/names.zs index c110f5b..975935e 100644 --- a/src/overrides/scripts/names.zs +++ b/src/overrides/scripts/names.zs @@ -3,8 +3,6 @@ .displayName = "Broken Space Monolith"; .displayName = "Time Monolith"; .displayName = "Creation Monolith"; -.displayName = "Grey Limestone Monolith"; -.displayName = "White Limestone Monolith"; .displayName = "World Thread"; .displayName = "Darkhold"; .displayName = "Dark Matter Ingot"; diff --git a/src/overrides/scripts/recipe.zs b/src/overrides/scripts/recipe.zs index bb588e4..236696f 100644 --- a/src/overrides/scripts/recipe.zs +++ b/src/overrides/scripts/recipe.zs @@ -61,11 +61,11 @@ mods.extendedcrafting.TableCrafting.addShaped(0, , [, , , , , , ] ]); mods.extendedcrafting.TableCrafting.addShaped(0, , [ - [, , , , ], + [, , , , ], [, , , , ], [, , , , ], [, , , , ], - [, , , , ] + [, , , , ] ]); recipes.addShaped(, [[, , ],[, , null], [, , ]]); recipes.addShaped(, [[, , ],[, , ], [, , ]]); @@ -101,5 +101,3 @@ mods.extendedcrafting.EnderCrafting.addShaped(, [ recipes.addShaped(, [[null, , null],[null, , null], [null, , null]]); recipes.addShaped(, [[null, , null],[, , ], [null, , null]]); recipes.addShaped(, [[, , ],[, , ], [, , ]]); -mods.projecte.WorldTransmutation.add(, ); -mods.extrautils2.Resonator.add( * 4, , 5000);