diff --git a/src/overrides/config/gtadditions.cfg b/src/overrides/config/gtadditions.cfg new file mode 100644 index 0000000..9530c05 --- /dev/null +++ b/src/overrides/config/gtadditions.cfg @@ -0,0 +1,193 @@ +# Configuration file + +general { + + ########################################################################################################## + # gt6 + #--------------------------------------------------------------------------------------------------------# + # Config options for GT6 features + ########################################################################################################## + + gt6 { + # Bending Recipes (disabling Bending Cylinders' recipes disables all of them) + B:"Bending - Bending Cylinders' recipes"=true + B:"Bending - Curved Plates' recipes"=true + B:"Bending - Foils are automated in the Cluster Mill instead of the Bending Machine"=true + B:"Bending - Foils are made with Bending Cylinders"=true + B:"Bending - Pipes are crafted with Curved Plates"=true + B:"Bending - Rings are crafted with Bending Cyliders"=true + B:"Bending - Rotors require Curved Plates"=true + + # Set this to false to disable Plates being crafted from Double Ingots + B:"Plates are crafted from Double Ingots"=true + + # Set this to false to disable Drums + B:"Should Drums be registered?"=true + + # Set this to false to disable the support for Forestry Electron Tubes + B:"Should Electrodes be registered?"=true + + # Set this to false to disable curved plates + B:"Should curved plates be registered?"=true + + # Set this to false to disable double ingots + B:"Should double ingots be registered?"=true + + # Set this to false to disable rounds + B:"Should rounds be registered?"=true + + # Set this to false to enable the GT5 Wrench recipes + B:"Wrenches are crafted with Plates instead of Ingots"=true + } + + ########################################################################################################## + # gt5u + #--------------------------------------------------------------------------------------------------------# + # Config options for GT5U features + ########################################################################################################## + + gt5u { + # Set to false to disable generated wood sawing recipes + B:"A saw is required to get 4 Planks per Log"=false + + # Set to false to enable Log>Charcoal smelting recipes + B:"All Log to Charcoal smelting recipes will be removed"=false + + # Set these to true to enable certain Batteries. + B:"Batteries - Enable an extra ZPM and UV Battery (this also makes the Ultimate Battery harder to make)"=false + B:"Batteries - Replace the Ultimate Battery with a MAX Battery"=false + + # Set to false to disable GT5U Cable isolation recipes + B:"Cables can be isolated with different combinations of Rubbers and Dusts with varying efficiencies"=true + + # Set these to false to disable the generated Compressor recipes for blocks + B:"Compression - Generate Compressor recipes for blocks"=true + B:"Compression - Remove 3x3 crafting recipes for blocks"=false + B:"Compression - Remove crafting recipes for uncompressing blocks"=false + + # Set to false to enable GTCE's Fine Wire recipes + B:"Fine Wires are made from Foils"=true + + # Set these to false to disable the higher tier versions of machines + B:"Should higher tier Alloy Smelters be registered?"=true + B:"Should higher tier Arc Furnaces be registered?"=true + B:"Should higher tier Assembling Machines be registered?"=true + B:"Should higher tier Autoclaves be registered?"=true + B:"Should higher tier Bending Machines be registered?"=true + B:"Should higher tier Breweries be registered?"=true + B:"Should higher tier Canning Machines be registered?"=true + B:"Should higher tier Centrifuges be registered?"=true + B:"Should higher tier Chemical Baths be registered?"=true + B:"Should higher tier Chemical Reactors be registered?"=true + B:"Should higher tier Circuit Assembling Machines be registered?"=true + B:"Should higher tier Cluster Mills be registered?"=true + B:"Should higher tier Compressors be registered?"=true + B:"Should higher tier Cutting Machines be registered?"=true + B:"Should higher tier Distilleries be registered?"=true + B:"Should higher tier Electric Furnaces be registered?"=true + B:"Should higher tier Electrolyzers be registered?"=true + B:"Should higher tier Electromagnetic Separators be registered?"=true + B:"Should higher tier Eluid Canners be registered?"=true + B:"Should higher tier Extractors be registered?"=true + B:"Should higher tier Extruders be registered?"=true + B:"Should higher tier Fermenters be registered?"=true + B:"Should higher tier Fluid Extractors be registered?"=true + B:"Should higher tier Fluid Heaters be registered?"=true + B:"Should higher tier Forge Hammers be registered?"=true + B:"Should higher tier Forming Presses be registered?"=true + B:"Should higher tier Lathes be registered?"=true + B:"Should higher tier Macerators be registered?"=true + B:"Should higher tier Mass Fabricators be registered?"=true + B:"Should higher tier Microwaves be registered?"=true + B:"Should higher tier Mixers be registered?"=true + B:"Should higher tier Ore Washers be registered?"=true + B:"Should higher tier Packagers be registered?"=true + B:"Should higher tier Plasma Arc Furnaces be registered?"=true + B:"Should higher tier Polarizers be registered?"=true + B:"Should higher tier Precision Laser Engravers be registered?"=true + B:"Should higher tier Pumps be registered?"=true + B:"Should higher tier Replicators be registered?"=true + B:"Should higher tier Sifting Machines be registered?"=true + B:"Should higher tier Thermal Centrifuges be registered?"=true + B:"Should higher tier Unpackagers be registered?"=true + B:"Should higher tier Wiremills be registered?"=true + } + + ########################################################################################################## + # gtbees + #--------------------------------------------------------------------------------------------------------# + # Config options of GTCE Bees features + ########################################################################################################## + + gtbees { + # Add Assembling Machine recipes for Impregnated items + B:AssemblerRecipes=true + + # Add Autoclave recipes for the Combs + B:AutoclaverRecipes=true + + # Enable/Disable all GT Bees features + B:EnableGTCEBees=true + + # Generate a recipe in the GT Centrifuge for every recipe in the Forestry Centrifuge + B:GenerateCentrifugeRecipes=true + + # Generate a recipe in the Fluid Extractor for every recipe in the Squeezer + B:GenerateExtractorRecipes=true + + # Add Chemical Reactor recipes for the Combs + B:ReactorRecipes=true + } + + ########################################################################################################## + # gregsconstruct + #--------------------------------------------------------------------------------------------------------# + # Config options for GregsConstruct features + ########################################################################################################## + + gregsconstruct { + # Enable/Disable all GregsConstruct features + B:EnableGregsConstruct=true + + # Enable Glass recipe changes + B:GregsConstructGlassProcessing=true + + # Add Tools with GT Gems to Tinkers + B:TinkersGemTools=true + + # Add Alloying of GT Materials to Tinkers Smeltery + B:TinkersMaterialAlloying=true + + # Add Smelting for GT Materials to Tinkers Smeltery + B:TinkersMaterialsSmelting=true + + # Add Tools with GT Metals to Tinkers + B:TinkersMetalTools=true + } + + ########################################################################################################## + # misc + #--------------------------------------------------------------------------------------------------------# + # Config options of miscellaneous features + ########################################################################################################## + + misc { + # Set this to false to disable the high tier Air Collectors + B:"Air Collector have IV and LuV version"=true + + # Set this to false to disable the Forestry Integration + B:"Forestry's Ethanol and Seed Oil are used in recipes instead of GTCE's"=true + + # Set these to flase to disable the generated Packager and Unpackaker recipes + B:"Packaging - 1x1 recipes with 9 outputs can be automated with the Unpackaker"=true + B:"Packaging - 2x2 recipes can automated with the Packagers"=true + B:"Packaging - 3x3 recipes can automated with the Packagers"=true + B:"Packaging - Dust compressing can automated with the Packagers"=true + + # Set this to false to disable Crates + B:"Should Crates be registered?"=true + } + +} + + diff --git a/src/overrides/config/modularmachinery/machinery/alloy_furnace.json b/src/overrides/config/modularmachinery/machinery/alloy_furnace.json deleted file mode 100644 index e4d6e77..0000000 --- a/src/overrides/config/modularmachinery/machinery/alloy_furnace.json +++ /dev/null @@ -1,188 +0,0 @@ -{ - "registryname": "alloy_furnace", - "localizedname": "Alloy Smelter", - "modifiers": [ - { - "elements": "modularmachinery:blockcasing@1", - "x": 0, - "y": 1, - "z": 0, - "description": "Replace block above controller with machine vent\nfor double item output!", - "modifier": { - "io": "output", - "target": "item", - "operation": 1, - "multiplier": 2.0 - } - } - ], - "parts": [ - { - "x": -1, - "y": -1, - "z": 0, - "elements": "modularmachinery:blockcasing@4" - }, - { - "x": 0, - "y": -1, - "z": 0, - "elements": "modularmachinery:blockcasing@2" - }, - { - "x": 1, - "y": -1, - "z": 0, - "elements": "modularmachinery:blockcasing@4" - }, - { - "x": -1, - "y": -1, - "z": 1, - "elements": "modularmachinery:blockcasing@2" - }, - { - "x": 1, - "y": -1, - "z": 1, - "elements": "modularmachinery:blockcasing@2" - }, - { - "x": -1, - "y": -1, - "z": 2, - "elements": "modularmachinery:blockcasing@4" - }, - { - "x": 1, - "y": -1, - "z": 2, - "elements": "modularmachinery:blockcasing@4" - }, - { - "x": 0, - "y": -1, - "z": 2, - "elements": "modularmachinery:blockcasing@2" - }, - { - "x": 0, - "y": -1, - "z": 1, - "elements": "modularmachinery:blockcasing@0" - }, - - - { - "x": -1, - "y": 0, - "z": 2, - "elements": "modularmachinery:blockcasing@4" - }, - { - "x": 1, - "y": 0, - "z": 2, - "elements": "modularmachinery:blockcasing@4" - }, - { - "x": -1, - "y": 0, - "z": 0, - "elements": "modularmachinery:blockcasing@4" - }, - { - "x": 1, - "y": 0, - "z": 0, - "elements": "modularmachinery:blockcasing@4" - }, - - { - "x": 1, - "y": 0, - "z": 1, - "elements": [ - "modularmachinery:blockinputbus" - ] - }, - { - "x": -1, - "y": 0, - "z": 1, - "elements": [ - "modularmachinery:blockoutputbus" - ] - }, - { - "x": 0, - "y": 0, - "z": 2, - "elements": [ - "modularmachinery:blockenergyinputhatch" - ] - }, - { - "x": 0, - "y": 0, - "z": 1, - "elements": "minecraft:lava" - }, - - - { - "x": -1, - "y": 1, - "z": 0, - "elements": "modularmachinery:blockcasing@4" - }, - { - "x": 0, - "y": 1, - "z": 0, - "elements": "modularmachinery:blockcasing@2" - }, - { - "x": 1, - "y": 1, - "z": 0, - "elements": "modularmachinery:blockcasing@4" - }, - { - "x": -1, - "y": 1, - "z": 1, - "elements": "modularmachinery:blockcasing@2" - }, - { - "x": 1, - "y": 1, - "z": 1, - "elements": "modularmachinery:blockcasing@2" - }, - { - "x": -1, - "y": 1, - "z": 2, - "elements": "modularmachinery:blockcasing@4" - }, - { - "x": 1, - "y": 1, - "z": 2, - "elements": "modularmachinery:blockcasing@4" - }, - { - "x": 0, - "y": 1, - "z": 2, - "elements": "modularmachinery:blockcasing@2" - }, - { - "x": 0, - "y": 1, - "z": 1, - "elements": "modularmachinery:blockcasing@0" - } - ] -} \ No newline at end of file diff --git a/src/overrides/config/modularmachinery/machinery/dimdrill.json b/src/overrides/config/modularmachinery/machinery/dimdrill.json deleted file mode 100644 index c8ffc90..0000000 --- a/src/overrides/config/modularmachinery/machinery/dimdrill.json +++ /dev/null @@ -1,533 +0,0 @@ -{ - "registryname": "dimdrill", - "localizedname": "Dimensional Drill", - "color": "52525B", - "parts": [ - { - "x": 2, - "y": 2, - "z": -1, - - "elements": [ - "modularmachinery:blockcasing@0" - ] - }, - { - "x": -1, - "y": 0, - "z": 0, - - "elements": [ - "modularmachinery:blockcasing@0" - ] - }, - { - "x": 1, - "y": 2, - "z": 1, - - "elements": [ - "modularmachinery:blockcasing@0" - ] - }, - { - "x": 1, - "y": 0, - "z": 0, - - "elements": [ - "modularmachinery:blockcasing@0" - ] - }, - { - "x": -1, - "y": 0, - "z": 2, - - "elements": [ - "modularmachinery:blockcasing@0" - ] - }, - { - "x": 0, - "y": 0, - "z": 2, - "elements": [ - "modulardiversity:blockmystmechinput" - ] - }, - { - "x": 2, - "y": 2, - "z": 3, - - "elements": [ - "modularmachinery:blockcasing@0" - ] - }, - { - "x": 1, - "y": 0, - "z": 2, - - "elements": [ - "modularmachinery:blockcasing@0" - ] - }, - { - "x": -2, - "y": 2, - "z": -1, - - "elements": [ - "modularmachinery:blockcasing@0" - ] - }, - { - "x": -2, - "y": 1, - "z": 0, - - "elements": [ - "modularmachinery:blockcasing@0" - ] - }, - { - "x": -1, - "y": 3, - "z": 1, - - "elements": [ - "modularmachinery:blockcasing@0" - ] - }, - { - "x": -1, - "y": 1, - "z": 0, - - "elements": [ - "modularmachinery:blockcasing@0" - ] - }, - { - "x": 0, - "y": 3, - "z": 1, - - "elements": [ - "modularmachinery:blockcasing@0" - ] - }, - { - "x": 2, - "y": 1, - "z": -1, - - "elements": [ - "modularmachinery:blockcasing@0" - ] - }, - { - "x": -2, - "y": 1, - "z": 2, - - "elements": [ - "modularmachinery:blockcasing@0" - ] - }, - { - "x": 0, - "y": 1, - "z": 0, - - "elements": [ - "modularmachinery:blockcasing@0" - ] - }, - { - "x": 1, - "y": 3, - "z": 1, - - "elements": [ - "modularmachinery:blockcasing@0" - ] - }, - { - "x": 1, - "y": 1, - "z": -1, - - "elements": [ - "modularmachinery:blockcasing@0" - ] - }, - { - "x": -1, - "y": 1, - "z": 2, - - "elements": [ - "modularmachinery:blockcasing@0" - ] - }, - { - "x": 1, - "y": 1, - "z": 0, - - "elements": [ - "modularmachinery:blockcasing@0" - ] - }, - { - "x": 2, - "y": 1, - "z": 0, - - "elements": [ - "modularmachinery:blockcasing@0" - ] - }, - { - "x": 0, - "y": 1, - "z": 2, - - "elements": [ - "modularmachinery:blockcasing@0" - ] - }, - { - "x": -1, - "y": 1, - "z": -1, - - "elements": [ - "modularmachinery:blockcasing@0" - ] - }, - { - "x": -2, - "y": -1, - "z": 3, - - "elements": [ - "modularmachinery:blockcasing@0" - ] - }, - { - "x": 1, - "y": 1, - "z": 2, - - "elements": [ - "modularmachinery:blockcasing@0" - ] - }, - { - "x": -2, - "y": 1, - "z": -1, - - "elements": [ - "modularmachinery:blockcasing@0" - ] - }, - { - "x": 2, - "y": 1, - "z": 2, - - "elements": [ - "modularmachinery:blockcasing@0" - ] - }, - { - "x": 2, - "y": -1, - "z": 3, - - "elements": [ - "modularmachinery:blockcasing@0" - ] - }, - { - "x": -1, - "y": 2, - "z": 0, - - "elements": [ - "modularmachinery:blockcasing@0" - ] - }, - { - "x": 2, - "y": 0, - "z": -1, - - "elements": [ - "modularmachinery:blockcasing@0" - ] - }, - { - "x": 0, - "y": 2, - "z": 0, - - "elements": [ - "modularmachinery:blockcasing@0" - ] - }, - { - "x": -1, - "y": 2, - "z": 2, - - "elements": [ - "modularmachinery:blockcasing@0" - ] - }, - { - "x": 1, - "y": 2, - "z": 0, - - "elements": [ - "modularmachinery:blockcasing@0" - ] - }, - { - "x": -1, - "y": 0, - "z": 1, - "elements": [ - "modularmachinery:blockinputbus" - ] - }, - { - "x": 0, - "y": 2, - "z": 2, - - "elements": [ - "modularmachinery:blockcasing@0" - ] - }, - { - "x": -2, - "y": 0, - "z": 3, - - "elements": [ - "modularmachinery:blockcasing@0" - ] - }, - { - "x": 1, - "y": 2, - "z": 2, - - "elements": [ - "modularmachinery:blockcasing@0" - ] - }, - { - "x": 0, - "y": 0, - "z": 1, - "elements": [ - "mystgears:drill" - ] - }, - { - "x": -2, - "y": 0, - "z": -1, - - "elements": [ - "modularmachinery:blockcasing@0" - ] - }, - { - "x": 1, - "y": 0, - "z": 1, - "elements": [ - "modularmachinery:blockoutputbus" - ] - }, - { - "x": 2, - "y": 0, - "z": 3, - - "elements": [ - "modularmachinery:blockcasing@0" - ] - }, - { - "x": -1, - "y": 3, - "z": 0, - - "elements": [ - "modularmachinery:blockcasing@0" - ] - }, - { - "x": 2, - "y": -1, - "z": -1, - - "elements": [ - "modularmachinery:blockcasing@0" - ] - }, - { - "x": 0, - "y": 3, - "z": 0, - - "elements": [ - "modularmachinery:blockcasing@0" - ] - }, - { - "x": 1, - "y": 3, - "z": 0, - - "elements": [ - "modularmachinery:blockcasing@0" - ] - }, - { - "x": -1, - "y": 3, - "z": 2, - - "elements": [ - "modularmachinery:blockcasing@0" - ] - }, - { - "x": -1, - "y": 1, - "z": 1, - - "elements": [ - "modularmachinery:blockcasing@0" - ] - }, - { - "x": 0, - "y": 3, - "z": 2, - - "elements": [ - "modularmachinery:blockcasing@0" - ] - }, - { - "x": -2, - "y": 1, - "z": 3, - - "elements": [ - "modularmachinery:blockcasing@0" - ] - }, - { - "x": 1, - "y": 3, - "z": 2, - - "elements": [ - "modularmachinery:blockcasing@0" - ] - }, - { - "x": 0, - "y": 1, - "z": 1, - - "elements": [ - "modularmachinery:blockcasing@0" - ] - }, - { - "x": -2, - "y": -1, - "z": -1, - - "elements": [ - "modularmachinery:blockcasing@0" - ] - }, - { - "x": -1, - "y": 1, - "z": 3, - - "elements": [ - "modularmachinery:blockcasing@0" - ] - }, - { - "x": 1, - "y": 1, - "z": 1, - - "elements": [ - "modularmachinery:blockcasing@0" - ] - }, - { - "x": 1, - "y": 1, - "z": 3, - - "elements": [ - "modularmachinery:blockcasing@0" - ] - }, - { - "x": 2, - "y": 1, - "z": 3, - - "elements": [ - "modularmachinery:blockcasing@0" - ] - }, - { - "x": -1, - "y": 2, - "z": 1, - - "elements": [ - "modularmachinery:blockcasing@0" - ] - }, - { - "x": -2, - "y": 2, - "z": 3, - - "elements": [ - "modularmachinery:blockcasing@0" - ] - }, - { - "x": 0, - "y": 2, - "z": 1, - - "elements": [ - "modularmachinery:blockcasing@0" - ] - } - ]} diff --git a/src/overrides/config/modularmachinery/machinery/dimextractor.json b/src/overrides/config/modularmachinery/machinery/dimextractor.json index 189952b..611c29c 100644 --- a/src/overrides/config/modularmachinery/machinery/dimextractor.json +++ b/src/overrides/config/modularmachinery/machinery/dimextractor.json @@ -56,7 +56,7 @@ "y": 3, "z": 1, "elements": [ - "modularmagic:blockgridproviderinput@0" + "modularmachinery:blockcasing@0" ] }, { diff --git a/src/overrides/config/modularmachinery/machinery/engine.json b/src/overrides/config/modularmachinery/machinery/engine.json index 4916107..53745ad 100644 --- a/src/overrides/config/modularmachinery/machinery/engine.json +++ b/src/overrides/config/modularmachinery/machinery/engine.json @@ -24,7 +24,8 @@ "y": -1, "z": 0, "elements": [ - "modularmachinery:blockenergyinputhatch + "modularmachinery:blockenergyinputhatch" ] } - ]} + ] + } diff --git a/src/overrides/config/modularmachinery/machinery/iron_centrifuge.json b/src/overrides/config/modularmachinery/machinery/iron_centrifuge.json deleted file mode 100644 index db47f7c..0000000 --- a/src/overrides/config/modularmachinery/machinery/iron_centrifuge.json +++ /dev/null @@ -1,169 +0,0 @@ -{ - "registryname": "iron_centrifuge", - "localizedname": "Iron Reinforced Centrifuge", - "parts": [ - { - "x": -1, - "y": -1, - "z": 0, - "elements": "casings_all" - }, - { - "x": 0, - "y": -1, - "z": 0, - "elements": "casings_all" - }, - { - "x": 1, - "y": -1, - "z": 0, - "elements": "casings_all" - }, - - { - "x": -1, - "y": -1, - "z": 1, - "elements": "casings_all" - }, - - { - "x": 0, - "y": -1, - "z": 1, - "elements": "casings_all" - }, - { - "x": 1, - "y": -1, - "z": 1, - "elements": "casings_all" - }, - - { - "x": -1, - "y": -1, - "z": 2, - "elements": "casings_all" - }, - { - "x": 0, - "y": -1, - "z": 2, - "elements": "casings_all" - }, - { - "x": 1, - "y": -1, - "z": 2, - "elements": "casings_all" - }, - { - "x": 0, - "y": 1, - "z": 2, - "elements": "minecraft:iron_block" - }, - { - "x": 0, - "y": 1, - "z": 0, - "elements": "minecraft:iron_block" - }, - { - "x": -1, - "y": 1, - "z": 1, - "elements": "minecraft:iron_block" - }, - { - "x": 1, - "y": 1, - "z": 1, - "elements": "minecraft:iron_block" - }, - { - "x": 1, - "y": 1, - "z": 2, - "elements": "minecraft:iron_bars" - }, - { - "x": -1, - "y": 1, - "z": 2, - "elements": "minecraft:iron_bars" - }, - { - "x": 1, - "y": 1, - "z": 0, - "elements": "minecraft:iron_bars" - }, - { - "x": -1, - "y": 1, - "z": 0, - "elements": "minecraft:iron_bars" - }, - { - "x": 0, - "y": 1, - "z": 1, - "elements": "minecraft:glass" - }, - - - - { - "x": 0, - "y": 0, - "z": 2, - "elements": "minecraft:iron_block" - }, - { - "x": -1, - "y": 0, - "z": 1, - "elements": "minecraft:iron_block" - }, - { - "x": 1, - "y": 0, - "z": 1, - "elements": "minecraft:iron_block" - }, - { - "x": 1, - "y": 0, - "z": 2, - "elements": "minecraft:iron_bars" - }, - { - "x": -1, - "y": 0, - "z": 2, - "elements": "minecraft:iron_bars" - }, - { - "x": 1, - "y": 0, - "z": 0, - "elements": "minecraft:iron_bars" - }, - { - "x": -1, - "y": 0, - "z": 0, - "elements": "minecraft:iron_bars" - }, - { - "x": 0, - "y": 0, - "z": 1, - "elements": "minecraft:water" - } - - ] -} \ No newline at end of file diff --git a/src/overrides/config/modularmachinery/machinery/manafab.json b/src/overrides/config/modularmachinery/machinery/manafab.json index d04e8fb..3b3cf23 100644 --- a/src/overrides/config/modularmachinery/machinery/manafab.json +++ b/src/overrides/config/modularmachinery/machinery/manafab.json @@ -3,95 +3,10 @@ "localizedname": "Mana Fabricator", "color": "1FCC2D", "parts": [ - { - "x": -3, - "y": 0, - "z": 3, - "elements": [ - "modularmachinery:blockenergyinputhatch" - ] - }, { "x": -1, "y": 0, "z": 0, - - "elements": [ - "modularmachinery:blockcasing@0" - ] - }, - { - "x": 0, - "y": 0, - "z": 1, - "elements": [ - "botania:storage@1" - ] - }, - { - "x": -2, - "y": 0, - "z": 3, - "elements": [ - "botania:storage@1" - ] - }, - { - "x": -3, - "y": 0, - "z": 4, - - "elements": [ - "modularmachinery:blockcasing@0" - ] - }, - { - "x": 1, - "y": 0, - "z": 0, - - "elements": [ - "modularmachinery:blockcasing@0" - ] - }, - { - "x": 0, - "y": 0, - "z": 3, - "elements": [ - "botania:specialflower@0" - ] - }, - { - "x": -2, - "y": 0, - "z": 5, - - "elements": [ - "modularmachinery:blockcasing@0" - ] - }, - { - "x": 2, - "y": 0, - "z": 1, - - "elements": [ - "modularmachinery:blockcasing@0" - ] - }, - { - "x": 2, - "y": 0, - "z": 3, - "elements": [ - "botania:storage@1" - ] - }, - { - "x": 0, - "y": 0, - "z": 5, "elements": [ "botania:storage@1" ] @@ -99,80 +14,69 @@ { "x": -1, "y": 0, - "z": 6, - + "z": 1, "elements": [ - "modularmachinery:blockcasing@0" + "botania:storage@1" ] }, { - "x": 3, - "y": 0, - "z": 2, - + "x": 0, + "y": 1, + "z": 1, "elements": [ - "modularmachinery:blockcasing@0" - ] - }, - { - "x": 3, - "y": 0, - "z": 3, - "elements": [ - "modularmachinery:blockenergyinputhatch" + "botania:spreader" ] }, { "x": 0, "y": 0, - "z": 6, + "z": 1, "elements": [ "modulardiversity:blockmanaoutputhatch@0" ] }, { - "x": 3, + "x": 1, "y": 0, - "z": 4, - + "z": 0, "elements": [ - "modularmachinery:blockcasing@0" + "botania:storage@1" ] }, { - "x": 2, + "x": -1, "y": 0, - "z": 5, - + "z": 2, "elements": [ - "modularmachinery:blockcasing@0" + "botania:storage@1" ] }, { "x": 1, "y": 0, - "z": 6, - + "z": 1, "elements": [ - "modularmachinery:blockcasing@0" + "botania:storage@1" ] }, { - "x": -3, + "x": 0, "y": 0, "z": 2, - "elements": [ - "modularmachinery:blockcasing@0" + "modularmachinery:blockenergyinputhatch", + "modulardiversity:blockemberinputhatch", + "modularmagic:blocklifeessenceproviderinput", + "modularmagic:blockstarlightproviderinput", + "modularmagic:blockgridproviderinput" ] }, { - "x": -2, + "x": 1, "y": 0, - "z": 1, - + "z": 2, "elements": [ - "modularmachinery:blockcasing@0" + "botania:storage@1" ] } ]} diff --git a/src/overrides/config/modularmachinery/machinery/reactor.json b/src/overrides/config/modularmachinery/machinery/reactor.json index fef6a7c..3ccd1b8 100644 --- a/src/overrides/config/modularmachinery/machinery/reactor.json +++ b/src/overrides/config/modularmachinery/machinery/reactor.json @@ -7,160 +7,122 @@ "x": -1, "y": 0, "z": 0, - "elements": [ - "modularmachinery:blockcasing@0" - ] + "elements": "casings_reactor" }, { "x": -4, "y": 0, "z": 4, - "elements": [ - "modulardiversity:blockemberinputhatch" - ] + "elements": "casings_reactor" }, { "x": 1, "y": 0, "z": 0, - "elements": [ - "modularmachinery:blockcasing@0" - ] + "elements": "casings_reactor" }, { "x": -4, "y": 0, "z": 5, - "elements": [ - "modularmagic:blocklifeessenceproviderinput" - ] + "elements": "casings_reactor" }, { "x": 2, "y": 0, "z": 1, - "elements": [ - "modularmachinery:blockcasing@0" - ] + "elements": "casings_reactor" }, { "x": -3, "y": 0, "z": 6, - "elements": [ - "modularmachinery:blockcasing@0" - ] + "elements": "casings_reactor" }, { "x": 0, "y": 0, "z": 4, "elements": [ - "avaritia:block_resource@1" + "extendedcrafting:storage@4" ] }, { "x": 3, "y": 0, "z": 2, - "elements": [ - "modularmachinery:blockcasing@0" - ] + "elements": "casings_reactor" }, { "x": -2, "y": 0, "z": 7, - "elements": [ - "modularmachinery:blockcasing@0" - ] + "elements": "casings_reactor" }, { "x": 4, "y": 0, "z": 3, - "elements": [ - "modularmagic:blockconstellationprovider" - ] + "elements": "casings_reactor" }, { "x": -1, "y": 0, "z": 8, - "elements": [ - "modulardiversity:blockmystmechinput" - ] + "elements": "casings_reactor" }, { "x": 4, "y": 0, "z": 4, - "elements": [ - "modulardiversity:blockmanainputhatch@0" - ] + "elements": "casings_reactor" }, { "x": 0, "y": 0, "z": 8, - "elements": [ - "modularmachinery:blockenergyoutputhatch" - ] + "elements": "casings_reactor" }, { "x": 1, "y": 0, "z": 8, - "elements": [ - "modularmagic:blockaspectproviderinput" - ] + "elements": "casings_reactor" }, { "x": 2, "y": 0, "z": 7, - "elements": [ - "modularmachinery:blockcasing@0" - ] + "elements": "casings_reactor" }, { "x": 3, "y": 0, "z": 6, - "elements": [ - "modularmachinery:blockcasing@0" - ] + "elements": "casings_reactor" }, { "x": 4, "y": 0, "z": 5, - "elements": [ - "modularmagic:blockstarlightproviderinput" - ] + "elements": "casings_reactor" }, { "x": -2, "y": 0, "z": 1, - "elements": [ - "modularmachinery:blockcasing@0" - ] + "elements": "casings_reactor" }, { "x": -3, "y": 0, "z": 2, - "elements": [ - "modularmachinery:blockcasing@0" - ] + "elements": "casings_reactor" }, { "x": -4, "y": 0, "z": 3, - "elements": [ - "modularmagic:blockgridproviderinput" - ] + "elements": "casings_reactor" } ]} diff --git a/src/overrides/config/modularmachinery/machinery/variables/casings.var.json b/src/overrides/config/modularmachinery/machinery/variables/casings.var.json index d35e9b2..0daf194 100644 --- a/src/overrides/config/modularmachinery/machinery/variables/casings.var.json +++ b/src/overrides/config/modularmachinery/machinery/variables/casings.var.json @@ -22,5 +22,18 @@ "casings_item": [ "modularmachinery:blockinputbus", "modularmachinery:blockoutputbus" + ], + "casings_reactor": [ + "modularmachinery:blockcasing", + "modularmachinery:blockinputbus", + "modularmachinery:blockenergyoutputhatch", + "modulardiversity:blockemberinputhatch", + "modularmagic:blocklifeessenceproviderinput", + "modularmagic:blockconstellationprovider", + "modulardiversity:blockmystmechinput", + "modulardiversity:blockmanainputhatch", + "modularmagic:blockaspectproviderinput", + "modularmagic:blockstarlightproviderinput", + "modularmagic:blockgridproviderinput" ] -} \ No newline at end of file +} diff --git a/src/overrides/config/modularmachinery/recipes/alloy_smelter_diamond.json b/src/overrides/config/modularmachinery/recipes/alloy_smelter_diamond.json deleted file mode 100644 index 6e74ccb..0000000 --- a/src/overrides/config/modularmachinery/recipes/alloy_smelter_diamond.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "machine": "alloy_furnace", - "registryName": "alloy_furnace_diamond", - "recipeTime": 5, - "requirements": [ - { - "type": "energy", - "io-type": "input", - "energyPerTick": 100 - }, - { - "type": "item", - "io-type": "output", - "item": "minecraft:diamond", - "amount": 1 - }, - { - "type": "item", - "io-type": "input", - "item": "minecraft:coal", - "amount": 32 - }, - { - "type": "item", - "io-type": "input", - "item": "minecraft:tnt", - "amount": 8 - } - ] -} \ No newline at end of file diff --git a/src/overrides/config/modularmachinery/recipes/alloy_smelter_furnaces.adapter.json b/src/overrides/config/modularmachinery/recipes/alloy_smelter_furnaces.adapter.json deleted file mode 100644 index fcac540..0000000 --- a/src/overrides/config/modularmachinery/recipes/alloy_smelter_furnaces.adapter.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "machine": "alloy_furnace", - "adapter": "minecraft:furnace", - "modifiers": [ - { - "io": "output", - "target": "item", - "operation": 1, - "multiplier": 3.0 - }, - { - "io": "input", - "target": "item", - "operation": 1, - "multiplier": 3.0 - }, - { - "io": "input", - "target": "duration", - "operation": 0, - "multiplier": 40 - } - ] -} \ No newline at end of file diff --git a/src/overrides/config/modularmachinery/recipes/alloy_smelter_modularium.json b/src/overrides/config/modularmachinery/recipes/alloy_smelter_modularium.json deleted file mode 100644 index 5620340..0000000 --- a/src/overrides/config/modularmachinery/recipes/alloy_smelter_modularium.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "machine": "alloy_furnace", - "registryName": "alloy_furnace_modularium", - "recipeTime": 120, - "requirements": [ - { - "type": "energy", - "io-type": "input", - "energyPerTick": 20 - }, - { - "type": "item", - "io-type": "output", - "item": "modularmachinery:itemmodularium", - "amount": 4 - }, - { - "type": "item", - "io-type": "input", - "item": "ore:ingotIron", - "amount": 1 - }, - { - "type": "item", - "io-type": "input", - "item": "ore:ingotGold", - "amount": 1 - }, - { - "type": "item", - "io-type": "input", - "item": "ore:dustRedstone", - "amount": 1 - }, - { - "type": "item", - "io-type": "input", - "item": "ore:dustGlowstone", - "amount": 1 - } - ] -} \ No newline at end of file diff --git a/src/overrides/config/modularmachinery/recipes/centrifuge_centrifuge_blaze_powder.json b/src/overrides/config/modularmachinery/recipes/centrifuge_centrifuge_blaze_powder.json deleted file mode 100644 index df02812..0000000 --- a/src/overrides/config/modularmachinery/recipes/centrifuge_centrifuge_blaze_powder.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "machine": "iron_centrifuge", - "registryName": "iron_centrifuge_centrifuge_blaze_powder", - "recipeTime": 60, - "requirements": [ - { - "type": "energy", - "io-type": "input", - "energyPerTick": 16 - }, - { - "type": "item", - "io-type": "output", - "item": "minecraft:gunpowder", - "amount": 1, - "chance": 0.95 - }, - { - "type": "item", - "io-type": "output", - "item": "minecraft:glowstone_dust", - "amount": 1, - "chance": 0.4 - }, - { - "type": "item", - "io-type": "input", - "item": "minecraft:blaze_powder", - "amount": 1 - } - ] -} \ No newline at end of file diff --git a/src/overrides/config/modularmachinery/recipes/centrifuge_centrifuge_grass.json b/src/overrides/config/modularmachinery/recipes/centrifuge_centrifuge_grass.json deleted file mode 100644 index 5111ddf..0000000 --- a/src/overrides/config/modularmachinery/recipes/centrifuge_centrifuge_grass.json +++ /dev/null @@ -1,80 +0,0 @@ -{ - "machine": "iron_centrifuge", - "registryName": "iron_centrifuge_centrifuge_grass", - "recipeTime": 120, - "requirements": [ - { - "type": "energy", - "io-type": "input", - "energyPerTick": 16 - }, - { - "type": "item", - "io-type": "input", - "item": "minecraft:grass", - "amount": 1 - }, - { - "type": "item", - "io-type": "output", - "item": "minecraft:dirt", - "amount": 1 - }, - { - "type": "item", - "io-type": "output", - "item": "minecraft:wheat_seeds", - "amount": 1, - "chance": 0.7 - }, - { - "type": "item", - "io-type": "output", - "item": "minecraft:dye@3", - "amount": 1, - "chance": 0.05 - }, - { - "type": "item", - "io-type": "output", - "item": "minecraft:pumpkin_seeds", - "amount": 1, - "chance": 0.1 - }, - { - "type": "item", - "io-type": "output", - "item": "minecraft:melon_seeds", - "amount": 1, - "chance": 0.1 - }, - { - "type": "item", - "io-type": "output", - "item": "minecraft:clay_ball", - "amount": 1, - "chance": 0.4 - }, - { - "type": "item", - "io-type": "output", - "item": "minecraft:brown_mushroom", - "amount": 1, - "chance": 0.3 - }, - { - "type": "item", - "io-type": "output", - "item": "minecraft:red_mushroom", - "amount": 1, - "chance": 0.3 - }, - { - "type": "item", - "io-type": "output", - "item": "minecraft:nether_wart", - "amount": 1, - "chance": 0.01 - } - ] -} \ No newline at end of file diff --git a/src/overrides/config/modularmachinery/recipes/centrifuge_centrifuge_magma_cream.json b/src/overrides/config/modularmachinery/recipes/centrifuge_centrifuge_magma_cream.json deleted file mode 100644 index b29ccde..0000000 --- a/src/overrides/config/modularmachinery/recipes/centrifuge_centrifuge_magma_cream.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "machine": "iron_centrifuge", - "registryName": "iron_centrifuge_centrifuge_magma_cream", - "recipeTime": 60, - "requirements": [ - { - "type": "energy", - "io-type": "input", - "energyPerTick": 16 - }, - { - "type": "item", - "io-type": "output", - "item": "minecraft:slime_ball", - "amount": 1, - "chance": 0.95 - }, - { - "type": "item", - "io-type": "output", - "item": "minecraft:blaze_powder", - "amount": 1, - "chance": 0.95 - }, - { - "type": "item", - "io-type": "input", - "item": "minecraft:magma_cream", - "amount": 1 - } - ] -} \ No newline at end of file diff --git a/src/overrides/config/modularmachinery/recipes/centrifuge_centrifuge_wool.json b/src/overrides/config/modularmachinery/recipes/centrifuge_centrifuge_wool.json deleted file mode 100644 index dd3222b..0000000 --- a/src/overrides/config/modularmachinery/recipes/centrifuge_centrifuge_wool.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "machine": "iron_centrifuge", - "registryName": "iron_centrifuge_centrifuge_wool", - "recipeTime": 60, - "requirements": [ - { - "type": "energy", - "io-type": "input", - "energyPerTick": 16 - }, - { - "type": "item", - "io-type": "output", - "item": "minecraft:string", - "amount": 2 - }, - { - "type": "item", - "io-type": "output", - "item": "minecraft:string", - "amount": 2, - "chance": 0.75 - }, - { - "type": "item", - "io-type": "output", - "item": "minecraft:string", - "amount": 1, - "chance": 0.4 - }, - { - "type": "item", - "io-type": "output", - "item": "minecraft:string", - "amount": 1, - "chance": 0.2 - }, - { - "type": "item", - "io-type": "input", - "item": "minecraft:wool", - "amount": 1 - } - ] -} \ No newline at end of file diff --git a/src/overrides/config/modularmachinery/recipes/centrifuge_wash_glowstone.json b/src/overrides/config/modularmachinery/recipes/centrifuge_wash_glowstone.json deleted file mode 100644 index da819a9..0000000 --- a/src/overrides/config/modularmachinery/recipes/centrifuge_wash_glowstone.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "machine": "iron_centrifuge", - "registryName": "iron_centrifuge_wash_glowstone", - "recipeTime": 120, - "requirements": [ - { - "type": "energy", - "io-type": "input", - "energyPerTick": 16 - }, - { - "type": "item", - "io-type": "output", - "item": "minecraft:gunpowder", - "amount": 1, - "chance": 0.6 - }, - { - "type": "item", - "io-type": "input", - "item": "ore:dustGlowstone", - "amount": 1 - } - ] -} \ No newline at end of file diff --git a/src/overrides/config/modularmachinery/recipes/centrifuge_wash_redstone.json b/src/overrides/config/modularmachinery/recipes/centrifuge_wash_redstone.json deleted file mode 100644 index be3c09e..0000000 --- a/src/overrides/config/modularmachinery/recipes/centrifuge_wash_redstone.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "machine": "iron_centrifuge", - "registryName": "iron_centrifuge_wash_redstone", - "recipeTime": 180, - "requirements": [ - { - "type": "energy", - "io-type": "input", - "energyPerTick": 16 - }, - { - "type": "item", - "io-type": "output", - "item": "minecraft:gunpowder", - "amount": 1, - "chance": 0.6 - }, - { - "type": "item", - "io-type": "input", - "item": "ore:dustRedstone", - "amount": 1 - } - ] -} \ No newline at end of file diff --git a/src/overrides/config/modularmachinery/recipes/gridmana.json b/src/overrides/config/modularmachinery/recipes/gridmana.json new file mode 100644 index 0000000..1a27500 --- /dev/null +++ b/src/overrides/config/modularmachinery/recipes/gridmana.json @@ -0,0 +1,17 @@ +{ + "machine": "manafab", + "registryName": "gridmana", + "recipeTime": 20, + "requirements": [ + { + "type": "mana", + "io-type": "output", + "mana": 10 + }, + { + "type": "grid", + "io-type": "input", + "power": 200 + } + ] +} diff --git a/src/overrides/config/modularmachinery/recipes/lifemana.json b/src/overrides/config/modularmachinery/recipes/lifemana.json new file mode 100644 index 0000000..d17b00f --- /dev/null +++ b/src/overrides/config/modularmachinery/recipes/lifemana.json @@ -0,0 +1,17 @@ +{ + "machine": "manafab", + "registryName": "lifemana", + "recipeTime": 10, + "requirements": [ + { + "type": "mana", + "io-type": "output", + "mana": 10 + }, + { + "type": "lifeessence", + "io-type": "input", + "essenceamount": 5 + } + ] +} diff --git a/src/overrides/config/modularmachinery/recipes/reactor_energy.json b/src/overrides/config/modularmachinery/recipes/reactor_energy.json new file mode 100644 index 0000000..81c3781 --- /dev/null +++ b/src/overrides/config/modularmachinery/recipes/reactor_energy.json @@ -0,0 +1,83 @@ +{ + "machine": "reactor", + "registryName": "reactor_energy", + "recipeTime": 1, + "requirements": [ + { + "type": "item", + "io-type": "input", + "item": "dimdoors:world_thread", + "amount": 64 + }, + { + "type": "item", + "io-type": "input", + "item": "dimdoors:world_thread", + "amount": 64 + }, + { + "type": "item", + "io-type": "input", + "item": "dimdoors:world_thread", + "amount": 64 + }, + { + "type": "item", + "io-type": "input", + "item": "dimdoors:world_thread", + "amount": 64 + }, + { + "type": "item", + "io-type": "input", + "item": "dimdoors:world_thread", + "amount": 64 + }, + { + "type": "starlight", + "io-type": "input", + "amount": 1000 + }, + { + "type": "grid", + "io-type": "input", + "power": 1000 + }, + { + "type": "lifeessence", + "io-type": "input", + "essenceamount": 512 + }, + { + "type": "mana", + "io-type": "input", + "mana": 100000 + }, + { + "type": "ember", + "io-type": "input", + "ember": 1024 + }, + { + "type": "mysticalmechanics", + "io-type": "input", + "levelRequiredMin": 40 + }, + { + "type": "aspect", + "io-type": "input", + "aspect": "vacuos", + "amount": 500 + }, + { + "type": "energy", + "io-type": "output", + "energyPerTick": 9223372036854775806 + }, + { + "type" : "constellation", + "io-type" : "input", + "constellation" : "horologium" + } + ] +} diff --git a/src/overrides/config/modularmachinery/recipes/starmana.json b/src/overrides/config/modularmachinery/recipes/starmana.json new file mode 100644 index 0000000..a1c597e --- /dev/null +++ b/src/overrides/config/modularmachinery/recipes/starmana.json @@ -0,0 +1,17 @@ +{ + "machine": "manafab", + "registryName": "starmana", + "recipeTime": 20, + "requirements": [ + { + "type": "mana", + "io-type": "output", + "mana": 10 + }, + { + "type": "starlight", + "io-type": "input", + "amount": 640 + } + ] +} diff --git a/src/overrides/resources/contenttweaker/lang/en_us.lang b/src/overrides/resources/contenttweaker/lang/en_us.lang new file mode 100644 index 0000000..d3afbb1 --- /dev/null +++ b/src/overrides/resources/contenttweaker/lang/en_us.lang @@ -0,0 +1,12 @@ +item.contenttweaker.cluster_end.name=End Cluster +item.contenttweaker.cluster_nether.name=Nether Cluster +item.contenttweaker.cluster_aether.name=Aether Cluster +item.contenttweaker.cluster_erebus.name=Erebus Cluster +item.contenttweaker.cluster_advent.name=Advent of Ascension Cluster +item.contenttweaker.cluster_mob.name=Mob Cluster +item.contenttweaker.cluster_boss.name=Boss Cluster +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 diff --git a/src/overrides/resources/contenttweaker/models/item/cluster_abyss.json b/src/overrides/resources/contenttweaker/models/item/cluster_abyss.json new file mode 100644 index 0000000..28e9c2c --- /dev/null +++ b/src/overrides/resources/contenttweaker/models/item/cluster_abyss.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "contenttweaker:items/cluster_abyss" + } +} diff --git a/src/overrides/resources/contenttweaker/models/item/cluster_advent.json b/src/overrides/resources/contenttweaker/models/item/cluster_advent.json new file mode 100644 index 0000000..0afeb7d --- /dev/null +++ b/src/overrides/resources/contenttweaker/models/item/cluster_advent.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "contenttweaker:items/cluster_advent" + } +} diff --git a/src/overrides/resources/contenttweaker/models/item/cluster_aether.json b/src/overrides/resources/contenttweaker/models/item/cluster_aether.json new file mode 100644 index 0000000..6792661 --- /dev/null +++ b/src/overrides/resources/contenttweaker/models/item/cluster_aether.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "contenttweaker:items/cluster_aether" + } +} diff --git a/src/overrides/resources/contenttweaker/models/item/cluster_alchemy.json b/src/overrides/resources/contenttweaker/models/item/cluster_alchemy.json new file mode 100644 index 0000000..38c9d50 --- /dev/null +++ b/src/overrides/resources/contenttweaker/models/item/cluster_alchemy.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "contenttweaker:items/cluster_alchemy" + } +} diff --git a/src/overrides/resources/contenttweaker/models/item/cluster_between.json b/src/overrides/resources/contenttweaker/models/item/cluster_between.json new file mode 100644 index 0000000..9cb65d6 --- /dev/null +++ b/src/overrides/resources/contenttweaker/models/item/cluster_between.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "contenttweaker:items/cluster_between" + } +} diff --git a/src/overrides/resources/contenttweaker/models/item/cluster_boss.json b/src/overrides/resources/contenttweaker/models/item/cluster_boss.json new file mode 100644 index 0000000..bcde66b --- /dev/null +++ b/src/overrides/resources/contenttweaker/models/item/cluster_boss.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "contenttweaker:items/cluster_boss" + } +} diff --git a/src/overrides/resources/contenttweaker/models/item/cluster_cavern.json b/src/overrides/resources/contenttweaker/models/item/cluster_cavern.json new file mode 100644 index 0000000..37e82b6 --- /dev/null +++ b/src/overrides/resources/contenttweaker/models/item/cluster_cavern.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "contenttweaker:items/cluster_cavern" + } +} diff --git a/src/overrides/resources/contenttweaker/models/item/cluster_end.json b/src/overrides/resources/contenttweaker/models/item/cluster_end.json new file mode 100644 index 0000000..2fbec0e --- /dev/null +++ b/src/overrides/resources/contenttweaker/models/item/cluster_end.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "contenttweaker:items/cluster_end" + } +} diff --git a/src/overrides/resources/contenttweaker/models/item/cluster_erebus.json b/src/overrides/resources/contenttweaker/models/item/cluster_erebus.json new file mode 100644 index 0000000..19aa770 --- /dev/null +++ b/src/overrides/resources/contenttweaker/models/item/cluster_erebus.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "contenttweaker:items/cluster_erebus" + } +} diff --git a/src/overrides/resources/contenttweaker/models/item/cluster_midnight.json b/src/overrides/resources/contenttweaker/models/item/cluster_midnight.json new file mode 100644 index 0000000..e0689e0 --- /dev/null +++ b/src/overrides/resources/contenttweaker/models/item/cluster_midnight.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "contenttweaker:items/cluster_midnight" + } +} diff --git a/src/overrides/resources/contenttweaker/models/item/cluster_mob.json b/src/overrides/resources/contenttweaker/models/item/cluster_mob.json new file mode 100644 index 0000000..f437abe --- /dev/null +++ b/src/overrides/resources/contenttweaker/models/item/cluster_mob.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "contenttweaker:items/cluster_mob" + } +} diff --git a/src/overrides/resources/contenttweaker/models/item/cluster_nether.json b/src/overrides/resources/contenttweaker/models/item/cluster_nether.json new file mode 100644 index 0000000..da43017 --- /dev/null +++ b/src/overrides/resources/contenttweaker/models/item/cluster_nether.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "contenttweaker:items/cluster_nether" + } +} diff --git a/src/overrides/resources/contenttweaker/models/item/cluster_twilight.json b/src/overrides/resources/contenttweaker/models/item/cluster_twilight.json new file mode 100644 index 0000000..2feebe5 --- /dev/null +++ b/src/overrides/resources/contenttweaker/models/item/cluster_twilight.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "contenttweaker:items/cluster_twilight" + } +} diff --git a/src/overrides/resources/pack.mcmeta b/src/overrides/resources/pack.mcmeta new file mode 100644 index 0000000..0a7d879 --- /dev/null +++ b/src/overrides/resources/pack.mcmeta @@ -0,0 +1 @@ +{"pack":{"pack_format":3,"description":"B.A.S.E External Resources"}} \ No newline at end of file diff --git a/src/overrides/scripts/dims.zs b/src/overrides/scripts/dims.zs index e201245..55fdf5c 100644 --- a/src/overrides/scripts/dims.zs +++ b/src/overrides/scripts/dims.zs @@ -1,5 +1,6 @@ var neutronium = mods.modularmachinery.RecipeBuilder.newBuilder("neutronium", "portal", 120); neutronium.addItemInput( * 20); +neutronium.addItemInput(); neutronium.addItemOutput(); neutronium.build(); @@ -11,6 +12,7 @@ wt.build(); var end = mods.modularmachinery.RecipeBuilder.newBuilder("end", "dimextractor", 60); end.addItemOutput(); +end.addItemInput( * 5); end.addItemInput(); end.addItemInput(); end.addItemInput(); @@ -19,6 +21,7 @@ end.build(); var nether = mods.modularmachinery.RecipeBuilder.newBuilder("nether", "dimextractor", 60); nether.addItemOutput(); +nether.addItemInput( * 5); nether.addItemInput(); nether.addItemInput(); nether.addDimensionRequirement([-1]); @@ -26,6 +29,7 @@ nether.build(); var aether = mods.modularmachinery.RecipeBuilder.newBuilder("aether", "dimextractor", 60); aether.addItemOutput(); +aether.addItemInput( * 5); aether.addItemInput(); aether.addItemInput(); aether.addItemInput(); @@ -34,6 +38,7 @@ aether.build(); var twilight = mods.modularmachinery.RecipeBuilder.newBuilder("twilight", "dimextractor", 60); twilight.addItemOutput(); +twilight.addItemInput( * 5); twilight.addItemInput(); twilight.addItemInput(); twilight.addItemInput(); @@ -44,6 +49,7 @@ twilight.build(); var cavern = mods.modularmachinery.RecipeBuilder.newBuilder("cavern", "dimextractor", 60); cavern.addItemOutput(); +cavern.addItemInput( * 5); cavern.addItemInput(); cavern.addItemInput(); cavern.addItemInput(); @@ -53,6 +59,7 @@ cavern.build(); var between = mods.modularmachinery.RecipeBuilder.newBuilder("between", "dimextractor", 60); between.addItemOutput(); +between.addItemInput( * 5); between.addItemInput(); between.addItemInput(); between.addItemInput(); @@ -61,6 +68,7 @@ between.build(); var erebus = mods.modularmachinery.RecipeBuilder.newBuilder("erebus", "dimextractor", 60); erebus.addItemOutput(); +erebus.addItemInput( * 5); erebus.addItemInput(); erebus.addItemInput(); erebus.addItemInput(); @@ -70,6 +78,7 @@ erebus.build(); var midnight = mods.modularmachinery.RecipeBuilder.newBuilder("midnight", "dimextractor", 60); midnight.addItemOutput(); +midnight.addItemInput( * 5); midnight.addItemInput(); midnight.addItemInput(); midnight.addItemInput(); diff --git a/src/overrides/scripts/mana.zs b/src/overrides/scripts/mana.zs new file mode 100644 index 0000000..275f4f1 --- /dev/null +++ b/src/overrides/scripts/mana.zs @@ -0,0 +1,13 @@ +mods.botania.ManaInfusion.addInfusion(.withTag({mana: 1000}), .withTag({}), 1000); +mods.botania.ManaInfusion.addInfusion(.withTag({entropy: 20}), .withTag({}), 2000); + + +val energy = mods.modularmachinery.RecipeBuilder.newBuilder("energymana", "manafab", 10); +energy.addEnergyPerTickInput(128); +energy.addManaOutput(10); +energy.build(); + +val ember = mods.modularmachinery.RecipeBuilder.newBuilder("embermana", "manafab", 10); +ember.addEmberInput(64); +ember.addManaOutput(10); +ember.build(); diff --git a/src/overrides/scripts/recipes.zs b/src/overrides/scripts/recipes.zs index 4e60c42..9fa24ba 100644 --- a/src/overrides/scripts/recipes.zs +++ b/src/overrides/scripts/recipes.zs @@ -8,3 +8,5 @@ blast_furnace.recipeBuilder() .duration(120) .EUt(120) .buildAndRegister(); + +recipes.remove();