diff --git a/PALAMOD_CDC.md b/PALAMOD_CDC.md index 55ca6a0..f0c7c62 100644 --- a/PALAMOD_CDC.md +++ b/PALAMOD_CDC.md @@ -750,6 +750,13 @@ avant M4 (TODO:crafts-machines). par defaut manquantes au chargement + resave (panda/goat VERIFIES en pala.json). Lecon : killer l'ancien serveur AVANT de booter (session.lock orphelin), rm lock si tue -9. VERIFIE : build SUCCESSFUL, boot Done, 0 erreur. UNVERIFIED en jeu. +- M-hunter-4 LIVRE 2026-10-19 ~08:15 : knocker 4 degats EXACTS (attribut +3 mainhand + ADD_VALUE via DataComponents.ATTRIBUTE_MODIFIERS, core.component ; Item simple = + non enchantable wiki OK) + canne peche paladium (FishingRodItem dura 384 ECART + vitesse non quantifiee, craft shapeless connu, textures cast/uncast, overrides). + Lecon : shapeless 26.3 = ingredients STRINGS (objets {item} rejetes "List too + short", crash datapacks). VERIFIE : build SUCCESSFUL, boot Done, 0 erreur. + UNVERIFIED en jeu (degats, peche, visuel cast). - M-palaforge LIVRE 2026-10-19 ~03:55 : bloc + BE partagee (3e mode) + gate mineur 14 + table fonte wiki §3.2 (31 items, ratio floor usure) + fuels bois (+buche/planches/baton, lave exclue : seau non rendu) + craft (1 findium + 4 furnaces + 4 briques, positions 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 2760e06..8446970 100644 --- a/mods/pala/src/main/java/fr/surviepote/pala/PalaItems.java +++ b/mods/pala/src/main/java/fr/surviepote/pala/PalaItems.java @@ -137,7 +137,22 @@ public final class PalaItems { // M-hunter-2 (wiki niv.9) : infernal knocker — tenu en main, coups sur wither = // knockback amplifie (sans degats propres, ECART chiffres). Sans craft/durabilite // (wiki muet, ECART). - public static final Item INFERNAL_KNOCKER = register("infernal_knocker", id -> new Item(new Item.Properties().setId(id).stacksTo(1))); + // M-hunter-4 (wiki niv.9 VERIFIE : 4 degats + knockback, non enchantable) : Item + // simple (sans composant enchantable -> non enchantable) + attribut +3 degats + // mainhand (1 base + 3 = 4 EXACT) ; le push x3 wither reste dans PalaJobEvents. + // M-hunter-4 (wiki niv.4 VERIFIE : craft 2 sticks pala + 1 lingot pala + 2 ficelles, + // "peche plus vite" NON QUANTIFIE -> ECART : durabilite 384 (6x vanilla, valeur + // gameplay), sans bonus invente ; gate craft chasseur 4 non applicable (pas de + // gates craft). Textures legacy cast/uncast. + public static final Item PALADIUM_FISHING_ROD = register("paladium_fishing_rod", id -> new net.minecraft.world.item.FishingRodItem(new Item.Properties().setId(id).stacksTo(1).durability(384))); + public static final Item INFERNAL_KNOCKER = register("infernal_knocker", id -> new Item(new Item.Properties().setId(id).stacksTo(1).component(DataComponents.ATTRIBUTE_MODIFIERS, + net.minecraft.world.item.component.ItemAttributeModifiers.builder().add( + net.minecraft.world.entity.ai.attributes.Attributes.ATTACK_DAMAGE, + new net.minecraft.world.entity.ai.attributes.AttributeModifier( + net.minecraft.resources.Identifier.fromNamespaceAndPath("pala", "infernal_knocker"), + 3.0, + net.minecraft.world.entity.ai.attributes.AttributeModifier.Operation.ADD_VALUE), + net.minecraft.world.entity.EquipmentSlotGroup.MAINHAND).build()))); // M-spawner-1 (wiki pillage ID 4795) : chercheur de spawners — scan 9 chunks, // message presence + coords du plus proche, gate chasseur 10. Durabilite 140 // minutes wiki => 140 usages (1/scan, ECART). Sans craft (image non OCR, ECART). 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 96513df..0d2ab6e 100644 --- a/mods/pala/src/main/java/fr/surviepote/pala/PalaTabs.java +++ b/mods/pala/src/main/java/fr/surviepote/pala/PalaTabs.java @@ -83,6 +83,7 @@ public final class PalaTabs { output.accept(PalaItems.MAGMA_AMULET); output.accept(PalaItems.CAVE_HAMMER); output.accept(PalaItems.INFERNAL_KNOCKER); + output.accept(PalaItems.PALADIUM_FISHING_ROD); output.accept(PalaItems.SPAWNER_FINDER); output.accept(PalaItems.DYNAMITE); output.accept(PalaItems.NINJA_DYNAMITE); diff --git a/mods/pala/src/main/java/fr/surviepote/pala/events/PalaJobEvents.java b/mods/pala/src/main/java/fr/surviepote/pala/events/PalaJobEvents.java index 952d3a7..dd5967d 100644 --- a/mods/pala/src/main/java/fr/surviepote/pala/events/PalaJobEvents.java +++ b/mods/pala/src/main/java/fr/surviepote/pala/events/PalaJobEvents.java @@ -92,8 +92,8 @@ public final class PalaJobEvents { if (killer instanceof ServerPlayer attacker) { xpStealer(attacker, entity); } - // M-hunter-2 (wiki niv.9) : infernal knocker — knockback amplifie sur wither - // quand tenu en main (x3 direction du coup, sans degats propres). + // M-hunter-2/4 (wiki niv.9) : infernal knocker — knockback amplifie sur wither + // quand tenu en main (x3 direction du coup ; 4 degats via attribut M-hunter-4). if (killer instanceof ServerPlayer knocker && knocker.getMainHandItem().is(fr.surviepote.pala.PalaItems.INFERNAL_KNOCKER) && entity.getType() == net.minecraft.world.entity.EntityTypes.WITHER) { diff --git a/mods/pala/src/main/resources/assets/pala/items/paladium_fishing_rod.json b/mods/pala/src/main/resources/assets/pala/items/paladium_fishing_rod.json new file mode 100644 index 0000000..814f6ca --- /dev/null +++ b/mods/pala/src/main/resources/assets/pala/items/paladium_fishing_rod.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "pala:item/paladium_fishing_rod" + } +} 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 9f9fdb6..42430c7 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 @@ -9,6 +9,7 @@ "item.pala.big_dynamite": "Big Dynamite", "item.pala.spawner_finder": "Chercheur de spawners", "item.pala.infernal_knocker": "Infernal Knocker", + "item.pala.paladium_fishing_rod": "Paladium Fishing Rod", "item.pala.cave_hammer": "Marteau des cavernes", "item.pala.magma_amulet": "Amulette de feu", "enchantment.pala.experience_bottler": "Experience Bottler", diff --git a/mods/pala/src/main/resources/assets/pala/models/item/paladium_fishing_rod.json b/mods/pala/src/main/resources/assets/pala/models/item/paladium_fishing_rod.json new file mode 100644 index 0000000..42666d5 --- /dev/null +++ b/mods/pala/src/main/resources/assets/pala/models/item/paladium_fishing_rod.json @@ -0,0 +1,14 @@ +{ + "parent": "minecraft:item/handheld_rod", + "textures": { + "layer0": "pala:item/paladium_fishing_rod" + }, + "overrides": [ + { + "predicate": { + "minecraft:cast": 1.0 + }, + "model": "pala:item/paladium_fishing_rod_cast" + } + ] +} diff --git a/mods/pala/src/main/resources/assets/pala/models/item/paladium_fishing_rod_cast.json b/mods/pala/src/main/resources/assets/pala/models/item/paladium_fishing_rod_cast.json new file mode 100644 index 0000000..442656c --- /dev/null +++ b/mods/pala/src/main/resources/assets/pala/models/item/paladium_fishing_rod_cast.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld_rod", + "textures": { + "layer0": "pala:item/paladium_fishing_rod_cast" + } +} diff --git a/mods/pala/src/main/resources/assets/pala/textures/item/paladium_fishing_rod.png b/mods/pala/src/main/resources/assets/pala/textures/item/paladium_fishing_rod.png new file mode 100644 index 0000000..a06c9b8 Binary files /dev/null and b/mods/pala/src/main/resources/assets/pala/textures/item/paladium_fishing_rod.png differ diff --git a/mods/pala/src/main/resources/assets/pala/textures/item/paladium_fishing_rod_cast.png b/mods/pala/src/main/resources/assets/pala/textures/item/paladium_fishing_rod_cast.png new file mode 100644 index 0000000..0b1e963 Binary files /dev/null and b/mods/pala/src/main/resources/assets/pala/textures/item/paladium_fishing_rod_cast.png differ diff --git a/mods/pala/src/main/resources/data/pala/recipe/paladiumfishingrodrecipe.json b/mods/pala/src/main/resources/data/pala/recipe/paladiumfishingrodrecipe.json new file mode 100644 index 0000000..4dfa92c --- /dev/null +++ b/mods/pala/src/main/resources/data/pala/recipe/paladiumfishingrodrecipe.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "equipment", + "ingredients": [ + "pala:paladium_stick", + "pala:paladium_stick", + "pala:paladium_ingot", + "minecraft:string", + "minecraft:string" + ], + "result": { + "id": "pala:paladium_fishing_rod", + "count": 1 + } +} diff --git a/server/mods/pala-0.2.1.jar b/server/mods/pala-0.2.1.jar index 8c7725c..74783db 100644 Binary files a/server/mods/pala-0.2.1.jar and b/server/mods/pala-0.2.1.jar differ