diff --git a/PALAMOD_CDC.md b/PALAMOD_CDC.md index 68fe92c..0829a4c 100644 --- a/PALAMOD_CDC.md +++ b/PALAMOD_CDC.md @@ -547,6 +547,12 @@ avant M4 (TODO:crafts-machines). - M-eco LIVRE 2026-10-19 ~03:05 : /pay (transfert, fonds verifies) + /baltop (top 10 via PalaStorage.topMoney) + /balance (solde). ECART : connectes uniquement (wiki suggere pseudo offline). VERIFIE : build SUCCESSFUL, boot Done, 0 erreur. UNVERIFIED en jeu (2 joueurs). +- M-grinder-1 LIVRE 2026-10-19 ~03:10 : 3 blocs (block/casing/frame, textures legacy cablees) + + 9 items (5 patterns, socket, orb_knockback, broadsword +9, fastsword +7 ; vitesses + UNVERIFIED) + 30 assets (blockstates/models/definitions items/lang 221 cles) + 3 crafts + (pattern frame UNVERIFIED : positions titane non visibles wiki). GUI + multibloc + tetes + + modifieurs : M-grinder-2/3. VERIFIE : build SUCCESSFUL, boot Done, 0 erreur. UNVERIFIED + visuel (session client M-grinder-2). - 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/PalaBlocks.java b/mods/pala/src/main/java/fr/surviepote/pala/PalaBlocks.java index a50f123..854afb9 100644 --- a/mods/pala/src/main/java/fr/surviepote/pala/PalaBlocks.java +++ b/mods/pala/src/main/java/fr/surviepote/pala/PalaBlocks.java @@ -33,6 +33,11 @@ public final class PalaBlocks { public static final Block AMETHYST_ORE = register("amethyst_ore", new Block(BlockBehaviour.Properties.of().setId(blockId("amethyst_ore")).strength(3.0F, 5.0F).sound(SoundType.STONE).requiresCorrectToolForDrops())); public static final Block AMETHYST_ORE_BLOCK = register("amethyst_ore_block", new Block(BlockBehaviour.Properties.of().setId(blockId("amethyst_ore_block")).strength(5.0F, 8.0F).sound(SoundType.METAL).requiresCorrectToolForDrops())); + // M-grinder-1 (wiki grinder §2) : 1 block + 5 casing + 20 frame + 1 lave (26 blocs). + // Crafts M-grinder-2 ; multibloc + GUI M-grinder-2/3. + public static final Block GRINDER_BLOCK = register("grinder_block", new Block(BlockBehaviour.Properties.of().setId(blockId("grinder_block")).strength(5.0F, 10.0F).sound(SoundType.METAL).requiresCorrectToolForDrops())); + public static final Block GRINDER_CASING = register("grinder_casing", new Block(BlockBehaviour.Properties.of().setId(blockId("grinder_casing")).strength(5.0F, 10.0F).sound(SoundType.METAL).requiresCorrectToolForDrops())); + public static final Block GRINDER_FRAME = register("grinder_frame", new Block(BlockBehaviour.Properties.of().setId(blockId("grinder_frame")).strength(5.0F, 10.0F).sound(SoundType.METAL).requiresCorrectToolForDrops())); public static final Block AMETHYST_SPIKE = register("amethyst_spike", new Block(BlockBehaviour.Properties.of().setId(blockId("amethyst_spike")).strength(1.0F, 10.0F).sound(SoundType.GRAVEL))); 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())); 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 8a99f34..d3087ec 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,15 @@ 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-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))); + public static final Item HAMMER_PATTERN = register("hammer_pattern", id -> new Item(new Item.Properties().setId(id))); + public static final Item BROADSWORD_PATTERN = register("broadsword_pattern", id -> new Item(new Item.Properties().setId(id))); + public static final Item FASTSWORD_PATTERN = register("fastsword_pattern", id -> new Item(new Item.Properties().setId(id))); + public static final Item INGOT_PATTERN = register("ingot_pattern", id -> new Item(new Item.Properties().setId(id))); + public static final Item SOCKET = register("socket", id -> new Item(new Item.Properties().setId(id))); + public static final Item ORB_KNOCKBACK = register("orb_knockback", id -> new Item(new Item.Properties().setId(id))); public static final Item PALA_APPLE = register("pala_apple", id -> new Item(new Item.Properties().setId(id).stacksTo(16).food(new FoodProperties(4, 0.3F, true)))); public static final Item AMETHYST_AXE = register("amethyst_axe", id -> new Item(new Item.Properties().setId(id).axe(PalaToolMaterials.AMETHYST_AXE, 3.7F, -3.0F))); public static final Item AMETHYST_HAMMER = register("amethyst_hammer", id -> new Item(new Item.Properties().setId(id).pickaxe(PalaToolMaterials.AMETHYST_HAMMER, 3.0F, -3.2F))); @@ -113,6 +122,11 @@ public final class PalaItems { public static final Item TITANE_PICKAXE = register("titane_pickaxe", id -> new Item(new Item.Properties().setId(id).pickaxe(PalaToolMaterials.TITANE_PICKAXE, 2.4F, -3.0F))); public static final Item TITANE_SHOVEL = register("titane_shovel", id -> new Item(new Item.Properties().setId(id).shovel(PalaToolMaterials.TITANE_SHOVEL, 1.8F, -3.0F))); public static final Item TITANE_SWORD = register("titane_sword", id -> new Item(new Item.Properties().setId(id).sword(PalaToolMaterials.TITANE_SWORD, 6.0F, -2.4F))); + // M-grinder-1 (wiki grinder §3.3/3.4) : broadsword +9 (lente) / fastsword +7 (rapide) vs + // epee paladium +10 (8.0F). Echelle : 7.0F -> +9, 5.0F -> +7. Vitesses UNVERIFIED (wiki + // qualitatif seul) : -2.6 lente, -1.8 rapide. Meme materiau paladium (dura 4999). + public static final Item BROADSWORD = register("broadsword", id -> new Item(new Item.Properties().setId(id).sword(PalaToolMaterials.PALADIUM_SWORD, 7.0F, -2.6F))); + public static final Item FASTSWORD = register("fastsword", id -> new Item(new Item.Properties().setId(id).sword(PalaToolMaterials.PALADIUM_SWORD, 5.0F, -1.8F))); public static final Item AMETHYST_HELMET = register("amethyst_helmet", id -> new Item(new Item.Properties().setId(id).durability(15).humanoidArmor(PalaArmorMaterials.AMETHYST, ArmorType.HELMET))); public static final Item AMETHYST_CHESTPLATE = register("amethyst_chestplate", id -> new Item(new Item.Properties().setId(id).durability(15).humanoidArmor(PalaArmorMaterials.AMETHYST, ArmorType.CHESTPLATE))); public static final Item AMETHYST_LEGGINGS = register("amethyst_leggings", id -> new Item(new Item.Properties().setId(id).durability(15).humanoidArmor(PalaArmorMaterials.AMETHYST, ArmorType.LEGGINGS))); 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 059fb61..d25f36c 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.SOCKET_PATTERN); + output.accept(PalaItems.HAMMER_PATTERN); + output.accept(PalaItems.BROADSWORD_PATTERN); + output.accept(PalaItems.FASTSWORD_PATTERN); + output.accept(PalaItems.INGOT_PATTERN); + output.accept(PalaItems.SOCKET); + output.accept(PalaItems.ORB_KNOCKBACK); output.accept(PalaItems.PALA_APPLE); output.accept(PalaItems.AMETHYST_AXE); output.accept(PalaItems.AMETHYST_HAMMER); @@ -86,6 +93,8 @@ public final class PalaTabs { output.accept(PalaItems.PALADIUM_PICKAXE); output.accept(PalaItems.PALADIUM_SHOVEL); output.accept(PalaItems.PALADIUM_SWORD); + output.accept(PalaItems.BROADSWORD); + output.accept(PalaItems.FASTSWORD); output.accept(PalaItems.PALADIUM_GREEN_AXE); output.accept(PalaItems.PALADIUM_GREEN_PICKAXE); output.accept(PalaItems.PALADIUM_GREEN_SHOVEL); @@ -161,6 +170,9 @@ public final class PalaTabs { output.accept(PalaBlocks.FIKUTSI_STAGE3); output.accept(PalaBlocks.FINDIUM_ORE); output.accept(PalaBlocks.FINDIUM_ORE_BLOCK); + output.accept(PalaBlocks.GRINDER_BLOCK); + output.accept(PalaBlocks.GRINDER_CASING); + output.accept(PalaBlocks.GRINDER_FRAME); output.accept(PalaBlocks.KISAKAY_ORE); output.accept(PalaBlocks.KISAKAY_ORE_BLOCK); output.accept(PalaBlocks.KIWANO_STAGE0); diff --git a/mods/pala/src/main/resources/assets/pala/blockstates/grinder_block.json b/mods/pala/src/main/resources/assets/pala/blockstates/grinder_block.json new file mode 100644 index 0000000..f72f05f --- /dev/null +++ b/mods/pala/src/main/resources/assets/pala/blockstates/grinder_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "pala:block/grinder_block" + } + } +} diff --git a/mods/pala/src/main/resources/assets/pala/blockstates/grinder_casing.json b/mods/pala/src/main/resources/assets/pala/blockstates/grinder_casing.json new file mode 100644 index 0000000..598bfd8 --- /dev/null +++ b/mods/pala/src/main/resources/assets/pala/blockstates/grinder_casing.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "pala:block/grinder_casing" + } + } +} diff --git a/mods/pala/src/main/resources/assets/pala/blockstates/grinder_frame.json b/mods/pala/src/main/resources/assets/pala/blockstates/grinder_frame.json new file mode 100644 index 0000000..5eaa0de --- /dev/null +++ b/mods/pala/src/main/resources/assets/pala/blockstates/grinder_frame.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "pala:block/grinder_frame" + } + } +} diff --git a/mods/pala/src/main/resources/assets/pala/items/broadsword.json b/mods/pala/src/main/resources/assets/pala/items/broadsword.json new file mode 100644 index 0000000..da66554 --- /dev/null +++ b/mods/pala/src/main/resources/assets/pala/items/broadsword.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "pala:item/broadsword" + } +} diff --git a/mods/pala/src/main/resources/assets/pala/items/broadsword_pattern.json b/mods/pala/src/main/resources/assets/pala/items/broadsword_pattern.json new file mode 100644 index 0000000..2233fc5 --- /dev/null +++ b/mods/pala/src/main/resources/assets/pala/items/broadsword_pattern.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "pala:item/broadsword_pattern" + } +} diff --git a/mods/pala/src/main/resources/assets/pala/items/fastsword.json b/mods/pala/src/main/resources/assets/pala/items/fastsword.json new file mode 100644 index 0000000..3e34440 --- /dev/null +++ b/mods/pala/src/main/resources/assets/pala/items/fastsword.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "pala:item/fastsword" + } +} diff --git a/mods/pala/src/main/resources/assets/pala/items/fastsword_pattern.json b/mods/pala/src/main/resources/assets/pala/items/fastsword_pattern.json new file mode 100644 index 0000000..773f73f --- /dev/null +++ b/mods/pala/src/main/resources/assets/pala/items/fastsword_pattern.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "pala:item/fastsword_pattern" + } +} diff --git a/mods/pala/src/main/resources/assets/pala/items/grinder_block.json b/mods/pala/src/main/resources/assets/pala/items/grinder_block.json new file mode 100644 index 0000000..46d7185 --- /dev/null +++ b/mods/pala/src/main/resources/assets/pala/items/grinder_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "pala:item/grinder_block" + } +} diff --git a/mods/pala/src/main/resources/assets/pala/items/grinder_casing.json b/mods/pala/src/main/resources/assets/pala/items/grinder_casing.json new file mode 100644 index 0000000..1253d0c --- /dev/null +++ b/mods/pala/src/main/resources/assets/pala/items/grinder_casing.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "pala:item/grinder_casing" + } +} diff --git a/mods/pala/src/main/resources/assets/pala/items/grinder_frame.json b/mods/pala/src/main/resources/assets/pala/items/grinder_frame.json new file mode 100644 index 0000000..ce195b8 --- /dev/null +++ b/mods/pala/src/main/resources/assets/pala/items/grinder_frame.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "pala:item/grinder_frame" + } +} diff --git a/mods/pala/src/main/resources/assets/pala/items/hammer_pattern.json b/mods/pala/src/main/resources/assets/pala/items/hammer_pattern.json new file mode 100644 index 0000000..4aad9c1 --- /dev/null +++ b/mods/pala/src/main/resources/assets/pala/items/hammer_pattern.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "pala:item/hammer_pattern" + } +} diff --git a/mods/pala/src/main/resources/assets/pala/items/ingot_pattern.json b/mods/pala/src/main/resources/assets/pala/items/ingot_pattern.json new file mode 100644 index 0000000..0552300 --- /dev/null +++ b/mods/pala/src/main/resources/assets/pala/items/ingot_pattern.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "pala:item/ingot_pattern" + } +} diff --git a/mods/pala/src/main/resources/assets/pala/items/orb_knockback.json b/mods/pala/src/main/resources/assets/pala/items/orb_knockback.json new file mode 100644 index 0000000..44d31a1 --- /dev/null +++ b/mods/pala/src/main/resources/assets/pala/items/orb_knockback.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "pala:item/orb_knockback" + } +} diff --git a/mods/pala/src/main/resources/assets/pala/items/socket.json b/mods/pala/src/main/resources/assets/pala/items/socket.json new file mode 100644 index 0000000..e9c2449 --- /dev/null +++ b/mods/pala/src/main/resources/assets/pala/items/socket.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "pala:item/socket" + } +} diff --git a/mods/pala/src/main/resources/assets/pala/items/socket_pattern.json b/mods/pala/src/main/resources/assets/pala/items/socket_pattern.json new file mode 100644 index 0000000..6c3580f --- /dev/null +++ b/mods/pala/src/main/resources/assets/pala/items/socket_pattern.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "pala:item/socket_pattern" + } +} 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 b0fe13c..df7758b 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 @@ -204,5 +204,20 @@ "item.pala.trixium_ore": "Trixium Ore", "item.pala.trixium_ore_block": "Trixium Block", "item.pala.xp_bush": "Xp Bush", - "item.pala.paladium_furnace": "Paladium Furnace" + "item.pala.paladium_furnace": "Paladium Furnace", + "block.pala.grinder_block": "Grinder Block", + "block.pala.grinder_casing": "Grinder Casing", + "block.pala.grinder_frame": "Grinder Frame", + "item.pala.grinder_block": "Grinder Block", + "item.pala.grinder_casing": "Grinder Casing", + "item.pala.grinder_frame": "Grinder Frame", + "item.pala.socket_pattern": "Socket Pattern", + "item.pala.hammer_pattern": "Hammer Pattern", + "item.pala.broadsword_pattern": "Broadsword Pattern", + "item.pala.fastsword_pattern": "Fastsword Pattern", + "item.pala.ingot_pattern": "Ingot Pattern", + "item.pala.socket": "Socket", + "item.pala.orb_knockback": "Knockback Orb", + "item.pala.broadsword": "Broadsword", + "item.pala.fastsword": "Fastsword" } diff --git a/mods/pala/src/main/resources/assets/pala/models/block/grinder_block.json b/mods/pala/src/main/resources/assets/pala/models/block/grinder_block.json new file mode 100644 index 0000000..48cfaa2 --- /dev/null +++ b/mods/pala/src/main/resources/assets/pala/models/block/grinder_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "pala:block/grinder_block" + } +} diff --git a/mods/pala/src/main/resources/assets/pala/models/block/grinder_casing.json b/mods/pala/src/main/resources/assets/pala/models/block/grinder_casing.json new file mode 100644 index 0000000..ab0e1d8 --- /dev/null +++ b/mods/pala/src/main/resources/assets/pala/models/block/grinder_casing.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "pala:block/grinder_casing" + } +} diff --git a/mods/pala/src/main/resources/assets/pala/models/block/grinder_frame.json b/mods/pala/src/main/resources/assets/pala/models/block/grinder_frame.json new file mode 100644 index 0000000..0e0f96a --- /dev/null +++ b/mods/pala/src/main/resources/assets/pala/models/block/grinder_frame.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "pala:block/grinder_frame" + } +} diff --git a/mods/pala/src/main/resources/assets/pala/models/item/broadsword.json b/mods/pala/src/main/resources/assets/pala/models/item/broadsword.json new file mode 100644 index 0000000..cfc0156 --- /dev/null +++ b/mods/pala/src/main/resources/assets/pala/models/item/broadsword.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "pala:item/broadsword" + } +} diff --git a/mods/pala/src/main/resources/assets/pala/models/item/broadsword_pattern.json b/mods/pala/src/main/resources/assets/pala/models/item/broadsword_pattern.json new file mode 100644 index 0000000..a904efd --- /dev/null +++ b/mods/pala/src/main/resources/assets/pala/models/item/broadsword_pattern.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "pala:item/broadsword_pattern" + } +} diff --git a/mods/pala/src/main/resources/assets/pala/models/item/fastsword.json b/mods/pala/src/main/resources/assets/pala/models/item/fastsword.json new file mode 100644 index 0000000..8b52e50 --- /dev/null +++ b/mods/pala/src/main/resources/assets/pala/models/item/fastsword.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "pala:item/fastsword" + } +} diff --git a/mods/pala/src/main/resources/assets/pala/models/item/fastsword_pattern.json b/mods/pala/src/main/resources/assets/pala/models/item/fastsword_pattern.json new file mode 100644 index 0000000..020c77e --- /dev/null +++ b/mods/pala/src/main/resources/assets/pala/models/item/fastsword_pattern.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "pala:item/fastsword_pattern" + } +} diff --git a/mods/pala/src/main/resources/assets/pala/models/item/grinder_block.json b/mods/pala/src/main/resources/assets/pala/models/item/grinder_block.json new file mode 100644 index 0000000..c6265a7 --- /dev/null +++ b/mods/pala/src/main/resources/assets/pala/models/item/grinder_block.json @@ -0,0 +1,3 @@ +{ + "parent": "pala:block/grinder_block" +} diff --git a/mods/pala/src/main/resources/assets/pala/models/item/grinder_casing.json b/mods/pala/src/main/resources/assets/pala/models/item/grinder_casing.json new file mode 100644 index 0000000..2ccdea5 --- /dev/null +++ b/mods/pala/src/main/resources/assets/pala/models/item/grinder_casing.json @@ -0,0 +1,3 @@ +{ + "parent": "pala:block/grinder_casing" +} diff --git a/mods/pala/src/main/resources/assets/pala/models/item/grinder_frame.json b/mods/pala/src/main/resources/assets/pala/models/item/grinder_frame.json new file mode 100644 index 0000000..2e7f02f --- /dev/null +++ b/mods/pala/src/main/resources/assets/pala/models/item/grinder_frame.json @@ -0,0 +1,3 @@ +{ + "parent": "pala:block/grinder_frame" +} diff --git a/mods/pala/src/main/resources/assets/pala/models/item/hammer_pattern.json b/mods/pala/src/main/resources/assets/pala/models/item/hammer_pattern.json new file mode 100644 index 0000000..b4d1f3c --- /dev/null +++ b/mods/pala/src/main/resources/assets/pala/models/item/hammer_pattern.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "pala:item/hammer_pattern" + } +} diff --git a/mods/pala/src/main/resources/assets/pala/models/item/ingot_pattern.json b/mods/pala/src/main/resources/assets/pala/models/item/ingot_pattern.json new file mode 100644 index 0000000..4f4a284 --- /dev/null +++ b/mods/pala/src/main/resources/assets/pala/models/item/ingot_pattern.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "pala:item/ingot_pattern" + } +} diff --git a/mods/pala/src/main/resources/assets/pala/models/item/orb_knockback.json b/mods/pala/src/main/resources/assets/pala/models/item/orb_knockback.json new file mode 100644 index 0000000..4d0550f --- /dev/null +++ b/mods/pala/src/main/resources/assets/pala/models/item/orb_knockback.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "pala:item/orb_knockback" + } +} diff --git a/mods/pala/src/main/resources/assets/pala/models/item/socket.json b/mods/pala/src/main/resources/assets/pala/models/item/socket.json new file mode 100644 index 0000000..992efa6 --- /dev/null +++ b/mods/pala/src/main/resources/assets/pala/models/item/socket.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "pala:item/socket" + } +} diff --git a/mods/pala/src/main/resources/assets/pala/models/item/socket_pattern.json b/mods/pala/src/main/resources/assets/pala/models/item/socket_pattern.json new file mode 100644 index 0000000..4fad7ca --- /dev/null +++ b/mods/pala/src/main/resources/assets/pala/models/item/socket_pattern.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "pala:item/socket_pattern" + } +} diff --git a/mods/pala/src/main/resources/assets/pala/textures/block/grinder_block.png b/mods/pala/src/main/resources/assets/pala/textures/block/grinder_block.png new file mode 100644 index 0000000..635021b Binary files /dev/null and b/mods/pala/src/main/resources/assets/pala/textures/block/grinder_block.png differ diff --git a/mods/pala/src/main/resources/assets/pala/textures/block/grinder_casing.png b/mods/pala/src/main/resources/assets/pala/textures/block/grinder_casing.png new file mode 100644 index 0000000..262057c Binary files /dev/null and b/mods/pala/src/main/resources/assets/pala/textures/block/grinder_casing.png differ diff --git a/mods/pala/src/main/resources/assets/pala/textures/block/grinder_frame.png b/mods/pala/src/main/resources/assets/pala/textures/block/grinder_frame.png new file mode 100644 index 0000000..3c1c35d Binary files /dev/null and b/mods/pala/src/main/resources/assets/pala/textures/block/grinder_frame.png differ diff --git a/mods/pala/src/main/resources/assets/pala/textures/item/broadsword.png b/mods/pala/src/main/resources/assets/pala/textures/item/broadsword.png new file mode 100644 index 0000000..55c52a9 Binary files /dev/null and b/mods/pala/src/main/resources/assets/pala/textures/item/broadsword.png differ diff --git a/mods/pala/src/main/resources/assets/pala/textures/item/broadsword_pattern.png b/mods/pala/src/main/resources/assets/pala/textures/item/broadsword_pattern.png new file mode 100644 index 0000000..8804255 Binary files /dev/null and b/mods/pala/src/main/resources/assets/pala/textures/item/broadsword_pattern.png differ diff --git a/mods/pala/src/main/resources/assets/pala/textures/item/fastsword.png b/mods/pala/src/main/resources/assets/pala/textures/item/fastsword.png new file mode 100644 index 0000000..dbc6aa9 Binary files /dev/null and b/mods/pala/src/main/resources/assets/pala/textures/item/fastsword.png differ diff --git a/mods/pala/src/main/resources/assets/pala/textures/item/fastsword_pattern.png b/mods/pala/src/main/resources/assets/pala/textures/item/fastsword_pattern.png new file mode 100644 index 0000000..6992dc0 Binary files /dev/null and b/mods/pala/src/main/resources/assets/pala/textures/item/fastsword_pattern.png differ diff --git a/mods/pala/src/main/resources/assets/pala/textures/item/hammer_pattern.png b/mods/pala/src/main/resources/assets/pala/textures/item/hammer_pattern.png new file mode 100644 index 0000000..b50aba8 Binary files /dev/null and b/mods/pala/src/main/resources/assets/pala/textures/item/hammer_pattern.png differ diff --git a/mods/pala/src/main/resources/assets/pala/textures/item/ingot_pattern.png b/mods/pala/src/main/resources/assets/pala/textures/item/ingot_pattern.png new file mode 100644 index 0000000..586da40 Binary files /dev/null and b/mods/pala/src/main/resources/assets/pala/textures/item/ingot_pattern.png differ diff --git a/mods/pala/src/main/resources/assets/pala/textures/item/orb_knockback.png b/mods/pala/src/main/resources/assets/pala/textures/item/orb_knockback.png new file mode 100644 index 0000000..ca5bf80 Binary files /dev/null and b/mods/pala/src/main/resources/assets/pala/textures/item/orb_knockback.png differ diff --git a/mods/pala/src/main/resources/assets/pala/textures/item/socket.png b/mods/pala/src/main/resources/assets/pala/textures/item/socket.png new file mode 100644 index 0000000..ed25a60 Binary files /dev/null and b/mods/pala/src/main/resources/assets/pala/textures/item/socket.png differ diff --git a/mods/pala/src/main/resources/assets/pala/textures/item/socket_pattern.png b/mods/pala/src/main/resources/assets/pala/textures/item/socket_pattern.png new file mode 100644 index 0000000..17922c8 Binary files /dev/null and b/mods/pala/src/main/resources/assets/pala/textures/item/socket_pattern.png differ diff --git a/mods/pala/src/main/resources/data/pala/recipe/grinderblockrecipe.json b/mods/pala/src/main/resources/data/pala/recipe/grinderblockrecipe.json new file mode 100644 index 0000000..6da03c4 --- /dev/null +++ b/mods/pala/src/main/resources/data/pala/recipe/grinderblockrecipe.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "pattern": [ + "###", + "#F#", + "###" + ], + "key": { + "#": "pala:paladium_ingot", + "F": "pala:paladium_furnace" + }, + "result": { + "id": "pala:grinder_block", + "count": 1 + } +} diff --git a/mods/pala/src/main/resources/data/pala/recipe/grindercasingrecipe.json b/mods/pala/src/main/resources/data/pala/recipe/grindercasingrecipe.json new file mode 100644 index 0000000..a2a994c --- /dev/null +++ b/mods/pala/src/main/resources/data/pala/recipe/grindercasingrecipe.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "pattern": [ + "###", + "# #", + "###" + ], + "key": { + "#": "pala:paladium_ingot" + }, + "result": { + "id": "pala:grinder_casing", + "count": 1 + } +} diff --git a/mods/pala/src/main/resources/data/pala/recipe/grinderframerecipe.json b/mods/pala/src/main/resources/data/pala/recipe/grinderframerecipe.json new file mode 100644 index 0000000..3a2b975 --- /dev/null +++ b/mods/pala/src/main/resources/data/pala/recipe/grinderframerecipe.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "pattern": [ + "#T#", + "# #", + "#T#" + ], + "key": { + "#": "pala:paladium_ingot", + "T": "pala:titane_ingot" + }, + "result": { + "id": "pala:grinder_frame", + "count": 1 + } +} diff --git a/server/mods/pala-0.2.1.jar b/server/mods/pala-0.2.1.jar index 3d08998..ceef422 100644 Binary files a/server/mods/pala-0.2.1.jar and b/server/mods/pala-0.2.1.jar differ