Merging space stuff from my own fork into the main repo (#935)
* ignore .vs * initial commit of ~space~ * fixed planets in config * adding ore blocks to anorthite, renamed moon deepslate to dunite * added moon ore veins, adjusted earth ones, added separate rock blocks * added new buds for the new minerals, adjusted veins again * forgot to add titanium to the moon! * added moon zombies * adjusted veins + added endermites * first step to the moon Signed-off-by: SverhRazum-Nah <leon.trol@mail.ru> * change sky colors back to black * added ad astra ores * add desh veins to the moon * added missing certus clusters * adding desh veins/loc * adding meteors + rabbit houses * cheeeeeeese * replaced meteor concrete with sky stone * burying the meteors a little more * initial commit of ores to field guide tool * updated mineral data with new space ores * fixed trapdoor orientation * added anorthite rocks/bricks, changed names of cut deepslate, made cut deepslate + asurine visible * changed average moon temp * First Push * split 'for' value into arrays, added russian * pillars are stone, not metal * adjusting spawns (again) * oh so that's how charge and energy budget work * added recipes for the create decoration blocks * bricks and rocks * remove ad astra recipes * added limpets to the moon * Landing on Mars Signed-off-by: SverhRazum-Nah <leon.trol@mail.ru> * Man thats a lot * added translations for vein types, rock types, and added ukranium * rabbit adjustments * removed cooking anorthite cobble into raw * Pushin P * Parity * Move translation tokens to the language tokens JSON * Remove bin and obj * Update .gitignore * Update .gitignore Signed-off-by: Pyritie <pyritie@gmail.com> * moon mobs again * Ore Index being Written * More PRogress * Improve string formatting * toned down realgar * structures! shulkers! oh my! * Some progress on the vein index writing * replace obsidian with scorchia in meteors * meteor adjustments * Actual vein index * add globes to loot table * Project Completed * added solar power values * adjusted ad astra recipes, hid some of the items, added bedrock ores * more fiddling with structures * made the rover a bit cheaper * comply with review * anorthite dust * retextured shulkers * disabled stuff from species/endermanoverhaul * texture tweak * recipe tweak * fixed space rocks being invisible on the map for some reason * removed earth bauxite vein * mars rock * mars stuff * starting work on mars biome generation * put biomes in folders * climate stuff * more mars worldgen * added carve tag to space blocks * move to correct folder * removed veins * added armalcolite to the moon * anorthite -> anorthosite * plagioclase -> syenite * dunite -> basanite * what is climate * climates again * mars rock layers * fixed the temps! * Update tags.js Signed-off-by: Pyritie <pyritie@gmail.com> * Add a Solution file * adding this back * remove tools folder since it was moved to a different repo * some stuff that didn't merge * updates * merges * merges --------- Signed-off-by: SverhRazum-Nah <leon.trol@mail.ru> Signed-off-by: Pyritie <pyritie@gmail.com> Co-authored-by: SverhRazum-Nah <leon.trol@mail.ru> Co-authored-by: Nebby1999 <nebby131999@gmail.com>
This commit is contained in:
Pyritie
GitHub
parent
7606ee85c6
commit
7c86ce53c0
227 changed files with 214667 additions and 753 deletions
|
|
@ -1,331 +1,100 @@
|
|||
|
||||
const registerTFGBlocks = (event) => {
|
||||
|
||||
event.create('tfg:artificial_end_portal_frame')
|
||||
.stoneSoundType()
|
||||
.tagBlock('minecraft:mineable/pickaxe')
|
||||
.requiresTool(true)
|
||||
.fullBlock(true)
|
||||
.item(item => {
|
||||
item.modelJson({ parent: 'minecraft:block/end_portal_frame' })
|
||||
})
|
||||
|
||||
global.MINECRAFT_DYE_NAMES.forEach(color => {
|
||||
event.create(`tfg:decorative_vase/generated/${color}`, 'cardinal')
|
||||
.model(`tfg:block/decorative_vase/loot_vase_${color}`)
|
||||
.soundType('decorated_pot')
|
||||
.hardness(0.7)
|
||||
.tagBlock('minecraft:mineable/pickaxe')
|
||||
.mapColor(`color_${color}`)
|
||||
.box(2, 0, 2, 14, 20, 14)
|
||||
.fullBlock(false)
|
||||
.opaque(false)
|
||||
.renderType('cutout')
|
||||
|
||||
event.create(`tfg:decorative_vase/${color}`, 'cardinal')
|
||||
.model(`tfg:block/decorative_vase/vase_${color}`)
|
||||
.soundType('decorated_pot')
|
||||
.hardness(0.7)
|
||||
.tagBlock('minecraft:mineable/pickaxe')
|
||||
.mapColor(`color_${color}`)
|
||||
.box(2, 0, 2, 14, 20, 14)
|
||||
.fullBlock(false)
|
||||
.opaque(false)
|
||||
.renderType('cutout')
|
||||
.blockEntity(be => {
|
||||
be.attach('tfc:inventory', {
|
||||
width: 9,
|
||||
height: 1,
|
||||
size: size => size.isSmallerThan('large')
|
||||
})
|
||||
be.rightClickOpensInventory()
|
||||
})
|
||||
|
||||
event.create(`tfg:decorative_vase/unfired/${color}`, 'cardinal')
|
||||
.model(`tfg:block/decorative_vase/vase_unfired_${color}`)
|
||||
.soundType('decorated_pot')
|
||||
.hardness(0.7)
|
||||
.tagBlock('minecraft:mineable/pickaxe')
|
||||
.mapColor(`color_${color}`)
|
||||
.box(2, 0, 2, 14, 20, 14)
|
||||
.fullBlock(false)
|
||||
.opaque(false)
|
||||
.renderType('cutout')
|
||||
})
|
||||
event.create('tfg:decorative_vase', 'cardinal')
|
||||
.model('tfg:block/decorative_vase/vase')
|
||||
.soundType('decorated_pot')
|
||||
.hardness(0.7)
|
||||
.tagBlock('minecraft:mineable/pickaxe')
|
||||
.mapColor(`color_gray`)
|
||||
.box(2, 0, 2, 14, 20, 14)
|
||||
.fullBlock(false)
|
||||
.opaque(false)
|
||||
.renderType('cutout')
|
||||
.blockEntity(be => {
|
||||
be.attach('tfc:inventory', {
|
||||
width: 9,
|
||||
height: 1,
|
||||
size: size => size.isSmallerThan('large')
|
||||
})
|
||||
be.rightClickOpensInventory()
|
||||
})
|
||||
|
||||
event.create('tfg:decorative_vase/unfired', 'cardinal')
|
||||
.model('tfg:block/decorative_vase/vase_unfired')
|
||||
.soundType('decorated_pot')
|
||||
.hardness(0.7)
|
||||
.tagBlock('minecraft:mineable/pickaxe')
|
||||
.mapColor(`color_gray`)
|
||||
.box(2, 0, 2, 14, 20, 14)
|
||||
.fullBlock(false)
|
||||
.opaque(false)
|
||||
.renderType('cutout')
|
||||
|
||||
const $Blocks = Java.loadClass('net.minecraft.world.level.block.Blocks')
|
||||
const $Properties = Java.loadClass('net.minecraft.world.level.block.state.BlockBehaviour$Properties')
|
||||
|
||||
// #region Deprecated tree tap
|
||||
|
||||
event.create('treetap:tap')
|
||||
.requiresTool(false)
|
||||
.textureAll('tfg:item/deprecated')
|
||||
|
||||
// #endregion
|
||||
|
||||
// #region Nether blocks
|
||||
|
||||
event.create('tfg:rock/hardened_deepslate')
|
||||
.soundType('deepslate')
|
||||
.property(BlockProperties.AXIS)
|
||||
.requiresTool(true)
|
||||
.item(item => {
|
||||
item.modelJson({ parent: 'minecraft:item/deepslate' })
|
||||
})
|
||||
.tagBlock('tfc:can_carve')
|
||||
.tagBoth('forge:stone')
|
||||
.tagBoth('tfc:rock/hardened')
|
||||
.tagBlock('minecraft:mineable/pickaxe')
|
||||
.mapColor('terracotta_grey')
|
||||
.fullBlock(true)
|
||||
.opaque(true)
|
||||
|
||||
event.create('tfg:rock/hardened_blackstone')
|
||||
.stoneSoundType()
|
||||
.requiresTool(true)
|
||||
.item(item => {
|
||||
item.modelJson({ parent: 'minecraft:item/blackstone' })
|
||||
})
|
||||
.tagBlock('tfc:can_carve')
|
||||
.tagBoth('forge:stone')
|
||||
.tagBoth('tfc:rock/hardened')
|
||||
.mapColor('terracotta_grey')
|
||||
.tagBlock('minecraft:mineable/pickaxe')
|
||||
.fullBlock(true)
|
||||
.opaque(true)
|
||||
|
||||
event.create('tfg:rock/hardened_dripstone')
|
||||
.soundType('dripstone_block')
|
||||
.stoneSoundType()
|
||||
.requiresTool(true)
|
||||
.item(item => {
|
||||
item.modelJson({ parent: 'minecraft:item/dripstone_block' })
|
||||
})
|
||||
.tagBlock('tfc:can_carve')
|
||||
.tagBoth('forge:stone')
|
||||
.tagBoth('tfc:rock/hardened')
|
||||
.mapColor('terracotta')
|
||||
.tagBlock('minecraft:mineable/pickaxe')
|
||||
.fullBlock(true)
|
||||
.opaque(true)
|
||||
|
||||
event.create('tfg:spike/dripstone_spike', 'tfc:rock_spike')
|
||||
.soundType('dripstone_block')
|
||||
.noItem()
|
||||
|
||||
event.create('tfg:spike/deepslate_spike', 'tfc:rock_spike')
|
||||
.soundType('deepslate')
|
||||
.noItem()
|
||||
|
||||
event.create('tfg:spike/blackstone_spike', 'tfc:rock_spike')
|
||||
.stoneSoundType()
|
||||
.noItem()
|
||||
|
||||
event.create('tfg:loose/deepslate', 'tfc:loose_rock')
|
||||
.itemTexture('tfg:item/loose/deepslate')
|
||||
.rockTypeModel('metamorphic')
|
||||
.soundType('deepslate')
|
||||
.translationKey("block.tfg.loose.deepslate")
|
||||
.tagBlock('tfc:loose_rocks')
|
||||
.tagItem('tfc:any_knapping')
|
||||
.tagItem('tfc:rock_knapping')
|
||||
.tagItem('tfc:metamorphic_rock')
|
||||
|
||||
event.create('tfg:loose/dripstone', 'tfc:loose_rock')
|
||||
.itemTexture('tfg:item/loose/dripstone')
|
||||
.rockTypeModel('sedimentary')
|
||||
.soundType('dripstone_block')
|
||||
.translationKey("block.tfg.loose.dripstone")
|
||||
.tagBlock('tfc:loose_rocks')
|
||||
.tagItem('tfc:any_knapping')
|
||||
.tagItem('tfc:rock_knapping')
|
||||
.tagItem('tfc:sedimentary_rock')
|
||||
|
||||
|
||||
const $SproutsBlock = Java.loadClass('net.minecraft.world.level.block.NetherSproutsBlock')
|
||||
|
||||
event.createCustom('tfg:mushroom_roots', () => new $SproutsBlock($Properties.copy($Blocks.WARPED_ROOTS)))
|
||||
event.createCustom('tfg:mushroom_sprouts', () => new $SproutsBlock($Properties.copy($Blocks.NETHER_SPROUTS)))
|
||||
|
||||
event.create('tfg:charred_log')
|
||||
.fullBlock(true)
|
||||
.woodSoundType()
|
||||
.property(BlockProperties.AXIS)
|
||||
.tagBoth('minecraft:mineable/axe')
|
||||
.tagBoth('tfc:logs_that_log')
|
||||
.tagBoth('afc:logs_that_log')
|
||||
.tagBoth('minecraft:logs')
|
||||
.mapColor('black')
|
||||
|
||||
// #endregion
|
||||
|
||||
//#region Custom Supports
|
||||
event.create('tfg:light_concrete_support', 'tfc:support')
|
||||
.textureAll('tfg:block/support/light_concrete_support')
|
||||
.horizontal(horizontal => {
|
||||
horizontal.textureAll('tfg:block/support/light_concrete_support')
|
||||
horizontal.soundType('stone')
|
||||
horizontal.hardness(5)
|
||||
horizontal.resistance(16)
|
||||
horizontal.mapColor('color_light_gray')
|
||||
horizontal.tagBlock('minecraft:mineable/pickaxe')
|
||||
horizontal.requiresTool(true)
|
||||
})
|
||||
.soundType('stone')
|
||||
.hardness(5)
|
||||
.resistance(16)
|
||||
.mapColor('color_light_gray')
|
||||
.tagBlock('minecraft:mineable/pickaxe')
|
||||
.requiresTool(true)
|
||||
|
||||
event.create('tfg:dark_concrete_support', 'tfc:support')
|
||||
.textureAll('tfg:block/support/dark_concrete_support')
|
||||
.horizontal(horizontal => {
|
||||
horizontal.textureAll('tfg:block/support/dark_concrete_support')
|
||||
horizontal.soundType('stone')
|
||||
horizontal.hardness(5)
|
||||
horizontal.resistance(16)
|
||||
horizontal.mapColor('color_gray')
|
||||
horizontal.tagBlock('minecraft:mineable/pickaxe')
|
||||
horizontal.requiresTool(true)
|
||||
})
|
||||
.soundType('stone')
|
||||
.hardness(5)
|
||||
.resistance(16)
|
||||
.mapColor('color_gray')
|
||||
.tagBlock('minecraft:mineable/pickaxe')
|
||||
.requiresTool(true)
|
||||
|
||||
event.create('tfg:reinforced_light_concrete_support', 'tfc:support')
|
||||
.textureAll('tfg:block/support/reinforced_light_concrete_support')
|
||||
.horizontal(horizontal => {
|
||||
horizontal.textureAll('tfg:block/support/reinforced_light_concrete_support')
|
||||
horizontal.soundType('stone')
|
||||
horizontal.hardness(5)
|
||||
horizontal.resistance(64)
|
||||
horizontal.mapColor('color_light_gray')
|
||||
horizontal.tagBlock('minecraft:mineable/pickaxe')
|
||||
horizontal.requiresTool(true)
|
||||
})
|
||||
.soundType('stone')
|
||||
.hardness(5)
|
||||
.resistance(64)
|
||||
.mapColor('color_light_gray')
|
||||
.tagBlock('minecraft:mineable/pickaxe')
|
||||
.requiresTool(true)
|
||||
|
||||
event.create('tfg:reinforced_dark_concrete_support', 'tfc:support')
|
||||
.textureAll('tfg:block/support/reinforced_dark_concrete_support')
|
||||
.horizontal(horizontal => {
|
||||
horizontal.textureAll('tfg:block/support/reinforced_dark_concrete_support')
|
||||
horizontal.soundType('stone')
|
||||
horizontal.hardness(5)
|
||||
horizontal.resistance(64)
|
||||
horizontal.mapColor('color_gray')
|
||||
horizontal.tagBlock('minecraft:mineable/pickaxe')
|
||||
horizontal.requiresTool(true)
|
||||
})
|
||||
.soundType('stone')
|
||||
.hardness(5)
|
||||
.resistance(64)
|
||||
.mapColor('color_gray')
|
||||
.tagBlock('minecraft:mineable/pickaxe')
|
||||
.requiresTool(true)
|
||||
|
||||
event.create('tfg:rebar_support', 'tfc:support')
|
||||
.textureAll('tfg:block/support/rebar_support')
|
||||
.horizontal(horizontal => {
|
||||
horizontal.textureAll('tfg:block/support/rebar_support')
|
||||
horizontal.soundType('chain')
|
||||
horizontal.hardness(3)
|
||||
horizontal.resistance(16)
|
||||
horizontal.mapColor('color_orange')
|
||||
horizontal.tagBlock('minecraft:mineable/pickaxe')
|
||||
horizontal.tagBlock('minecraft:climbable')
|
||||
horizontal.requiresTool(true)
|
||||
horizontal.renderType('cutout')
|
||||
horizontal.opaque(false)
|
||||
})
|
||||
.soundType('chain')
|
||||
.hardness(3)
|
||||
.resistance(16)
|
||||
.mapColor('color_orange')
|
||||
.tagBlock('minecraft:mineable/pickaxe')
|
||||
.tagBlock('minecraft:climbable')
|
||||
.requiresTool(true)
|
||||
.renderType('cutout')
|
||||
.opaque(false)
|
||||
|
||||
event.create('tfg:steel_support', 'tfc:support')
|
||||
.textureAll('tfg:block/support/steel_support')
|
||||
.horizontal(horizontal => {
|
||||
horizontal.textureAll('tfg:block/support/steel_support')
|
||||
horizontal.soundType('metal')
|
||||
horizontal.hardness(5)
|
||||
horizontal.resistance(64)
|
||||
horizontal.mapColor('color_gray')
|
||||
horizontal.tagBlock('minecraft:mineable/pickaxe')
|
||||
horizontal.requiresTool(true)
|
||||
})
|
||||
.soundType('metal')
|
||||
.hardness(5)
|
||||
.resistance(64)
|
||||
.mapColor('color_gray')
|
||||
.tagBlock('minecraft:mineable/pickaxe')
|
||||
.requiresTool(true)
|
||||
|
||||
|
||||
const other_stone = ['pyroxenite', 'migmatite', 'travertine']
|
||||
const stone_types = global.TFC_STONE_TYPES.concat(other_stone)
|
||||
|
||||
stone_types.forEach(stone => {
|
||||
event.create(`tfg:${stone}_support`, 'tfc:support')
|
||||
.textureAll(`tfg:block/support/${stone}_support`)
|
||||
.horizontal(horizontal => {
|
||||
horizontal.textureAll(`tfg:block/support/${stone}_support`)
|
||||
horizontal.soundType('stone')
|
||||
horizontal.hardness(5)
|
||||
horizontal.resistance(8)
|
||||
horizontal.mapColor('color_gray')
|
||||
horizontal.tagBlock('minecraft:mineable/pickaxe')
|
||||
horizontal.requiresTool(true)
|
||||
})
|
||||
.soundType('stone')
|
||||
.hardness(5)
|
||||
.resistance(8)
|
||||
.mapColor('color_gray')
|
||||
.tagBlock('minecraft:mineable/pickaxe')
|
||||
.requiresTool(true)
|
||||
})
|
||||
//#endregion
|
||||
}
|
||||
|
||||
const registerTFGBlocks = (event) => {
|
||||
|
||||
registerTFGNetherBlocks(event)
|
||||
registerTFGSpaceBlocks(event)
|
||||
registerTFGSupportBlocks(event)
|
||||
|
||||
event.create('tfg:artificial_end_portal_frame')
|
||||
.stoneSoundType()
|
||||
.tagBlock('minecraft:mineable/pickaxe')
|
||||
.requiresTool(true)
|
||||
.fullBlock(true)
|
||||
.item(item => {
|
||||
item.modelJson({ parent: 'minecraft:block/end_portal_frame' })
|
||||
})
|
||||
|
||||
// #region Decorative vases
|
||||
global.MINECRAFT_DYE_NAMES.forEach(color => {
|
||||
event.create(`tfg:decorative_vase/generated/${color}`, 'cardinal')
|
||||
.model(`tfg:block/decorative_vase/loot_vase_${color}`)
|
||||
.soundType('decorated_pot')
|
||||
.hardness(0.7)
|
||||
.tagBlock('minecraft:mineable/pickaxe')
|
||||
.mapColor(`color_${color}`)
|
||||
.box(2, 0, 2, 14, 20, 14)
|
||||
.fullBlock(false)
|
||||
.opaque(false)
|
||||
.renderType('cutout')
|
||||
|
||||
event.create(`tfg:decorative_vase/${color}`, 'cardinal')
|
||||
.model(`tfg:block/decorative_vase/vase_${color}`)
|
||||
.soundType('decorated_pot')
|
||||
.hardness(0.7)
|
||||
.tagBlock('minecraft:mineable/pickaxe')
|
||||
.mapColor(`color_${color}`)
|
||||
.box(2, 0, 2, 14, 20, 14)
|
||||
.fullBlock(false)
|
||||
.opaque(false)
|
||||
.renderType('cutout')
|
||||
.blockEntity(be => {
|
||||
be.attach('tfc:inventory', {
|
||||
width: 9,
|
||||
height: 1,
|
||||
size: size => size.isSmallerThan('large')
|
||||
})
|
||||
be.rightClickOpensInventory()
|
||||
})
|
||||
|
||||
event.create(`tfg:decorative_vase/unfired/${color}`, 'cardinal')
|
||||
.model(`tfg:block/decorative_vase/vase_unfired_${color}`)
|
||||
.soundType('decorated_pot')
|
||||
.hardness(0.7)
|
||||
.tagBlock('minecraft:mineable/pickaxe')
|
||||
.mapColor(`color_${color}`)
|
||||
.box(2, 0, 2, 14, 20, 14)
|
||||
.fullBlock(false)
|
||||
.opaque(false)
|
||||
.renderType('cutout')
|
||||
})
|
||||
event.create('tfg:decorative_vase', 'cardinal')
|
||||
.model('tfg:block/decorative_vase/vase')
|
||||
.soundType('decorated_pot')
|
||||
.hardness(0.7)
|
||||
.tagBlock('minecraft:mineable/pickaxe')
|
||||
.mapColor(`color_gray`)
|
||||
.box(2, 0, 2, 14, 20, 14)
|
||||
.fullBlock(false)
|
||||
.opaque(false)
|
||||
.renderType('cutout')
|
||||
.blockEntity(be => {
|
||||
be.attach('tfc:inventory', {
|
||||
width: 9,
|
||||
height: 1,
|
||||
size: size => size.isSmallerThan('large')
|
||||
})
|
||||
be.rightClickOpensInventory()
|
||||
})
|
||||
|
||||
event.create('tfg:decorative_vase/unfired', 'cardinal')
|
||||
.model('tfg:block/decorative_vase/vase_unfired')
|
||||
.soundType('decorated_pot')
|
||||
.hardness(0.7)
|
||||
.tagBlock('minecraft:mineable/pickaxe')
|
||||
.mapColor(`color_gray`)
|
||||
.box(2, 0, 2, 14, 20, 14)
|
||||
.fullBlock(false)
|
||||
.opaque(false)
|
||||
.renderType('cutout')
|
||||
|
||||
// #endregion
|
||||
|
||||
|
||||
// #region Deprecated tree tap
|
||||
|
||||
event.create('treetap:tap')
|
||||
.requiresTool(false)
|
||||
.textureAll('tfg:item/deprecated')
|
||||
|
||||
// #endregion
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue