Block interaction changes (#1434)
* - Yeast recipe conflict fix * - Fixed seed oil voiding in barrels. And item weight inconsistency. * - Reduced loading screen logo size by 4MB * - Update Changelog * - Compressed loading screen images to maybe help with ram * - Added default gui scale to make the main menu look better on first launch * - Update Changelog * - Added utility script for adding circuits to existing recipes * fixed changelog conflict Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com> * - Added harvest baskets * - Fixed baked potato recipe mixing from oven * - Allowed elytras to be repaired regardless of damage * - Fixed sea water barrel recipe * - Gave plants tags to bushes so they can have other uses * - Pushed stubborn models * - updated Changelog * - Changelog typo * - Integrated Ad Astra wood * - Updated changelog * - Treated chipboard composite barrel lang * - Some Tacz fixes * - Jar dupe fix * - tacz data * - updated changelog * - we hate git * - Loading screen and main menu optimizations * - image push * - I think I got the title screen looking good on all resolutions * - Updated Changelog * - Added scale fix to loading screen too * - Fix pixel alignment * - Recipes, tags, assets+ for railgun * - Brick interaction events and new function for interacting with blocks * - Added parameter boolean to decide if blockstate should be copied * - Change for block interaction event constant that may fix linux crash * - Moved global array to the events file and some linter fixes. * - Updated Changelog --------- Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com> Signed-off-by: Pyritie <pyritie@gmail.com> Co-authored-by: Pyritie <pyritie@gmail.com>
This commit is contained in:
Redeix
GitHub
parent
46998f1151
commit
668f86fcfc
3 changed files with 162 additions and 76 deletions
|
|
@ -1,5 +1,9 @@
|
|||
# Changelog
|
||||
## [Unreleased]
|
||||
## Changes
|
||||
- Added block interactions for mossy cobble (#1434) @Redeix
|
||||
### Bug fixes
|
||||
- Pushed a patch to fix registry errors on Linux machines. If you are still receiving these errors please report it [here](https://github.com/TerraFirmaGreg-Team/Modpack-Modern/issues/1431) (#1434) @Redeix
|
||||
|
||||
## [0.10.3] - 23-07-2025
|
||||
### Changes
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
pill_event.forEach(pill_event => {
|
||||
|
||||
ItemEvents.rightClicked(event => {
|
||||
const {item,server,player,player:{x,y,z,username}} = event
|
||||
const {item,server,player,player:{x,y,z}} = event
|
||||
if (item.id != `tfg:${pill_event}_pill`) return
|
||||
item.count--
|
||||
player.addItemCooldown(item, 100)
|
||||
|
|
@ -27,7 +27,7 @@
|
|||
});
|
||||
|
||||
ItemEvents.rightClicked(event => {
|
||||
const {item,server,player,player:{x,y,z,username}} = event
|
||||
const {item,server,player,player:{x,y,z}} = event
|
||||
if (item.id != `tfg:${pill_event}_tablet`) return
|
||||
item.count--
|
||||
player.addItemCooldown(item, 100)
|
||||
|
|
@ -37,7 +37,7 @@
|
|||
});
|
||||
|
||||
ItemEvents.rightClicked(event => {
|
||||
const {item,server,player,player:{x,y,z,username}} = event
|
||||
const {item,server,player,player:{x,y,z}} = event
|
||||
if (item.id != `tfg:antipoison_pill`) return
|
||||
item.count--
|
||||
player.addItemCooldown(item, 50)
|
||||
|
|
@ -46,7 +46,7 @@
|
|||
});
|
||||
|
||||
ItemEvents.rightClicked(event => {
|
||||
const {item,server,player,player:{x,y,z,username}} = event
|
||||
const {item,server,player,player:{x,y,z}} = event
|
||||
if (item.id != `tfg:antipoison_tablet`) return
|
||||
item.count--
|
||||
player.addItemCooldown(item, 50)
|
||||
|
|
@ -75,7 +75,7 @@
|
|||
salvo_event.forEach(salvo_event => {
|
||||
|
||||
ItemEvents.rightClicked(event => {
|
||||
const {item,server,player,player:{x,y,z,username}} = event
|
||||
const {item,server,player,player:{x,y,z}} = event
|
||||
if (item.id != `tfg:${salvo_event}_salvo`) return
|
||||
item.count--
|
||||
player.addItemCooldown(item, 100)
|
||||
|
|
@ -85,7 +85,7 @@
|
|||
});
|
||||
|
||||
ItemEvents.rightClicked(event => {
|
||||
const {item,server,player,player:{x,y,z,username}} = event
|
||||
const {item,server,player,player:{x,y,z}} = event
|
||||
if (item.id != `tfg:absorption_salvo`) return
|
||||
item.count--
|
||||
player.addItemCooldown(item, 200)
|
||||
|
|
@ -94,7 +94,7 @@ ItemEvents.rightClicked(event => {
|
|||
});
|
||||
|
||||
ItemEvents.rightClicked(event => {
|
||||
const {item,server,player,player:{x,y,z,username}} = event
|
||||
const {item,server,player,player:{x,y,z}} = event
|
||||
if (item.id != `tfg:instant_health_salvo`) return
|
||||
item.count--
|
||||
player.addItemCooldown(item, 100)
|
||||
|
|
@ -107,7 +107,7 @@ ItemEvents.rightClicked(event => {
|
|||
// Vase Sounds
|
||||
global.MINECRAFT_DYE_NAMES.forEach(color => {
|
||||
BlockEvents.rightClicked(event => {
|
||||
const {block,server,player,player:{x,y,z,username}} = event
|
||||
const {block,server,player} = event
|
||||
if (block.id != `tfg:decorative_vase/${color}`) {return}{
|
||||
server.runCommandSilent(`playsound tfc:block.quern.drag block ${player.username} ${block.x} ${block.y} ${block.z} 0.3 2.0 0.1`)
|
||||
}})
|
||||
|
|
@ -115,7 +115,7 @@ global.MINECRAFT_DYE_NAMES.forEach(color => {
|
|||
|
||||
|
||||
BlockEvents.rightClicked(event => {
|
||||
const {block,server,player,player:{x,y,z,username}} = event
|
||||
const {block,server,player} = event
|
||||
if (block.id != 'tfg:decorative_vase') {return}{
|
||||
server.runCommandSilent(`playsound tfc:block.quern.drag block ${player.username} ${block.x} ${block.y} ${block.z} 0.3 2.0 0.1`)
|
||||
}});
|
||||
|
|
@ -246,12 +246,96 @@ function getTFGPersistentDataRoot(player)
|
|||
|
||||
//#region Block Interactions
|
||||
|
||||
/**
|
||||
* @typedef {Object} BrickVariant
|
||||
* @property {string} brick_type - The name of the brick variant.
|
||||
* @property {string|null} brick - Main brick block ID.
|
||||
* @property {string|null} brick_stairs - Brick stairs block ID.
|
||||
* @property {string|null} brick_slab - Brick slab block ID.
|
||||
* @property {string|null} brick_wall - Brick wall block ID.
|
||||
* @property {string|null} cracked_brick - Cracked brick block ID.
|
||||
* @property {string|null} cracked_stairs - Cracked brick stairs block ID.
|
||||
* @property {string|null} cracked_slab - Cracked brick slab block ID.
|
||||
* @property {string|null} cracked_wall - Cracked brick wall block ID.
|
||||
* @property {string|null} mossy_brick - Mossy brick block ID.
|
||||
* @property {string|null} mossy_stairs - Mossy brick stairs block ID.
|
||||
* @property {string|null} mossy_slab - Mossy brick slab block ID.
|
||||
* @property {string|null} mossy_wall - Mossy brick wall block ID.
|
||||
* @property {string|null} smooth_brick - Smooth brick block ID.
|
||||
* @property {string|null} smooth_stairs - Smooth brick stairs block ID.
|
||||
* @property {string|null} smooth_slab - Smooth brick slab block ID.
|
||||
* @property {string|null} smooth_wall - Smooth brick wall block ID.
|
||||
* @property {string|null} chiseled_brick - Chiseled brick block ID.
|
||||
*/
|
||||
|
||||
/** @type {BrickVariant[]} */
|
||||
global.BRICK_INDEX = (global.TFC_STONE_TYPES ?? []).map(tfc_stone => ({
|
||||
brick_type: tfc_stone,
|
||||
brick: `tfc:rock/bricks/${tfc_stone}`, brick_stairs: `tfc:rock/bricks/${tfc_stone}_stairs`, brick_slab: `tfc:rock/bricks/${tfc_stone}_slab`, brick_wall: `tfc:rock/bricks/${tfc_stone}_wall`,
|
||||
cracked_brick: `tfc:rock/cracked_bricks/${tfc_stone}`, cracked_stairs: `tfc:rock/cracked_bricks/${tfc_stone}_stairs`, cracked_slab: `tfc:rock/cracked_bricks/${tfc_stone}_slab`, cracked_wall: `tfc:rock/cracked_bricks/${tfc_stone}_wall`,
|
||||
mossy_brick: `tfc:rock/mossy_bricks/${tfc_stone}`, mossy_stairs: `tfc:rock/mossy_bricks/${tfc_stone}_stairs`, mossy_slab: `tfc:rock/mossy_bricks/${tfc_stone}_slab`, mossy_wall: `tfc:rock/mossy_bricks/${tfc_stone}_wall`,
|
||||
smooth_brick: `tfc:rock/smooth/${tfc_stone}`, smooth_stairs: `tfc:rock/smooth/${tfc_stone}_stairs`, smooth_slab: `tfc:rock/smooth/${tfc_stone}_slab`, smooth_wall: `tfc:rock/smooth/${tfc_stone}_wall`,
|
||||
chiseled_brick: `tfc:rock/chiseled/${tfc_stone}`
|
||||
}));
|
||||
(global.CREATE_DECO_BRICK_TYPES ?? []).slice(0, -1).forEach(create_brick => {
|
||||
global.BRICK_INDEX.push({
|
||||
brick_type: create_brick,
|
||||
brick: `createdeco:${create_brick}_bricks`, brick_stairs: `createdeco:${create_brick}_brick_stairs`, brick_slab: `createdeco:${create_brick}_brick_slab`, brick_wall: `createdeco:${create_brick}_brick_wall`,
|
||||
cracked_brick: `createdeco:cracked_${create_brick}_bricks`, cracked_stairs: `createdeco:cracked_${create_brick}_brick_stairs`, cracked_slab: `createdeco:cracked_${create_brick}_brick_slab`, cracked_wall: `createdeco:cracked_${create_brick}_brick_wall`,
|
||||
mossy_brick: `createdeco:mossy_${create_brick}_bricks`, mossy_stairs: `createdeco:mossy_${create_brick}_brick_stairs`, mossy_slab: `createdeco:mossy_${create_brick}_brick_slab`, mossy_wall: `createdeco:mossy_${create_brick}_brick_wall`,
|
||||
smooth_brick: `createdeco:corner_${create_brick}_bricks`, smooth_stairs: `createdeco:corner_${create_brick}_brick_stairs`, smooth_slab: `createdeco:corner_${create_brick}_brick_slab`, smooth_wall: `createdeco:corner_${create_brick}_brick_wall`,
|
||||
chiseled_brick: `createdeco:tiled_${create_brick}_bricks`
|
||||
})
|
||||
});
|
||||
global.BRICK_INDEX = global.BRICK_INDEX.concat([
|
||||
// {
|
||||
// brick_type: '',
|
||||
// brick: '', brick_stairs: '', brick_slab: '', brick_wall: '',
|
||||
// cracked_brick: '', cracked_stairs: '', cracked_slab: '', cracked_wall: '',
|
||||
// mossy_brick: '', mossy_stairs: '', mossy_slab: '', mossy_wallL: '',
|
||||
// smooth_brick: '', smooth_stairs: '', smooth_slab: '', smooth_wall: '',
|
||||
// chiseled_brick: ''
|
||||
// },
|
||||
{
|
||||
brick_type: 'red',
|
||||
brick: 'minecraft:bricks', brick_stairs: 'minecraft:brick_stairs', brick_slab: 'minecraft:brick_slab', brick_wall: 'minecraft:brick_wall',
|
||||
cracked_brick: 'createdeco:cracked_red_bricks', cracked_stairs: 'createdeco:cracked_red_brick_stairs', cracked_slab: 'createdeco:cracked_red_brick_slab', cracked_wall: 'createdeco:cracked_red_brick_wall',
|
||||
mossy_brick: 'createdeco:mossy_red_bricks', mossy_stairs: 'createdeco:mossy_red_brick_stairs', mossy_slab: 'createdeco:mossy_red_brick_slab', mossy_wall: 'createdeco:mossy_red_brick_wall',
|
||||
smooth_brick: 'createdeco:corner_red_bricks', smooth_stairs: 'createdeco:corner_red_brick_stairs', smooth_slab: 'createdeco:corner_red_brick_slab', smooth_wall: 'createdeco:corner_red_brick_wall',
|
||||
chiseled_brick: 'createdeco:tiled_red_bricks'
|
||||
},
|
||||
{
|
||||
brick_type: 'light_concrete',
|
||||
brick: 'gtceu:light_concrete_bricks', brick_stairs: null, brick_slab: null, brick_wall: null,
|
||||
cracked_brick: 'gtceu:cracked_light_concrete_bricks', cracked_stairs: null, cracked_slab: null, cracked_wall: null,
|
||||
mossy_brick: 'gtceu:mossy_light_concrete_bricks', mossy_stairs: null, mossy_slab: null, mossy_wall: null,
|
||||
smooth_brick: 'gtceu:polished_light_concrete', smooth_stairs: null, smooth_slab: null, smooth_wall: null,
|
||||
chiseled_brick: 'gtceu:chiseled_light_concrete'
|
||||
},
|
||||
{
|
||||
brick_type: 'dark_concrete',
|
||||
brick: 'gtceu:dark_concrete_bricks', brick_stairs: null, brick_slab: null, brick_wall: null,
|
||||
cracked_brick: 'gtceu:cracked_dark_concrete_bricks', cracked_stairs: null, cracked_slab: null, cracked_wall: null,
|
||||
mossy_brick: 'gtceu:mossy_dark_concrete_bricks', mossy_stairs: null, mossy_slab: null, mossy_wall: null,
|
||||
smooth_brick: 'gtceu:polished_dark_concrete', smooth_stairs: null, smooth_slab: null, smooth_wall: null,
|
||||
chiseled_brick: 'gtceu:chiseled_dark_concrete'
|
||||
},
|
||||
{
|
||||
brick_type: 'red_granite',
|
||||
brick: 'gtceu:red_granite_bricks', brick_stairs: null, brick_slab: null, brick_wall: null,
|
||||
cracked_brick: 'gtceu:cracked_red_granite_bricks', cracked_stairs: null, cracked_slab: null, cracked_wall: null,
|
||||
mossy_brick: 'gtceu:mossy_red_granite_bricks', mossy_stairs: null, mossy_slab: null, mossy_wall: null,
|
||||
smooth_brick: 'gtceu:polished_red_granite', smooth_stairs: null, smooth_slab: null, smooth_wall: null,
|
||||
chiseled_brick: 'gtceu:chiseled_red_granite'
|
||||
}
|
||||
]);
|
||||
|
||||
/**
|
||||
* Function for replacing a block with another block by crouch-right-clicking with a tool.
|
||||
*
|
||||
*
|
||||
* If input and output is null recipe will just return.
|
||||
*
|
||||
* @param {*} event
|
||||
* @param {*} event
|
||||
* @param {string} inputBlock -Block ID to be replaced. Accepts a Tag, but not recommended.
|
||||
* @param {string} outputBlock -Block ID of the replacement.
|
||||
* @param {string} toolId -Item ID of the tool.
|
||||
|
|
@ -309,10 +393,10 @@ function transformBlockWithTool(event, inputBlock, outputBlock, toolId, damageTo
|
|||
|
||||
/**
|
||||
* Function for replacing a block with another block by crouch-right-clicking with an item.
|
||||
*
|
||||
*
|
||||
* If input and output is null recipe will just return.
|
||||
*
|
||||
* @param {*} event
|
||||
* @param {*} event
|
||||
* @param {string} inputBlock -Block ID to be replaced. Accepts a Tag, but not recommended.
|
||||
* @param {string} outputBlock -Block ID of the replacement.
|
||||
* @param {string} itemId -Item ID of the consumed item. Accepts Tags.
|
||||
|
|
@ -415,6 +499,32 @@ BlockEvents.rightClicked(event => {
|
|||
transformBlockWithTool(event, b.brick, b.smooth_brick, '#create:sandpaper', true, 'create:sanding_short', 'minecraft:crit', true);
|
||||
transformBlockWithTool(event, b.mossy_brick, b.smooth_brick, '#create:sandpaper', true, 'create:sanding_short', 'minecraft:crit', true);
|
||||
transformBlockWithTool(event, b.cracked_brick, b.smooth_brick, '#create:sandpaper', true, 'create:sanding_short', 'minecraft:crit', true);
|
||||
// smooth ->
|
||||
transformBlockWithTool(event, b.smooth_brick, b.cracked_brick, '#forge:tools/hammers',true, 'minecraft:block.copper.hit', 'minecraft:crit', true);
|
||||
transformBlockWithItem(event, b.smooth_brick, b.mossy_brick, '#tfc:compost_greens_low', true, 1, 'minecraft:block.moss.hit', 'minecraft:item_slime', true);
|
||||
transformBlockWithItem(event, b.smooth_brick, b.mossy_brick, 'gtceu:plant_ball', true, 1, 'minecraft:block.moss.hit', 'minecraft:item_slime', true);
|
||||
transformBlockWithTool(event, b.smooth_brick, b.brick, '#forge:tools/files', true, 'minecraft:block.beehive.shear', 'minecraft:crit', true);
|
||||
}
|
||||
//Other TFC Blocks
|
||||
global.TFC_STONE_TYPES.forEach(stone => {
|
||||
//cobble -> mossy
|
||||
transformBlockWithItem(event, `tfc:rock/cobble/${stone}`, `tfc:rock/mossy_cobble/${stone}`, '#tfc:compost_greens_low', true, 1, 'minecraft:block.moss.hit', 'minecraft:item_slime', true);
|
||||
transformBlockWithItem(event, `tfc:rock/cobble/${stone}`, `tfc:rock/mossy_cobble/${stone}`, 'gtceu:plant_ball', true, 1, 'minecraft:block.moss.hit', 'minecraft:item_slime', true);
|
||||
transformBlockWithItem(event, `tfc:rock/cobble/${stone}_stairs`, `tfc:rock/mossy_cobble/${stone}_stairs`, '#tfc:compost_greens_low', true, 1, 'minecraft:block.moss.hit', 'minecraft:item_slime', true);
|
||||
transformBlockWithItem(event, `tfc:rock/cobble/${stone}_stairs`, `tfc:rock/mossy_cobble/${stone}_stairs`, 'gtceu:plant_ball', true, 1, 'minecraft:block.moss.hit', 'minecraft:item_slime', true);
|
||||
transformBlockWithItem(event, `tfc:rock/cobble/${stone}_slab`, `tfc:rock/mossy_cobble/${stone}_slab`, '#tfc:compost_greens_low', true, 1, 'minecraft:block.moss.hit', 'minecraft:item_slime', true);
|
||||
transformBlockWithItem(event, `tfc:rock/cobble/${stone}_slab`, `tfc:rock/mossy_cobble/${stone}_slab`, 'gtceu:plant_ball', true, 1, 'minecraft:block.moss.hit', 'minecraft:item_slime', true);
|
||||
transformBlockWithItem(event, `tfc:rock/cobble/${stone}_wall`, `tfc:rock/mossy_cobble/${stone}_wall`, '#tfc:compost_greens_low', true, 1, 'minecraft:block.moss.hit', 'minecraft:item_slime', true);
|
||||
transformBlockWithItem(event, `tfc:rock/cobble/${stone}_wall`, `tfc:rock/mossy_cobble/${stone}_wall`, 'gtceu:plant_ball', true, 1, 'minecraft:block.moss.hit', 'minecraft:item_slime', true);
|
||||
//mossy -> cobble
|
||||
transformBlockWithTool(event, `tfc:rock/mossy_cobble/${stone}`, `tfc:rock/cobble/${stone}`, '#forge:tools/knives', true, 'minecraft:item.axe.wax_off', 'minecraft:item_slime', true);
|
||||
transformBlockWithItem(event, `tfc:rock/mossy_cobble/${stone}`, `tfc:rock/cobble/${stone}`, 'tfc:groundcover/pumice', true, 1, 'minecraft:item.axe.wax_off', 'minecraft:item_slime', true);
|
||||
transformBlockWithTool(event, `tfc:rock/mossy_cobble/${stone}_stairs`, `tfc:rock/cobble/${stone}_stairs`, '#forge:tools/knives', true, 'minecraft:item.axe.wax_off', 'minecraft:item_slime', true);
|
||||
transformBlockWithItem(event, `tfc:rock/mossy_cobble/${stone}_stairs`, `tfc:rock/cobble/${stone}_stairs`, 'tfc:groundcover/pumice', true, 1, 'minecraft:item.axe.wax_off', 'minecraft:item_slime', true);
|
||||
transformBlockWithTool(event, `tfc:rock/mossy_cobble/${stone}_slab`, `tfc:rock/cobble/${stone}_slab`, '#forge:tools/knives', true, 'minecraft:item.axe.wax_off', 'minecraft:item_slime', true);
|
||||
transformBlockWithItem(event, `tfc:rock/mossy_cobble/${stone}_slab`, `tfc:rock/cobble/${stone}_slab`, 'tfc:groundcover/pumice', true, 1, 'minecraft:item.axe.wax_off', 'minecraft:item_slime', true);
|
||||
transformBlockWithTool(event, `tfc:rock/mossy_cobble/${stone}_wall`, `tfc:rock/cobble/${stone}_wall`, '#forge:tools/knives', true, 'minecraft:item.axe.wax_off', 'minecraft:item_slime', true);
|
||||
transformBlockWithItem(event, `tfc:rock/mossy_cobble/${stone}_wall`, `tfc:rock/cobble/${stone}_wall`, 'tfc:groundcover/pumice', true, 1, 'minecraft:item.axe.wax_off', 'minecraft:item_slime', true);
|
||||
});
|
||||
});
|
||||
//#endregion
|
||||
|
|
@ -1,6 +1,8 @@
|
|||
"use strict";
|
||||
|
||||
|
||||
/**
|
||||
* @type {string[]} - Item Names
|
||||
*/
|
||||
global.AIRCRAFT_UPGRADES = [
|
||||
"lv_aircraft_engine",
|
||||
"hv_aircraft_engine",
|
||||
|
|
@ -22,6 +24,9 @@ global.AIRCRAFT_UPGRADES = [
|
|||
"titanium_hull_reinforcement"
|
||||
]
|
||||
|
||||
/**
|
||||
* @type {string[]} - Item IDs
|
||||
*/
|
||||
global.EXTRATERRESTRIAL_RAW_ROCKS = [
|
||||
'ad_astra:moon_stone',
|
||||
'ad_astra:moon_deepslate',
|
||||
|
|
@ -32,6 +37,9 @@ global.EXTRATERRESTRIAL_RAW_ROCKS = [
|
|||
'gtceu:red_granite'
|
||||
]
|
||||
|
||||
/**
|
||||
* @type {string[]} - Item IDs
|
||||
*/
|
||||
global.EXTRATERRESTRIAL_HARDENED_ROCKS = [
|
||||
'tfg:rock/hardened_moon_stone',
|
||||
'tfg:rock/hardened_moon_deepslate',
|
||||
|
|
@ -42,6 +50,9 @@ global.EXTRATERRESTRIAL_HARDENED_ROCKS = [
|
|||
'tfg:rock/hardened_red_granite'
|
||||
]
|
||||
|
||||
/**
|
||||
* @type {string[]} - Stone Names
|
||||
*/
|
||||
global.MOON_STONE_TYPES = [
|
||||
"andesite",
|
||||
"basalt",
|
||||
|
|
@ -54,6 +65,9 @@ global.MOON_STONE_TYPES = [
|
|||
"rhyolite"
|
||||
]
|
||||
|
||||
/**
|
||||
* @type {string[]} - Biome IDs
|
||||
*/
|
||||
global.MOON_BIOMES = [
|
||||
'tfg:moon/lunar_plains',
|
||||
'tfg:moon/lunar_sands',
|
||||
|
|
@ -67,6 +81,9 @@ global.MOON_BIOMES = [
|
|||
'tfg:moon/lunar_lights_sparse'
|
||||
]
|
||||
|
||||
/**
|
||||
* @type {string[]} - Biome IDs
|
||||
*/
|
||||
global.MARS_BIOMES = [
|
||||
'tfg:mars/martian_oasis',
|
||||
'tfg:mars/martian_deep_desert',
|
||||
|
|
@ -83,6 +100,9 @@ global.MARS_BIOMES = [
|
|||
'tfg:mars/martian_mountains'
|
||||
]
|
||||
|
||||
/**
|
||||
* @type {string[]} - Block Names
|
||||
*/
|
||||
global.TFG_MACHINE_CASINGS = [
|
||||
//'machine_casing_clean_stainless_steel_desh',
|
||||
//'machine_casing_desh_ptfe',
|
||||
|
|
@ -94,8 +114,22 @@ global.TFG_MACHINE_CASINGS = [
|
|||
'machine_casing_red_solar_panel'
|
||||
];
|
||||
|
||||
/**
|
||||
* @type {string[]} - Circuit Tiers
|
||||
*/
|
||||
global.UNIVERSAL_CIRCUIT_TIERS = ["ulv", "lv", "mv", "hv", "ev", "iv", "luv", "zpm", "uv", "uhv"];
|
||||
|
||||
/**
|
||||
* @typedef {Object} Fruit
|
||||
* @property {string} name - Fruit Name
|
||||
* @property {string} id - Fruit ID
|
||||
* @property {number} saturation - Saturation Value
|
||||
* @property {number} water - Water Value
|
||||
* @property {number} fruit - Fruit Value
|
||||
* @property {number} decay - Decay Modifier
|
||||
*/
|
||||
|
||||
/** @type {Fruit[]} */
|
||||
global.FOOD_FRUIT = [
|
||||
{name: 'red_grapes', id: 'firmalife:food/red_grapes', saturation: 0.4, water: 2, fruit: 0.5, decay: 2.25},
|
||||
{name: 'white_grapes', id: 'firmalife:food/white_grapes', saturation: 0.4, water: 2, fruit: 0.5, decay: 2.25},
|
||||
|
|
@ -127,65 +161,3 @@ global.FOOD_FRUIT = [
|
|||
{name: 'fig', id: 'firmalife:food/fig', saturation: 1, water: 5, fruit: 0.9, decay: 1},
|
||||
{name: 'pineapple', id: 'firmalife:food/pineapple', saturation: 1, water: 1, fruit: 0.8, decay: 4.5}
|
||||
];
|
||||
|
||||
/** @global */
|
||||
global.BRICK_INDEX = global.TFC_STONE_TYPES.map(tfc_stone => ({
|
||||
brick_type: tfc_stone,
|
||||
brick: `tfc:rock/bricks/${tfc_stone}`, brick_stairs: `tfc:rock/bricks/${tfc_stone}_stairs`, brick_slab: `tfc:rock/bricks/${tfc_stone}_slab`, brick_wall: `tfc:rock/bricks/${tfc_stone}_wall`,
|
||||
cracked_brick: `tfc:rock/cracked_bricks/${tfc_stone}`, cracked_stairs: `tfc:rock/cracked_bricks/${tfc_stone}_stairs`, cracked_slab: `tfc:rock/cracked_bricks/${tfc_stone}_slab`, cracked_wall: `tfc:rock/cracked_bricks/${tfc_stone}_wall`,
|
||||
mossy_brick: `tfc:rock/mossy_bricks/${tfc_stone}`, mossy_stairs: `tfc:rock/mossy_bricks/${tfc_stone}_stairs`, mossy_slab: `tfc:rock/mossy_bricks/${tfc_stone}_slab`, mossy_wall: `tfc:rock/mossy_bricks/${tfc_stone}_wall`,
|
||||
smooth_brick: `tfc:rock/smooth/${tfc_stone}`, smooth_stairs: `tfc:rock/smooth/${tfc_stone}_stairs`, smooth_slab: `tfc:rock/smooth/${tfc_stone}_slab`, smooth_wall: `tfc:rock/smooth/${tfc_stone}_wall`,
|
||||
chiseled_brick: `tfc:rock/chiseled/${tfc_stone}`
|
||||
}));
|
||||
global.CREATE_DECO_BRICK_TYPES.slice(0, -1).forEach(create_brick => {
|
||||
global.BRICK_INDEX.push({
|
||||
brick_type: create_brick,
|
||||
brick: `createdeco:${create_brick}_bricks`, brick_stairs: `createdeco:${create_brick}_brick_stairs`, brick_slab: `createdeco:${create_brick}_brick_slab`, brick_wall: `createdeco:${create_brick}_brick_wall`,
|
||||
cracked_brick: `createdeco:cracked_${create_brick}_bricks`, cracked_stairs: `createdeco:cracked_${create_brick}_brick_stairs`, cracked_slab: `createdeco:cracked_${create_brick}_brick_slab`, cracked_wall: `createdeco:cracked_${create_brick}_brick_wall`,
|
||||
mossy_brick: `createdeco:mossy_${create_brick}_bricks`, mossy_stairs: `createdeco:mossy_${create_brick}_brick_stairs`, mossy_slab: `createdeco:mossy_${create_brick}_brick_slab`, mossy_wall: `createdeco:mossy_${create_brick}_brick_wall`,
|
||||
smooth_brick: `createdeco:corner_${create_brick}_bricks`, smooth_stairs: `createdeco:corner_${create_brick}_brick_stairs`, smooth_slab: `createdeco:corner_${create_brick}_brick_slab`, smooth_wall: `createdeco:corner_${create_brick}_brick_wall`,
|
||||
chiseled_brick: `createdeco:tiled_${create_brick}_bricks`
|
||||
})
|
||||
});
|
||||
global.BRICK_INDEX = global.BRICK_INDEX.concat([
|
||||
// {
|
||||
// brick_type: '',
|
||||
// brick: '', brick_stairs: '', brick_slab: '', brick_wall: '',
|
||||
// cracked_brick: '', cracked_stairs: '', cracked_slab: '', cracked_wall: '',
|
||||
// mossy_brick: '', mossy_stairs: '', mossy_slab: '', mossy_wallL: '',
|
||||
// smooth_brick: '', smooth_stairs: '', smooth_slab: '', smooth_wall: '',
|
||||
// chiseled_brick: ''
|
||||
// },
|
||||
{
|
||||
brick_type: 'red',
|
||||
brick: 'minecraft:bricks', brick_stairs: 'minecraft:brick_stairs', brick_slab: 'minecraft:brick_slab', brick_wall: 'minecraft:brick_wall',
|
||||
cracked_brick: 'createdeco:cracked_red_bricks', cracked_stairs: 'createdeco:cracked_red_brick_stairs', cracked_slab: 'createdeco:cracked_red_brick_slab', cracked_wall: 'createdeco:cracked_red_brick_wall',
|
||||
mossy_brick: 'createdeco:mossy_red_bricks', mossy_stairs: 'createdeco:mossy_red_brick_stairs', mossy_slab: 'createdeco:mossy_red_brick_slab', mossy_wall: 'createdeco:mossy_red_brick_wall',
|
||||
smooth_brick: 'createdeco:corner_red_bricks', smooth_stairs: 'createdeco:corner_red_brick_stairs', smooth_slab: 'createdeco:corner_red_brick_slab', smooth_wall: 'createdeco:corner_red_brick_wall',
|
||||
chiseled_brick: 'createdeco:tiled_red_bricks'
|
||||
},
|
||||
{
|
||||
brick_type: 'light_concrete',
|
||||
brick: 'gtceu:light_concrete_bricks', brick_stairs: null, brick_slab: null, brick_wall: null,
|
||||
cracked_brick: 'gtceu:cracked_light_concrete_bricks', cracked_stairs: null, cracked_slab: null, cracked_wall: null,
|
||||
mossy_brick: 'gtceu:mossy_light_concrete_bricks', mossy_stairs: null, mossy_slab: null, mossy_wall: null,
|
||||
smooth_brick: 'gtceu:polished_light_concrete', smooth_stairs: null, smooth_slab: null, smooth_wall: null,
|
||||
chiseled_brick: 'gtceu:chiseled_light_concrete'
|
||||
},
|
||||
{
|
||||
brick_type: 'dark_concrete',
|
||||
brick: 'gtceu:dark_concrete_bricks', brick_stairs: null, brick_slab: null, brick_wall: null,
|
||||
cracked_brick: 'gtceu:cracked_dark_concrete_bricks', cracked_stairs: null, cracked_slab: null, cracked_wall: null,
|
||||
mossy_brick: 'gtceu:mossy_dark_concrete_bricks', mossy_stairs: null, mossy_slab: null, mossy_wall: null,
|
||||
smooth_brick: 'gtceu:polished_dark_concrete', smooth_stairs: null, smooth_slab: null, smooth_wall: null,
|
||||
chiseled_brick: 'gtceu:chiseled_dark_concrete'
|
||||
},
|
||||
{
|
||||
brick_type: 'red_granite',
|
||||
brick: 'gtceu:red_granite_bricks', brick_stairs: null, brick_slab: null, brick_wall: null,
|
||||
cracked_brick: 'gtceu:cracked_red_granite_bricks', cracked_stairs: null, cracked_slab: null, cracked_wall: null,
|
||||
mossy_brick: 'gtceu:mossy_red_granite_bricks', mossy_stairs: null, mossy_slab: null, mossy_wall: null,
|
||||
smooth_brick: 'gtceu:polished_red_granite', smooth_stairs: null, smooth_slab: null, smooth_wall: null,
|
||||
chiseled_brick: 'gtceu:chiseled_red_granite'
|
||||
}
|
||||
])
|
||||
Loading…
Add table
Add a link
Reference in a new issue