diff --git a/PALAMOD_CDC.md b/PALAMOD_CDC.md index 40218aa..d93fe90 100644 --- a/PALAMOD_CDC.md +++ b/PALAMOD_CDC.md @@ -563,6 +563,12 @@ avant M4 (TODO:crafts-machines). SUCCESS sinon la GUI ne s'ouvre pas — lecon). Tetes + modifieurs : M-grinder-4 (pas de textures legacy pour les tetes). VERIFIE : build SUCCESSFUL, boot Done, 0 erreur. UNVERIFIED en jeu (GUI + fuel). +- M-grinder-4 LIVRE 2026-10-19 ~03:30 : page grinder relue en live (18 875 car., images des + crafts non OCRisables fiablement) : fix jauge 1 lingot = +1 (wiki "jusqu'a 100 lingots") + + 3 recettes patterns shapeless (socket 4p+4t, hammer marteau+4p+4t, lingot 4p+5t ; positions + UNVERIFIED -> shapeless). ECART : patterns broadsword/fastsword non craftables (outils + titane inexistants), patterns pioche/hache/pelle/epee/bloc sans textures legacy. Tetes + + modifieurs + recyclage armure : M-grinder-5. VERIFIE : build SUCCESSFUL, boot Done, 0 erreur. - M-mixin LIVRE 2026-10-19 ~03:25 : pipeline mixin sans loom (pala.mixins.json + entree fabric.mod.json, pas de refmap : noms Mojang non obfusques) + 2 mixins : craft (pain 1 XP niv.1+, tarte citrouille 4 XP niv.11+, via ResultSlot.checkTakeAchievements) et cuisson diff --git a/mods/pala/src/main/java/fr/surviepote/pala/machine/PalaGrinderBlockEntity.java b/mods/pala/src/main/java/fr/surviepote/pala/machine/PalaGrinderBlockEntity.java index ecaf190..0cc7a27 100644 --- a/mods/pala/src/main/java/fr/surviepote/pala/machine/PalaGrinderBlockEntity.java +++ b/mods/pala/src/main/java/fr/surviepote/pala/machine/PalaGrinderBlockEntity.java @@ -20,12 +20,13 @@ import fr.surviepote.pala.PalaItems; // M-grinder-3 (wiki grinder §3) : block entity du coeur. GUI = menu vanilla Dispenser // (9 slots, utilises : 0 socket, 1 pattern, 2 combustible, 3 sortie ; 4-8 reserves pour // l'assemblage tete+stick en M-grinder-4). -// Jauge 0-100 alimentee en lingots paladium (1 lingot = +10, UNVERIFIED : wiki dit "6 -// paladium minimum pour une tete" sans echelle de jauge). Tetes + modifieurs en -// M-grinder-4 (pas de textures legacy pour les tetes : aucun placeholder cree). +// Jauge 0-100 alimentee en lingots paladium (wiki : "jusqu'a 100 lingots" => 1 lingot +// = +1 ; corrige depuis +10 en M-grinder-4). Pieces d'armure recyclees en M-grinder-5 +// (rendement selon usure). Tetes + modifieurs en M-grinder-5 (pas de textures legacy +// pour les tetes : aucun placeholder cree). public class PalaGrinderBlockEntity extends BlockEntity implements MenuProvider { - private static final int FUEL_PER_INGOT = 10; + private static final int FUEL_PER_INGOT = 1; private static final int FUEL_COOLDOWN_TICKS = 20; private final SimpleContainer inventory = new SimpleContainer(9); diff --git a/mods/pala/src/main/resources/data/pala/recipe/hammerpatternrecipe.json b/mods/pala/src/main/resources/data/pala/recipe/hammerpatternrecipe.json new file mode 100644 index 0000000..6824938 --- /dev/null +++ b/mods/pala/src/main/resources/data/pala/recipe/hammerpatternrecipe.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + "pala:titane_hammer", + "pala:paladium_ingot", + "pala:paladium_ingot", + "pala:paladium_ingot", + "pala:paladium_ingot", + "pala:titane_ingot", + "pala:titane_ingot", + "pala:titane_ingot", + "pala:titane_ingot" + ], + "result": { + "id": "pala:hammer_pattern", + "count": 1 + } +} diff --git a/mods/pala/src/main/resources/data/pala/recipe/ingotpatternrecipe.json b/mods/pala/src/main/resources/data/pala/recipe/ingotpatternrecipe.json new file mode 100644 index 0000000..d4dabf4 --- /dev/null +++ b/mods/pala/src/main/resources/data/pala/recipe/ingotpatternrecipe.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + "pala:paladium_ingot", + "pala:paladium_ingot", + "pala:paladium_ingot", + "pala:paladium_ingot", + "pala:titane_ingot", + "pala:titane_ingot", + "pala:titane_ingot", + "pala:titane_ingot", + "pala:titane_ingot" + ], + "result": { + "id": "pala:ingot_pattern", + "count": 1 + } +} diff --git a/mods/pala/src/main/resources/data/pala/recipe/socketpatternrecipe.json b/mods/pala/src/main/resources/data/pala/recipe/socketpatternrecipe.json new file mode 100644 index 0000000..4b57868 --- /dev/null +++ b/mods/pala/src/main/resources/data/pala/recipe/socketpatternrecipe.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + "pala:paladium_ingot", + "pala:paladium_ingot", + "pala:paladium_ingot", + "pala:paladium_ingot", + "pala:titane_ingot", + "pala:titane_ingot", + "pala:titane_ingot", + "pala:titane_ingot" + ], + "result": { + "id": "pala:socket_pattern", + "count": 1 + } +} diff --git a/server/mods/pala-0.2.1.jar b/server/mods/pala-0.2.1.jar index 971a994..2dcc74b 100644 Binary files a/server/mods/pala-0.2.1.jar and b/server/mods/pala-0.2.1.jar differ