big rock naming overhaul -- keeping to the ad astra naming scheme, then using lang files to give them funny rock names

This commit is contained in:
Pyritie 2025-05-05 17:41:36 +01:00
parent 38219fdb98
commit 2c0d2cbd24
83 changed files with 914 additions and 784 deletions

View file

@ -41,9 +41,6 @@ global.AD_ASTRA_DISABLED_ITEMS =
'ad_astra:oil_bucket',
'ad_astra:fuel_bucket',
'ad_astra:cryo_fuel_bucket',
'ad_astra:moon_stone',
'ad_astra:moon_deepslate',
'ad_astra:mars_stone',
'ad_astra_giselle_addon:gravity_normalizer',
'ad_astra:steel_block',
'ad_astra:raw_desh_block',

View file

@ -0,0 +1,29 @@
// priority: 0
function registerAdAstraDimensionMarkers(event) {
event.create('ad_astra:earth_orbit')
.iconSupplier(() => Item.of('ad_astra:earth_globe').getItem())
.tier(1)
.overrideName('Earth Orbit')
event.create('ad_astra:moon')
.iconSupplier(() => Item.of('ad_astra:moon_globe').getItem())
.tier(1)
.overrideName('The Moon')
event.create('ad_astra:mars')
.iconSupplier(() => Item.of('ad_astra:mars_globe').getItem())
.tier(2)
.overrideName('Mars')
event.create('ad_astra:venus')
.iconSupplier(() => Item.of('ad_astra:venus_globe').getItem())
.tier(3)
.overrideName('Venus')
event.create('ad_astra:mercury')
.iconSupplier(() => Item.of('ad_astra:mercury_globe').getItem())
.tier(3)
.overrideName('Mercury')
}

View file

@ -190,7 +190,8 @@ global.ORE_BEARING_STONES = [
'pyroxenite',
'dripstone',
'anorthosite',
'basanite'
'moon_stone',
'moon_deepslate',
'mars_stone'
];

View file

@ -80,12 +80,9 @@ GTCEuStartupEvents.materialModification(event => {
})
//GTCEuStartupEvents.registry('gtceu:dimension_marker', event => {
// event.create('ad_astra:earth_orbit')
// .iconSupplier(() => Item.of('ad_astra:earth_globe').getItem())
// .tier(0)
// .overrideName('Earth Orbit')
//})
GTCEuStartupEvents.registry('gtceu:dimension_marker', event => {
registerAdAstraDimensionMarkers(event)
})
Platform.mods.kaolinclayze.name = "Primitive Creatures";

View file

