TMC/modded7
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 5 Wiki Activity

Thermal and AR Stuff, Fix issue #240

Browse Source 
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.
This commit is contained in:
IntegerLimit 2023-02-12 19:49:00 +11:00
parent 3cc787ffb8
commit e120312830
7 changed files with 57 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
overrides/config/advRocketry/advancedRocketry.cfg
View File

@ -109,7 +109,7 @@ general {
D:OxygenVentPowerMultiplier=1.0 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] # 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!!! # 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 I:SpaceStationBuildRadius=2048
@ -212,7 +212,7 @@ general {
I:pointsPerDilithium=500 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] # 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]] # 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 < S:rocketBlockBlackList <

10
overrides/config/advRocketry/planetDefs.xml
View File

@ -19,6 +19,16 @@
<rotationalPeriod>128000</rotationalPeriod> <rotationalPeriod>128000</rotationalPeriod>
<atmosphereDensity>0</atmosphereDensity> <atmosphereDensity>0</atmosphereDensity>
</planet> </planet>
<planet name="Void" DIMID="119" dimMapping="" customIcon="Moon">
<isKnown>true</isKnown>
<fogColor>1.0,1.0,1.0</fogColor>
<skyColor>1.0,1.0,1.0</skyColor>
<gravitationalMultiplier>100</gravitationalMultiplier>
<orbitalDistance>110</orbitalDistance>
<orbitalPhi>0</orbitalPhi>
<rotationalPeriod>24000</rotationalPeriod>
<atmosphereDensity>100</atmosphereDensity>
</planet>
</planet> </planet>
<planet name="Mercury" DIMID="101" customIcon="lava"> <planet name="Mercury" DIMID="101" customIcon="lava">
<biomeIds>biomesoplenty:volcanic_island</biomeIds> <biomeIds>biomesoplenty:volcanic_island</biomeIds>

7
overrides/scripts/AdvRocketry.zs
View File

