Merge remote-tracking branch 'origin/main' into server

README.md

@@ -33,4 +33,6 @@ Y dejar la carpeta con el achivo asi:
 
 Tras eso, ejecutar el .bat en la carpeta de minecraft para instalar/actualizar los mods. Si salta algo de seguridad, darle a mas informacion y ejecutar igualmente.
 
-Si el servidor da un error de que no se tienen los mismos mods, solo habria que hacer doble click y abrir el archivo updateMods.bat, eso los actualizara automaticamente.
+Si el servidor da un error de que no se tienen los mismos mods, solo habria que hacer doble click y abrir el archivo updateMods.bat, eso los actualizara automaticamente.
+
+## NOTA: NO ACTUALIZAR LOS MODS NUNCA DESDE MODRINTH

kubejs/server_scripts/my_create_recipes.js

@@ -3,8 +3,18 @@ ServerEvents.recipes(event => {
   // =========================
   // REMOVE OLD RECIPES
   // =========================
-  event.remove({ id: 'jei:/create/crushing/tuff' });
-  event.remove({ id: 'jei:/create/crushing/tuff_recycling' });
+  event.remove({ id: 'create:crushing/tuff' });
+  event.remove({ id: 'create:crushing/tuff_recycling' });
+  event.remove({ id: 'create:milling/dripstone_block' });
+  event.remove({ id: 'create:crushing/crimsite' });
+  event.remove({ id: 'create:crushing/crimsite_recycling' });
+  event.remove({ id: 'create:crushing/veridium' });
+  event.remove({ id: 'create:crushing/veridium_recycling' });
+  event.remove({ id: 'create:crushing/asurine' });
+  event.remove({ id: 'create:crushing/asurine_recycling' });
+  event.remove({ id: 'create:crushing/ochrum' });
+  event.remove({ id: 'create:crushing/ochrum_recycling' });
+
 
   // =========================
   // COMPACTING
@@ -35,7 +45,7 @@ ServerEvents.recipes(event => {
   event.recipes.create.crushing([
     Item.of('minecraft:clay_ball').withChance(0.4),
     Item.of('3x create:copper_nugget').withChance(0.2)
-  ], 'minecraft:pointed_dripstone');
+  ], 'minecraft:dripstone_block');
 
   event.recipes.create.crushing([
     Item.of('3x create:zinc_nugget').withChance(0.2)
@@ -47,7 +57,8 @@ ServerEvents.recipes(event => {
   // Gravel + Nether Wart (Heated) -> Netherrack
   event.recipes.create.mixing('minecraft:netherrack', [
     'minecraft:gravel',
-    'minecraft:nether_wart'
+    'minecraft:nether_wart',
+    Fluid.of('minecraft:lava', 250)
   ]).heated();
 
   // Quartz + Blue Dye -> Lapis Lazuli
@@ -59,25 +70,29 @@ ServerEvents.recipes(event => {
   // NEW: Crimsite + Blackstone (Heated) -> 2x Crimsite
   event.recipes.create.mixing('2x create:crimsite', [
     'create:crimsite',
-    'minecraft:blackstone'
+    'minecraft:blackstone',
+    Fluid.of('minecraft:lava', 250)
   ]).heated();
 
   // NEW: Asurine + Basalt (Heated) -> 2x Asurine
   event.recipes.create.mixing('2x create:asurine', [
     'create:asurine',
-    'minecraft:basalt'
+    'minecraft:basalt',
+    Fluid.of('minecraft:lava', 250)
   ]).heated();
 
   // NEW: Ochrum + Sandstone (Heated) -> 2x Ochrum
   event.recipes.create.mixing('2x create:ochrum', [
     'create:ochrum',
-    'minecraft:sandstone'
+    'minecraft:sandstone',
+    Fluid.of('minecraft:lava', 250)
   ]).heated();
 
   // NEW: Veridium + Mossy Cobblestone -> 2x Veridium
   event.recipes.create.mixing('2x create:veridium', [
     'create:veridium',
-    'minecraft:mossy_cobblestone'
+    'minecraft:mossy_cobblestone',
+    Fluid.of('minecraft:lava', 250)
   ]);
 
   // =========================
@@ -93,4 +108,24 @@ ServerEvents.recipes(event => {
     Item.of('minecraft:moss_block').withChance(0.2)
   ], '#minecraft:logs');
 
+
+  // Fixing limestone
+  // Remove Garnished limestone milling
+  event.remove({ id: 'garnished:milling/crushed_salt' })
+
+  // Remove Aquatic Ambitions limestone milling
+  event.remove({ id: 'create_aquatic_ambitions:milling/limestone' })
+
+  event.recipes.create.milling([
+    Item.of('garnished:crushed_salt'),
+
+    Item.of('create_aquatic_ambitions:calcium_rich_powder'),
+    Item.of('create_aquatic_ambitions:calcium_rich_powder').withChance(0.5),
+
+    Item.of('create_aquatic_ambitions:suspicious_rock').withChance(0.05)
+  ], 'create:limestone')
+
+  // Remove salt from limestone crushing
+  event.remove({id: 'garnished:crushing/crushed_salt'})
+
 });

updateMods.sh

@@ -0,0 +1,28 @@
+#!/bin/bash
+
+cd "$(dirname "$0")" || exit 1
+echo "Iniciando"
+# Check if git is installed
+if ! command -v git >/dev/null 2>&1; then
+    echo "Git no está instalado"
+    echo "Instálalo desde https://git-scm.com/downloads"
+    exit 1
+fi
+
+# If not already a git repo, initialize and fetch
+if [ ! -d ".git" ]; then
+    echo "Git no esta inicializado"
+    git init
+    git remote add origin https://git.sfkao.net/SFKao/All-Of-Create.git
+    git fetch
+    git checkout -t origin/main -f
+fi
+echo "Bajando..."
+# Fetch and pull updates
+if ! git fetch --progress || ! git pull --rebase --autostash --progress; then
+    echo "Han habido errores actualizando, contactar con SFKao"
+    exit 1
+fi
+
+# Equivalent to pause (wait for user input before closing)
+read -rp "Presiona Enter para salir..."