@ -61,22 +61,22 @@ const registerTFCTagPrefixes = (event) => {
.generationCondition(ItemGenerationCondition.hasOreProperty)
.materialSupplier(() => GTMaterials.Deepslate)
event.create('anorthosite', 'ore')
.stateSupplier(() => Block.getBlock('tfg:rock/raw_anorthosite').defaultBlockState())
event.create('moon_stone', 'ore')
.stateSupplier(() => Block.getBlock('tfg:rock/hardened_moon_stone').defaultBlockState())
.baseModelLocation('ad_astra:block/moon_stone')
.unificationEnabled(true)
.materialIconType(GTMaterialIconType.ore)
.generationCondition(ItemGenerationCondition.hasOreProperty)
event.create('basanite', 'ore')
.stateSupplier(() => Block.getBlock('tfg:rock/raw_basanite').defaultBlockState())
event.create('moon_deepslate', 'ore')
.stateSupplier(() => Block.getBlock('tfg:rock/hardened_moon_deepslate').defaultBlockState())
.baseModelLocation('ad_astra:block/moon_deepslate')
.unificationEnabled(true)
.materialIconType(GTMaterialIconType.ore)
.generationCondition(ItemGenerationCondition.hasOreProperty)
event.create('syenite', 'ore')
.stateSupplier(() => Block.getBlock('tfg:rock/raw_syenite').defaultBlockState())
event.create('mars_stone', 'ore')
.stateSupplier(() => Block.getBlock('tfg:rock/hardened_mars_stone').defaultBlockState())
.baseModelLocation('ad_astra:block/mars_stone')
.unificationEnabled(true)
.materialIconType(GTMaterialIconType.ore)

View file

@ -9,21 +9,7 @@ function registerTFGSpaceBlocks(event) {
event.createCustom(`tfg:lunar_warped_roots`, () => new $SproutsBlock($Properties.copy($Blocks.DEAD_TUBE_CORAL_BLOCK)))
event.createCustom(`tfg:lunar_sprouts`, () => new $SproutsBlock( $Properties.copy($Blocks.DEAD_TUBE_CORAL_BLOCK)))
event.create('tfg:rock/raw_anorthosite')
.stoneSoundType()
.requiresTool(true)
.item(item => {
item.modelJson({ parent: 'ad_astra:item/moon_stone' })
})
.tagBlock('tfc:can_carve')
.tagBoth('forge:stone')
.tagBoth('tfc:rock/raw')
.tagBlock('minecraft:mineable/pickaxe')
.mapColor('terracotta_cyan')
.fullBlock(true)
.opaque(true)
event.create('tfg:rock/hardened_anorthosite')
event.create('tfg:rock/hardened_moon_stone')
.stoneSoundType()
.requiresTool(true)
.item(item => {
@ -37,7 +23,7 @@ function registerTFGSpaceBlocks(event) {
.fullBlock(true)
.opaque(true)
event.create('tfg:rock/raw_basanite')
event.create('tfg:rock/hardened_moon_deepslate')
.stoneSoundType()
.requiresTool(true)
.item(item => {
@ -45,35 +31,25 @@ function registerTFGSpaceBlocks(event) {
})
.tagBlock('tfc:can_carve')
.tagBoth('forge:stone')
.tagBoth('tfc:rock/raw')
.tagBoth('tfc:rock/hardened')
.tagBlock('minecraft:mineable/pickaxe')
.mapColor('terracotta_cyan')
.fullBlock(true)
.opaque(true)
event.create('tfg:loose/anorthosite', 'tfc:loose_rock')
.itemTexture('tfg:item/loose_anorthosite')
.rockTypeModel('igneous_intrusive')
event.create('tfg:loose/moon_stone', 'tfc:loose_rock')
.itemTexture('tfg:item/loose/moon_stone')
.rockTypeModel('igneous_extrusive')
event.create('tfg:loose/moon_deepslate', 'tfc:loose_rock')
.itemTexture('tfg:item/loose/moon_deepslate')
.rockTypeModel('igneous_extrusive')
// #endregion
// #region Mars blocks
event.create('tfg:rock/raw_syenite')
.stoneSoundType()
.requiresTool(true)
.item(item => {
item.modelJson({ parent: 'ad_astra:item/mars_stone' })
})
.tagBlock('tfc:can_carve')
.tagBoth('forge:stone')
.tagBoth('tfc:rock/raw')
.tagBlock('minecraft:mineable/pickaxe')
.mapColor('terracotta_orange')
.fullBlock(true)
.opaque(true)
event.create('tfg:rock/hardened_syenite')
event.create('tfg:rock/hardened_mars_stone')
.stoneSoundType()
.requiresTool(true)
.item(item => {
@ -87,8 +63,8 @@ function registerTFGSpaceBlocks(event) {
.fullBlock(true)
.opaque(true)
event.create('tfg:loose/syenite', 'tfc:loose_rock')
.itemTexture('tfg:item/loose_syenite')
.rockTypeModel('igneous_intrusive')
event.create('tfg:loose/mars_stone', 'tfc:loose_rock')
.itemTexture('tfg:item/loose/mars_stone')
.rockTypeModel('sedimentary')
}

View file

@ -20,14 +20,16 @@ global.AIRCRAFT_UPGRADES = [
]
global.EXTRATERRESTRIAL_RAW_ROCKS = [
'tfg:rock/raw_anorthosite',
'tfg:rock/raw_basanite',
'tfg:rock/raw_syenite'
'ad_astra:moon_stone',
'ad_astra:moon_deepslate',
'ad_astra:mars_stone',
'ad_astra:venus_stone',
'ad_astra:mercury_stone'
]
global.EXTRATERRESTRIAL_HARDENED_ROCKS = [
'tfg:rock/hardened_anorthosite',
'tfg:rock/hardened_syenite'
'tfg:rock/hardened_moon_stone',
'tfg:rock/hardened_mars_stone'
]
global.MOON_BIOMES = [

View file

@ -50,17 +50,17 @@ const registerTFGItems = (event) => {
event.create('tfg:brick/deepslate')
.translationKey('item.tfg.brick.deepslate')
event.create('tfg:brick/anorthosite')
.translationKey('item.tfg.brick.anorthosite')
event.create('tfg:brick/moon_stone')
.translationKey('item.tfg.brick.moon_stone')
event.create('tfg:brick/syenite')
.translationKey('item.tfg.brick.syenite')
event.create('tfg:brick/mars_stone')
.translationKey('item.tfg.brick.mars_stone')
event.create('tfg:dust/anorthosite')
.translationKey('item.tfg.dust.anorthosite')
event.create('tfg:dust/moon_stone')
.translationKey('item.tfg.dust.moon_stone')
event.create('tfg:dust/syenite')
.translationKey('item.tfg.dust.syenite')
event.create('tfg:dust/mars_stone')
.translationKey('item.tfg.dust.mars_stone')
// #endregion
// #region Primitive rubber gloves