From e120312830d618bbec8cea37d533422ef0984243 Mon Sep 17 00:00:00 2001 From: IntegerLimit <103940576+IntegerLimit@users.noreply.github.com> Date: Sun, 12 Feb 2023 19:49:00 +1100 Subject: [PATCH] Thermal and AR Stuff, Fix issue #240 Removes all thermal ores, and dyes, from JEI Adds a lens for the Orbital Laser Drill, and renamed it to avoid confusion. Furthermore, added a warning to the Orbital Laser Drill Adds the Void World to the AR Database, orbiting around Earth, allowing for rockets launching from the void world to the moon. Fixes issue #240 by changing the recipes from a fixed ingredient to an oreDict. --- .../config/advRocketry/advancedRocketry.cfg | 4 +-- overrides/config/advRocketry/planetDefs.xml | 10 +++++++ overrides/scripts/AdvRocketry.zs | 7 +++++ overrides/scripts/EnderIO.zs | 10 +++---- overrides/scripts/ThermalExpansion.zs | 28 +++++-------------- overrides/scripts/_oreDict.zs | 8 ++++-- overrides/scripts/aa xu2.zs | 27 ++++++++++++++---- 7 files changed, 57 insertions(+), 37 deletions(-) diff --git a/overrides/config/advRocketry/advancedRocketry.cfg b/overrides/config/advRocketry/advancedRocketry.cfg index 1702edd..43d7714 100644 --- a/overrides/config/advRocketry/advancedRocketry.cfg +++ b/overrides/config/advRocketry/advancedRocketry.cfg @@ -109,7 +109,7 @@ general { D:OxygenVentPowerMultiplier=1.0 # setting this to false will will prevent resetPlanetsFromXML from being set to false upon world reload. Recommended for those who want to force ALL saves to ALWAYS use the planetDefs XML in the /config folder. Essentially that 'Are you sure you're sure' option. If resetPlanetsFromXML is false, this option does nothing. [default: true] - B:ResetOnlyOnce=true + B:ResetOnlyOnce=false # The largest size a space station can be. Should also be a power of 2 (512, 1024, 2048, 4096, ...). CAUTION: CHANGING THIS OPTION WILL DAMAGE EXISTING STATIONS!!! I:SpaceStationBuildRadius=2048 @@ -212,7 +212,7 @@ general { I:pointsPerDilithium=500 # setting this to true will force AR to read from the XML file in the config/advRocketry instead of the local data, intended for use pack developers to ensure updates are pushed through [default: false] - B:resetPlanetsFromXML=false + B:resetPlanetsFromXML=true # Mod:Blockname for example "minecraft:chest" [default: [minecraft:portal], [minecraft:bedrock], [minecraft:snow_layer], [minecraft:water], [minecraft:flowing_water], [minecraft:lava], [minecraft:flowing_lava]] S:rocketBlockBlackList < diff --git a/overrides/config/advRocketry/planetDefs.xml b/overrides/config/advRocketry/planetDefs.xml index 1d5fae1..3dfb792 100644 --- a/overrides/config/advRocketry/planetDefs.xml +++ b/overrides/config/advRocketry/planetDefs.xml @@ -19,6 +19,16 @@ 128000 0 + + true + 1.0,1.0,1.0 + 1.0,1.0,1.0 + 100 + 110 + 0 + 24000 + 100 + biomesoplenty:volcanic_island diff --git a/overrides/scripts/AdvRocketry.zs b/overrides/scripts/AdvRocketry.zs index 03284b7..7a232e1 100644 --- a/overrides/scripts/AdvRocketry.zs +++ b/overrides/scripts/AdvRocketry.zs @@ -922,6 +922,13 @@ makeExtremeRecipe5(, .addTooltip(format.gray("Glory to the PGS!")); .addTooltip(format.gray("Consult the AR Wiki for building instructions.")); .addTooltip(format.gray("Consumes ") + format.yellow("1,000,000") + format.gray(" RF/t")); +.addTooltip(format.red("Extremely finicky. Use at your own risk. Try restarting your world if it isn't working.")); + +// Lens (for the drill) +recipes.remove(); +recipes.addShapeless(, []); +.addTooltip(format.gray("A basic lens, used for the Orbital Laser Drill.")); +.displayName = "Orbital Laser Drill Lens"; // Force Field Projector recipes.addShaped(, [ diff --git a/overrides/scripts/EnderIO.zs b/overrides/scripts/EnderIO.zs index 59506c7..aed9a68 100644 --- a/overrides/scripts/EnderIO.zs +++ b/overrides/scripts/EnderIO.zs @@ -152,7 +152,7 @@ recipes.addShapeless( // Enlightened Clear Glass alloy.recipeBuilder() - .inputs([, ]) + .inputs([, ]) .outputs([]) .duration(160) .EUt(16) @@ -160,7 +160,7 @@ alloy.recipeBuilder() //Dark Clear Glass alloy.recipeBuilder() - .inputs([, ]) + .inputs([, ]) .outputs() .duration(200).EUt(32).buildAndRegister(); @@ -173,15 +173,15 @@ alloy.recipeBuilder() // Enlightened Fused Quartz alloy.recipeBuilder() - .inputs([, ]) + .inputs([, ]) .outputs([]) .duration(160) .EUt(16) .buildAndRegister(); -//Dark Fused Quarz +//Dark Fused Quartz alloy.recipeBuilder() - .inputs([, ]) + .inputs([, ]) .outputs([]) .duration(200) .EUt(32) diff --git a/overrides/scripts/ThermalExpansion.zs b/overrides/scripts/ThermalExpansion.zs index 7a5ebe4..fdd8c5a 100644 --- a/overrides/scripts/ThermalExpansion.zs +++ b/overrides/scripts/ThermalExpansion.zs @@ -347,27 +347,6 @@ recipes.addShaped(, [ [, , ], [, , ]]); -//Trash Can (Items) -recipes.remove(); -recipes.addShaped(, [ - [null, , null], - [, , ], - [null, , null]]); - -//Trash Can (Fluid) -recipes.remove(); -recipes.addShaped(, [ - [null, , null], - [, , ], - [null, , null]]); - -//Trash Can (Energy) -recipes.remove(); -recipes.addShaped(, [ - [null, , null], - [, , ], - [null, , null]]); - //Mana Powder recipes.addShaped( * 4,[ [, , ], @@ -392,12 +371,19 @@ recipes.addShaped(, [ [,,]]); .displayName = "Thermal Device Casing"; +// Fluxbore Core +recipes.addShapeless(, []); + +// Fluxbore Head +recipes.addShapeless(, []); //Add Black Lotus to Phytogenic Insolator for black dye mods.thermalexpansion.Insolator.addRecipe(*3,, , 4800); mods.thermalexpansion.Insolator.addRecipe(*6,, , 7200); mods.thermalexpansion.Insolator.addRecipe(*9,, , 9600); +// Remove Arcane Ensorcellator Recipes +mods.jei.JEI.hideCategory("thermalexpansion.enchanter"); //Mana Infused mixer.recipeBuilder() diff --git a/overrides/scripts/_oreDict.zs b/overrides/scripts/_oreDict.zs index 902e1d6..46157d8 100644 --- a/overrides/scripts/_oreDict.zs +++ b/overrides/scripts/_oreDict.zs @@ -1559,7 +1559,7 @@ mods.jei.JEI.removeAndHide(); mods.jei.JEI.removeAndHide(); mods.jei.JEI.removeAndHide(); mods.jei.JEI.removeAndHide(); -mods.jei.JEI.removeAndHide(); +// mods.jei.JEI.removeAndHide(); mods.jei.JEI.removeAndHide(); mods.jei.JEI.removeAndHide(); mods.jei.JEI.removeAndHide(); @@ -1782,7 +1782,7 @@ mods.jei.JEI.removeAndHide(); mods.jei.JEI.removeAndHide(); -//Deep Mob Learning Removals +//Deep Mob Evolution Removals mods.jei.JEI.removeAndHide(); mods.jei.JEI.removeAndHide(); @@ -2156,9 +2156,11 @@ mods.jei.JEI.removeAndHide(); mods.jei.JEI.removeAndHide(); mods.jei.JEI.removeAndHide(); mods.jei.JEI.removeAndHide(); -mods.jei.JEI.removeAndHide(); +mods.jei.JEI.removeAndHide(); +mods.jei.JEI.removeAndHide(); mods.jei.JEI.removeAndHide(); mods.jei.JEI.removeAndHide(); +mods.jei.JEI.removeAndHide(); //Custom Materials Removals diff --git a/overrides/scripts/aa xu2.zs b/overrides/scripts/aa xu2.zs index d57ceed..30c691c 100644 --- a/overrides/scripts/aa xu2.zs +++ b/overrides/scripts/aa xu2.zs @@ -299,12 +299,27 @@ recipes.addShaped(, [ [, , ], [, , ], [, , ]]); - - - -//TE Drill -recipes.addShapeless(, []); -recipes.addShapeless(, []); + +//Trash Can (Items) +recipes.remove(); +recipes.addShaped(, [ + [null, , null], + [, , ], + [null, , null]]); + +//Trash Can (Fluid) +recipes.remove(); +recipes.addShaped(, [ + [null, , null], + [, , ], + [null, , null]]); + +//Trash Can (Energy) +recipes.remove(); +recipes.addShaped(, [ + [null, , null], + [, , ], + [null, , null]]); //medium and large crate