diff --git a/PALAMOD_CDC.md b/PALAMOD_CDC.md index 347172c..2490749 100644 --- a/PALAMOD_CDC.md +++ b/PALAMOD_CDC.md @@ -587,6 +587,10 @@ avant M4 (TODO:crafts-machines). pas d'XP au toucher de soie (wiki) ; hammerArea confirme sans XP (destroyBlock direct). TODO:crusher-xp CLOS. VERIFIE : build SUCCESSFUL, boot Done, 0 erreur, 19 cles config. UNVERIFIED en jeu. +- M-candy LIVRE 2026-10-19 ~03:45 : 7 bonbons (textures legacy 32x32) + effet clic droit : + vert = +50 000 XP fermier, rainbow = +50 000 aux 4 metiers (wiki VERIFIE). Autres couleurs + = mapping non publie (TODO:mapping-bonbons, sans effet). VERIFIE : build SUCCESSFUL, boot + Done, 0 erreur, lang 228 cles. UNVERIFIED en jeu. - Client/mod : boucle visuelle OPERATIONNELLE 2026-10-19 (Xvfb :99 + runClient SDL x11 + captures Java Robot + pilotage xdotool + vision_analyze) : menu, Select World, monde New World (creatif, cheats), /give, pose de bloc, inventaire, F3+T. Screens : scratch vis*.png. diff --git a/mods/pala/src/main/java/fr/surviepote/pala/PalaItems.java b/mods/pala/src/main/java/fr/surviepote/pala/PalaItems.java index d3087ec..ba7574c 100644 --- a/mods/pala/src/main/java/fr/surviepote/pala/PalaItems.java +++ b/mods/pala/src/main/java/fr/surviepote/pala/PalaItems.java @@ -59,6 +59,16 @@ public final class PalaItems { public static final Item TITANE_STICK = register("titane_stick", id -> new Item(new Item.Properties().setId(id))); public static final Item TRIXIUM_GEM = register("trixium_gem", id -> new Item(new Item.Properties().setId(id))); public static final Item XP_BERRIES = register("xp_berries", id -> new Item(new Item.Properties().setId(id))); + // M-candy (wiki metiers, VERIFIE partiel) : bonbons 50 000 XP. Vert = fermier et + // rainbow = tous (pages Evolution) ; autres couleurs = mapping non publie (items seuls, + // TODO:mapping-bonbons) ; candy/job_candy = nature inconnue (items seuls). + public static final Item CANDY = register("candy", id -> new Item(new Item.Properties().setId(id))); + public static final Item CANDY_BLUE = register("candy_blue", id -> new Item(new Item.Properties().setId(id))); + public static final Item CANDY_GREEN = register("candy_green", id -> new Item(new Item.Properties().setId(id))); + public static final Item CANDY_PINK = register("candy_pink", id -> new Item(new Item.Properties().setId(id))); + public static final Item CANDY_YELLOW = register("candy_yellow", id -> new Item(new Item.Properties().setId(id))); + public static final Item CANDY_RAINBOW = register("candy_rainbow", id -> new Item(new Item.Properties().setId(id))); + public static final Item JOB_CANDY = register("job_candy", id -> new Item(new Item.Properties().setId(id))); // M-grinder-1 (wiki grinder) : patterns + socket + orbe. Textures d'origine legacy // (textures/, jamais cablees). Les crafts complets + GUI arrivent en M-grinder-2. public static final Item SOCKET_PATTERN = register("socket_pattern", id -> new Item(new Item.Properties().setId(id))); diff --git a/mods/pala/src/main/java/fr/surviepote/pala/PalaTabs.java b/mods/pala/src/main/java/fr/surviepote/pala/PalaTabs.java index d25f36c..beb972b 100644 --- a/mods/pala/src/main/java/fr/surviepote/pala/PalaTabs.java +++ b/mods/pala/src/main/java/fr/surviepote/pala/PalaTabs.java @@ -67,6 +67,13 @@ public final class PalaTabs { output.accept(PalaItems.TITANE_STICK); output.accept(PalaItems.TRIXIUM_GEM); output.accept(PalaItems.XP_BERRIES); + output.accept(PalaItems.CANDY); + output.accept(PalaItems.CANDY_BLUE); + output.accept(PalaItems.CANDY_GREEN); + output.accept(PalaItems.CANDY_PINK); + output.accept(PalaItems.CANDY_YELLOW); + output.accept(PalaItems.CANDY_RAINBOW); + output.accept(PalaItems.JOB_CANDY); output.accept(PalaItems.SOCKET_PATTERN); output.accept(PalaItems.HAMMER_PATTERN); output.accept(PalaItems.BROADSWORD_PATTERN); diff --git a/mods/pala/src/main/java/fr/surviepote/pala/events/PalaItemUseEvents.java b/mods/pala/src/main/java/fr/surviepote/pala/events/PalaItemUseEvents.java index ffc7e29..56263ed 100644 --- a/mods/pala/src/main/java/fr/surviepote/pala/events/PalaItemUseEvents.java +++ b/mods/pala/src/main/java/fr/surviepote/pala/events/PalaItemUseEvents.java @@ -118,6 +118,20 @@ public final class PalaItemUseEvents { stack.shrink(1); return InteractionResult.PASS; } + // M-candy (wiki metiers) : bonbon vert = +50 000 XP fermier, rainbow = +50 000 aux + // 4 metiers. Autres couleurs : mapping non publie (TODO:mapping-bonbons, sans effet). + if (item == PalaItems.CANDY_GREEN) { + fr.surviepote.pala.core.PalaJobs.addXp(sp, "fermier", 50000.0); + stack.shrink(1); + return InteractionResult.PASS; + } + if (item == PalaItems.CANDY_RAINBOW) { + for (String job : fr.surviepote.pala.core.PalaJobs.JOBS) { + fr.surviepote.pala.core.PalaJobs.addXp(sp, job, 50000.0); + } + stack.shrink(1); + return InteractionResult.PASS; + } if (item == PalaItems.HANG_GLIDER) { effect(sp, MobEffects.LEVITATION, 5, -4); effect(sp, MobEffects.RESISTANCE, 1, 5); diff --git a/mods/pala/src/main/resources/assets/pala/items/candy.json b/mods/pala/src/main/resources/assets/pala/items/candy.json new file mode 100644 index 0000000..c3e7060 --- /dev/null +++ b/mods/pala/src/main/resources/assets/pala/items/candy.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "pala:item/candy" + } +} diff --git a/mods/pala/src/main/resources/assets/pala/items/candy_blue.json b/mods/pala/src/main/resources/assets/pala/items/candy_blue.json new file mode 100644 index 0000000..c04f09e --- /dev/null +++ b/mods/pala/src/main/resources/assets/pala/items/candy_blue.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "pala:item/candy_blue" + } +} diff --git a/mods/pala/src/main/resources/assets/pala/items/candy_green.json b/mods/pala/src/main/resources/assets/pala/items/candy_green.json new file mode 100644 index 0000000..debef8d --- /dev/null +++ b/mods/pala/src/main/resources/assets/pala/items/candy_green.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "pala:item/candy_green" + } +} diff --git a/mods/pala/src/main/resources/assets/pala/items/candy_pink.json b/mods/pala/src/main/resources/assets/pala/items/candy_pink.json new file mode 100644 index 0000000..573c126 --- /dev/null +++ b/mods/pala/src/main/resources/assets/pala/items/candy_pink.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "pala:item/candy_pink" + } +} diff --git a/mods/pala/src/main/resources/assets/pala/items/candy_rainbow.json b/mods/pala/src/main/resources/assets/pala/items/candy_rainbow.json new file mode 100644 index 0000000..fc0f825 --- /dev/null +++ b/mods/pala/src/main/resources/assets/pala/items/candy_rainbow.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "pala:item/candy_rainbow" + } +} diff --git a/mods/pala/src/main/resources/assets/pala/items/candy_yellow.json b/mods/pala/src/main/resources/assets/pala/items/candy_yellow.json new file mode 100644 index 0000000..61b1bc7 --- /dev/null +++ b/mods/pala/src/main/resources/assets/pala/items/candy_yellow.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "pala:item/candy_yellow" + } +} diff --git a/mods/pala/src/main/resources/assets/pala/items/job_candy.json b/mods/pala/src/main/resources/assets/pala/items/job_candy.json new file mode 100644 index 0000000..716f911 --- /dev/null +++ b/mods/pala/src/main/resources/assets/pala/items/job_candy.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "pala:item/job_candy" + } +} diff --git a/mods/pala/src/main/resources/assets/pala/lang/en_us.json b/mods/pala/src/main/resources/assets/pala/lang/en_us.json index df7758b..cc9f323 100644 --- a/mods/pala/src/main/resources/assets/pala/lang/en_us.json +++ b/mods/pala/src/main/resources/assets/pala/lang/en_us.json @@ -219,5 +219,12 @@ "item.pala.socket": "Socket", "item.pala.orb_knockback": "Knockback Orb", "item.pala.broadsword": "Broadsword", - "item.pala.fastsword": "Fastsword" + "item.pala.fastsword": "Fastsword", + "item.pala.candy": "Candy", + "item.pala.candy_blue": "Blue Candy", + "item.pala.candy_green": "Green Candy", + "item.pala.candy_pink": "Pink Candy", + "item.pala.candy_yellow": "Yellow Candy", + "item.pala.candy_rainbow": "Rainbow Candy", + "item.pala.job_candy": "Job Candy" } diff --git a/mods/pala/src/main/resources/assets/pala/models/item/candy.json b/mods/pala/src/main/resources/assets/pala/models/item/candy.json new file mode 100644 index 0000000..e029a07 --- /dev/null +++ b/mods/pala/src/main/resources/assets/pala/models/item/candy.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "pala:item/candy" + } +} diff --git a/mods/pala/src/main/resources/assets/pala/models/item/candy_blue.json b/mods/pala/src/main/resources/assets/pala/models/item/candy_blue.json new file mode 100644 index 0000000..0595806 --- /dev/null +++ b/mods/pala/src/main/resources/assets/pala/models/item/candy_blue.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "pala:item/candy_blue" + } +} diff --git a/mods/pala/src/main/resources/assets/pala/models/item/candy_green.json b/mods/pala/src/main/resources/assets/pala/models/item/candy_green.json new file mode 100644 index 0000000..b1b4765 --- /dev/null +++ b/mods/pala/src/main/resources/assets/pala/models/item/candy_green.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "pala:item/candy_green" + } +} diff --git a/mods/pala/src/main/resources/assets/pala/models/item/candy_pink.json b/mods/pala/src/main/resources/assets/pala/models/item/candy_pink.json new file mode 100644 index 0000000..594785e --- /dev/null +++ b/mods/pala/src/main/resources/assets/pala/models/item/candy_pink.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "pala:item/candy_pink" + } +} diff --git a/mods/pala/src/main/resources/assets/pala/models/item/candy_rainbow.json b/mods/pala/src/main/resources/assets/pala/models/item/candy_rainbow.json new file mode 100644 index 0000000..1ab1816 --- /dev/null +++ b/mods/pala/src/main/resources/assets/pala/models/item/candy_rainbow.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "pala:item/candy_rainbow" + } +} diff --git a/mods/pala/src/main/resources/assets/pala/models/item/candy_yellow.json b/mods/pala/src/main/resources/assets/pala/models/item/candy_yellow.json new file mode 100644 index 0000000..afe34e8 --- /dev/null +++ b/mods/pala/src/main/resources/assets/pala/models/item/candy_yellow.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "pala:item/candy_yellow" + } +} diff --git a/mods/pala/src/main/resources/assets/pala/models/item/job_candy.json b/mods/pala/src/main/resources/assets/pala/models/item/job_candy.json new file mode 100644 index 0000000..32222c8 --- /dev/null +++ b/mods/pala/src/main/resources/assets/pala/models/item/job_candy.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "pala:item/job_candy" + } +} diff --git a/mods/pala/src/main/resources/assets/pala/textures/item/candy.png b/mods/pala/src/main/resources/assets/pala/textures/item/candy.png new file mode 100644 index 0000000..016635f Binary files /dev/null and b/mods/pala/src/main/resources/assets/pala/textures/item/candy.png differ diff --git a/mods/pala/src/main/resources/assets/pala/textures/item/candy_blue.png b/mods/pala/src/main/resources/assets/pala/textures/item/candy_blue.png new file mode 100644 index 0000000..651d6ae Binary files /dev/null and b/mods/pala/src/main/resources/assets/pala/textures/item/candy_blue.png differ diff --git a/mods/pala/src/main/resources/assets/pala/textures/item/candy_green.png b/mods/pala/src/main/resources/assets/pala/textures/item/candy_green.png new file mode 100644 index 0000000..fc5add1 Binary files /dev/null and b/mods/pala/src/main/resources/assets/pala/textures/item/candy_green.png differ diff --git a/mods/pala/src/main/resources/assets/pala/textures/item/candy_pink.png b/mods/pala/src/main/resources/assets/pala/textures/item/candy_pink.png new file mode 100644 index 0000000..70cd6a8 Binary files /dev/null and b/mods/pala/src/main/resources/assets/pala/textures/item/candy_pink.png differ diff --git a/mods/pala/src/main/resources/assets/pala/textures/item/candy_rainbow.png b/mods/pala/src/main/resources/assets/pala/textures/item/candy_rainbow.png new file mode 100644 index 0000000..47de617 Binary files /dev/null and b/mods/pala/src/main/resources/assets/pala/textures/item/candy_rainbow.png differ diff --git a/mods/pala/src/main/resources/assets/pala/textures/item/candy_yellow.png b/mods/pala/src/main/resources/assets/pala/textures/item/candy_yellow.png new file mode 100644 index 0000000..6b9fc97 Binary files /dev/null and b/mods/pala/src/main/resources/assets/pala/textures/item/candy_yellow.png differ diff --git a/mods/pala/src/main/resources/assets/pala/textures/item/job_candy.png b/mods/pala/src/main/resources/assets/pala/textures/item/job_candy.png new file mode 100644 index 0000000..c4142b0 Binary files /dev/null and b/mods/pala/src/main/resources/assets/pala/textures/item/job_candy.png differ diff --git a/server/mods/pala-0.2.1.jar b/server/mods/pala-0.2.1.jar index 8b35909..5ee96e0 100644 Binary files a/server/mods/pala-0.2.1.jar and b/server/mods/pala-0.2.1.jar differ