@ -922,6 +922,13 @@ makeExtremeRecipe5(<advancedrocketry:spacelaser>,
<advancedrocketry:spacelaser>.addTooltip(format.gray("Glory to the PGS!")); <advancedrocketry:spacelaser>.addTooltip(format.gray("Glory to the PGS!"));
<advancedrocketry:spacelaser>.addTooltip(format.gray("Consult the AR Wiki for building instructions.")); <advancedrocketry:spacelaser>.addTooltip(format.gray("Consult the AR Wiki for building instructions."));
<advancedrocketry:spacelaser>.addTooltip(format.gray("Consumes ") + format.yellow("1,000,000") + format.gray(" RF/t")); <advancedrocketry:spacelaser>.addTooltip(format.gray("Consumes ") + format.yellow("1,000,000") + format.gray(" RF/t"));
<advancedrocketry:spacelaser>.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(<advancedrocketry:lens>);
recipes.addShapeless(<advancedrocketry:lens>, [<ore:craftingLensGlass>]);
<advancedrocketry:lens>.addTooltip(format.gray("A basic lens, used for the Orbital Laser Drill."));
<advancedrocketry:lens>.displayName = "Orbital Laser Drill Lens";
// Force Field Projector // Force Field Projector
recipes.addShaped(<advancedrocketry:forcefieldprojector>, [ recipes.addShaped(<advancedrocketry:forcefieldprojector>, [

10
overrides/scripts/EnderIO.zs
View File

@ -152,7 +152,7 @@ recipes.addShapeless(
// Enlightened Clear Glass // Enlightened Clear Glass
alloy.recipeBuilder() alloy.recipeBuilder()
.inputs([<enderio:block_fused_glass:*>, <minecraft:glowstone>]) .inputs([<ore:fusedGlass>, <minecraft:glowstone>])
.outputs([<enderio:block_enlightened_fused_glass:0>]) .outputs([<enderio:block_enlightened_fused_glass:0>])
.duration(160) .duration(160)
.EUt(16) .EUt(16)
@ -160,7 +160,7 @@ alloy.recipeBuilder()
//Dark Clear Glass //Dark Clear Glass
alloy.recipeBuilder() alloy.recipeBuilder()
.inputs([<enderio:block_fused_glass:*>, <actuallyadditions:item_misc:5>]) .inputs([<ore:fusedGlass>, <actuallyadditions:item_misc:5>])
.outputs(<enderio:block_dark_fused_glass>) .outputs(<enderio:block_dark_fused_glass>)
.duration(200).EUt(32).buildAndRegister(); .duration(200).EUt(32).buildAndRegister();
@ -173,15 +173,15 @@ alloy.recipeBuilder()
// Enlightened Fused Quartz // Enlightened Fused Quartz
alloy.recipeBuilder() alloy.recipeBuilder()
.inputs([<enderio:block_fused_quartz:*>, <minecraft:glowstone>]) .inputs([<ore:fusedQuartz>, <minecraft:glowstone>])
.outputs([<enderio:block_enlightened_fused_quartz:0>]) .outputs([<enderio:block_enlightened_fused_quartz:0>])
.duration(160) .duration(160)
.EUt(16) .EUt(16)
.buildAndRegister(); .buildAndRegister();
//Dark Fused Quarz //Dark Fused Quartz
alloy.recipeBuilder() alloy.recipeBuilder()
.inputs([<actuallyadditions:item_misc:5>, <enderio:block_fused_quartz:*>]) .inputs([<ore:fusedQuartz>, <actuallyadditions:item_misc:5>])
.outputs([<enderio:block_dark_fused_quartz:0>]) .outputs([<enderio:block_dark_fused_quartz:0>])
.duration(200) .duration(200)
.EUt(32) .EUt(32)

28
overrides/scripts/ThermalExpansion.zs
View File

@ -347,27 +347,6 @@ recipes.addShaped(<thermalexpansion:augment:336>, [
[<thermalfoundation:material:328>, <minecraft:gold_block>, <thermalfoundation:material:328>], [<thermalfoundation:material:328>, <minecraft:gold_block>, <thermalfoundation:material:328>],
[<thermalfoundation:material:136>, <thermalfoundation:material:328>, <thermalfoundation:material:136>]]); [<thermalfoundation:material:136>, <thermalfoundation:material:328>, <thermalfoundation:material:136>]]);
//Trash Can (Items)
recipes.remove(<extrautils2:trashcan>);
recipes.addShaped(<extrautils2:trashcan>, [
[null, <minecraft:iron_trapdoor>, null],
[<metaitem:plateIron>, <minecraft:chest>, <metaitem:plateIron>],
[null, <metaitem:plateIron>, null]]);
//Trash Can (Fluid)
recipes.remove(<extrautils2:trashcanfluid>);
recipes.addShaped(<extrautils2:trashcanfluid>, [
[null, <minecraft:iron_trapdoor>, null],
[<metaitem:plateIron>, <minecraft:bucket>, <metaitem:plateIron>],
[null, <metaitem:plateIron>, null]]);
//Trash Can (Energy)
recipes.remove(<extrautils2:trashcanenergy>);
recipes.addShaped(<extrautils2:trashcanenergy>, [
[null, <minecraft:iron_trapdoor>, null],
[<metaitem:plateIron>, <minecraft:redstone_block>, <metaitem:plateIron>],
[null, <metaitem:plateIron>, null]]);
//Mana Powder //Mana Powder
recipes.addShaped(<thermalfoundation:material:1028> * 4,[ recipes.addShaped(<thermalfoundation:material:1028> * 4,[
[<thermalfoundation:material:1026>, <thermalfoundation:material:1026>, <thermalfoundation:material:1024>], [<thermalfoundation:material:1026>, <thermalfoundation:material:1026>, <thermalfoundation:material:1024>],
@ -392,12 +371,19 @@ recipes.addShaped(<thermalexpansion:frame:64>, [
[<thermalfoundation:material:136>,<thermalfoundation:material:136>,<thermalfoundation:material:136>]]); [<thermalfoundation:material:136>,<thermalfoundation:material:136>,<thermalfoundation:material:136>]]);
<thermalexpansion:frame:64>.displayName = "Thermal Device Casing"; <thermalexpansion:frame:64>.displayName = "Thermal Device Casing";
// Fluxbore Core
recipes.addShapeless(<thermalfoundation:material:640>, [<actuallyadditions:item_misc:16>]);
// Fluxbore Head
recipes.addShapeless(<thermalfoundation:material:656>, [<metaitem:toolHeadDrillStainlessSteel>]);
//Add Black Lotus to Phytogenic Insolator for black dye //Add Black Lotus to Phytogenic Insolator for black dye
mods.thermalexpansion.Insolator.addRecipe(<actuallyadditions:block_black_lotus>*3,<actuallyadditions:block_black_lotus>, <thermalfoundation:fertilizer:0>, 4800); mods.thermalexpansion.Insolator.addRecipe(<actuallyadditions:block_black_lotus>*3,<actuallyadditions:block_black_lotus>, <thermalfoundation:fertilizer:0>, 4800);
mods.thermalexpansion.Insolator.addRecipe(<actuallyadditions:block_black_lotus>*6,<actuallyadditions:block_black_lotus>, <thermalfoundation:fertilizer:1>, 7200); mods.thermalexpansion.Insolator.addRecipe(<actuallyadditions:block_black_lotus>*6,<actuallyadditions:block_black_lotus>, <thermalfoundation:fertilizer:1>, 7200);
mods.thermalexpansion.Insolator.addRecipe(<actuallyadditions:block_black_lotus>*9,<actuallyadditions:block_black_lotus>, <thermalfoundation:fertilizer:2>, 9600); mods.thermalexpansion.Insolator.addRecipe(<actuallyadditions:block_black_lotus>*9,<actuallyadditions:block_black_lotus>, <thermalfoundation:fertilizer:2>, 9600);
// Remove Arcane Ensorcellator Recipes
mods.jei.JEI.hideCategory("thermalexpansion.enchanter");
//Mana Infused //Mana Infused
mixer.recipeBuilder() mixer.recipeBuilder()

8
overrides/scripts/_oreDict.zs
View File

@ -1559,7 +1559,7 @@ mods.jei.JEI.removeAndHide(<advancedrocketry:sawbladeiron>);
mods.jei.JEI.removeAndHide(<advancedrocketry:jackhammer>); mods.jei.JEI.removeAndHide(<advancedrocketry:jackhammer>);
mods.jei.JEI.removeAndHide(<advancedrocketry:asteroidchip>); mods.jei.JEI.removeAndHide(<advancedrocketry:asteroidchip>);
mods.jei.JEI.removeAndHide(<advancedrocketry:elevatorchip>); mods.jei.JEI.removeAndHide(<advancedrocketry:elevatorchip>);
mods.jei.JEI.removeAndHide(<advancedrocketry:lens>); // mods.jei.JEI.removeAndHide(<advancedrocketry:lens>);
mods.jei.JEI.removeAndHide(<advancedrocketry:basiclasergun>); mods.jei.JEI.removeAndHide(<advancedrocketry:basiclasergun>);
mods.jei.JEI.removeAndHide(<advancedrocketry:beaconfinder>); mods.jei.JEI.removeAndHide(<advancedrocketry:beaconfinder>);
mods.jei.JEI.removeAndHide(<advancedrocketry:thermite>); mods.jei.JEI.removeAndHide(<advancedrocketry:thermite>);
@ -1782,7 +1782,7 @@ mods.jei.JEI.removeAndHide(<avaritia:neutronium_compressor>);
mods.jei.JEI.removeAndHide(<avaritia:matter_cluster>); mods.jei.JEI.removeAndHide(<avaritia:matter_cluster>);
//Deep Mob Learning Removals //Deep Mob Evolution Removals
mods.jei.JEI.removeAndHide(<deepmoblearning:soot_covered_plate>); mods.jei.JEI.removeAndHide(<deepmoblearning:soot_covered_plate>);
mods.jei.JEI.removeAndHide(<deepmoblearning:soot_covered_redstone>); mods.jei.JEI.removeAndHide(<deepmoblearning:soot_covered_redstone>);
@ -2156,9 +2156,11 @@ mods.jei.JEI.removeAndHide(<thermalfoundation:tool.hammer_diamond>);
mods.jei.JEI.removeAndHide(<thermalfoundation:rockwool:*>); mods.jei.JEI.removeAndHide(<thermalfoundation:rockwool:*>);
mods.jei.JEI.removeAndHide(<thermalfoundation:material:864>); mods.jei.JEI.removeAndHide(<thermalfoundation:material:864>);
mods.jei.JEI.removeAndHide(<thermalfoundation:material:865>); mods.jei.JEI.removeAndHide(<thermalfoundation:material:865>);
mods.jei.JEI.removeAndHide(<thermalfoundation:ore:8>); mods.jei.JEI.removeAndHide(<thermalfoundation:ore:*>);
mods.jei.JEI.removeAndHide(<thermalfoundation:ore_fluid:*>);
mods.jei.JEI.removeAndHide(<thermalfoundation:glass:*>); mods.jei.JEI.removeAndHide(<thermalfoundation:glass:*>);
mods.jei.JEI.removeAndHide(<thermalfoundation:glass_alloy:*>); mods.jei.JEI.removeAndHide(<thermalfoundation:glass_alloy:*>);
mods.jei.JEI.removeAndHide(<thermalfoundation:dye:*>);
//Custom Materials Removals //Custom Materials Removals

27
overrides/scripts/aa xu2.zs
View File

@ -299,12 +299,27 @@ recipes.addShaped(<actuallyadditions:block_misc:8>, [
[<metaitem:plateEnderPearl>, <metaitem:platePulsatingIron>, <metaitem:plateEnderPearl>], [<metaitem:plateEnderPearl>, <metaitem:platePulsatingIron>, <metaitem:plateEnderPearl>],
[<metaitem:platePulsatingIron>, <actuallyadditions:block_misc:2>, <metaitem:platePulsatingIron>], [<metaitem:platePulsatingIron>, <actuallyadditions:block_misc:2>, <metaitem:platePulsatingIron>],
[<metaitem:plateEnderPearl>, <metaitem:platePulsatingIron>, <metaitem:plateEnderPearl>]]); [<metaitem:plateEnderPearl>, <metaitem:platePulsatingIron>, <metaitem:plateEnderPearl>]]);
//Trash Can (Items)
recipes.remove(<extrautils2:trashcan>);
//TE Drill recipes.addShaped(<extrautils2:trashcan>, [
recipes.addShapeless(<thermalfoundation:material:640>, [<actuallyadditions:item_misc:16>]); [null, <minecraft:iron_trapdoor>, null],
recipes.addShapeless(<thermalfoundation:material:656>, [<metaitem:toolHeadDrillStainlessSteel>]); [<metaitem:plateIron>, <minecraft:chest>, <metaitem:plateIron>],
[null, <metaitem:plateIron>, null]]);
//Trash Can (Fluid)
recipes.remove(<extrautils2:trashcanfluid>);
recipes.addShaped(<extrautils2:trashcanfluid>, [
[null, <minecraft:iron_trapdoor>, null],
[<metaitem:plateIron>, <minecraft:bucket>, <metaitem:plateIron>],
[null, <metaitem:plateIron>, null]]);
//Trash Can (Energy)
recipes.remove(<extrautils2:trashcanenergy>);
recipes.addShaped(<extrautils2:trashcanenergy>, [
[null, <minecraft:iron_trapdoor>, null],
[<metaitem:plateIron>, <minecraft:redstone_block>, <metaitem:plateIron>],
[null, <metaitem:plateIron>, null]]);
//medium and large crate //medium and large crate