fixed a crash when tping to the moon lol

kubejs/assets/ad_astra/lang/en_us.json

@@ -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"

kubejs/assets/gtceu/lang/en_us.json

@@ -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",

kubejs/assets/tfc/lang/en_us.json

@@ -2608,53 +2608,5 @@
   "tfc.jei.raw_hide_knapping": "Raw Hide Knapping",
   "metal.tfg.redstone": "Redstone",
   "metal.tfg.red_alloy": "Red Alloy",
-	"metal.tfg.tin_alloy": "Tin Alloy",
+  "metal.tfg.tin_alloy": "Tin Alloy"
-	"trim_material.tfc.almandine_tfc": "Almandine",
-	"trim_material.tfc.andradite_tfc": "Andradite",
-	"trim_material.tfc.blue_topaz_tfc": "Blue Topaz",
-	"trim_material.tfc.cinnabar_tfc": "Cinnabar",
-	"trim_material.tfc.coal_tfc": "Coal",
-	"trim_material.tfc.diamond_tfc": "Diamond",
-	"trim_material.tfc.emerald_tfc": "Emerald",
-	"trim_material.tfc.green_sapphire_tfc": "Green Sapphire",
-	"trim_material.tfc.grossular_tfc": "Grossular",
-	"trim_material.tfc.rutile_tfc": "Rutile",
-	"trim_material.tfc.lazurite_tfc": "Lazurite",
-	"trim_material.tfc.pyrope_tfc": "Pyrope",
-	"trim_material.tfc.rock_salt_tfc": "Rock Salt",
-	"trim_material.tfc.ruby_tfc": "Ruby",
-	"trim_material.tfc.salt_tfc": "salt",
-	"trim_material.tfc.sapphire_tfc": "Sapphire",
-	"trim_material.tfc.sodalite_tfc": "Sodalite",
-	"trim_material.tfc.coke_tfc": "Coke",
-	"trim_material.tfc.spessartine_tfc": "Spessartine",
-	"trim_material.tfc.topaz_tfc": "Topaz",
-	"trim_material.tfc.uvarovite_tfc": "Uvarovite",
-	"trim_material.tfc.nether_quartz_tfc": "Nether Quartz",
-	"trim_material.tfc.certus_quartz_tfc": "Certus Quartz",
-	"trim_material.tfc.quartzite_tfc": "Quartzite",
-	"trim_material.tfc.realgar_tfc": "Realgar",
-	"trim_material.tfc.malachite_tfc": "Malachite",
-	"trim_material.tfc.glass_tfc": "Glass",
-	"trim_material.tfc.olivine_tfc": "Olivine",
-	"trim_material.tfc.opal_tfc": "Opal",
-	"trim_material.tfc.amethyst_tfc": "Amethyst",
-	"trim_material.tfc.lapis_tfc": "Lapis",
-	"trim_material.tfc.apatite_tfc": "Apatite",
-	"trim_material.tfc.red_garnet_tfc": "Red Garnet",
-	"trim_material.tfc.yellow_garnet_tfc": "Yellow Garnet",
-	"trim_material.tfc.monazite_tfc": "Monazite",
-	"trim_material.tfc.rose_quartz_tfc": "Rose Quartz",
-	"trim_material.tfc.fluix_tfc": "Fluix",
-	"trim_material.tfc.silver_tfc": "Silver",
-	"trim_material.tfc.sterling_silver_tfc": "Sterling Silver",
-	"trim_material.tfc.gold_tfc": "Gold",
-	"trim_material.tfc.rose_gold_tfc": "Rose Gold",
-	"trim_material.tfc.nickel_tfc": "Nickel",
-	"trim_material.tfc.platinum_tfc": "Platinum",
-	"trim_material.tfc.titanium_tfc": "Titanium",
-	"trim_material.tfc.bismuth_tfc": "Bismuth",
-	"trim_material.tfc.neutronium_tfc": "Neutronium",
-	"trim_material.tfc.pyrite_tfc": "Pyrite",
-	"trim_material.tfc.redx_tfc": "RedX"
 }

kubejs/assets/tfg/lang/en_us.json

@@ -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",

kubejs/data/tfg/loot_tables/chests/moonbase.json

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

