Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Stainless #89

Open
wants to merge 5 commits into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions kubejs/assets/firmalife/lang/en_us.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"item.firmalife.metal.ingot.stainless_steel": "Chrome Ingot",
"item.firmalife.metal.double_ingot.stainless_steel": "Chrome Double Ingot",
"item.firmalife.metal.sheet.stainless_steel": "Chrome Sheet",
"item.firmalife.metal.double_sheet.stainless_steel": "Chrome Double Sheet",
"item.firmalife.metal.rod.stainless_steel": "Chrome Rod",
"block.firmalife.fluid.metal.stainless_steel": "Molten Chrome",
"fluid.firmalife.metal.stainless_steel": "Molten Chrome",
"item.firmalife.bucket.metal.stainless_steel": "Molten Chrome Bucket",
"metal.firmalife.stainless_steel": "Chrome",
"block.firmalife.metal.block.stainless_steel": "Chrome Plated Block",
"block.firmalife.metal.block.stainless_steel_slab": "Chrome Plated Slab",
"block.firmalife.metal.block.stainless_steel_stairs": "Chrome Plated Stairs",
"greenhouse.firmalife.stainless_steel": "Chrome",
"block.firmalife.stainless_steel_greenhouse_roof_top": "Chrome Greenhouse Roof Top",
"block.firmalife.stainless_steel_greenhouse_roof": "Chrome Greenhouse Roof",
"block.firmalife.stainless_steel_greenhouse_wall": "Chrome Greenhouse Wall",
"block.firmalife.stainless_steel_greenhouse_port": "Chrome Greenhouse Port",
"block.firmalife.stainless_steel_greenhouse_panel_wall": "Chrome Greenhouse Panel Wall",
"block.firmalife.stainless_steel_greenhouse_panel_roof": "Chrome Greenhouse Panel Roof",
"block.firmalife.stainless_steel_greenhouse_trapdoor": "Chrome Greenhouse Trapdoor",
"block.firmalife.stainless_steel_greenhouse_door": "Chrome Greenhouse Door",
"firmalife.advancements.story.big_greenhouse.description": "Activate a chrome greenhouse of more than 200 blocks."
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"__comment__": "This file was automatically created by mcresources",
"name": "Firmalife",
"description": "All about the Firmalife addon",
"icon": "firmalife:cured_oven_top",
"sortnum": 10
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
{
"__comment__": "This file was automatically created by mcresources",
"name": "Greenhouse",
"category": "tfc:firmalife",
"icon": "firmalife:sealed_bricks",
"pages": [
{
"type": "patchouli:text",
"text": "The $(thing)Greenhouse$() is a multiblock device controlled by a $(l:tfc:firmalife/climate_station)Climate Station$(). It allows growing crops year round. The Greenhouse has an array of types and blocks to choose from. However, building a greenhouse is quite simple. Like the $(l:tfc:firmalife/cellar)Cellar$(), it should be an enclosed area of blocks belonging to the same $(thing)Greenhouse Type$(). The floor of the greenhouse may be non-air block."
},
{
"type": "patchouli:text",
"text": "The walls of greenhouses must be solid faces. Panel walls should be placed so that the face that is on the exterior of the block (eg. the face you can place a torch on) faces into the greenhouse. The same applies for roofs, except that slabs are always considered valid roof blocks. Trapdoors and doors are also always valid and require no special placement."
},
{
"type": "patchouli:text",
"text": "$(thing)Greenhouse Types$() are families of greenhouse blocks that can be used interchangeably in a greenhouse. Most greenhouse blocks $(thing)age$(). For example, $(thing)Treated Wood$() greenhouse blocks become $(thing)Weathered Treated Wood$() blocks. Since both of those block types belong to the same greenhouse type, your greenhouse will continue to function."
},
{
"type": "patchouli:text",
"text": "These are the $(thing)Greenhouse Types$() available, with the block types they can age into:$(br)$(br)$(li)Treated Wood: Weathered $()$(li)Copper: Exposed, Weathered, Oxidized$()$(li)Iron: Rusted$() $(li)Chrome (does not age)$()",
"title": "Greenhouse Types"
},
{
"type": "patchouli:text",
"text": "There are four types of regular $(thing)Greenhouse Blocks$(): Walls, Doors, Roofs, and Roof Tops. Roofs and Roof Tops are stairs and slabs, respectively. There are also thinner versions of these blocks, also known as panel walls, trapdoors, and panel roofs. These can be combined however you choose to form the structure of the greenhouse."
},
{
"type": "tfc:multimultiblock",
"text": "An example greenhouse, in each main type.",
"multiblocks": [
"firmalife:treated_wood_greenhouse",
"firmalife:copper_greenhouse",
"firmalife:iron_greenhouse",
"firmalife:stainless_steel_greenhouse"
]
},
{
"type": "patchouli:text",
"text": "There are many blocks that operate inside Greenhouses:$(br)$(li)$(l:tfc:firmalife/planters)Planters$(), for growing crops$(), and $(br)$(li)$(l:tfc:firmalife/sprinklers)Sprinklers$(), various devices that add water to planters."
},
{
"type": "patchouli:text",
"text": "The next four pages contain recipes for the main greenhouse block types. While they are only shown for Iron greenhouses, the iron rods in the recipe can be replaced with $(thing)Treated Lumber$(), $(thing)Copper Rods$(), or $(thing)Chrome Rods$(). For information on Chrome, see $(l:tfc:firmalife/stainless_steel)this linked page$()."
},
{
"type": "patchouli:crafting",
"recipe": "firmalife:crafting/greenhouse/iron_greenhouse_wall",
"recipe2": "firmalife:crafting/greenhouse/iron_greenhouse_roof"
},
{
"type": "patchouli:crafting",
"recipe": "firmalife:crafting/greenhouse/iron_greenhouse_door",
"recipe2": "firmalife:crafting/greenhouse/iron_greenhouse_roof_top"
},
{
"type": "patchouli:crafting",
"recipe": "firmalife:crafting/greenhouse/iron_greenhouse_trapdoor",
"recipe2": "firmalife:crafting/greenhouse/iron_greenhouse_panel_roof"
},
{
"type": "patchouli:crafting",
"recipe": "firmalife:crafting/greenhouse/iron_greenhouse_panel_wall",
"recipe2": "firmalife:crafting/greenhouse/iron_greenhouse_port"
}
],
"read_by_default": true,
"sortnum": 7
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"__comment__": "This file was automatically created by mcresources",
"name": "Chrome",
"category": "tfc:firmalife",
"icon": "firmalife:metal/ingot/stainless_steel",
"pages": [
{
"type": "patchouli:text",
"text": "$(thing)Chrome$() and $(thing)Chromium$() are $(thing)Steel-tier$() metals added by Firmalife. They are used in the construction of $(l:tfc:firmalife/greenhouse)Chrome Greenhouses$()."
},
{
"type": "patchouli:spotlight",
"item": "firmalife:metal/ingot/stainless_steel",
"title": "Chrome",
"link_recipes": false,
"text": "$(br)$(bold)Requirements:$()$(br)$(li)20 - 30 % : $(thing)Chromium$()$(li)10 - 20 % : $(thing)Nickel$()$(li)60 - 80 % : $(thing)Steel$()$(br2)"
},
{
"type": "patchouli:spotlight",
"item": "firmalife:ore/small_chromite",
"link_recipes": false,
"text": "Chromite is an ore that is melted to obtain Chromium. It is found in $(thing)Igneous Intrusive$() and $(thing)Metamorphic$() rocks."
},
{
"type": "patchouli:text",
"text": "$(li)Granite$()$(li)Diorite$()$(li)Gabbro$()$(li)Slate$()$(li)Phyllite$()$(li)Schist$()$(li)Gneiss$()$(li)Marble$()",
"title": "All Chromium Rocks"
}
],
"read_by_default": true,
"sortnum": 11
}
69 changes: 69 additions & 0 deletions kubejs/server_scripts/mods/firmalife/firmalife.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@

