illuc/neuralgia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed a crash when tping to the moon lol

Browse source
This commit is contained in:
Pyritie 2025-04-30 00:29:53 +01:00
parent c74339adb7
commit 187e5a2f5f
23 changed files with 2666 additions and 2797 deletions
Download patch file Download diff file Expand all files Collapse all files

4
kubejs/assets/ad_astra/lang/en_us.json
View file

@ -18,10 +18,6 @@
"block.ad_astra.polished_moon_stone": "Polished Anorthosite",
"block.ad_astra.polished_moon_stone_slab": "Polished Anorthosite Slab",
"block.ad_astra.polished_moon_stone_stairs": "Polished Anorthosite Stairs",
"material.ad_astra.desh": "Desh",
"material.ad_astra.ostrum": "Ostrum",
"material.ad_astra.calorite": "Calorite",
"material.ad_astra.etrium": "Etrium",
"tagprefix.anorthosite": "Anorthosite %s Ore",
"tagprefix.basanite": "Basanite %s Ore",
"tagprefix.syenite": "Syenite %s Ore"

8
kubejs/assets/gtceu/lang/en_us.json
View file

@ -54,6 +54,14 @@
"item.gtceu.ice_bucket": "Ice Water Bucket",
"material.gtceu.ice": "Ice Water",
"material.gtceu.cooperite": "Cooperite",
"material.gtceu.fayalite": "Fayalite",
"material.gtceu.diopside": "Diopside",
"material.gtceu.enstatite": "Enstatite",
"material.gtceu.armalcolite": "Armalcolite",
"material.gtceu.desh": "Desh",
"material.gtceu.ostrum": "Ostrum",
"material.gtceu.calorite": "Calorite",
"material.gtceu.etrium": "Etrium",
"metaitem.dust.tooltip.purify": "Drop in Water to get Clean Dust",
"metaitem.crushed.tooltip.purify": "Drop in Water to get Purified Ore",
"item.gtceu.tool.behavior.silk_ice": "Silk Harvests Packed Ice",

5268
kubejs/assets/tfc/lang/en_us.json
View file

File diff suppressed because it is too large Load diff

4
kubejs/assets/tfg/lang/en_us.json
View file

@ -238,10 +238,6 @@
"material.tfg.schist": "Schist",
"material.tfg.gneiss": "Gneiss",
"material.tfg.chalk": "Chalk",
"material.tfg.fayalite": "Fayalite",
"material.tfg.diopside": "Diopside",
"material.tfg.enstatite": "Enstatite",
"material.tfg.armalcolite": "Armalcolite",
"material.gtceu.thermochemically_treated_hardwood": "Thermochemically Treated Hardwood",
"material.gtceu.hardwood": "Hardwood",
"tfg.disabled_portal": "Portal magic seems to be blocked by an unknown force, try reaching another dimension by going down or up",

2
kubejs/data/tfg/loot_tables/chests/moonbase.json
View file

