diff --git a/PALAMOD_CDC.md b/PALAMOD_CDC.md index a6c70e7..54a09c6 100644 --- a/PALAMOD_CDC.md +++ b/PALAMOD_CDC.md @@ -694,6 +694,10 @@ avant M4 (TODO:crafts-machines). Correction CDC : craft extracteur = sticks+core+planches+fake water (lingots+eau = REPARATION palamachine). Lecon : variable locale `entity` masque le parametre (nommer `drop`). VERIFIE : build SUCCESSFUL, boot Done, 0 erreur. UNVERIFIED en jeu (orage). +- M-alchi-3 LIVRE 2026-10-19 ~06:40 : fondations chaudron (bloc ID 2931 + coeur 2933 + + support tank 2932, textures legacy, loot self, decoratifs v1). ECART : sans craft + (ressources non lisibles), logique crafts/rituels en TODO:M-alchi-cauldron. + 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/PalaBlocks.java b/mods/pala/src/main/java/fr/surviepote/pala/PalaBlocks.java index 1e0c5ab..15d7b72 100644 --- a/mods/pala/src/main/java/fr/surviepote/pala/PalaBlocks.java +++ b/mods/pala/src/main/java/fr/surviepote/pala/PalaBlocks.java @@ -43,6 +43,12 @@ public final class PalaBlocks { // M-gadget-6 (wiki items lucky ID 5024 VERIFIE) : sac de couchage — pose au sol, // clic droit = point de reapparition. Sans craft (ECART lucky). public static final Block SLEEPING_BAG = register("sleeping_bag", new Block(BlockBehaviour.Properties.of().setId(blockId("sleeping_bag")).strength(1.0F, 2.0F).sound(SoundType.WOOL))); + // M-alchi-3 (wiki chaudron ID 2931/2932/2933) : fondations multibloc (decoratifs v1, + // logique crafts/rituels en TODO:M-alchi-cauldron). Sans craft (ressources non + // lisibles, ECART). + public static final Block CAULDRON_BLOCK = register("cauldron_block", new Block(BlockBehaviour.Properties.of().setId(blockId("cauldron_block")).strength(3.0F, 10.0F).sound(SoundType.METAL))); + public static final Block CAULDRON_CORE = register("cauldron_core", new Block(BlockBehaviour.Properties.of().setId(blockId("cauldron_core")).strength(3.0F, 10.0F).sound(SoundType.METAL))); + public static final Block CAULDRON_TANK_SUPPORT = register("cauldron_tank_support", new Block(BlockBehaviour.Properties.of().setId(blockId("cauldron_tank_support")).strength(3.0F, 10.0F).sound(SoundType.METAL))); public static final Block CAVE_BLOCK = register("cave_block", new Block(BlockBehaviour.Properties.of().setId(blockId("cave_block")).strength(1.0F, 10.0F).sound(SoundType.METAL))); public static final Block FIKUTSI_STAGE0 = register("fikutsi_stage0", new Block(BlockBehaviour.Properties.of().setId(blockId("fikutsi_stage0")).strength(0.0F, 0.0F).sound(SoundType.CROP).noCollision().instabreak())); public static final Block FIKUTSI_STAGE1 = register("fikutsi_stage1", new Block(BlockBehaviour.Properties.of().setId(blockId("fikutsi_stage1")).strength(0.0F, 0.0F).sound(SoundType.CROP).noCollision().instabreak())); 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 c6d4181..0633ff6 100644 --- a/mods/pala/src/main/java/fr/surviepote/pala/PalaTabs.java +++ b/mods/pala/src/main/java/fr/surviepote/pala/PalaTabs.java @@ -184,6 +184,9 @@ public final class PalaTabs { output.accept(PalaBlocks.AMETHYST_ORE_BLOCK); output.accept(PalaBlocks.AMETHYST_SPIKE); output.accept(PalaBlocks.CAVE_BLOCK); + output.accept(PalaBlocks.CAULDRON_BLOCK); + output.accept(PalaBlocks.CAULDRON_CORE); + output.accept(PalaBlocks.CAULDRON_TANK_SUPPORT); output.accept(PalaBlocks.SLEEPING_BAG); output.accept(PalaBlocks.FIKUTSI_STAGE0); output.accept(PalaBlocks.FIKUTSI_STAGE1); diff --git a/mods/pala/src/main/resources/assets/pala/blockstates/cauldron_block.json b/mods/pala/src/main/resources/assets/pala/blockstates/cauldron_block.json new file mode 100644 index 0000000..35328a4 --- /dev/null +++ b/mods/pala/src/main/resources/assets/pala/blockstates/cauldron_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "pala:block/cauldron_block" + } + } +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/assets/pala/blockstates/cauldron_core.json b/mods/pala/src/main/resources/assets/pala/blockstates/cauldron_core.json new file mode 100644 index 0000000..4eafb6d --- /dev/null +++ b/mods/pala/src/main/resources/assets/pala/blockstates/cauldron_core.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "pala:block/cauldron_core" + } + } +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/assets/pala/blockstates/cauldron_tank_support.json b/mods/pala/src/main/resources/assets/pala/blockstates/cauldron_tank_support.json new file mode 100644 index 0000000..1fe1ba0 --- /dev/null +++ b/mods/pala/src/main/resources/assets/pala/blockstates/cauldron_tank_support.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "pala:block/cauldron_tank_support" + } + } +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/assets/pala/items/cauldron_block.json b/mods/pala/src/main/resources/assets/pala/items/cauldron_block.json new file mode 100644 index 0000000..8d30541 --- /dev/null +++ b/mods/pala/src/main/resources/assets/pala/items/cauldron_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "pala:block/cauldron_block" + } +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/assets/pala/items/cauldron_core.json b/mods/pala/src/main/resources/assets/pala/items/cauldron_core.json new file mode 100644 index 0000000..c8c274a --- /dev/null +++ b/mods/pala/src/main/resources/assets/pala/items/cauldron_core.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "pala:block/cauldron_core" + } +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/assets/pala/items/cauldron_tank_support.json b/mods/pala/src/main/resources/assets/pala/items/cauldron_tank_support.json new file mode 100644 index 0000000..d7e823c --- /dev/null +++ b/mods/pala/src/main/resources/assets/pala/items/cauldron_tank_support.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "pala:block/cauldron_tank_support" + } +} \ 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 7a53ad5..b8d9913 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,9 @@ "item.pala.amethyst_mixed_coal": "Amethyst Mixed Coal", "item.pala.amethyst_stick": "Amethyst Stick", "item.pala.compressed_amethyst": "Compressed Amethyst", + "block.pala.cauldron_block": "Bloc du chaudron", + "block.pala.cauldron_core": "Coeur du chaudron", + "block.pala.cauldron_tank_support": "Support de tank", "item.pala.lightning_potion": "Lightning Potion", "item.pala.flask": "Fiole", "item.pala.balaclava": "Cagoule", diff --git a/mods/pala/src/main/resources/assets/pala/models/block/cauldron_block.json b/mods/pala/src/main/resources/assets/pala/models/block/cauldron_block.json new file mode 100644 index 0000000..4e38dfc --- /dev/null +++ b/mods/pala/src/main/resources/assets/pala/models/block/cauldron_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "pala:block/cauldron_side" + } +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/assets/pala/models/block/cauldron_core.json b/mods/pala/src/main/resources/assets/pala/models/block/cauldron_core.json new file mode 100644 index 0000000..d275752 --- /dev/null +++ b/mods/pala/src/main/resources/assets/pala/models/block/cauldron_core.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "pala:block/cauldron_core" + } +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/assets/pala/models/block/cauldron_tank_support.json b/mods/pala/src/main/resources/assets/pala/models/block/cauldron_tank_support.json new file mode 100644 index 0000000..580a03e --- /dev/null +++ b/mods/pala/src/main/resources/assets/pala/models/block/cauldron_tank_support.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "pala:block/cauldron_tanksupport" + } +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/assets/pala/textures/block/cauldron_core.png b/mods/pala/src/main/resources/assets/pala/textures/block/cauldron_core.png new file mode 100644 index 0000000..00a0243 Binary files /dev/null and b/mods/pala/src/main/resources/assets/pala/textures/block/cauldron_core.png differ diff --git a/mods/pala/src/main/resources/assets/pala/textures/block/cauldron_side.png b/mods/pala/src/main/resources/assets/pala/textures/block/cauldron_side.png new file mode 100644 index 0000000..c01f34e Binary files /dev/null and b/mods/pala/src/main/resources/assets/pala/textures/block/cauldron_side.png differ diff --git a/mods/pala/src/main/resources/assets/pala/textures/block/cauldron_tanksupport.png b/mods/pala/src/main/resources/assets/pala/textures/block/cauldron_tanksupport.png new file mode 100644 index 0000000..a757458 Binary files /dev/null and b/mods/pala/src/main/resources/assets/pala/textures/block/cauldron_tanksupport.png differ diff --git a/mods/pala/src/main/resources/data/pala/loot_table/blocks/cauldron_block.json b/mods/pala/src/main/resources/data/pala/loot_table/blocks/cauldron_block.json new file mode 100644 index 0000000..7db3c42 --- /dev/null +++ b/mods/pala/src/main/resources/data/pala/loot_table/blocks/cauldron_block.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "condition": { + "type": "minecraft:survives_explosion" + }, + "entries": [ + { + "type": "minecraft:item", + "name": "pala:cauldron_block" + } + ], + "rolls": 1 + } + ], + "random_sequence": "pala:blocks/cauldron_block" +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/loot_table/blocks/cauldron_core.json b/mods/pala/src/main/resources/data/pala/loot_table/blocks/cauldron_core.json new file mode 100644 index 0000000..e444efb --- /dev/null +++ b/mods/pala/src/main/resources/data/pala/loot_table/blocks/cauldron_core.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "condition": { + "type": "minecraft:survives_explosion" + }, + "entries": [ + { + "type": "minecraft:item", + "name": "pala:cauldron_core" + } + ], + "rolls": 1 + } + ], + "random_sequence": "pala:blocks/cauldron_core" +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/loot_table/blocks/cauldron_tank_support.json b/mods/pala/src/main/resources/data/pala/loot_table/blocks/cauldron_tank_support.json new file mode 100644 index 0000000..9f492d9 --- /dev/null +++ b/mods/pala/src/main/resources/data/pala/loot_table/blocks/cauldron_tank_support.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "condition": { + "type": "minecraft:survives_explosion" + }, + "entries": [ + { + "type": "minecraft:item", + "name": "pala:cauldron_tank_support" + } + ], + "rolls": 1 + } + ], + "random_sequence": "pala:blocks/cauldron_tank_support" +} \ 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 c3e450f..bac13e0 100644 Binary files a/server/mods/pala-0.2.1.jar and b/server/mods/pala-0.2.1.jar differ