ServerEvents.tags('item', event => {
event.remove('forge:ingots/stainless_steel', 'firmalife:metal/ingot/stainless_steel')
event.remove('forge:double_ingots/stainless_steel', 'firmalife:metal/double_ingot/stainless_steel')
event.remove('forge:sheets/stainless_steel', 'firmalife:metal/sheet/stainless_steel')
event.remove('forge:double_sheets/stainless_steel', 'firmalife:metal/double_sheet/stainless_steel')
event.remove('forge:rods/stainless_steel', 'firmalife:metal/rod/stainless_steel')
event.remove('tfc:metal_item/stainless_steel', 'firmalife:metal/ingot/stainless_steel')
event.remove('tfc:metal_item/stainless_steel', 'firmalife:metal/double_ingot/stainless_steel')
event.remove('tfc:metal_item/stainless_steel', 'firmalife:metal/sheet/stainless_steel')
event.remove('tfc:metal_item/stainless_steel', 'firmalife:metal/double_sheet/stainless_steel')
event.remove('tfc:metal_item/stainless_steel', 'firmalife:metal/rod/stainless_steel')
event.add('forge:ingots/chrome', 'firmalife:metal/ingot/stainless_steel')
event.add('forge:double_ingots/chrome', 'firmalife:metal/double_ingot/stainless_steel')
event.add('forge:sheet/chrome', 'firmalife:metal/sheet/stainless_steel')
event.add('forge:double_sheets/chrome', 'firmalife:metal/double_sheet/stainless_steel')
event.add('forge:rods/chrome', 'firmalife:metal/rod/stainless_steel')
event.add('forge:treated_lumber', 'gregitas:creosote_treated_lumber')
event.add('forge:treated_lumber', 'firmalife:treated_lumber')
})

