prepare for oregen

config/jade/sort-order.json

@@ -1,4 +1,92 @@
 {
+  "minecraft:brewing_stand": null,
+  "minecraft:beehive": null,
+  "minecraft:command_block": null,
+  "minecraft:jukebox": null,
+  "minecraft:lectern": null,
+  "minecraft:redstone": null,
+  "minecraft:furnace": null,
+  "minecraft:chiseled_bookshelf": null,
+  "minecraft:animal_owner": null,
+  "minecraft:potion_effects": null,
+  "minecraft:mob_growth": null,
+  "minecraft:mob_breeding": null,
+  "minecraft:chicken_egg": null,
+  "minecraft:zombie_villager": null,
+  "minecraft:block_states": null,
+  "minecraft:horse_stats": null,
+  "minecraft:item_frame": null,
+  "minecraft:tnt_stability": null,
+  "minecraft:note_block": null,
+  "minecraft:armor_stand": null,
+  "minecraft:painting": null,
+  "minecraft:harvest_tool": null,
+  "minecraft:enchantment_power": null,
+  "minecraft:total_enchantment_power": null,
+  "minecraft:player_head": null,
+  "minecraft:item_ber": null,
+  "minecraft:villager_profession": null,
+  "minecraft:item_tooltip": null,
+  "minecraft:falling_block": null,
+  "minecraft:entity_health": null,
+  "minecraft:entity_armor": null,
+  "minecraft:crop_progress": null,
+  "minecraft:mob_spawner": null,
+  "minecraft:item_display": null,
+  "minecraft:block_display": null,
+  "minecraft:item_storage": null,
+  "minecraft:fluid_storage": null,
+  "minecraft:energy_storage": null,
+  "minecraft:progress": null,
+  "jade:object_name": null,
+  "jade:registry_name": null,
+  "jade:mod_name": null,
+  "jade:distance": null,
+  "jade:block_face": null,
+  "gtceu:electric_container_provider": null,
+  "gtceu:workable_provider": null,
+  "gtceu:controllable_provider": null,
+  "gtceu:recipe_logic_provider": null,
+  "tfc:barrel": null,
+  "tfc:bellows": null,
+  "tfc:sapling": null,
+  "tfc:blast_furnace": null,
+  "tfc:bloomery": null,
+  "tfc:bloom": null,
+  "tfc:charcoal_forge": null,
+  "tfc:composter": null,
+  "tfc:crop": null,
+  "tfc:crucible": null,
+  "tfc:firepit": null,
+  "tfc:fruit_tree_sapling": null,
+  "tfc:hoe_overlay": null,
+  "tfc:lamp": null,
+  "tfc:nest_box": null,
+  "tfc:pit_kiln_internal": null,
+  "tfc:pit_kiln_above": null,
+  "tfc:powder_keg": null,
+  "tfc:torch": null,
+  "tfc:wall_torch": null,
+  "tfc:candle": null,
+  "tfc:candle_cake": null,
+  "tfc:jack_o_lantern": null,
+  "tfc:mud_bricks": null,
+  "tfc:decaying": null,
+  "tfc:loom": null,
+  "tfc:sheet_pile": null,
+  "tfc:ingot_pile": null,
+  "tfc:animal": null,
+  "tfc:horse": null,
+  "tfc:chested_horse": null,
+  "tfc:wild_animal": null,
+  "tfc:frog": null,
+  "tfc:squid": null,
+  "tfc:fish": null,
+  "tfc:predator": null,
+  "tfc:pack_predator": null,
+  "tfc:ocelot": null,
+  "tfc:rabbit": null,
+  "tfc:fishing_hook": null,
   "minecraft:brewing_stand": null,
   "minecraft:beehive": null,
   "minecraft:command_block": null,

config/jei/ingredient-list-mod-sort-order.ini

@@ -0,0 +1,4 @@
+Minecraft
+Create
+GregTech
+TerraFirmaCraft

config/jei/ingredient-list-type-sort-order.ini

@@ -0,0 +1,2 @@
+net.minecraft.world.item.ItemStack
+net.minecraftforge.fluids.FluidStack

config/jei/recipe-category-sort-order.ini

@@ -0,0 +1,115 @@
+minecraft:crafting
+minecraft:anvil
+minecraft:blasting
+minecraft:brewing
+minecraft:campfire
+minecraft:compostable
+minecraft:fuel
+minecraft:furnace
+minecraft:smithing
+minecraft:smoking
+minecraft:stonecutting
+create:automatic_brewing
+create:automatic_packing
+create:automatic_shaped
+create:automatic_shapeless
+create:block_cutting
+create:crushing
+create:deploying
+create:draining
+create:fan_blasting
+create:fan_haunting
+create:fan_smoking
+create:fan_washing
+create:item_application
+create:mechanical_crafting
+create:milling
+create:mixing
+create:mystery_conversion
+create:packing
+create:pressing
+create:sandpaper_polishing
+create:sawing
+create:sequenced_assembly
+create:spout_filling
+create:wood_cutting
+gtceu:alloy_blast_smelter
+gtceu:alloy_smelter
+gtceu:arc_furnace
+gtceu:assembler
+gtceu:assembly_line
+gtceu:autoclave
+gtceu:bender
+gtceu:brewery
+gtceu:canner
+gtceu:centrifuge
+gtceu:chemical_bath
+gtceu:chemical_reactor
+gtceu:circuit_assembler
+gtceu:coke_oven
+gtceu:combustion_generator
+gtceu:compressor
+gtceu:cracker
+gtceu:create_mixer
+gtceu:cutter
+gtceu:distillation_tower
+gtceu:distillery
+gtceu:electric_blast_furnace
+gtceu:electric_furnace
+gtceu:electrolyzer
+gtceu:electromagnetic_separator
+gtceu:extractor
+gtceu:extruder
+gtceu:fermenter
+gtceu:fluid_heater
+gtceu:fluid_solidifier
+gtceu:forge_hammer
+gtceu:forming_press
+gtceu:fusion_reactor
+gtceu:gas_collector
+gtceu:gas_turbine
+gtceu:implosion_compressor
+gtceu:large_boiler
+gtceu:large_chemical_reactor
+gtceu:laser_engraver
+gtceu:lathe
+gtceu:macerator
+gtceu:mixer
+gtceu:multiblock_info
+gtceu:ore_washer
+gtceu:packer
+gtceu:plasma_generator
+gtceu:polarizer
+gtceu:primitive_blast_furnace
+gtceu:pyrolyse_oven
+gtceu:rock_breaker
+gtceu:sifter
+gtceu:steam_boiler
+gtceu:steam_turbine
+gtceu:thermal_centrifuge
+gtceu:vacuum_freezer
+gtceu:wiremill
+jei:information
+tfc:alloying
+tfc:anvil
+tfc:blast_furnace
+tfc:bloomery
+tfc:casting
+tfc:chisel
+tfc:clay_knapping
+tfc:fire_clay_knapping
+tfc:glassworking
+tfc:goat_horn_knapping
+tfc:heating
+tfc:instant_barrel
+tfc:instant_fluid_barrel
+tfc:jam_pot
+tfc:leather_knapping
+tfc:loom
+tfc:quern
+tfc:rock_knapping
+tfc:scraping
+tfc:sealed_barrel
+tfc:simple_pot
+tfc:soup_pot
+tfc:welding

config/oculus.properties

@@ -1,5 +1,5 @@
 #This file stores configuration options for Iris, such as the currently active shaderpack
-#Thu Oct 12 20:59:26 NOVT 2023
+#Sat Oct 14 19:51:02 NOVT 2023
 colorSpace=SRGB
 disableUpdateMessage=false
 enableDebugOptions=false

config/tfc-common.toml

@@ -24,5 +24,5 @@
 	enableNetworkDebugging = false
 	#
 	# If enabled, TFC will validate that certain pieces of reloadable data fit the conditions we expect, for example heating recipes having heatable items. It will error or warn in the log if these conditions are not met.
-	enableDatapackTests = false
+	enableDatapackTests = true
 

config/xaerominimap.txt

@@ -1,5 +1,5 @@
 #CONFIG ONLY OPTIONS
-ignoreUpdate:0
+ignoreUpdate:365
 settingsButton:false
 allowWrongWorldTeleportation:false
 differentiateByServerAddress:true
@@ -115,7 +115,7 @@ infoDisplay:overworld_coords:false:15:-1
 infoDisplay:chunk_coords:false:15:-1
 infoDisplay:angles:false:15:-1
 infoDisplay:dimension:false:15:-1
-infoDisplay:biome:false:15:-1
+infoDisplay:biome:true:15:-1
 infoDisplay:weather:false:15:-1
 infoDisplay:light_level:0:15:-1
 infoDisplay:time:0:15:-1
@@ -124,9 +124,9 @@ infoDisplay:highlights:true:15:-1
 infoDisplay:light_overlay_indicator:true:15:-1
 infoDisplay:manual_cave_mode_indicator:true:15:-1
 infoDisplay:custom_sub_world:true:15:-1
-interface:dummy:0:0:true:false:false:false
+interface:dummy:0:36:true:false:false:false
 interface:dummy:0:10000:true:false:false:false
 interface:dummy:0:0:false:false:true:false
 interface:dummy:0:36:true:false:false:false
-interface:gui.xaero_minimap:0:0:false:false:false:false
+interface:gui.xaero_minimap:117:-33:false:false:true:false
 #WAYPOINTS HAVE BEEN MOVED TO /XaeroWaypoints

config/xaerominimap_entities.json

@@ -10,8 +10,8 @@
   "name": "gui.xaero_entity_category_root",
   "protection": true,
   "settingOverrides": {
-    "displayHeight": 0.0,
     "displayed": true,
+    "displayHeight": 0.0,
     "heightBasedFade": true,
     "renderOrder": 0.0,
     "color": 13.0,
@@ -22,8 +22,8 @@
     "dotSize": 2.0,
     "renderOverMinimapFrame": 1.0,
     "icons": 1.0,
-    "names": 0.0,
     "heightLimit": 20.0,
+    "names": 0.0,
     "iconScale": 1.0
   },
   "subCategories": [

config/xaeroworldmap.txt

@@ -1,4 +1,4 @@
-ignoreUpdate:0
+ignoreUpdate:167
 updateNotification:true
 allowInternetAccess:true
 differentiateByServerAddress:true
@@ -48,6 +48,7 @@ multipleImagesExport:false
 nightExport:false
 highlightsExport:false
 exportScaleDownSquare:20
+mapWritingDistance:-1
 displayClaims:true
 claimsFillOpacity:46
 claimsBorderOpacity:80

kubejs/assets/kubejs/lang/en_us.json

@@ -1,18 +1,18 @@
 {
-    "tagprefix.gabbro": "Gabbro %s Ore",
+    "tagprefix.tfc_gabbro": "Gabbro %s Ore",
-    "tagprefix.shale": "Shale %s Ore",
+    "tagprefix.tfc_shale": "Shale %s Ore",
-    "tagprefix.claystone": "Claystone %s Ore",
+    "tagprefix.tfc_claystone": "Claystone %s Ore",
-    "tagprefix.limestone": "Limestone %s Ore",
+    "tagprefix.tfc_limestone": "Limestone %s Ore",
-    "tagprefix.conglomerate": "Conglomerate %s Ore",
+    "tagprefix.tfc_conglomerate": "Conglomerate %s Ore",
-    "tagprefix.dolomite": "Dolomite %s Ore",
+    "tagprefix.tfc_dolomite": "Dolomite %s Ore",
-    "tagprefix.chert": "Chert %s Ore",
+    "tagprefix.tfc_chert": "Chert %s Ore",
-    "tagprefix.chalk": "Chalk %s Ore",
+    "tagprefix.tfc_chalk": "Chalk %s Ore",
-    "tagprefix.rhyolite": "Rhyolite %s Ore",
+    "tagprefix.tfc_rhyolite": "Rhyolite %s Ore",
-    "tagprefix.dacite": "Dacite %s Ore",
+    "tagprefix.tfc_dacite": "Dacite %s Ore",
-    "tagprefix.quartzite": "Quartzite %s Ore",
+    "tagprefix.tfc_quartzite": "Quartzite %s Ore",
-    "tagprefix.slate": "Slate %s Ore",
+    "tagprefix.tfc_slate": "Slate %s Ore",
-    "tagprefix.phyllite": "Phyllite %s Ore",
+    "tagprefix.tfc_phyllite": "Phyllite %s Ore",
-    "tagprefix.schist": "Schist %s Ore",
+    "tagprefix.tfc_schist": "Schist %s Ore",
-    "tagprefix.gneiss": "Gneiss %s Ore",
+    "tagprefix.tfc_gneiss": "Gneiss %s Ore",
-    "tagprefix.marble": "Marble %s Ore"
+    "tagprefix.tfc_marble": "Marble %s Ore"
 }

kubejs/data/tfc/tags/worldgen/placed_feature/in_biome/veins.json

@@ -1,7 +1,6 @@
 {
     "__comment__": "This file was automatically created by mcresources",
-    "replace": true,
+    "replace": false,
     "values": [
-      "tfc:vein/gravel"
     ]
   }

kubejs/data/tfc/worldgen/configured_feature/vein/example.json

@@ -0,0 +1,150 @@
+{
+  "__comment__": "This file was automatically created by mcresources",
+  "type": "tfc:disc_vein",
+  "config": {
+    "rarity": 14,
+    "min_y": {
+      "absolute": 40
+    },
+    "max_y": {
+      "absolute": 60
+    },
+    "size": 8,
+    "density": 0.2,
+    "blocks": [
+      {
+        "replace": [
+          "tfc:rock/raw/shale"
+        ],
+        "with": [
+          {
+            "block": "gtceu:tfc_shale_amethyst_ore"
+          }
+        ]
+      },
+      {
+        "replace": [
+          "tfc:rock/raw/claystone"
+        ],
+        "with": [
+          {
+            "block": "gtceu:tfc_claystone_amethyst_ore"
+          }
+        ]
+      },
+      {
+        "replace": [
+          "tfc:rock/raw/limestone"
+        ],
+        "with": [
+          {
+            "block": "gtceu:tfc_limestone_amethyst_ore"
+          }
+        ]
+      },
+      {
+        "replace": [
+          "tfc:rock/raw/conglomerate"
+        ],
+        "with": [
+          {
+            "block": "gtceu:tfc_conglomerate_amethyst_ore"
+          }
+        ]
+      },
+      {
+        "replace": [
+          "tfc:rock/raw/dolomite"
+        ],
+        "with": [
+          {
+            "block": "gtceu:tfc_dolomite_amethyst_ore"
+          }
+        ]
+      },
+      {
+        "replace": [
+          "tfc:rock/raw/chert"
+        ],
+        "with": [
+          {
+            "block": "gtceu:tfc_chert_amethyst_ore"
+          }
+        ]
+      },
+      {
+        "replace": [
+          "tfc:rock/raw/chalk"
+        ],
+        "with": [
+          {
+            "block": "gtceu:tfc_chalk_amethyst_ore"
+          }
+        ]
+      },
+      {
+        "replace": [
+          "tfc:rock/raw/quartzite"
+        ],
+        "with": [
+          {
+            "block": "gtceu:tfc_quartzite_amethyst_ore"
+          }
+        ]
+      },
+      {
+        "replace": [
+          "tfc:rock/raw/slate"
+        ],
+        "with": [
+          {
+            "block": "gtceu:tfc_slate_amethyst_ore"
+          }
+        ]
+      },
+      {
+        "replace": [
+          "tfc:rock/raw/phyllite"
+        ],
+        "with": [
+          {
+            "block": "gtceu:tfc_phyllite_amethyst_ore"
+          }
+        ]
+      },
+      {
+        "replace": [
+          "tfc:rock/raw/schist"
+        ],
+        "with": [
+          {
+            "block": "gtceu:tfc_schist_amethyst_ore"
+          }
+        ]
+      },
+      {
+        "replace": [
+          "tfc:rock/raw/gneiss"
+        ],
+        "with": [
+          {
+            "block": "gtceu:tfc_gneiss_amethyst_ore"
+          }
+        ]
+      },
+      {
+        "replace": [
+          "tfc:rock/raw/marble"
+        ],
+        "with": [
+          {
+            "block": "gtceu:tfc_marble_amethyst_ore"
+          }
+        ]
+      }
+    ],
+    "random_name": "amethyst",
+    "biomes": "#tfc:is_river",
+    "height": 4
+  }
+}

kubejs/server_scripts/block_tags.js

@@ -1,9 +0,0 @@
-// priority: 999
-
-// Комментарий
-ServerEvents.tags('block', event => {
-    global.AllStoneTypeNames.forEach(stoneTypeName => {
-        event.add('minecraft:stone_ore_replaceables', 'tfc:rock/raw/' + stoneTypeName)
-    });
-})
-

kubejs/server_scripts/example.js

@@ -0,0 +1,3 @@
+// priority: 0
+
+// script..

kubejs/startup_scripts/gregtech/stonetypes.js

@@ -1,38 +1,14 @@
 // priority: 0
 
-const MapColor = Java.loadClass('net.minecraft.world.level.material.MapColor')
-const ChemicalHelper = Java.loadClass("com.gregtechceu.gtceu.api.data.chemical.ChemicalHelper")
-
 // Replace + Remove Stonetypes
 GTCEuStartupEvents.registry('gtceu:tag_prefix', event => {
-    // Ожидаем нормальной фичи для удаления стоунтайпов
+    global.allTFCStoneTypeNames.forEach(stoneTypeName => {
-    // TagPrefix.ORES.remove(TagPrefix.ore)
+        event.create("tfc_" + stoneTypeName, 'ore')
-    // TagPrefix.ORES.remove(TagPrefix.oreTuff)
-    // TagPrefix.ORES.remove(TagPrefix.oreDeepslate)
-    // TagPrefix.ORES.remove(TagPrefix.oreSand)
-    // TagPrefix.ORES.remove(TagPrefix.oreRedSand)
-    // TagPrefix.ORES.remove(TagPrefix.oreGravel)
-    // TagPrefix.ORES.remove(TagPrefix.oreNetherrack)
-    // TagPrefix.ORES.remove(TagPrefix.oreEndstone)
-
-    global.StoneTypeNamesWithoutGTDups.forEach(stoneTypeName => {
-        event.create(stoneTypeName, 'ore')
             .stateSupplier(() => Block.getBlock('tfc:rock/raw/' + stoneTypeName).defaultBlockState())
             .sound(SoundType.STONE)
             .unificationEnabled(true)
             .materialIconType(GTMaterialIconType.ore)
             .generationCondition(ItemGenerationCondition.hasOreProperty)
     });
-
-    TagPrefix.ORES.put(TagPrefix.oreGranite, new TagPrefix.OreType(() => Block.getBlock('tfc:rock/raw/granite').defaultBlockState(), false, false, MapColor.STONE, SoundType.STONE))
-    ChemicalHelper.ORES_INVERSE.put(() => Block.getBlock('tfc:rock/raw/granite').defaultBlockState(), TagPrefix.oreGranite)
-
-    TagPrefix.ORES.put(TagPrefix.oreDiorite, new TagPrefix.OreType(() => Block.getBlock('tfc:rock/raw/diorite').defaultBlockState(), false, false, MapColor.STONE, SoundType.STONE))
-    ChemicalHelper.ORES_INVERSE.put(() => Block.getBlock('tfc:rock/raw/diorite').defaultBlockState(), TagPrefix.oreDiorite)
-
-    TagPrefix.ORES.put(TagPrefix.oreBasalt, new TagPrefix.OreType(() => Block.getBlock('tfc:rock/raw/basalt').defaultBlockState(), false, false, MapColor.STONE, SoundType.STONE))
-    ChemicalHelper.ORES_INVERSE.put(() => Block.getBlock('tfc:rock/raw/basalt').defaultBlockState(), TagPrefix.oreBasalt)
-
-    TagPrefix.ORES.put(TagPrefix.oreAndesite, new TagPrefix.OreType(() => Block.getBlock('tfc:rock/raw/andesite').defaultBlockState(), false, false, MapColor.STONE, SoundType.STONE))
-    ChemicalHelper.ORES_INVERSE.put(() => Block.getBlock('tfc:rock/raw/andesite').defaultBlockState(), TagPrefix.oreAndesite)
 })
+

kubejs/startup_scripts/tfc/constants.js

@@ -1,6 +1,6 @@
 // priority: 1000
 
-global.AllStoneTypeNames = [
+global.allTFCStoneTypeNames = [
     'gabbro', 
     'shale', 
     'claystone', 
@@ -23,7 +23,7 @@ global.AllStoneTypeNames = [
     'granite'
 ];
 
-global.StoneTypeNamesWithoutGTDups = [
+global.allTFCStoneTypeNamesWithoutDups = [
     'gabbro', 
     'shale', 
     'claystone', 
@@ -42,7 +42,7 @@ global.StoneTypeNamesWithoutGTDups = [
     'marble'
 ];
 
-global.StoneTypeNamesOfGTDups = [
+global.allTFCStoneTypeNamesOnlyDups = [
     'basalt',
     'diorite',
     'andesite',