diff --git a/PALAMOD_CDC.md b/PALAMOD_CDC.md index 9ac7e71..0e69289 100644 --- a/PALAMOD_CDC.md +++ b/PALAMOD_CDC.md @@ -666,6 +666,11 @@ avant M4 (TODO:crafts-machines). Consumable+ApplyStatusEffects, nutrition ECART). Lecon : effets nourriture 26.3 = food(FoodProperties, Consumable), plus de Builder.effect(). VERIFIE : build SUCCESSFUL, boot Done, 0 erreur. UNVERIFIED en jeu. +- M-gadget-8 LIVRE 2026-10-19 ~06:05 : cagoule (ID 5023, 0 armure, UNBREAKABLE) + + masque de garde (ID 5029, stats fer, repair iron). ECART : textures portees absentes + (pas d'equipment JSON). Incident : 1er boot crash (Enchantment value 0 rejete en + 26.3 -> enchant 1). Lecon : boot-systématique attrape ce que la compile ne voit pas. + VERIFIE : build SUCCESSFUL, boot Done, 0 erreur. UNVERIFIED en jeu. - 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/PalaArmorMaterials.java b/mods/pala/src/main/java/fr/surviepote/pala/PalaArmorMaterials.java index 19bf077..7e46237 100644 --- a/mods/pala/src/main/java/fr/surviepote/pala/PalaArmorMaterials.java +++ b/mods/pala/src/main/java/fr/surviepote/pala/PalaArmorMaterials.java @@ -33,4 +33,9 @@ public final class PalaArmorMaterials { public static final ArmorMaterial PALADIUM_GREEN = new ArmorMaterial(64, Map.of(ArmorType.HELMET, 4, ArmorType.CHESTPLATE, 10, ArmorType.LEGGINGS, 8, ArmorType.BOOTS, 4), 20, SoundEvents.ARMOR_EQUIP_DIAMOND, 4.0F, 0.0F, repair("paladium_green_repairs"), asset("paladium_green")); public static final ArmorMaterial TITANE = new ArmorMaterial(18, Map.of(ArmorType.HELMET, 2, ArmorType.CHESTPLATE, 7, ArmorType.LEGGINGS, 5, ArmorType.BOOTS, 2), 12, SoundEvents.ARMOR_EQUIP_IRON, 1.0F, 0.0F, repair("titane_repairs"), asset("titane")); public static final ArmorMaterial WEIGHTED_BOOTS = new ArmorMaterial(16, Map.of(ArmorType.HELMET, 2, ArmorType.CHESTPLATE, 2, ArmorType.LEGGINGS, 2, ArmorType.BOOTS, 2), 7, SoundEvents.ARMOR_EQUIP_GENERIC, 0.0F, 0.0F, repair("weighted_boots_repairs"), asset("weighted_boots")); + // M-gadget-8 (wiki ID 5023/5029) : cagoule (0 armure, inusable via UNBREAKABLE sur + // l'item) + masque de garde (stats casque fer). ECART : textures portees absentes + // du legacy (pas d'equipment JSON, rendu casque absent cote client). + public static final ArmorMaterial BALACLAVA = new ArmorMaterial(1, Map.of(ArmorType.HELMET, 0, ArmorType.CHESTPLATE, 0, ArmorType.LEGGINGS, 0, ArmorType.BOOTS, 0), 1, SoundEvents.ARMOR_EQUIP_LEATHER, 0.0F, 0.0F, repair("balaclava_repairs"), asset("balaclava")); + public static final ArmorMaterial GUARD_MASK = new ArmorMaterial(15, Map.of(ArmorType.HELMET, 2, ArmorType.CHESTPLATE, 0, ArmorType.LEGGINGS, 0, ArmorType.BOOTS, 0), 9, SoundEvents.ARMOR_EQUIP_IRON, 0.0F, 0.0F, repair("guard_mask_repairs"), asset("guard_mask")); } 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 4cf695f..36ea746 100644 --- a/mods/pala/src/main/java/fr/surviepote/pala/PalaItems.java +++ b/mods/pala/src/main/java/fr/surviepote/pala/PalaItems.java @@ -120,6 +120,10 @@ public final class PalaItems { // Nutrition 4/0.3 ECART (wiki muet, comme pomme). Sans craft (ECART lucky). public static final Item BANANA = register("banana", id -> new Item(new Item.Properties().setId(id).food(new FoodProperties(4, 0.3F, true), net.minecraft.world.item.component.Consumable.builder().onConsume(new net.minecraft.world.item.consume_effects.ApplyStatusEffectsConsumeEffect(new net.minecraft.world.effect.MobEffectInstance(net.minecraft.world.effect.MobEffects.SPEED, 300, 2), 1.0F)).build()))); public static final Item COUAC_SWORD = register("couac_sword", id -> new Item(new Item.Properties().setId(id).sword(PalaToolMaterials.PALADIUM_SWORD, 8.0F, -2.3F))); + // M-gadget-8 (wiki ID 5023/5029) : cagoule (cosmetique, UNBREAKABLE) + masque de + // garde (stats fer). Sans craft (ECART lucky). + public static final Item BALACLAVA = register("balaclava", id -> new Item(new Item.Properties().setId(id).durability(1).humanoidArmor(PalaArmorMaterials.BALACLAVA, ArmorType.HELMET).component(DataComponents.UNBREAKABLE, Unit.INSTANCE))); + public static final Item GUARD_MASK = register("guard_mask", id -> new Item(new Item.Properties().setId(id).durability(15).humanoidArmor(PalaArmorMaterials.GUARD_MASK, ArmorType.HELMET))); public static final Item PICKAXE_OF_THE_GOD = register("pickaxe_of_the_god", id -> new Item(new Item.Properties().setId(id).pickaxe(PalaToolMaterials.PICKAXE_OF_THE_GOD, 1.8F, -3.0F).component(DataComponents.UNBREAKABLE, Unit.INSTANCE))); public static final Item PICKAXE_OF_THE_GOD_LEVE6 = register("pickaxe_of_the_god_leve6", id -> new Item(new Item.Properties().setId(id).pickaxe(PalaToolMaterials.PICKAXE_OF_THE_GOD_LEVE6, 0.4F, -2.9F).component(DataComponents.UNBREAKABLE, Unit.INSTANCE))); public static final Item PICKAXE_OF_THE_GOD_LEVEL1 = register("pickaxe_of_the_god_level1", id -> new Item(new Item.Properties().setId(id).pickaxe(PalaToolMaterials.PICKAXE_OF_THE_GOD_LEVEL1, 0.0F, -3.0F).component(DataComponents.UNBREAKABLE, Unit.INSTANCE))); 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 2e45dde..83a753f 100644 --- a/mods/pala/src/main/java/fr/surviepote/pala/PalaTabs.java +++ b/mods/pala/src/main/java/fr/surviepote/pala/PalaTabs.java @@ -76,6 +76,8 @@ public final class PalaTabs { output.accept(PalaItems.STATS_STONE); output.accept(PalaItems.COUAC_SWORD); output.accept(PalaItems.BANANA); + output.accept(PalaItems.BALACLAVA); + output.accept(PalaItems.GUARD_MASK); output.accept(PalaItems.CANDY); output.accept(PalaItems.CANDY_BLUE); output.accept(PalaItems.CANDY_GREEN); diff --git a/mods/pala/src/main/resources/assets/pala/items/balaclava.json b/mods/pala/src/main/resources/assets/pala/items/balaclava.json new file mode 100644 index 0000000..77b7703 --- /dev/null +++ b/mods/pala/src/main/resources/assets/pala/items/balaclava.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "pala:item/balaclava" + } +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/assets/pala/items/guard_mask.json b/mods/pala/src/main/resources/assets/pala/items/guard_mask.json new file mode 100644 index 0000000..58ce7b0 --- /dev/null +++ b/mods/pala/src/main/resources/assets/pala/items/guard_mask.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "pala:item/guard_mask" + } +} \ No newline at end of file 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 62d1e75..58bb28d 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 @@ -4,6 +4,8 @@ "item.pala.amethyst_mixed_coal": "Amethyst Mixed Coal", "item.pala.amethyst_stick": "Amethyst Stick", "item.pala.compressed_amethyst": "Compressed Amethyst", + "item.pala.balaclava": "Cagoule", + "item.pala.guard_mask": "Masque de garde", "item.pala.banana": "Banane", "block.pala.sleeping_bag": "Sac de couchage", "item.pala.stats_stone": "Pierre de statistiques", diff --git a/mods/pala/src/main/resources/assets/pala/models/item/balaclava.json b/mods/pala/src/main/resources/assets/pala/models/item/balaclava.json new file mode 100644 index 0000000..81500cd --- /dev/null +++ b/mods/pala/src/main/resources/assets/pala/models/item/balaclava.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "pala:item/balaclava" + } +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/assets/pala/models/item/guard_mask.json b/mods/pala/src/main/resources/assets/pala/models/item/guard_mask.json new file mode 100644 index 0000000..9b62c8b --- /dev/null +++ b/mods/pala/src/main/resources/assets/pala/models/item/guard_mask.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "pala:item/guard_mask" + } +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/assets/pala/textures/item/balaclava.png b/mods/pala/src/main/resources/assets/pala/textures/item/balaclava.png new file mode 100644 index 0000000..f9b1894 Binary files /dev/null and b/mods/pala/src/main/resources/assets/pala/textures/item/balaclava.png differ diff --git a/mods/pala/src/main/resources/assets/pala/textures/item/guard_mask.png b/mods/pala/src/main/resources/assets/pala/textures/item/guard_mask.png new file mode 100644 index 0000000..838fec9 Binary files /dev/null and b/mods/pala/src/main/resources/assets/pala/textures/item/guard_mask.png differ diff --git a/mods/pala/src/main/resources/data/pala/tags/item/balaclava_repairs.json b/mods/pala/src/main/resources/data/pala/tags/item/balaclava_repairs.json new file mode 100644 index 0000000..5e8aecc --- /dev/null +++ b/mods/pala/src/main/resources/data/pala/tags/item/balaclava_repairs.json @@ -0,0 +1,4 @@ +{ + "replace": false, + "values": [] +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/tags/item/guard_mask_repairs.json b/mods/pala/src/main/resources/data/pala/tags/item/guard_mask_repairs.json new file mode 100644 index 0000000..549adc4 --- /dev/null +++ b/mods/pala/src/main/resources/data/pala/tags/item/guard_mask_repairs.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:iron_ingot" + ] +} \ No newline at end of file diff --git a/server/mods/pala-0.2.1.jar b/server/mods/pala-0.2.1.jar index 13e30c9..ae5f950 100644 Binary files a/server/mods/pala-0.2.1.jar and b/server/mods/pala-0.2.1.jar differ