@ -33,7 +33,7 @@
},
{
"type": "minecraft:item",
"name": "gtceu:aluminium_plate",
"name": "vintageimprovements:aluminium_sheet",
"weight": 50,
"functions": [
{

3
kubejs/data/tfg/worldgen/biome/moon/lunar_basalt_maria.json
View file

@ -24,8 +24,7 @@
[],
[
"tfg:moon/blob/asurine",
"tfg:moon/blob/smooth_basalt",
"tfg:moon/blob/cut_deepslate"
"tfg:moon/blob/smooth_basalt"
],
[
"tfg:moon/surface/basalt_delta",

4
kubejs/data/tfg/worldgen/biome/moon/lunar_diorite_delta.json
View file

@ -23,9 +23,7 @@
[],
[],
[
"tfg:moon/blob/asurine",
"tfg:moon/blob/cut_diorite",
"tfg:moon/blob/cut_deepslate"
"tfg:moon/blob/asurine"
],
[
"tfc:vein/gabbro_dike",

3
kubejs/data/tfg/worldgen/biome/moon/lunar_gabbro_uplift.json
View file

@ -23,8 +23,7 @@
[],
[],
[
"tfg:moon/blob/asurine",
"tfg:moon/blob/cut_deepslate"
"tfg:moon/blob/asurine"
],
[
"tfc:vein/diorite_dike",

3
kubejs/data/tfg/worldgen/biome/moon/lunar_plains.json
View file

@ -23,8 +23,7 @@
[],
[],
[
"tfg:moon/blob/asurine",
"tfg:moon/blob/cut_deepslate"
"tfg:moon/blob/asurine"
],
[
"tfc:vein/gabbro_dike",

18
kubejs/data/tfg/worldgen/configured_feature/moon/blob/cut_deepslate.json
View file

@ -1,18 +0,0 @@
{
"type": "minecraft:ore",
"config": {
"discard_chance_on_air_exposure": 0.0,
"size": 40,
"targets": [
{
"state": {
"Name": "create:cut_deepslate"
},
"target": {
"predicate_type": "minecraft:block_match",
"block": "tfg:raw_basanite"
}
}
]
}
}

18
kubejs/data/tfg/worldgen/configured_feature/moon/blob/cut_diorite.json
View file

@ -1,18 +0,0 @@
{
"type": "minecraft:ore",
"config": {
"discard_chance_on_air_exposure": 0.0,
"size": 40,
"targets": [
{
"state": {
"Name": "create:cut_diorite"
},
"target": {
"predicate_type": "minecraft:block_match",
"block": "tfc:rock/raw/diorite"
}
}
]
}
}

2
kubejs/data/tfg/worldgen/configured_feature/moon/surface/loose_anorthosite_rocks.json
View file

@ -14,7 +14,7 @@
"source": {
"type": "minecraft:simple_state_provider",
"state": {
"Name": "tfg:loose_anorthosite"
"Name": "tfg:loose/anorthosite"
}
}
}

4
kubejs/data/tfg/worldgen/configured_feature/moon/surface/moon_rock_pile.json
View file

@ -25,13 +25,13 @@
{
"weight": 20,
"data": {
"Name": "tfg:raw_basanite"
"Name": "tfg:rock/raw_basanite"
}
},
{
"weight": 20,
"data": {
"Name": "tfg:raw_anorthosite"
"Name": "tfg:rock/raw_anorthosite"
}
}
]

6
kubejs/data/tfg/worldgen/noise_settings/mars_noise.json
View file

@ -5,7 +5,7 @@
"ore_veins_enabled": false,
"legacy_random_source": false,
"default_block": {
"Name": "tfg:raw_syenite"
"Name": "tfg:rock/raw_syenite"
},
"default_fluid": {
"Name": "minecraft:air"
@ -311,7 +311,7 @@
"then_run": {
"type": "minecraft:block",
"result_state": {
"Name": "tfg:hardened_syenite"
"Name": "tfg:rock/hardened_syenite"
}
}
},
@ -569,7 +569,7 @@
"if_true": {
"type": "minecraft:biome",
"biome_is": [
"tfg:lunar_diorite_delta"
"tfg:moon/lunar_diorite_delta"
]
},
"then_run": {

6
kubejs/data/tfg/worldgen/noise_settings/moon_noise.json
View file

@ -5,7 +5,7 @@
"ore_veins_enabled": false,
"legacy_random_source": false,
"default_block": {
"Name": "tfg:raw_anorthosite"
"Name": "tfg:rock/raw_anorthosite"
},
"default_fluid": {
"Name": "minecraft:air"
@ -250,7 +250,7 @@
"then_run": {
"type": "minecraft:block",
"result_state": {
"Name": "tfg:raw_basanite",
"Name": "tfg:rock/raw_basanite",
"Properties": {
"axis": "y"
}
@ -280,7 +280,7 @@
"then_run": {
"type": "minecraft:block",
"result_state": {
"Name": "tfg:hardened_anorthosite"
"Name": "tfg:rock/hardened_anorthosite"
}
}
},

24
kubejs/data/tfg/worldgen/placed_feature/moon/blob/cut_deepslate.json
View file

@ -1,24 +0,0 @@
{
"feature": "tfg:moon/blob/cut_deepslate",
"placement": [
{
"type": "minecraft:count",
"count": 8
},
{
"type": "minecraft:in_square"
},
{
"type": "minecraft:height_range",
"height": {
"type": "minecraft:trapezoid",
"max_inclusive": {
"absolute": 8
},
"min_inclusive": {
"absolute": -64
}
}
}
]
}

24
kubejs/data/tfg/worldgen/placed_feature/moon/blob/cut_diorite.json
View file

@ -1,24 +0,0 @@
{
"feature": "tfg:moon/blob/cut_diorite",
"placement": [
{
"type": "minecraft:count",
"count": 8
},
{
"type": "minecraft:in_square"
},
{
"type": "minecraft:height_range",
"height": {
"type": "minecraft:trapezoid",
"max_inclusive": {
"absolute": 210
},
"min_inclusive": {
"absolute": 8
}
}
}
]
}

12
kubejs/server_scripts/ad_astra/tags.js
View file

@ -68,9 +68,9 @@ const registerAdAstraBlockTags = (event) => {
})
// Moon
event.add('minecraft:rabbits_spawnable_on', 'tfg:raw_anorthosite')
event.add('minecraft:rabbits_spawnable_on', 'tfg:hardened_anorthosite')
event.add('minecraft:rabbits_spawnable_on', 'tfg:raw_basanite')
event.add('minecraft:rabbits_spawnable_on', 'tfg:rock/raw_anorthosite')
event.add('minecraft:rabbits_spawnable_on', 'tfg:rock/hardened_anorthosite')
event.add('minecraft:rabbits_spawnable_on', 'tfg:rock/raw_basanite')
event.add('minecraft:rabbits_spawnable_on', 'ad_astra:moon_sand')
event.add('minecraft:rabbits_spawnable_on', 'tfc:sand/black')
event.add('minecraft:rabbits_spawnable_on', 'tfc:sand/white')
@ -81,9 +81,9 @@ const registerAdAstraBlockTags = (event) => {
event.add('minecraft:rabbits_spawnable_on', 'tfc:rock/gravel/gabbro')
event.add('minecraft:rabbits_spawnable_on', 'tfc:rock/gravel/basalt')
event.add('ad_astra:moon_stone_replaceables', 'tfg:raw_basanite')
event.add('ad_astra:moon_stone_replaceables', 'tfg:raw_anorthosite')
event.add('ad_astra:moon_stone_replaceables', 'tfg:hardened_anorthosite')
event.add('ad_astra:moon_stone_replaceables', 'tfg:rock/raw_basanite')
event.add('ad_astra:moon_stone_replaceables', 'tfg:rock/raw_anorthosite')
event.add('ad_astra:moon_stone_replaceables', 'tfg:rock/hardened_anorthosite')
event.add('ad_astra:moon_stone_replaceables', 'tfc:rock/raw/basalt')
event.add('ad_astra:moon_stone_replaceables', 'tfc:rock/hardened/basalt')
event.add('ad_astra:moon_stone_replaceables', 'tfc:rock/raw/gabbro')

10
kubejs/server_scripts/tfg/recipes.collapse.js
View file

@ -20,15 +20,15 @@ function registerTFGCollapseRecipes(event) {
// #endregion Nether
// #region Space
event.recipes.tfc.collapse('ad_astra:moon_cobblestone', 'tfg:raw_anorthosite')
event.recipes.tfc.collapse('ad_astra:moon_cobblestone', 'tfg:hardened_anorthosite')
event.recipes.tfc.collapse('tfg:raw_basanite', 'tfg:raw_basanite')
event.recipes.tfc.collapse('ad_astra:moon_cobblestone', 'tfg:rock/raw_anorthosite')
event.recipes.tfc.collapse('ad_astra:moon_cobblestone', 'tfg:rock/hardened_anorthosite')
event.recipes.tfc.collapse('tfg:raw_basanite', 'tfg:rock/raw_basanite')
event.recipes.tfc.landslide('ad_astra:moon_cobblestone', 'ad_astra:moon_cobblestone')
event.recipes.tfc.landslide('ad_astra:moon_sand', 'ad_astra:moon_sand')
event.recipes.tfc.collapse('ad_astra:mars_cobblestone', 'tfg:raw_syenite')
event.recipes.tfc.collapse('ad_astra:mars_cobblestone', 'tfg:hardened_syenite')
event.recipes.tfc.collapse('ad_astra:mars_cobblestone', 'tfg:rock/raw_syenite')
event.recipes.tfc.collapse('ad_astra:mars_cobblestone', 'tfg:rock/hardened_syenite')
event.recipes.tfc.landslide('ad_astra:mars_cobblestone', 'ad_astra:mars_cobblestone')
event.recipes.tfc.landslide('ad_astra:mars_sand', 'ad_astra:mars_sand')

22
kubejs/server_scripts/tfg/recipes.rocks.js
View file

@ -114,8 +114,8 @@ function registerTFGRockRecipes(event) {
{ raw: 'minecraft:blackstone', hammered: 'tfc:sand/black' },
{ raw: 'beneath:crackrack', hammered: 'tfc:sand/pink' },
{ raw: 'minecraft:dripstone_block', hammered: 'tfc:sand/brown' },
{ raw: 'tfg:raw_anorthosite', hammered: 'ad_astra:moon_cobblestone' },
{ raw: 'tfg:hardened_anorthosite', hammered: 'ad_astra:moon_cobblestone' },
{ raw: 'tfg:rock/raw_anorthosite', hammered: 'ad_astra:moon_cobblestone' },
{ raw: 'tfg:rock/hardened_anorthosite', hammered: 'ad_astra:moon_cobblestone' },
{ raw: 'ad_astra:moon_cobblestone', hammered: 'tfc:sand/white' }
]
@ -262,20 +262,26 @@ function registerTFGRockRecipes(event) {
.EUt(7)
})
event.recipes.gtceu.rock_breaker('tfg:raw_anorthosite')
.notConsumable('tfg:raw_anorthosite')
.itemOutputs('tfg:raw_anorthosite')
event.recipes.gtceu.rock_breaker('tfg:anorthosite')
.notConsumable('tfg:rock/raw_anorthosite')
.itemOutputs('tfg:rock/raw_anorthosite')
.duration(16)
.EUt(7)
.dimension('ad_astra:moon')
event.recipes.gtceu.rock_breaker('tfg:raw_basanite')
.notConsumable('tfg:raw_basanite')
.itemOutputs('tfg:raw_basanite')
event.recipes.gtceu.rock_breaker('tfg:basanite')
.notConsumable('tfg:rock/raw_basanite')
.itemOutputs('tfg:rock/raw_basanite')
.duration(16)
.EUt(7)
.dimension('ad_astra:moon')
event.recipes.gtceu.rock_breaker('tfg:syenite')
.notConsumable('tfg:rock/raw_syenite')
.itemOutputs('tfg:rock/raw_syenite')
.duration(16)
.EUt(7)
.dimension('ad_astra:mars')
// #endregion
}

6
kubejs/startup_scripts/tfc/tag_prefixes.js
View file

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

10
kubejs/startup_scripts/tfg/constants.js
View file

@ -20,14 +20,14 @@ global.AIRCRAFT_UPGRADES = [
]
global.EXTRATERRESTRIAL_RAW_ROCKS = [
'tfg:raw_anorthosite',
'tfg:raw_basanite',
'tfg:raw_syenite'
'tfg:rock/raw_anorthosite',
'tfg:rock/raw_basanite',
'tfg:rock/raw_syenite'
]
global.EXTRATERRESTRIAL_HARDENED_ROCKS = [
'tfg:hardened_anorthosite',
'tfg:hardened_syenite'
'tfg:rock/hardened_anorthosite',
'tfg:rock/hardened_syenite'
]
global.MOON_BIOMES = [

2
kubejs/startup_scripts/tfg/items.js
View file

@ -56,7 +56,7 @@ const registerTFGItems = (event) => {
event.create('tfg:brick/syenite')
.translationKey('item.tfg.brick.syenite')
event.create('tfg:dust/anorthosite_dust')
event.create('tfg:dust/anorthosite')
.translationKey('item.tfg.dust.anorthosite')
event.create('tfg:dust/syenite')