ServerEvents.recipes(event => {
event.custom(
{
type: 'tfc:anvil',
input: {
item:'firmalife:metal/ingot/stainless_steel'
},
result: {
item: ('2x firmalife:metal/rod/stainless_steel')
},
tier: 3,
rules: [
'hit_last',
'hit_second_last',
'punch_not_last'
]
}
),
event.shaped('firmalife:vat', [
' ',
'S S',
'WSW'
], {
S: 'firmalife:metal/sheet/stainless_steel',
W: 'firmalife:beeswax'
})
event.shaped('firmalife:jarring_station', [
' ',
'S S',
'TTT'
], {
S: 'firmalife:metal/sheet/stainless_steel',
T: '#forge:treated_lumber'
})
event.custom(
{
type: 'tfc:heating',
ingredient: {
tag: 'forge:ingots/chrome'
},
result_fluid: {
fluid: 'firmalife:metal/stainless_steel',
amount: 144.0
},
temperature: 1400
}
)
})
24 changes: 19 additions & 5 deletions kubejs/server_scripts/recipes/gtceu_tools.js
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,9 @@ const gtceuToolsTFC = [
},
{
id: 'stainless_steel',
fluid: 'firmalife:metal/stainless_steel',
fluid: 'gtceu:stainless_steel',
tier: 5,
double: 'firmalife:metal/double_ingot/stainless_steel'
double: 'gregitas:double_stainless_steel_ingot'
},
{
id: 'steel',
Expand Down Expand Up @@ -152,9 +152,9 @@ const gtceuToolsGT = [
},
{
id: 'stainless_steel',
fluid: 'firmalife:metal/stainless_steel',
fluid: 'gtceu:stainless_steel',
tier: 5,
double: 'firmalife:metal/double_ingot/stainless_steel'
double: 'gregitas:double_stainless_steel_ingot'
},
{
id: 'damascus_steel',
Expand Down Expand Up @@ -191,7 +191,21 @@ const gtceuALLToolMetalsID = [
'blue_steel'
]
let tfcGregTools = (/** @type {Internal.RecipesEventJS} */ event) => {
//Mortar
//Weilding
event.custom({
type: 'tfc:welding',
first_input: {
item: 'gtceu:stainless_steel_ingot'
},
second_input: {
item: 'gtceu:stainless_steel_ingot'
},
tier: 4,
result: {
item: 'gregitas:double_stainless_steel_ingot'
}
})
//Mortar
tfcRockKnapping.forEach((rock) => {
event.custom({
type: 'tfc:knapping',
Expand Down
4 changes: 3 additions & 1 deletion kubejs/server_scripts/recipes/removal.js
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,9 @@ let recipeRemoval = (/** @type {Internal.RecipesEventJS} */ event) => {
event.remove({ id: "immersiveengineering:crafting/ersatz_leather"})

//Firmalife
event.remove({ id: "firmalife:alloy/stainless_steel"})
event.remove({ id: "firmalife:anvil/stainless_steel_rod"})
event.remove({ id: "firmalife:crafting/vat"})
event.remove({ id: "firmalife:crafting/jarring_station"})
//AE2

event.remove({ id: `/^ae2:tools\/.*_pickaxe/`})
Expand Down