diff --git a/PALAMOD_CDC.md b/PALAMOD_CDC.md index ad94c4b..72b9b5b 100644 --- a/PALAMOD_CDC.md +++ b/PALAMOD_CDC.md @@ -629,6 +629,11 @@ avant M4 (TODO:crafts-machines). /f info + /f help maj). ECART : perms fines GUI en M-faction-3b. Lecon : bloc argument-then = 5 parentheses finales (getPlayer inclus), verifier au parencheck. VERIFIE : build SUCCESSFUL, boot Done, 0 erreur. UNVERIFIED en jeu. +- M-compress LIVRE 2026-10-19 ~05:10 : COMPRESSED_PALADIUM + COMPRESSED_TITANE (textures + legacy, pattern legacy 8 ore_blocks + 1 ingot comme amethyste, lang, onglets). + ECART : pas de recette decompression (legacy n'en a pas), guardian stone + broken + spawner absents du legacy (textures a extraire, TODO:M-spawner). 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/PalaItems.java b/mods/pala/src/main/java/fr/surviepote/pala/PalaItems.java index 8e73da0..34308ca 100644 --- a/mods/pala/src/main/java/fr/surviepote/pala/PalaItems.java +++ b/mods/pala/src/main/java/fr/surviepote/pala/PalaItems.java @@ -26,6 +26,8 @@ public final class PalaItems { public static final Item AMETHYST_MIXED_COAL = register("amethyst_mixed_coal", id -> new Item(new Item.Properties().setId(id))); public static final Item AMETHYST_STICK = register("amethyst_stick", id -> new Item(new Item.Properties().setId(id))); public static final Item COMPRESSED_AMETHYST = register("compressed_amethyst", id -> new Item(new Item.Properties().setId(id))); + public static final Item COMPRESSED_PALADIUM = register("compressed_paladium", id -> new Item(new Item.Properties().setId(id))); + public static final Item COMPRESSED_TITANE = register("compressed_titane", id -> new Item(new Item.Properties().setId(id))); public static final Item CREATIVE_MIXED_COAL = register("creative_mixed_coal", id -> new Item(new Item.Properties().setId(id))); public static final Item EGG_PLANT_FRUIT = register("egg_plant_fruit", id -> new Item(new Item.Properties().setId(id))); public static final Item ENDIUM_INGOT = register("endium_ingot", 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 c809f4b..d491696 100644 --- a/mods/pala/src/main/java/fr/surviepote/pala/PalaTabs.java +++ b/mods/pala/src/main/java/fr/surviepote/pala/PalaTabs.java @@ -34,6 +34,8 @@ public final class PalaTabs { output.accept(PalaItems.AMETHYST_MIXED_COAL); output.accept(PalaItems.AMETHYST_STICK); output.accept(PalaItems.COMPRESSED_AMETHYST); + output.accept(PalaItems.COMPRESSED_PALADIUM); + output.accept(PalaItems.COMPRESSED_TITANE); output.accept(PalaItems.CREATIVE_MIXED_COAL); output.accept(PalaItems.EGG_PLANT_FRUIT); output.accept(PalaItems.ENDIUM_INGOT); diff --git a/mods/pala/src/main/resources/assets/pala/items/compressed_paladium.json b/mods/pala/src/main/resources/assets/pala/items/compressed_paladium.json new file mode 100644 index 0000000..9ddb28b --- /dev/null +++ b/mods/pala/src/main/resources/assets/pala/items/compressed_paladium.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "pala:item/compressed_paladium" + } +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/assets/pala/items/compressed_titane.json b/mods/pala/src/main/resources/assets/pala/items/compressed_titane.json new file mode 100644 index 0000000..80ea80b --- /dev/null +++ b/mods/pala/src/main/resources/assets/pala/items/compressed_titane.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "pala:item/compressed_titane" + } +} \ 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 07bbef0..1957e6a 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.compressed_paladium": "Compressed Paladium", + "item.pala.compressed_titane": "Compressed Titane", "item.pala.creative_mixed_coal": "Creative Mixed Coal", "item.pala.egg_plant_fruit": "Egg Plant", "item.pala.endium_ingot": "Endium Ingot", diff --git a/mods/pala/src/main/resources/assets/pala/models/item/compressed_paladium.json b/mods/pala/src/main/resources/assets/pala/models/item/compressed_paladium.json new file mode 100644 index 0000000..534f90b --- /dev/null +++ b/mods/pala/src/main/resources/assets/pala/models/item/compressed_paladium.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "pala:item/compressed_paladium" + } +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/assets/pala/models/item/compressed_titane.json b/mods/pala/src/main/resources/assets/pala/models/item/compressed_titane.json new file mode 100644 index 0000000..b5f672a --- /dev/null +++ b/mods/pala/src/main/resources/assets/pala/models/item/compressed_titane.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "pala:item/compressed_titane" + } +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/assets/pala/textures/item/compressed_paladium.png b/mods/pala/src/main/resources/assets/pala/textures/item/compressed_paladium.png new file mode 100644 index 0000000..74e4e37 Binary files /dev/null and b/mods/pala/src/main/resources/assets/pala/textures/item/compressed_paladium.png differ diff --git a/mods/pala/src/main/resources/assets/pala/textures/item/compressed_titane.png b/mods/pala/src/main/resources/assets/pala/textures/item/compressed_titane.png new file mode 100644 index 0000000..68b1e00 Binary files /dev/null and b/mods/pala/src/main/resources/assets/pala/textures/item/compressed_titane.png differ diff --git a/mods/pala/src/main/resources/data/pala/recipe/compressedpaladiumrecipe.json b/mods/pala/src/main/resources/data/pala/recipe/compressedpaladiumrecipe.json new file mode 100644 index 0000000..0846342 --- /dev/null +++ b/mods/pala/src/main/resources/data/pala/recipe/compressedpaladiumrecipe.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "pattern": [ + "###", + "#A#", + "###" + ], + "key": { + "#": "pala:paladium_ore_block", + "A": "pala:paladium_ingot" + }, + "result": { + "id": "pala:compressed_paladium", + "count": 1 + } +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/recipe/compressedtitanerecipe.json b/mods/pala/src/main/resources/data/pala/recipe/compressedtitanerecipe.json new file mode 100644 index 0000000..c49f299 --- /dev/null +++ b/mods/pala/src/main/resources/data/pala/recipe/compressedtitanerecipe.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "pattern": [ + "###", + "#A#", + "###" + ], + "key": { + "#": "pala:titane_ore_block", + "A": "pala:titane_ingot" + }, + "result": { + "id": "pala:compressed_titane", + "count": 1 + } +} \ 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 3148203..133402e 100644 Binary files a/server/mods/pala-0.2.1.jar and b/server/mods/pala-0.2.1.jar differ