Feature/new emi categories (#1862)
* stuff * all the stuff * Update CHANGELOG.md Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com> --------- Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
This commit is contained in:
parent
ff81d23c66
commit
b06e59db31
8 changed files with 89 additions and 1 deletions
|
|
@ -11,6 +11,7 @@
|
|||
- Added mossy, stairs, slabs, walls, and more to the non-TFC stone types (#1845) @vidal-adrien
|
||||
- Added back vanilla stone and all its variants, craftable out of the stone dust you get from ore processing (#1845) @vidal-adrien
|
||||
- Tweaked the moon worldgen a bit to add the new stone stuff @Pyritie
|
||||
- Adds emi pages for Create Blaze Burner Fuels and for in-world block modifications @BlueBoat29
|
||||
### Bug fixes
|
||||
- Ice soup now requires a bowl to craft, so it doesn't generate free bowls @Pyritie
|
||||
- Fixed repairing an iron flask consuming the knife, also added some flask recipes with rubber instead of a bladder (#1826) @Pyritie
|
||||
|
|
|
|||
|
|
@ -1056,7 +1056,11 @@
|
|||
"tfg.emi.ore_veins.size": "Size: %d",
|
||||
"tfg.emi.ore_veins.height": "Height: %d",
|
||||
"tfg.emi.ore_veins.radius": "Radius: %d",
|
||||
"tfg.emi.liquid_bb_burn_time": "Duration: %d secs",
|
||||
"tfg.emi.liquid_bb_superheat": "§lSuperheated",
|
||||
"emi.category.tfg.ore_vein_info": "Ore Veins",
|
||||
"emi.category.tfg.blaze_burner": "Blaze Burner Fuels",
|
||||
"emi.category.tfg.block_interaction": "Block Modifications",
|
||||
"tfg.toast.ore_prospector_none": "No ores found in range.",
|
||||
"tfg.toast.ore_prospector_message": "Ores found within %s §6blocks in this direction: %s",
|
||||
"tfg.tooltip.ore_prospector_stats": "Scan Range: %s, Cross Section: %s x %s.",
|
||||
|
|
|
|||
BIN
kubejs/assets/tfg/textures/gui/emi/arrow.png
Normal file
BIN
kubejs/assets/tfg/textures/gui/emi/arrow.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 656 B |
|
|
@ -90,6 +90,9 @@ const registerMinecraftItemTags = (event) => {
|
|||
|
||||
event.add('tfc:makes_black_dye', 'minecraft:ink_sac')
|
||||
event.add('tfc:makes_white_dye', 'minecraft:bone_meal')
|
||||
|
||||
event.add('create:blaze_burner_fuel/regular', 'minecraft:coal')
|
||||
event.add('create:blaze_burner_fuel/regular', 'minecraft:charcoal')
|
||||
}
|
||||
|
||||
const registerMinecraftBlockTags = (event) => {
|
||||
|
|
|
|||
|
|
@ -608,7 +608,7 @@ BlockEvents.rightClicked(event => {
|
|||
transformBlockWithTool(event, b.mossy_slab, b.brick_slab, '#forge:tools/knives', true, 'minecraft:item.axe.wax_off', 'minecraft:item_slime', true);
|
||||
transformBlockWithItem(event, b.mossy_slab, b.brick_slab, 'tfc:groundcover/pumice', true, 1, 'minecraft:item.axe.wax_off', 'minecraft:item_slime', true);
|
||||
transformBlockWithTool(event, b.mossy_wall, b.brick_wall, '#forge:tools/knives', true, 'minecraft:item.axe.wax_off', 'minecraft:item_slime', true);
|
||||
transformBlockWithItem(event, b.mossy_wall, b.mossy_wall, 'tfc:groundcover/pumice', true, 1, 'minecraft:item.axe.wax_off', 'minecraft:item_slime', true);
|
||||
transformBlockWithItem(event, b.mossy_wall, b.brick_wall, 'tfc:groundcover/pumice', true, 1, 'minecraft:item.axe.wax_off', 'minecraft:item_slime', true);
|
||||
//cracked -> brick
|
||||
transformBlockWithItem(event, b.cracked_brick, b.brick, 'tfc:mortar', true, 1, 'minecraft:item.ink_sac.use', 'minecraft:effect', true);
|
||||
transformBlockWithItem(event, b.cracked_stairs, b.brick_stairs, 'tfc:mortar', true, 1, 'minecraft:item.ink_sac.use', 'minecraft:effect', true);
|
||||
|
|
|
|||
68
kubejs/server_scripts/tfg/tags.interaction.js
Normal file
68
kubejs/server_scripts/tfg/tags.interaction.js
Normal file
|
|
@ -0,0 +1,68 @@
|
|||
// priority: 0
|
||||
"use strict";
|
||||
|
||||
function registerBlockInteractionTags(event) {
|
||||
|
||||
/**
|
||||
* @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.
|
||||
*/
|
||||
|
||||
for (const b of global.BRICK_INDEX) {
|
||||
if (b.brick !== null) { event.add('tfg:interaction/brick', b.brick) }
|
||||
if (b.brick_stairs !== null) {event.add('tfg:interaction/brick_stairs', b.brick_stairs) }
|
||||
if (b.brick_slab !== null) { event.add('tfg:interaction/brick_slab', b.brick_slab) }
|
||||
if (b.brick_wall !== null) { event.add('tfg:interaction/brick_wall', b.brick_wall) }
|
||||
|
||||
if (b.cracked_brick !== null) { event.add('tfg:interaction/cracked_brick', b.cracked_brick) }
|
||||
if (b.cracked_stairs !== null) { event.add('tfg:interaction/cracked_brick_stairs', b.cracked_stairs) }
|
||||
if (b.cracked_slab !== null) { event.add('tfg:interaction/cracked_brick_slab', b.cracked_slab) }
|
||||
if (b.cracked_wall !== null) { event.add('tfg:interaction/cracked_brick_wall', b.cracked_wall) }
|
||||
|
||||
if (b.mossy_brick !== null) { event.add('tfg:interaction/mossy_brick', b.mossy_brick) }
|
||||
if (b.mossy_stairs !== null) { event.add('tfg:interaction/mossy_brick_stairs', b.mossy_stairs) }
|
||||
if (b.mossy_slab !== null) { event.add('tfg:interaction/mossy_brick_slab', b.mossy_slab) }
|
||||
if (b.mossy_wall !== null) { event.add('tfg:interaction/mossy_brick_wall', b.mossy_wall) }
|
||||
|
||||
if (b.smooth_brick !== null) { event.add('tfg:interaction/smooth_brick', b.smooth_brick) }
|
||||
//event.add('tfg:interaction/smooth_bricks', b.smooth_stairs)
|
||||
//event.add('tfg:interaction/smooth_bricks', b.smooth_slab)
|
||||
//event.add('tfg:interaction/smooth_bricks', b.smooth_wall)
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
for (const c of global.COBBLE_INDEX) {
|
||||
|
||||
event.add('tfg:interaction/cobble', c.block)
|
||||
event.add('tfg:interaction/cobble_stairs', c.stairs)
|
||||
event.add('tfg:interaction/cobble_slab', c.slab)
|
||||
event.add('tfg:interaction/cobble_wall', c.wall)
|
||||
|
||||
event.add('tfg:interaction/mossy_cobble', c.mossy_block)
|
||||
event.add('tfg:interaction/mossy_cobble_stairs', c.mossy_stairs)
|
||||
event.add('tfg:interaction/mossy_cobble_slab', c.mossy_slab)
|
||||
event.add('tfg:interaction/mossy_cobble_wall', c.mossy_wall)
|
||||
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -4,6 +4,7 @@ const registerTFGItemTags = (event) => {
|
|||
|
||||
registerTFGTrimTags(event)
|
||||
registerFacadeWhitelistTags(event)
|
||||
registerBlockInteractionTags(event)
|
||||
//crop stuff
|
||||
event.add('tfc:seeds', 'tfg:sunflower_seeds')
|
||||
event.add('tfc:seeds', 'tfg:rapeseed_seeds')
|
||||
|
|
|
|||
|
|
@ -44,6 +44,17 @@ function registerGTCEuItemModifications(event) {
|
|||
item.armorKnockbackResistance = 0.25
|
||||
})
|
||||
|
||||
event.modify('gtceu:poor_raw_coal', item => {
|
||||
item.burnTime = 30*20
|
||||
})
|
||||
event.modify('gtceu:raw_coal', item => {
|
||||
item.burnTime = 60*20
|
||||
})
|
||||
event.modify('gtceu:rich_raw_coal', item => {
|
||||
item.burnTime = 120*20
|
||||
})
|
||||
|
||||
|
||||
//#region eating radioactive stuff
|
||||
const EDIBLE_ITEMS = [
|
||||
'gtceu:thorium_nugget',
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue