Всякие фиксы всяких всячин

config/additionalplacements-common-1.toml.bak

@@ -0,0 +1,41 @@
+
+#Common settings
+[common]
+	#Automatically generate vertical slabs
+	automatic_slabs = true
+	#Automatically generate vertical stairs
+	automatic_stairs = true
+	#Automatically generate wall and ceiling carpets
+	automatic_carpets = true
+	#Automatically generate wall and ceiling pressure plates
+	automatic_pressure_plates = true
+	#Automatically generate wall and ceiling weighted pressure plates
+	automatic_weighted_pressure_plates = true
+	#Disable automatic vertical slab placement. Use if a mod E.G. DoubleSlabs is conflicting.
+	disable_slab_placement = false
+	#Disable automatic vertical stair placement. Use if a mod is conflicting.
+	disable_stair_placement = false
+	#Disable automatic wall and ceiling carpet placement. Use if a mod is conflicting.
+	disable_carpet_placement = false
+	#Disable automatic wall and ceiling pressure plate placement. Use if a mod is conflicting.
+	disable_pressure_plate_placement = false
+	#Disable automatic wall and ceiling weighted pressure plate placement. Use if a mod is conflicting.
+	disable_weighted_pressure_plate_placement = false
+	#Show tooltip when a block has additional placements
+	tooltip = true
+	#Check for and notify of mismatching tags. Only works when the same option in the server/world config is true.
+	check_tags = true
+	#Automatically rebuild and reload the generated tags datapack when a tagging mismatch is detected. Only works when the same option in the server/world config is true.
+	auto_rebuild_tags = true
+	#Log missing or additional tags on generated blocks.
+	log_tag_mismatch = false
+	#The thread priority of the mismatched tag checker. 1 is lowest, 10 is highest, 5 is normal.
+	#Range: 1 ~ 10
+	checker_priority = 1
+	#Blacklist for blocks to not have generated placement variants
+	blacklist = []
+	#Blacklist for mods to not have generated placement variants
+	mod_blacklist = []
+	#Whitelist for blocks from blacklisted mods to still have generated placement variants
+	mod_block_whitelist = []
+

config/gcyr.yaml

@@ -55,6 +55,6 @@ rocket:
 
   # How much fuel is required to travel to a planet anywhere?
   # note: this is platform-specific.
-  # Default: 8 buckets.
+  # Default: 48 buckets.
   anywhereFuelAmount: 48000
 

config/jade/sort-order.json

@@ -158,10 +158,6 @@
   "create:exact_block": null,
   "create:filter": null,
   "create:goggles": 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,
@@ -211,6 +207,10 @@
   "tfc:ocelot": null,
   "tfc:rabbit": null,
   "tfc:fishing_hook": null,
+  "gtceu:electric_container_provider": null,
+  "gtceu:workable_provider": null,
+  "gtceu:controllable_provider": null,
+  "gtceu:recipe_logic_provider": null,
   "minecraft:brewing_stand": null,
   "minecraft:beehive": null,
   "minecraft:command_block": null,

config/voicechat/voicechat-client.properties

@@ -27,7 +27,7 @@ microphone=
 # Empty for default device
 speaker=
 # If the microphone is muted (only when using voice activation)
-muted=false
+muted=true
 # If the voice chat is disabled (sound and microphone off)
 disabled=false
 # If the voice chat icons should be hidden

kubejs/server_scripts/create/recipes.js

@@ -20,7 +20,6 @@ const registerCreateRecipes = (event) => {
         { id: 'create:crafting/kinetics/weighted_ejector' },
         { id: 'create:crafting/kinetics/smart_chute' },
         { id: 'create:crafting/kinetics/speedometerfrom_conversion' },
-        { id: 'create:crafting/kinetics/speedometer' },
         { id: 'create:crafting/kinetics/stressometerfrom_conversion' },
         { id: 'create:crafting/kinetics/mechanical_pump' },
         { id: 'create:crafting/kinetics/smart_fluid_pipe' },
@@ -40,7 +39,6 @@ const registerCreateRecipes = (event) => {
         { id: 'create:crafting/kinetics/white_sailfrom_conversion' },
         { id: 'create:crafting/kinetics/sequenced_gearshift' },
         { id: 'create:crafting/kinetics/rotation_speed_controller' },
-        { id: 'create:crafting/kinetics/track_station' },
         { id: 'create:crafting/kinetics/track_signal' },
         { id: 'create:crafting/kinetics/track_observer' },
         { id: 'create:crafting/kinetics/controls' },
@@ -95,6 +93,18 @@ const registerCreateRecipes = (event) => {
         { id: 'create:milling/bone' },
     ], mod: 'create' })
 