kubejs/data/tfg/worldgen/biome/moon/lunar_basalt_maria.json

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

kubejs/data/tfg/worldgen/biome/moon/lunar_diorite_delta.json

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

kubejs/data/tfg/worldgen/biome/moon/lunar_gabbro_uplift.json

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

kubejs/data/tfg/worldgen/biome/moon/lunar_plains.json

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

kubejs/data/tfg/worldgen/configured_feature/moon/blob/cut_deepslate.json

@@ -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"
-        }
-      }
-    ]
-  }
-}

kubejs/data/tfg/worldgen/configured_feature/moon/blob/cut_diorite.json

@@ -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"
-        }
-      }
-    ]
-  }
-}

kubejs/data/tfg/worldgen/configured_feature/moon/surface/loose_anorthosite_rocks.json

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

kubejs/data/tfg/worldgen/configured_feature/moon/surface/moon_rock_pile.json

@@ -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"
 					}
 				}
 			]

kubejs/data/tfg/worldgen/noise_settings/mars_noise.json

@@ -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": {

kubejs/data/tfg/worldgen/noise_settings/moon_noise.json

@@ -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"
 								}
 							}
 						},

kubejs/data/tfg/worldgen/placed_feature/moon/blob/cut_deepslate.json

@@ -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
-        }
-      }
-    }
-  ]
-}

kubejs/data/tfg/worldgen/placed_feature/moon/blob/cut_diorite.json

@@ -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
-        }
-      }
-    }
-  ]
-}

kubejs/server_scripts/ad_astra/tags.js

@@ -68,9 +68,9 @@ const registerAdAstraBlockTags = (event) => {
 	})
 
 	// Moon
-	event.add('minecraft:rabbits_spawnable_on', 'tfg:raw_anorthosite')
+	event.add('minecraft:rabbits_spawnable_on', 'tfg:rock/raw_anorthosite')
-	event.add('minecraft:rabbits_spawnable_on', 'tfg:hardened_anorthosite')
+	event.add('minecraft:rabbits_spawnable_on', 'tfg:rock/hardened_anorthosite')
-	event.add('minecraft:rabbits_spawnable_on', 'tfg:raw_basanite')
+	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:rock/raw_basanite')
-	event.add('ad_astra:moon_stone_replaceables', 'tfg:raw_anorthosite')
+	event.add('ad_astra:moon_stone_replaceables', 'tfg:rock/raw_anorthosite')
-	event.add('ad_astra:moon_stone_replaceables', 'tfg:hardened_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')

kubejs/server_scripts/tfg/recipes.collapse.js

@@ -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:rock/raw_anorthosite')
-	event.recipes.tfc.collapse('ad_astra:moon_cobblestone', 'tfg:hardened_anorthosite')
+	event.recipes.tfc.collapse('ad_astra:moon_cobblestone', 'tfg:rock/hardened_anorthosite')
-	event.recipes.tfc.collapse('tfg:raw_basanite', 'tfg:raw_basanite')
+	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:rock/raw_syenite')
-	event.recipes.tfc.collapse('ad_astra:mars_cobblestone', 'tfg:hardened_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')

kubejs/server_scripts/tfg/recipes.rocks.js

@@ -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:rock/raw_anorthosite', hammered: 'ad_astra:moon_cobblestone' },
-		{ raw: 'tfg:hardened_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')
+	event.recipes.gtceu.rock_breaker('tfg:anorthosite')
-		.notConsumable('tfg:raw_anorthosite')
+		.notConsumable('tfg:rock/raw_anorthosite')
-		.itemOutputs('tfg:raw_anorthosite')
+		.itemOutputs('tfg:rock/raw_anorthosite')
 		.duration(16)
 		.EUt(7)
 		.dimension('ad_astra:moon')
 
-	event.recipes.gtceu.rock_breaker('tfg:raw_basanite')
+	event.recipes.gtceu.rock_breaker('tfg:basanite')
-		.notConsumable('tfg:raw_basanite')
+		.notConsumable('tfg:rock/raw_basanite')
-		.itemOutputs('tfg: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
 }

kubejs/startup_scripts/tfc/tag_prefixes.js

@@ -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)

kubejs/startup_scripts/tfg/constants.js

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

kubejs/startup_scripts/tfg/items.js

@@ -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')