+    // Train Station
+    event.shapeless('2x create:track_station', [
+        'create:railway_casing',
+        'firmaciv:firmaciv_compass'
+    ]).id('create:crafting/kinetics/track_station')
+
+    // Speedometer
+    event.shapeless('create:speedometer', [
+        'create:andesite_casing',
+        'firmaciv:firmaciv_compass'
+    ]).id('create:crafting/kinetics/speedometer')
+
     // Пушка для постройки схематик
     event.shaped('create:schematicannon', [
         ' A ',

kubejs/server_scripts/firmaciv/recipes.js

@@ -8,4 +8,12 @@ const registerFirmaCivRecipes = (event) => {
     event.recipes.tfc.heating('firmaciv:oarlock', 1535)
         .resultFluid(Fluid.of('gtceu:iron', 288))
         .id(`firmaciv:heating/oarlock`)
+
+    // Compass
+    event.recipes.gtceu.canner('tfg:firmaciv/compass')             
+        .itemInputs('minecraft:redstone', '#forge:plates/wrought_iron')
+        .circuit(1)
+        .itemOutputs('firmaciv:firmaciv_compass')
+        .duration(100)
+        .EUt(4)
 }

kubejs/server_scripts/gregtech/recipes.js

@@ -554,6 +554,7 @@ const registerGTCEURecipes = (event) => {
     event.remove({ id: 'gtceu:arc_furnace/arc_anvil' })
     event.remove({ id: 'gtceu:arc_furnace/arc_furnace_minecart' })
     event.remove({ id: 'gtceu:arc_furnace/arc_bucket' })
+    event.remove({ id: 'gtceu:arc_furnace/arc_compass' })
     
     //#endregion
 
@@ -577,6 +578,7 @@ const registerGTCEURecipes = (event) => {
     event.remove({ id: 'gtceu:macerator/macerate_anvil' })
     event.remove({ id: 'gtceu:macerator/macerate_furnace_minecart' })
     event.remove({ id: 'gtceu:macerator/macerate_bucket' })
+    event.remove({ id: 'gtceu:macerator/macerate_compass' })
 
     //#endregion
 

kubejs/server_scripts/minecraft/recipes.js

@@ -1456,6 +1456,13 @@ const registerMinecraftRecipes = (event) => {
 
     //#endregion
 
+    //#region Выход: Компасс
+
+    event.remove({ id: 'tfc:crafting/vanilla/compass' })
+    event.remove({ id: 'gtceu:assembler/compass' })
+
+    //#endregion
+
     //#region Выход: Незеритовый слиток
 
     event.remove({ id: 'minecraft:netherite_ingot_from_netherite_block' })
@@ -1683,6 +1690,16 @@ const registerMinecraftRecipes = (event) => {
 
     //#endregion
 
+    //#region Выход: Пустая карта
+
+    event.recipes.gtceu.assembler('map')             
+        .itemInputs('8x minecraft:paper', 'firmaciv:firmaciv_compass')
+        .itemOutputs('minecraft:map')
+        .duration(100)
+        .EUt(4)
+
+    //#endregion
+
     //#region Выход: Жаренный картофель
 
     event.remove({ id: 'minecraft:baked_potato' })
@@ -2615,7 +2632,7 @@ const registerMinecraftRecipes = (event) => {
     //event.smelting('tfc:metal/ingot/gold', 'minecraft:raw_gold')
     //    .id('minecraft:copper_ingot_from_smelting_raw_gold')
 
-    event.remove({ id: 'minecraft:gold_ingot_from_smelting_raw_gold' })
+    // event.remove({ id: 'minecraft:gold_ingot_from_smelting_raw_gold' })
     event.remove({ id: 'minecraft:gold_ingot_from_blasting_raw_gold' })
 
     event.remove({ id: 'minecraft:raw_gold_block' })

kubejs/startup_scripts/minecraft/constants.js

@@ -709,6 +709,10 @@ global.MINECRAFT_DISABLED_ITEMS = [
     'minecraft:large_amethyst_bud', 
     'minecraft:amethyst_cluster',
     'minecraft:rabbit_hide',
+    'minecraft:raw_iron_block', 
+    'minecraft:raw_gold_block', 
+    'minecraft:raw_copper_block',
+    'minecraft:compass',
     '/spawn_egg/'
 ];