diff --git a/atlas/root/distribution.json b/atlas/root/distribution.json index 393a78a..f39b61b 100644 --- a/atlas/root/distribution.json +++ b/atlas/root/distribution.json @@ -422,17 +422,16 @@ } }, { - "id": "fr.surviepote:pala:0.2.0@jar", + "id": "fr.surviepote:pala:0.2.1@jar", "name": "Pala (SurviePote)", "type": "FabricMod", "artifact": { - "size": 1564309, - "url": "https://git.kisakay.com/k/mc/raw/branch/main/atlas/root/servers/SurviePote-26.3/fabricmods/optionaloff/pala-0.2.0.jar", - "MD5": "f8fa5125897f087553cc2da44dc57ff1" + "size": 1568238, + "url": "https://git.kisakay.com/k/mc/raw/branch/main/atlas/root/servers/SurviePote-26.3/fabricmods/optionalon/pala-0.2.1.jar", + "MD5": "435dec23b44c4aa86fa147de0325463e" }, "required": { - "value": false, - "def": false + "value": false } }, { diff --git a/atlas/root/servers/SurviePote-26.3/fabricmods/optionaloff/pala-0.2.0.jar b/atlas/root/servers/SurviePote-26.3/fabricmods/optionalon/pala-0.2.1.jar similarity index 87% rename from atlas/root/servers/SurviePote-26.3/fabricmods/optionaloff/pala-0.2.0.jar rename to atlas/root/servers/SurviePote-26.3/fabricmods/optionalon/pala-0.2.1.jar index 3e6b71e..188f1c1 100644 Binary files a/atlas/root/servers/SurviePote-26.3/fabricmods/optionaloff/pala-0.2.0.jar and b/atlas/root/servers/SurviePote-26.3/fabricmods/optionalon/pala-0.2.1.jar differ diff --git a/mods/pala/gradle.properties b/mods/pala/gradle.properties index cc59b62..a7576b1 100644 --- a/mods/pala/gradle.properties +++ b/mods/pala/gradle.properties @@ -5,7 +5,7 @@ loader_version=0.20.0 loom_version=1.19.1 # Mod Properties -mod_version=0.2.0 +mod_version=0.2.1 maven_group=fr.surviepote archives_base_name=pala 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 9de57ef..a50f123 100644 --- a/mods/pala/src/main/java/fr/surviepote/pala/PalaBlocks.java +++ b/mods/pala/src/main/java/fr/surviepote/pala/PalaBlocks.java @@ -16,52 +16,61 @@ public final class PalaBlocks { private PalaBlocks() { } + + private static net.minecraft.resources.ResourceKey blockId(String path) { + return net.minecraft.resources.ResourceKey.create(net.minecraft.core.registries.Registries.BLOCK, + net.minecraft.resources.Identifier.fromNamespaceAndPath("pala", path)); + } + private static Block register(String path, Block block) { Block registered = Registry.register(BuiltInRegistries.BLOCK, Identifier.fromNamespaceAndPath("pala", path), block); - Registry.register(BuiltInRegistries.ITEM, Identifier.fromNamespaceAndPath("pala", path), new BlockItem(registered, new Item.Properties())); + net.minecraft.resources.ResourceKey itemId = net.minecraft.resources.ResourceKey.create( + net.minecraft.core.registries.Registries.ITEM, Identifier.fromNamespaceAndPath("pala", path)); + Registry.register(BuiltInRegistries.ITEM, Identifier.fromNamespaceAndPath("pala", path), + new BlockItem(registered, new Item.Properties().setId(itemId))); return registered; } - public static final Block AMETHYST_ORE = register("amethyst_ore", new Block(BlockBehaviour.Properties.of().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().strength(5.0F, 8.0F).sound(SoundType.METAL).requiresCorrectToolForDrops())); - public static final Block AMETHYST_SPIKE = register("amethyst_spike", new Block(BlockBehaviour.Properties.of().strength(1.0F, 10.0F).sound(SoundType.GRAVEL))); - public static final Block CAVE_BLOCK = register("cave_block", new Block(BlockBehaviour.Properties.of().strength(1.0F, 10.0F).sound(SoundType.METAL))); - public static final Block FIKUTSI_STAGE0 = register("fikutsi_stage0", new Block(BlockBehaviour.Properties.of().strength(0.0F, 0.0F).sound(SoundType.CROP).noCollision().instabreak())); - public static final Block FIKUTSI_STAGE1 = register("fikutsi_stage1", new Block(BlockBehaviour.Properties.of().strength(0.0F, 0.0F).sound(SoundType.CROP).noCollision().instabreak())); - public static final Block FIKUTSI_STAGE2 = register("fikutsi_stage2", new Block(BlockBehaviour.Properties.of().strength(0.0F, 0.0F).sound(SoundType.CROP).noCollision().instabreak())); - public static final Block FIKUTSI_STAGE3 = register("fikutsi_stage3", new Block(BlockBehaviour.Properties.of().strength(0.0F, 0.0F).sound(SoundType.CROP).noCollision().instabreak())); - public static final Block FINDIUM_ORE = register("findium_ore", new Block(BlockBehaviour.Properties.of().strength(3.0F, 8.7055F).sound(SoundType.STONE).requiresCorrectToolForDrops())); - public static final Block FINDIUM_ORE_BLOCK = register("findium_ore_block", new Block(BlockBehaviour.Properties.of().strength(5.0F, 10.0F).sound(SoundType.METAL).requiresCorrectToolForDrops())); - public static final Block KISAKAY_ORE = register("kisakay_ore", new Block(BlockBehaviour.Properties.of().strength(6.0F, 12.0F).sound(SoundType.STONE).requiresCorrectToolForDrops())); - public static final Block KISAKAY_ORE_BLOCK = register("kisakay_ore_block", new Block(BlockBehaviour.Properties.of().strength(5.0F, 10.0F).sound(SoundType.METAL).requiresCorrectToolForDrops())); - public static final Block KIWANO_STAGE0 = register("kiwano_stage0", new Block(BlockBehaviour.Properties.of().strength(0.0F, 0.0F).sound(SoundType.CROP).noCollision().instabreak())); - public static final Block KIWANO_STAGE1 = register("kiwano_stage1", new Block(BlockBehaviour.Properties.of().strength(0.0F, 0.0F).sound(SoundType.CROP).noCollision().instabreak())); - public static final Block KIWANO_STAGE2 = register("kiwano_stage2", new Block(BlockBehaviour.Properties.of().strength(0.0F, 0.0F).sound(SoundType.CROP).noCollision().instabreak())); - public static final Block KIWANO_STAGE3 = register("kiwano_stage3", new Block(BlockBehaviour.Properties.of().strength(0.0F, 0.0F).sound(SoundType.CROP).noCollision().instabreak())); - public static final Block KIWANO_STAGE4 = register("kiwano_stage4", new Block(BlockBehaviour.Properties.of().strength(0.0F, 0.0F).sound(SoundType.CROP).noCollision().instabreak())); - public static final Block OKAMI_STAGE0 = register("okami_stage0", new Block(BlockBehaviour.Properties.of().strength(0.0F, 0.0F).sound(SoundType.CROP).noCollision().instabreak())); - public static final Block OKAMI_STAGE1 = register("okami_stage1", new Block(BlockBehaviour.Properties.of().strength(0.0F, 0.0F).sound(SoundType.CROP).noCollision().instabreak())); - public static final Block OKAMI_STAGE2 = register("okami_stage2", new Block(BlockBehaviour.Properties.of().strength(0.0F, 0.0F).sound(SoundType.CROP).noCollision().instabreak())); - public static final Block OKAMI_STAGE3 = register("okami_stage3", new Block(BlockBehaviour.Properties.of().strength(0.0F, 0.0F).sound(SoundType.CROP).noCollision().instabreak())); - public static final Block ORANGE_BLUE_STAGE0 = register("orange_blue_stage0", new Block(BlockBehaviour.Properties.of().strength(0.0F, 0.0F).sound(SoundType.CROP).noCollision().instabreak())); - public static final Block ORANGE_BLUE_STAGE1 = register("orange_blue_stage1", new Block(BlockBehaviour.Properties.of().strength(0.0F, 0.0F).sound(SoundType.CROP).noCollision().instabreak())); - public static final Block ORANGE_BLUE_STAGE2 = register("orange_blue_stage2", new Block(BlockBehaviour.Properties.of().strength(0.0F, 0.0F).sound(SoundType.CROP).noCollision().instabreak())); - public static final Block ORANGE_BLUE_STAGE3 = register("orange_blue_stage3", new Block(BlockBehaviour.Properties.of().strength(0.0F, 0.0F).sound(SoundType.CROP).noCollision().instabreak())); - public static final Block ORANGE_BLUE_STAGE4 = register("orange_blue_stage4", new Block(BlockBehaviour.Properties.of().strength(0.0F, 0.0F).sound(SoundType.CROP).noCollision().instabreak())); - public static final Block PALADIUM_CRUSHER = register("paladium_crusher", new PalaMachineBlock()); - public static final Block PALADIUM_FURNACE = register("paladium_furnace", new PalaMachineBlock()); - public static final Block PALADIUM_GREEN_ORE = register("paladium_green_ore", new Block(BlockBehaviour.Properties.of().strength(5.5F, 9.0F).sound(SoundType.STONE).requiresCorrectToolForDrops())); - public static final Block PALADIUM_GREEN_ORE_BLOCK = register("paladium_green_ore_block", new Block(BlockBehaviour.Properties.of().strength(5.0F, 10.0F).sound(SoundType.METAL).requiresCorrectToolForDrops())); - public static final Block PALADIUM_ORE = register("paladium_ore", new Block(BlockBehaviour.Properties.of().strength(5.0F, 8.0F).sound(SoundType.STONE).requiresCorrectToolForDrops())); - public static final Block PALADIUM_ORE_BLOCK = register("paladium_ore_block", new Block(BlockBehaviour.Properties.of().strength(5.0F, 10.0F).sound(SoundType.METAL).requiresCorrectToolForDrops())); - public static final Block SLIME_PAD = register("slime_pad", new Block(BlockBehaviour.Properties.of().strength(1.0F, 10.0F).sound(SoundType.SLIME_BLOCK).requiresCorrectToolForDrops())); - public static final Block TITANE_ORE = register("titane_ore", new Block(BlockBehaviour.Properties.of().strength(4.0F, 6.0F).sound(SoundType.STONE).requiresCorrectToolForDrops())); - public static final Block TITANE_ORE_BLOCK = register("titane_ore_block", new Block(BlockBehaviour.Properties.of().strength(5.0F, 10.0F).sound(SoundType.METAL).requiresCorrectToolForDrops())); - public static final Block TRANNY = register("tranny", new Block(BlockBehaviour.Properties.of().strength(1.0F, 10.0F).sound(SoundType.WOOD))); - public static final Block TRIXIUM_ORE = register("trixium_ore", new Block(BlockBehaviour.Properties.of().strength(2.0F, 11.0678F).sound(SoundType.STONE).requiresCorrectToolForDrops())); - public static final Block TRIXIUM_ORE_BLOCK = register("trixium_ore_block", new Block(BlockBehaviour.Properties.of().strength(5.0F, 10.0F).sound(SoundType.METAL).requiresCorrectToolForDrops())); + 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())); + 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())); + 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())); + public static final Block FIKUTSI_STAGE2 = register("fikutsi_stage2", new Block(BlockBehaviour.Properties.of().setId(blockId("fikutsi_stage2")).strength(0.0F, 0.0F).sound(SoundType.CROP).noCollision().instabreak())); + public static final Block FIKUTSI_STAGE3 = register("fikutsi_stage3", new Block(BlockBehaviour.Properties.of().setId(blockId("fikutsi_stage3")).strength(0.0F, 0.0F).sound(SoundType.CROP).noCollision().instabreak())); + public static final Block FINDIUM_ORE = register("findium_ore", new Block(BlockBehaviour.Properties.of().setId(blockId("findium_ore")).strength(3.0F, 8.7055F).sound(SoundType.STONE).requiresCorrectToolForDrops())); + public static final Block FINDIUM_ORE_BLOCK = register("findium_ore_block", new Block(BlockBehaviour.Properties.of().setId(blockId("findium_ore_block")).strength(5.0F, 10.0F).sound(SoundType.METAL).requiresCorrectToolForDrops())); + public static final Block KISAKAY_ORE = register("kisakay_ore", new Block(BlockBehaviour.Properties.of().setId(blockId("kisakay_ore")).strength(6.0F, 12.0F).sound(SoundType.STONE).requiresCorrectToolForDrops())); + public static final Block KISAKAY_ORE_BLOCK = register("kisakay_ore_block", new Block(BlockBehaviour.Properties.of().setId(blockId("kisakay_ore_block")).strength(5.0F, 10.0F).sound(SoundType.METAL).requiresCorrectToolForDrops())); + public static final Block KIWANO_STAGE0 = register("kiwano_stage0", new Block(BlockBehaviour.Properties.of().setId(blockId("kiwano_stage0")).strength(0.0F, 0.0F).sound(SoundType.CROP).noCollision().instabreak())); + public static final Block KIWANO_STAGE1 = register("kiwano_stage1", new Block(BlockBehaviour.Properties.of().setId(blockId("kiwano_stage1")).strength(0.0F, 0.0F).sound(SoundType.CROP).noCollision().instabreak())); + public static final Block KIWANO_STAGE2 = register("kiwano_stage2", new Block(BlockBehaviour.Properties.of().setId(blockId("kiwano_stage2")).strength(0.0F, 0.0F).sound(SoundType.CROP).noCollision().instabreak())); + public static final Block KIWANO_STAGE3 = register("kiwano_stage3", new Block(BlockBehaviour.Properties.of().setId(blockId("kiwano_stage3")).strength(0.0F, 0.0F).sound(SoundType.CROP).noCollision().instabreak())); + public static final Block KIWANO_STAGE4 = register("kiwano_stage4", new Block(BlockBehaviour.Properties.of().setId(blockId("kiwano_stage4")).strength(0.0F, 0.0F).sound(SoundType.CROP).noCollision().instabreak())); + public static final Block OKAMI_STAGE0 = register("okami_stage0", new Block(BlockBehaviour.Properties.of().setId(blockId("okami_stage0")).strength(0.0F, 0.0F).sound(SoundType.CROP).noCollision().instabreak())); + public static final Block OKAMI_STAGE1 = register("okami_stage1", new Block(BlockBehaviour.Properties.of().setId(blockId("okami_stage1")).strength(0.0F, 0.0F).sound(SoundType.CROP).noCollision().instabreak())); + public static final Block OKAMI_STAGE2 = register("okami_stage2", new Block(BlockBehaviour.Properties.of().setId(blockId("okami_stage2")).strength(0.0F, 0.0F).sound(SoundType.CROP).noCollision().instabreak())); + public static final Block OKAMI_STAGE3 = register("okami_stage3", new Block(BlockBehaviour.Properties.of().setId(blockId("okami_stage3")).strength(0.0F, 0.0F).sound(SoundType.CROP).noCollision().instabreak())); + public static final Block ORANGE_BLUE_STAGE0 = register("orange_blue_stage0", new Block(BlockBehaviour.Properties.of().setId(blockId("orange_blue_stage0")).strength(0.0F, 0.0F).sound(SoundType.CROP).noCollision().instabreak())); + public static final Block ORANGE_BLUE_STAGE1 = register("orange_blue_stage1", new Block(BlockBehaviour.Properties.of().setId(blockId("orange_blue_stage1")).strength(0.0F, 0.0F).sound(SoundType.CROP).noCollision().instabreak())); + public static final Block ORANGE_BLUE_STAGE2 = register("orange_blue_stage2", new Block(BlockBehaviour.Properties.of().setId(blockId("orange_blue_stage2")).strength(0.0F, 0.0F).sound(SoundType.CROP).noCollision().instabreak())); + public static final Block ORANGE_BLUE_STAGE3 = register("orange_blue_stage3", new Block(BlockBehaviour.Properties.of().setId(blockId("orange_blue_stage3")).strength(0.0F, 0.0F).sound(SoundType.CROP).noCollision().instabreak())); + public static final Block ORANGE_BLUE_STAGE4 = register("orange_blue_stage4", new Block(BlockBehaviour.Properties.of().setId(blockId("orange_blue_stage4")).strength(0.0F, 0.0F).sound(SoundType.CROP).noCollision().instabreak())); + public static final Block PALADIUM_CRUSHER = register("paladium_crusher", new PalaMachineBlock(BlockBehaviour.Properties.of().setId(blockId("paladium_crusher")))); + public static final Block PALADIUM_FURNACE = register("paladium_furnace", new PalaMachineBlock(BlockBehaviour.Properties.of().setId(blockId("paladium_furnace")))); + public static final Block PALADIUM_GREEN_ORE = register("paladium_green_ore", new Block(BlockBehaviour.Properties.of().setId(blockId("paladium_green_ore")).strength(5.5F, 9.0F).sound(SoundType.STONE).requiresCorrectToolForDrops())); + public static final Block PALADIUM_GREEN_ORE_BLOCK = register("paladium_green_ore_block", new Block(BlockBehaviour.Properties.of().setId(blockId("paladium_green_ore_block")).strength(5.0F, 10.0F).sound(SoundType.METAL).requiresCorrectToolForDrops())); + public static final Block PALADIUM_ORE = register("paladium_ore", new Block(BlockBehaviour.Properties.of().setId(blockId("paladium_ore")).strength(5.0F, 8.0F).sound(SoundType.STONE).requiresCorrectToolForDrops())); + public static final Block PALADIUM_ORE_BLOCK = register("paladium_ore_block", new Block(BlockBehaviour.Properties.of().setId(blockId("paladium_ore_block")).strength(5.0F, 10.0F).sound(SoundType.METAL).requiresCorrectToolForDrops())); + public static final Block SLIME_PAD = register("slime_pad", new Block(BlockBehaviour.Properties.of().setId(blockId("slime_pad")).strength(1.0F, 10.0F).sound(SoundType.SLIME_BLOCK).requiresCorrectToolForDrops())); + public static final Block TITANE_ORE = register("titane_ore", new Block(BlockBehaviour.Properties.of().setId(blockId("titane_ore")).strength(4.0F, 6.0F).sound(SoundType.STONE).requiresCorrectToolForDrops())); + public static final Block TITANE_ORE_BLOCK = register("titane_ore_block", new Block(BlockBehaviour.Properties.of().setId(blockId("titane_ore_block")).strength(5.0F, 10.0F).sound(SoundType.METAL).requiresCorrectToolForDrops())); + public static final Block TRANNY = register("tranny", new Block(BlockBehaviour.Properties.of().setId(blockId("tranny")).strength(1.0F, 10.0F).sound(SoundType.WOOD))); + public static final Block TRIXIUM_ORE = register("trixium_ore", new Block(BlockBehaviour.Properties.of().setId(blockId("trixium_ore")).strength(2.0F, 11.0678F).sound(SoundType.STONE).requiresCorrectToolForDrops())); + public static final Block TRIXIUM_ORE_BLOCK = register("trixium_ore_block", new Block(BlockBehaviour.Properties.of().setId(blockId("trixium_ore_block")).strength(5.0F, 10.0F).sound(SoundType.METAL).requiresCorrectToolForDrops())); - public static final Block XP_BUSH = register("xp_bush", new Block(BlockBehaviour.Properties.of().strength(0.0F, 0.0F).sound(SoundType.CROP).noCollision().instabreak())); + public static final Block XP_BUSH = register("xp_bush", new Block(BlockBehaviour.Properties.of().setId(blockId("xp_bush")).strength(0.0F, 0.0F).sound(SoundType.CROP).noCollision().instabreak())); public static void register() { } diff --git a/mods/pala/src/main/java/fr/surviepote/pala/PalaFluids.java b/mods/pala/src/main/java/fr/surviepote/pala/PalaFluids.java index 1f0a1cf..2005ed0 100644 --- a/mods/pala/src/main/java/fr/surviepote/pala/PalaFluids.java +++ b/mods/pala/src/main/java/fr/surviepote/pala/PalaFluids.java @@ -7,6 +7,8 @@ import net.minecraft.core.Registry; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.resources.Identifier; import net.minecraft.world.item.BlockItem; +import net.minecraft.core.registries.Registries; +import net.minecraft.resources.ResourceKey; import net.minecraft.world.item.BucketItem; import net.minecraft.world.item.Item; import net.minecraft.world.level.BlockGetter; @@ -132,8 +134,8 @@ public final class PalaFluids { } public static final class PalaFluidBlock extends LiquidBlock { - public PalaFluidBlock(Supplier fluid) { - super(fluid.get(), BlockBehaviour.Properties.of().mapColor(MapColor.WATER).replaceable() + public PalaFluidBlock(Supplier fluid, net.minecraft.resources.ResourceKey id) { + super(fluid.get(), BlockBehaviour.Properties.of().setId(id).mapColor(MapColor.WATER).replaceable() .noCollision().strength(100.0F).pushReaction(PushReaction.IGNORE_ENTITY) .noLootTable().liquid().sound(SoundType.EMPTY)); } @@ -162,13 +164,13 @@ public final class PalaFluids { () -> ANGELIC_WATER_BLOCK, () -> ANGELIC_WATER_BUCKET, false); ANGELIC_WATER_BLOCK = Registry.register(BuiltInRegistries.BLOCK, Identifier.fromNamespaceAndPath("pala", "angelic_water"), - new PalaFluidBlock(() -> ANGELIC_WATER)); + new PalaFluidBlock(() -> ANGELIC_WATER, ResourceKey.create(Registries.BLOCK, Identifier.fromNamespaceAndPath("pala", "angelic_water")))); // BlockItem sous l'id pala:angelic_water (cible de angelicwaterrecipe.json). Registry.register(BuiltInRegistries.ITEM, Identifier.fromNamespaceAndPath("pala", "angelic_water"), - new BlockItem(ANGELIC_WATER_BLOCK, new Item.Properties())); + new BlockItem(ANGELIC_WATER_BLOCK, new Item.Properties().setId(ResourceKey.create(Registries.ITEM, Identifier.fromNamespaceAndPath("pala", "angelic_water"))))); ANGELIC_WATER_BUCKET = Registry.register(BuiltInRegistries.ITEM, Identifier.fromNamespaceAndPath("pala", "angelic_water_bucket"), - new BucketItem(ANGELIC_WATER, new Item.Properties().stacksTo(1))); + new BucketItem(ANGELIC_WATER, new Item.Properties().setId(ResourceKey.create(Registries.ITEM, Identifier.fromNamespaceAndPath("pala", "angelic_water_bucket"))).stacksTo(1))); FAKE_WATER = registerFluid("fake_water", () -> FAKE_WATER, () -> FAKE_WATER_FLOWING, () -> FAKE_WATER_BLOCK, () -> FAKE_WATER_BUCKET, true); @@ -176,12 +178,12 @@ public final class PalaFluids { () -> FAKE_WATER_BLOCK, () -> FAKE_WATER_BUCKET, false); FAKE_WATER_BLOCK = Registry.register(BuiltInRegistries.BLOCK, Identifier.fromNamespaceAndPath("pala", "fake_water"), - new PalaFluidBlock(() -> FAKE_WATER)); + new PalaFluidBlock(() -> FAKE_WATER, ResourceKey.create(Registries.BLOCK, Identifier.fromNamespaceAndPath("pala", "fake_water")))); // BlockItem sous l'id pala:fake_water (cible de fakewaterrecipe.json). Registry.register(BuiltInRegistries.ITEM, Identifier.fromNamespaceAndPath("pala", "fake_water"), - new BlockItem(FAKE_WATER_BLOCK, new Item.Properties())); + new BlockItem(FAKE_WATER_BLOCK, new Item.Properties().setId(ResourceKey.create(Registries.ITEM, Identifier.fromNamespaceAndPath("pala", "fake_water"))))); FAKE_WATER_BUCKET = Registry.register(BuiltInRegistries.ITEM, Identifier.fromNamespaceAndPath("pala", "fake_water_bucket"), - new BucketItem(FAKE_WATER, new Item.Properties().stacksTo(1))); + new BucketItem(FAKE_WATER, new Item.Properties().setId(ResourceKey.create(Registries.ITEM, Identifier.fromNamespaceAndPath("pala", "fake_water_bucket"))).stacksTo(1))); } } 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 b46870c..8a99f34 100644 --- a/mods/pala/src/main/java/fr/surviepote/pala/PalaItems.java +++ b/mods/pala/src/main/java/fr/surviepote/pala/PalaItems.java @@ -16,129 +16,131 @@ public final class PalaItems { private PalaItems() { } - private static Item register(String path, Item item) { - return Registry.register(BuiltInRegistries.ITEM, Identifier.fromNamespaceAndPath("pala", path), item); + private static Item register(String path, java.util.function.Function, Item> factory) { + net.minecraft.resources.ResourceKey id = net.minecraft.resources.ResourceKey.create( + net.minecraft.core.registries.Registries.ITEM, Identifier.fromNamespaceAndPath("pala", path)); + return Registry.register(BuiltInRegistries.ITEM, Identifier.fromNamespaceAndPath("pala", path), factory.apply(id)); } - public static final Item AMETHYST_INGOT = register("amethyst_ingot", new Item(new Item.Properties())); - public static final Item AMETHYST_MIXED_COAL = register("amethyst_mixed_coal", new Item(new Item.Properties())); - public static final Item AMETHYST_STICK = register("amethyst_stick", new Item(new Item.Properties())); - public static final Item COMPRESSED_AMETHYST = register("compressed_amethyst", new Item(new Item.Properties())); - public static final Item CREATIVE_MIXED_COAL = register("creative_mixed_coal", new Item(new Item.Properties())); - public static final Item EGG_PLANT_FRUIT = register("egg_plant_fruit", new Item(new Item.Properties())); - public static final Item ENDIUM_INGOT = register("endium_ingot", new Item(new Item.Properties())); - public static final Item ENDIUM_NUGGET = register("endium_nugget", new Item(new Item.Properties().fireResistant())); - public static final Item EXTRAPOLATED_BUCKET = register("extrapolated_bucket", new Item(new Item.Properties().stacksTo(1))); - public static final Item FIKUTSI_SEEDS = register("fikutsi_seeds", new Item(new Item.Properties())); - public static final Item FINDIUM_GEM = register("findium_gem", new Item(new Item.Properties())); - public static final Item GOLD_MIXED_COAL = register("gold_mixed_coal", new Item(new Item.Properties())); - public static final Item HANG_GLIDER = register("hang_glider", new Item(new Item.Properties().stacksTo(1))); - public static final Item HEAL_STICK = register("heal_stick", new Item(new Item.Properties().stacksTo(1).component(DataComponents.ENCHANTMENT_GLINT_OVERRIDE, true))); - public static final Item HYPER_JUMP_STICK = register("hyper_jump_stick", new Item(new Item.Properties().stacksTo(1).component(DataComponents.ENCHANTMENT_GLINT_OVERRIDE, true))); - public static final Item KISAKAY_INGOT = register("kisakay_ingot", new Item(new Item.Properties())); - public static final Item KIWANO = register("kiwano", new Item(new Item.Properties())); - public static final Item KIWANO_SEEDS = register("kiwano_seeds", new Item(new Item.Properties())); - public static final Item LEGENDARY_STONE_OF_POWER = register("legendary_stone_of_power", new Item(new Item.Properties().stacksTo(1))); - public static final Item LENGENDARY_STONE_OF_TELEPORTATION = register("lengendary_stone_of_teleportation", new Item(new Item.Properties().stacksTo(1))); - public static final Item OKAMI_FRUIT = register("okami_fruit", new Item(new Item.Properties())); - public static final Item OKAMI_SEEDS = register("okami_seeds", new Item(new Item.Properties())); - public static final Item ORANGE_BLUE_FRUIT = register("orange_blue_fruit", new Item(new Item.Properties())); - public static final Item ORANGE_BLUE_SEEDS = register("orange_blue_seeds", new Item(new Item.Properties())); - public static final Item PALA_MIXED_COAL = register("pala_mixed_coal", new Item(new Item.Properties())); - public static final Item PALADIUM_CORE = register("paladium_core", new Item(new Item.Properties())); - public static final Item PALADIUM_GREEN_INGOT = register("paladium_green_ingot", new Item(new Item.Properties())); - public static final Item PALADIUM_INGOT = register("paladium_ingot", new Item(new Item.Properties())); - public static final Item PALADIUM_STICK = register("paladium_stick", new Item(new Item.Properties())); - public static final Item SPEED_STICK = register("speed_stick", new Item(new Item.Properties().stacksTo(1).component(DataComponents.ENCHANTMENT_GLINT_OVERRIDE, true))); - public static final Item STICK_OF_GOD = register("stick_of_god", new Item(new Item.Properties().stacksTo(1).component(DataComponents.ENCHANTMENT_GLINT_OVERRIDE, true))); - public static final Item STRENGHT_STICK = register("strenght_stick", new Item(new Item.Properties().stacksTo(1).component(DataComponents.ENCHANTMENT_GLINT_OVERRIDE, true))); - public static final Item TITANE_INGOT = register("titane_ingot", new Item(new Item.Properties())); - public static final Item TITANE_MIXED_COAL = register("titane_mixed_coal", new Item(new Item.Properties())); - public static final Item TITANE_STICK = register("titane_stick", new Item(new Item.Properties())); - public static final Item TRIXIUM_GEM = register("trixium_gem", new Item(new Item.Properties())); - public static final Item XP_BERRIES = register("xp_berries", new Item(new Item.Properties())); - public static final Item PALA_APPLE = register("pala_apple", new Item(new Item.Properties().stacksTo(16).food(new FoodProperties(4, 0.3F, true)))); - public static final Item AMETHYST_AXE = register("amethyst_axe", new Item(new Item.Properties().axe(PalaToolMaterials.AMETHYST_AXE, 3.7F, -3.0F))); - public static final Item AMETHYST_HAMMER = register("amethyst_hammer", new Item(new Item.Properties().pickaxe(PalaToolMaterials.AMETHYST_HAMMER, 3.0F, -3.2F))); - public static final Item AMETHYST_PICKAXE = register("amethyst_pickaxe", new Item(new Item.Properties().pickaxe(PalaToolMaterials.AMETHYST_PICKAXE, 2.1F, -3.0F))); - public static final Item AMETHYST_SHOVEL = register("amethyst_shovel", new Item(new Item.Properties().shovel(PalaToolMaterials.AMETHYST_SHOVEL, 1.5F, -3.0F))); - public static final Item AMETHYST_SWORD = register("amethyst_sword", new Item(new Item.Properties().sword(PalaToolMaterials.AMETHYST_SWORD, 5.0F, -2.4F))); - public static final Item ENDIUM_AXE = register("endium_axe", new Item(new Item.Properties().axe(PalaToolMaterials.ENDIUM_AXE, 7.5F, -3.0F))); - public static final Item ENDIUM_PICKAXE = register("endium_pickaxe", new Item(new Item.Properties().pickaxe(PalaToolMaterials.ENDIUM_PICKAXE, 5.5F, -3.0F))); - public static final Item ENDIUM_SWORD = register("endium_sword", new Item(new Item.Properties().sword(PalaToolMaterials.ENDIUM_SWORD, 11.0F, -2.0F))); - public static final Item KISAKAY_AXE = register("kisakay_axe", new Item(new Item.Properties().axe(PalaToolMaterials.KISAKAY_AXE, 25.0F, -3.0F))); - public static final Item KISAKAY_HOE = register("kisakay_hoe", new Item(new Item.Properties().hoe(PalaToolMaterials.KISAKAY_HOE, 8.0F, -3.0F))); - public static final Item KISAKAY_PICKAXE = register("kisakay_pickaxe", new Item(new Item.Properties().pickaxe(PalaToolMaterials.KISAKAY_PICKAXE, 8.0F, -3.0F))); - public static final Item KISAKAY_SHOVEL = register("kisakay_shovel", new Item(new Item.Properties().shovel(PalaToolMaterials.KISAKAY_SHOVEL, 8.0F, -3.0F))); - public static final Item KISAKAY_SWORD = register("kisakay_sword", new Item(new Item.Properties().sword(PalaToolMaterials.KISAKAY_SWORD, 8.0F, -3.0F))); - public static final Item PALADIUM_AXE = register("paladium_axe", new Item(new Item.Properties().axe(PalaToolMaterials.PALADIUM_AXE, 4.8F, -3.0F))); - public static final Item PALADIUM_GREEN_AXE = register("paladium_green_axe", new Item(new Item.Properties().axe(PalaToolMaterials.PALADIUM_GREEN_AXE, 5.0F, -3.0F))); - public static final Item PALADIUM_GREEN_PICKAXE = register("paladium_green_pickaxe", new Item(new Item.Properties().pickaxe(PalaToolMaterials.PALADIUM_GREEN_PICKAXE, 6.0F, -3.0F))); - public static final Item PALADIUM_GREEN_SHOVEL = register("paladium_green_shovel", new Item(new Item.Properties().shovel(PalaToolMaterials.PALADIUM_GREEN_SHOVEL, 2.0F, -3.0F))); - public static final Item PALADIUM_GREEN_SWORD = register("paladium_green_sword", new Item(new Item.Properties().sword(PalaToolMaterials.PALADIUM_GREEN_SWORD, 9.0F, -2.2F))); - public static final Item PALADIUM_HAMMER = register("paladium_hammer", new Item(new Item.Properties().pickaxe(PalaToolMaterials.PALADIUM_HAMMER, 3.0F, -3.2F))); - public static final Item PALADIUM_PICKAXE = register("paladium_pickaxe", new Item(new Item.Properties().pickaxe(PalaToolMaterials.PALADIUM_PICKAXE, 2.0F, -3.0F))); - public static final Item PALADIUM_SHOVEL = register("paladium_shovel", new Item(new Item.Properties().shovel(PalaToolMaterials.PALADIUM_SHOVEL, 11.0F, -3.0F))); - public static final Item PALADIUM_SWORD = register("paladium_sword", new Item(new Item.Properties().sword(PalaToolMaterials.PALADIUM_SWORD, 8.0F, -2.3F))); - public static final Item PICKAXE_OF_THE_GOD = register("pickaxe_of_the_god", new Item(new Item.Properties().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", new Item(new Item.Properties().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", new Item(new Item.Properties().pickaxe(PalaToolMaterials.PICKAXE_OF_THE_GOD_LEVEL1, 0.0F, -3.0F).component(DataComponents.UNBREAKABLE, Unit.INSTANCE))); - public static final Item PICKAXE_OF_THE_GOD_LEVEL10 = register("pickaxe_of_the_god_level10", new Item(new Item.Properties().pickaxe(PalaToolMaterials.PICKAXE_OF_THE_GOD_LEVEL10, 0.8F, -2.1F).component(DataComponents.UNBREAKABLE, Unit.INSTANCE))); - public static final Item PICKAXE_OF_THE_GOD_LEVEL11 = register("pickaxe_of_the_god_level11", new Item(new Item.Properties().pickaxe(PalaToolMaterials.PICKAXE_OF_THE_GOD_LEVEL11, 1.0F, -1.9F).component(DataComponents.UNBREAKABLE, Unit.INSTANCE))); - public static final Item PICKAXE_OF_THE_GOD_LEVEL12 = register("pickaxe_of_the_god_level12", new Item(new Item.Properties().pickaxe(PalaToolMaterials.PICKAXE_OF_THE_GOD_LEVEL12, 1.1F, -1.8F).component(DataComponents.UNBREAKABLE, Unit.INSTANCE))); - public static final Item PICKAXE_OF_THE_GOD_LEVEL13 = register("pickaxe_of_the_god_level13", new Item(new Item.Properties().pickaxe(PalaToolMaterials.PICKAXE_OF_THE_GOD_LEVEL13, 1.2F, -1.7F).component(DataComponents.UNBREAKABLE, Unit.INSTANCE))); - public static final Item PICKAXE_OF_THE_GOD_LEVEL14 = register("pickaxe_of_the_god_level14", new Item(new Item.Properties().pickaxe(PalaToolMaterials.PICKAXE_OF_THE_GOD_LEVEL14, 1.3F, -1.6F).component(DataComponents.UNBREAKABLE, Unit.INSTANCE))); - public static final Item PICKAXE_OF_THE_GOD_LEVEL15 = register("pickaxe_of_the_god_level15", new Item(new Item.Properties().pickaxe(PalaToolMaterials.PICKAXE_OF_THE_GOD_LEVEL15, 1.4F, -1.5F).component(DataComponents.UNBREAKABLE, Unit.INSTANCE))); - public static final Item PICKAXE_OF_THE_GOD_LEVEL16 = register("pickaxe_of_the_god_level16", new Item(new Item.Properties().pickaxe(PalaToolMaterials.PICKAXE_OF_THE_GOD_LEVEL16, 1.6F, -1.3F).component(DataComponents.UNBREAKABLE, Unit.INSTANCE))); - public static final Item PICKAXE_OF_THE_GOD_LEVEL17 = register("pickaxe_of_the_god_level17", new Item(new Item.Properties().pickaxe(PalaToolMaterials.PICKAXE_OF_THE_GOD_LEVEL17, 1.6F, -1.2F).component(DataComponents.UNBREAKABLE, Unit.INSTANCE))); - public static final Item PICKAXE_OF_THE_GOD_LEVEL18 = register("pickaxe_of_the_god_level18", new Item(new Item.Properties().pickaxe(PalaToolMaterials.PICKAXE_OF_THE_GOD_LEVEL18, 0.0F, -1.1F).component(DataComponents.UNBREAKABLE, Unit.INSTANCE))); - public static final Item PICKAXE_OF_THE_GOD_LEVEL19 = register("pickaxe_of_the_god_level19", new Item(new Item.Properties().pickaxe(PalaToolMaterials.PICKAXE_OF_THE_GOD_LEVEL19, 0.0F, -1.0F).component(DataComponents.UNBREAKABLE, Unit.INSTANCE))); - public static final Item PICKAXE_OF_THE_GOD_LEVEL2 = register("pickaxe_of_the_god_level2", new Item(new Item.Properties().pickaxe(PalaToolMaterials.PICKAXE_OF_THE_GOD_LEVEL2, 0.0F, -3.5F).component(DataComponents.UNBREAKABLE, Unit.INSTANCE))); - public static final Item PICKAXE_OF_THE_GOD_LEVEL20 = register("pickaxe_of_the_god_level20", new Item(new Item.Properties().pickaxe(PalaToolMaterials.PICKAXE_OF_THE_GOD_LEVEL20, 0.3F, -0.8F).component(DataComponents.UNBREAKABLE, Unit.INSTANCE))); - public static final Item PICKAXE_OF_THE_GOD_LEVEL21 = register("pickaxe_of_the_god_level21", new Item(new Item.Properties().pickaxe(PalaToolMaterials.PICKAXE_OF_THE_GOD_LEVEL21, 0.7F, -0.2F).component(DataComponents.UNBREAKABLE, Unit.INSTANCE))); - public static final Item PICKAXE_OF_THE_GOD_LEVEL22 = register("pickaxe_of_the_god_level22", new Item(new Item.Properties().pickaxe(PalaToolMaterials.PICKAXE_OF_THE_GOD_LEVEL22, 2.0F, 0.1F).component(DataComponents.UNBREAKABLE, Unit.INSTANCE))); - public static final Item PICKAXE_OF_THE_GOD_LEVEL23 = register("pickaxe_of_the_god_level23", new Item(new Item.Properties().pickaxe(PalaToolMaterials.PICKAXE_OF_THE_GOD_LEVEL23, 2.3F, 0.4F).component(DataComponents.UNBREAKABLE, Unit.INSTANCE))); - public static final Item PICKAXE_OF_THE_GOD_LEVEL24 = register("pickaxe_of_the_god_level24", new Item(new Item.Properties().pickaxe(PalaToolMaterials.PICKAXE_OF_THE_GOD_LEVEL24, 4.5F, 1.4F).component(DataComponents.UNBREAKABLE, Unit.INSTANCE))); - public static final Item PICKAXE_OF_THE_GOD_LEVEL25 = register("pickaxe_of_the_god_level25", new Item(new Item.Properties().pickaxe(PalaToolMaterials.PICKAXE_OF_THE_GOD_LEVEL25, 14.5F, 11.4F).component(DataComponents.UNBREAKABLE, Unit.INSTANCE))); - public static final Item PICKAXE_OF_THE_GOD_LEVEL3 = register("pickaxe_of_the_god_level3", new Item(new Item.Properties().pickaxe(PalaToolMaterials.PICKAXE_OF_THE_GOD_LEVEL3, 0.0F, -3.3F).component(DataComponents.UNBREAKABLE, Unit.INSTANCE))); - public static final Item PICKAXE_OF_THE_GOD_LEVEL4 = register("pickaxe_of_the_god_level4", new Item(new Item.Properties().pickaxe(PalaToolMaterials.PICKAXE_OF_THE_GOD_LEVEL4, 0.0F, -3.2F).component(DataComponents.UNBREAKABLE, Unit.INSTANCE))); - public static final Item PICKAXE_OF_THE_GOD_LEVEL5 = register("pickaxe_of_the_god_level5", new Item(new Item.Properties().pickaxe(PalaToolMaterials.PICKAXE_OF_THE_GOD_LEVEL5, 0.1F, -3.0F).component(DataComponents.UNBREAKABLE, Unit.INSTANCE))); - public static final Item PICKAXE_OF_THE_GOD_LEVEL7 = register("pickaxe_of_the_god_level7", new Item(new Item.Properties().pickaxe(PalaToolMaterials.PICKAXE_OF_THE_GOD_LEVEL7, 0.6F, -2.7F).component(DataComponents.UNBREAKABLE, Unit.INSTANCE))); - public static final Item PICKAXE_OF_THE_GOD_LEVEL8 = register("pickaxe_of_the_god_level8", new Item(new Item.Properties().pickaxe(PalaToolMaterials.PICKAXE_OF_THE_GOD_LEVEL8, 0.6F, -2.5F).component(DataComponents.UNBREAKABLE, Unit.INSTANCE))); - public static final Item PICKAXE_OF_THE_GOD_LEVEL9 = register("pickaxe_of_the_god_level9", new Item(new Item.Properties().pickaxe(PalaToolMaterials.PICKAXE_OF_THE_GOD_LEVEL9, 0.7F, -2.2F).component(DataComponents.UNBREAKABLE, Unit.INSTANCE))); - public static final Item TITANE_AXE = register("titane_axe", new Item(new Item.Properties().axe(PalaToolMaterials.TITANE_AXE, 1.8F, -3.0F))); - public static final Item TITANE_HAMMER = register("titane_hammer", new Item(new Item.Properties().pickaxe(PalaToolMaterials.TITANE_HAMMER, 3.0F, -3.2F))); - public static final Item TITANE_PICKAXE = register("titane_pickaxe", new Item(new Item.Properties().pickaxe(PalaToolMaterials.TITANE_PICKAXE, 2.4F, -3.0F))); - public static final Item TITANE_SHOVEL = register("titane_shovel", new Item(new Item.Properties().shovel(PalaToolMaterials.TITANE_SHOVEL, 1.8F, -3.0F))); - public static final Item TITANE_SWORD = register("titane_sword", new Item(new Item.Properties().sword(PalaToolMaterials.TITANE_SWORD, 6.0F, -2.4F))); - public static final Item AMETHYST_HELMET = register("amethyst_helmet", new Item(new Item.Properties().durability(15).humanoidArmor(PalaArmorMaterials.AMETHYST, ArmorType.HELMET))); - public static final Item AMETHYST_CHESTPLATE = register("amethyst_chestplate", new Item(new Item.Properties().durability(15).humanoidArmor(PalaArmorMaterials.AMETHYST, ArmorType.CHESTPLATE))); - public static final Item AMETHYST_LEGGINGS = register("amethyst_leggings", new Item(new Item.Properties().durability(15).humanoidArmor(PalaArmorMaterials.AMETHYST, ArmorType.LEGGINGS))); - public static final Item AMETHYST_BOOTS = register("amethyst_boots", new Item(new Item.Properties().durability(15).humanoidArmor(PalaArmorMaterials.AMETHYST, ArmorType.BOOTS))); - public static final Item ENDIUM_HELMET = register("endium_helmet", new Item(new Item.Properties().durability(1024).humanoidArmor(PalaArmorMaterials.ENDIUM, ArmorType.HELMET))); - public static final Item ENDIUM_CHESTPLATE = register("endium_chestplate", new Item(new Item.Properties().durability(1024).humanoidArmor(PalaArmorMaterials.ENDIUM, ArmorType.CHESTPLATE))); - public static final Item ENDIUM_LEGGINGS = register("endium_leggings", new Item(new Item.Properties().durability(1024).humanoidArmor(PalaArmorMaterials.ENDIUM, ArmorType.LEGGINGS))); - public static final Item ENDIUM_BOOTS = register("endium_boots", new Item(new Item.Properties().durability(1024).humanoidArmor(PalaArmorMaterials.ENDIUM, ArmorType.BOOTS))); - public static final Item KISAKAY_HELMET = register("kisakay_helmet", new Item(new Item.Properties().durability(65).humanoidArmor(PalaArmorMaterials.KISAKAY, ArmorType.HELMET))); - public static final Item KISAKAY_CHESTPLATE = register("kisakay_chestplate", new Item(new Item.Properties().durability(65).humanoidArmor(PalaArmorMaterials.KISAKAY, ArmorType.CHESTPLATE))); - public static final Item KISAKAY_LEGGINGS = register("kisakay_leggings", new Item(new Item.Properties().durability(65).humanoidArmor(PalaArmorMaterials.KISAKAY, ArmorType.LEGGINGS))); - public static final Item KISAKAY_BOOTS = register("kisakay_boots", new Item(new Item.Properties().durability(65).humanoidArmor(PalaArmorMaterials.KISAKAY, ArmorType.BOOTS))); - public static final Item PALADIUM_HELMET = register("paladium_helmet", new Item(new Item.Properties().durability(45).humanoidArmor(PalaArmorMaterials.PALADIUM, ArmorType.HELMET))); - public static final Item PALADIUM_CHESTPLATE = register("paladium_chestplate", new Item(new Item.Properties().durability(45).humanoidArmor(PalaArmorMaterials.PALADIUM, ArmorType.CHESTPLATE))); - public static final Item PALADIUM_LEGGINGS = register("paladium_leggings", new Item(new Item.Properties().durability(45).humanoidArmor(PalaArmorMaterials.PALADIUM, ArmorType.LEGGINGS))); - public static final Item PALADIUM_BOOTS = register("paladium_boots", new Item(new Item.Properties().durability(45).humanoidArmor(PalaArmorMaterials.PALADIUM, ArmorType.BOOTS))); - public static final Item PALADIUM_GREEN_HELMET = register("paladium_green_helmet", new Item(new Item.Properties().durability(64).humanoidArmor(PalaArmorMaterials.PALADIUM_GREEN, ArmorType.HELMET))); - public static final Item PALADIUM_GREEN_CHESTPLATE = register("paladium_green_chestplate", new Item(new Item.Properties().durability(64).humanoidArmor(PalaArmorMaterials.PALADIUM_GREEN, ArmorType.CHESTPLATE))); - public static final Item PALADIUM_GREEN_LEGGINGS = register("paladium_green_leggings", new Item(new Item.Properties().durability(64).humanoidArmor(PalaArmorMaterials.PALADIUM_GREEN, ArmorType.LEGGINGS))); - public static final Item PALADIUM_GREEN_BOOTS = register("paladium_green_boots", new Item(new Item.Properties().durability(64).humanoidArmor(PalaArmorMaterials.PALADIUM_GREEN, ArmorType.BOOTS))); - public static final Item TITANE_HELMET = register("titane_helmet", new Item(new Item.Properties().durability(18).humanoidArmor(PalaArmorMaterials.TITANE, ArmorType.HELMET))); - public static final Item TITANE_CHESTPLATE = register("titane_chestplate", new Item(new Item.Properties().durability(18).humanoidArmor(PalaArmorMaterials.TITANE, ArmorType.CHESTPLATE))); - public static final Item TITANE_LEGGINGS = register("titane_leggings", new Item(new Item.Properties().durability(18).humanoidArmor(PalaArmorMaterials.TITANE, ArmorType.LEGGINGS))); - public static final Item TITANE_BOOTS = register("titane_boots", new Item(new Item.Properties().durability(18).humanoidArmor(PalaArmorMaterials.TITANE, ArmorType.BOOTS))); - public static final Item WEIGHTED_BOOTS = register("weighted_boots", new Item(new Item.Properties().durability(16).humanoidArmor(PalaArmorMaterials.WEIGHTED_BOOTS, ArmorType.BOOTS))); - public static final Item DYNAMITE = register("dynamite", new DynamiteGunItem(1.5F)); - public static final Item DYNAMITE_NINJA = register("dynamite_ninja", new DynamiteGunItem(1.5F)); - public static final Item ENDIUM_DYNAMITE = register("endium_dynamite", new DynamiteGunItem(1.8F)); + public static final Item AMETHYST_INGOT = register("amethyst_ingot", id -> new Item(new Item.Properties().setId(id))); + 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 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))); + public static final Item ENDIUM_NUGGET = register("endium_nugget", id -> new Item(new Item.Properties().setId(id).fireResistant())); + public static final Item EXTRAPOLATED_BUCKET = register("extrapolated_bucket", id -> new Item(new Item.Properties().setId(id).stacksTo(1))); + public static final Item FIKUTSI_SEEDS = register("fikutsi_seeds", id -> new Item(new Item.Properties().setId(id))); + public static final Item FINDIUM_GEM = register("findium_gem", id -> new Item(new Item.Properties().setId(id))); + public static final Item GOLD_MIXED_COAL = register("gold_mixed_coal", id -> new Item(new Item.Properties().setId(id))); + public static final Item HANG_GLIDER = register("hang_glider", id -> new Item(new Item.Properties().setId(id).stacksTo(1))); + public static final Item HEAL_STICK = register("heal_stick", id -> new Item(new Item.Properties().setId(id).stacksTo(1).component(DataComponents.ENCHANTMENT_GLINT_OVERRIDE, true))); + public static final Item HYPER_JUMP_STICK = register("hyper_jump_stick", id -> new Item(new Item.Properties().setId(id).stacksTo(1).component(DataComponents.ENCHANTMENT_GLINT_OVERRIDE, true))); + public static final Item KISAKAY_INGOT = register("kisakay_ingot", id -> new Item(new Item.Properties().setId(id))); + public static final Item KIWANO = register("kiwano", id -> new Item(new Item.Properties().setId(id))); + public static final Item KIWANO_SEEDS = register("kiwano_seeds", id -> new Item(new Item.Properties().setId(id))); + public static final Item LEGENDARY_STONE_OF_POWER = register("legendary_stone_of_power", id -> new Item(new Item.Properties().setId(id).stacksTo(1))); + public static final Item LENGENDARY_STONE_OF_TELEPORTATION = register("lengendary_stone_of_teleportation", id -> new Item(new Item.Properties().setId(id).stacksTo(1))); + public static final Item OKAMI_FRUIT = register("okami_fruit", id -> new Item(new Item.Properties().setId(id))); + public static final Item OKAMI_SEEDS = register("okami_seeds", id -> new Item(new Item.Properties().setId(id))); + public static final Item ORANGE_BLUE_FRUIT = register("orange_blue_fruit", id -> new Item(new Item.Properties().setId(id))); + public static final Item ORANGE_BLUE_SEEDS = register("orange_blue_seeds", id -> new Item(new Item.Properties().setId(id))); + public static final Item PALA_MIXED_COAL = register("pala_mixed_coal", id -> new Item(new Item.Properties().setId(id))); + public static final Item PALADIUM_CORE = register("paladium_core", id -> new Item(new Item.Properties().setId(id))); + public static final Item PALADIUM_GREEN_INGOT = register("paladium_green_ingot", id -> new Item(new Item.Properties().setId(id))); + public static final Item PALADIUM_INGOT = register("paladium_ingot", id -> new Item(new Item.Properties().setId(id))); + public static final Item PALADIUM_STICK = register("paladium_stick", id -> new Item(new Item.Properties().setId(id))); + public static final Item SPEED_STICK = register("speed_stick", id -> new Item(new Item.Properties().setId(id).stacksTo(1).component(DataComponents.ENCHANTMENT_GLINT_OVERRIDE, true))); + public static final Item STICK_OF_GOD = register("stick_of_god", id -> new Item(new Item.Properties().setId(id).stacksTo(1).component(DataComponents.ENCHANTMENT_GLINT_OVERRIDE, true))); + public static final Item STRENGHT_STICK = register("strenght_stick", id -> new Item(new Item.Properties().setId(id).stacksTo(1).component(DataComponents.ENCHANTMENT_GLINT_OVERRIDE, true))); + public static final Item TITANE_INGOT = register("titane_ingot", id -> new Item(new Item.Properties().setId(id))); + public static final Item TITANE_MIXED_COAL = register("titane_mixed_coal", id -> new Item(new Item.Properties().setId(id))); + 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))); + 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))); + public static final Item AMETHYST_PICKAXE = register("amethyst_pickaxe", id -> new Item(new Item.Properties().setId(id).pickaxe(PalaToolMaterials.AMETHYST_PICKAXE, 2.1F, -3.0F))); + public static final Item AMETHYST_SHOVEL = register("amethyst_shovel", id -> new Item(new Item.Properties().setId(id).shovel(PalaToolMaterials.AMETHYST_SHOVEL, 1.5F, -3.0F))); + public static final Item AMETHYST_SWORD = register("amethyst_sword", id -> new Item(new Item.Properties().setId(id).sword(PalaToolMaterials.AMETHYST_SWORD, 5.0F, -2.4F))); + public static final Item ENDIUM_AXE = register("endium_axe", id -> new Item(new Item.Properties().setId(id).axe(PalaToolMaterials.ENDIUM_AXE, 7.5F, -3.0F))); + public static final Item ENDIUM_PICKAXE = register("endium_pickaxe", id -> new Item(new Item.Properties().setId(id).pickaxe(PalaToolMaterials.ENDIUM_PICKAXE, 5.5F, -3.0F))); + public static final Item ENDIUM_SWORD = register("endium_sword", id -> new Item(new Item.Properties().setId(id).sword(PalaToolMaterials.ENDIUM_SWORD, 11.0F, -2.0F))); + public static final Item KISAKAY_AXE = register("kisakay_axe", id -> new Item(new Item.Properties().setId(id).axe(PalaToolMaterials.KISAKAY_AXE, 25.0F, -3.0F))); + public static final Item KISAKAY_HOE = register("kisakay_hoe", id -> new Item(new Item.Properties().setId(id).hoe(PalaToolMaterials.KISAKAY_HOE, 8.0F, -3.0F))); + public static final Item KISAKAY_PICKAXE = register("kisakay_pickaxe", id -> new Item(new Item.Properties().setId(id).pickaxe(PalaToolMaterials.KISAKAY_PICKAXE, 8.0F, -3.0F))); + public static final Item KISAKAY_SHOVEL = register("kisakay_shovel", id -> new Item(new Item.Properties().setId(id).shovel(PalaToolMaterials.KISAKAY_SHOVEL, 8.0F, -3.0F))); + public static final Item KISAKAY_SWORD = register("kisakay_sword", id -> new Item(new Item.Properties().setId(id).sword(PalaToolMaterials.KISAKAY_SWORD, 8.0F, -3.0F))); + public static final Item PALADIUM_AXE = register("paladium_axe", id -> new Item(new Item.Properties().setId(id).axe(PalaToolMaterials.PALADIUM_AXE, 4.8F, -3.0F))); + public static final Item PALADIUM_GREEN_AXE = register("paladium_green_axe", id -> new Item(new Item.Properties().setId(id).axe(PalaToolMaterials.PALADIUM_GREEN_AXE, 5.0F, -3.0F))); + public static final Item PALADIUM_GREEN_PICKAXE = register("paladium_green_pickaxe", id -> new Item(new Item.Properties().setId(id).pickaxe(PalaToolMaterials.PALADIUM_GREEN_PICKAXE, 6.0F, -3.0F))); + public static final Item PALADIUM_GREEN_SHOVEL = register("paladium_green_shovel", id -> new Item(new Item.Properties().setId(id).shovel(PalaToolMaterials.PALADIUM_GREEN_SHOVEL, 2.0F, -3.0F))); + public static final Item PALADIUM_GREEN_SWORD = register("paladium_green_sword", id -> new Item(new Item.Properties().setId(id).sword(PalaToolMaterials.PALADIUM_GREEN_SWORD, 9.0F, -2.2F))); + public static final Item PALADIUM_HAMMER = register("paladium_hammer", id -> new Item(new Item.Properties().setId(id).pickaxe(PalaToolMaterials.PALADIUM_HAMMER, 3.0F, -3.2F))); + public static final Item PALADIUM_PICKAXE = register("paladium_pickaxe", id -> new Item(new Item.Properties().setId(id).pickaxe(PalaToolMaterials.PALADIUM_PICKAXE, 2.0F, -3.0F))); + public static final Item PALADIUM_SHOVEL = register("paladium_shovel", id -> new Item(new Item.Properties().setId(id).shovel(PalaToolMaterials.PALADIUM_SHOVEL, 11.0F, -3.0F))); + public static final Item PALADIUM_SWORD = register("paladium_sword", id -> new Item(new Item.Properties().setId(id).sword(PalaToolMaterials.PALADIUM_SWORD, 8.0F, -2.3F))); + 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))); + public static final Item PICKAXE_OF_THE_GOD_LEVEL10 = register("pickaxe_of_the_god_level10", id -> new Item(new Item.Properties().setId(id).pickaxe(PalaToolMaterials.PICKAXE_OF_THE_GOD_LEVEL10, 0.8F, -2.1F).component(DataComponents.UNBREAKABLE, Unit.INSTANCE))); + public static final Item PICKAXE_OF_THE_GOD_LEVEL11 = register("pickaxe_of_the_god_level11", id -> new Item(new Item.Properties().setId(id).pickaxe(PalaToolMaterials.PICKAXE_OF_THE_GOD_LEVEL11, 1.0F, -1.9F).component(DataComponents.UNBREAKABLE, Unit.INSTANCE))); + public static final Item PICKAXE_OF_THE_GOD_LEVEL12 = register("pickaxe_of_the_god_level12", id -> new Item(new Item.Properties().setId(id).pickaxe(PalaToolMaterials.PICKAXE_OF_THE_GOD_LEVEL12, 1.1F, -1.8F).component(DataComponents.UNBREAKABLE, Unit.INSTANCE))); + public static final Item PICKAXE_OF_THE_GOD_LEVEL13 = register("pickaxe_of_the_god_level13", id -> new Item(new Item.Properties().setId(id).pickaxe(PalaToolMaterials.PICKAXE_OF_THE_GOD_LEVEL13, 1.2F, -1.7F).component(DataComponents.UNBREAKABLE, Unit.INSTANCE))); + public static final Item PICKAXE_OF_THE_GOD_LEVEL14 = register("pickaxe_of_the_god_level14", id -> new Item(new Item.Properties().setId(id).pickaxe(PalaToolMaterials.PICKAXE_OF_THE_GOD_LEVEL14, 1.3F, -1.6F).component(DataComponents.UNBREAKABLE, Unit.INSTANCE))); + public static final Item PICKAXE_OF_THE_GOD_LEVEL15 = register("pickaxe_of_the_god_level15", id -> new Item(new Item.Properties().setId(id).pickaxe(PalaToolMaterials.PICKAXE_OF_THE_GOD_LEVEL15, 1.4F, -1.5F).component(DataComponents.UNBREAKABLE, Unit.INSTANCE))); + public static final Item PICKAXE_OF_THE_GOD_LEVEL16 = register("pickaxe_of_the_god_level16", id -> new Item(new Item.Properties().setId(id).pickaxe(PalaToolMaterials.PICKAXE_OF_THE_GOD_LEVEL16, 1.6F, -1.3F).component(DataComponents.UNBREAKABLE, Unit.INSTANCE))); + public static final Item PICKAXE_OF_THE_GOD_LEVEL17 = register("pickaxe_of_the_god_level17", id -> new Item(new Item.Properties().setId(id).pickaxe(PalaToolMaterials.PICKAXE_OF_THE_GOD_LEVEL17, 1.6F, -1.2F).component(DataComponents.UNBREAKABLE, Unit.INSTANCE))); + public static final Item PICKAXE_OF_THE_GOD_LEVEL18 = register("pickaxe_of_the_god_level18", id -> new Item(new Item.Properties().setId(id).pickaxe(PalaToolMaterials.PICKAXE_OF_THE_GOD_LEVEL18, 0.0F, -1.1F).component(DataComponents.UNBREAKABLE, Unit.INSTANCE))); + public static final Item PICKAXE_OF_THE_GOD_LEVEL19 = register("pickaxe_of_the_god_level19", id -> new Item(new Item.Properties().setId(id).pickaxe(PalaToolMaterials.PICKAXE_OF_THE_GOD_LEVEL19, 0.0F, -1.0F).component(DataComponents.UNBREAKABLE, Unit.INSTANCE))); + public static final Item PICKAXE_OF_THE_GOD_LEVEL2 = register("pickaxe_of_the_god_level2", id -> new Item(new Item.Properties().setId(id).pickaxe(PalaToolMaterials.PICKAXE_OF_THE_GOD_LEVEL2, 0.0F, -3.5F).component(DataComponents.UNBREAKABLE, Unit.INSTANCE))); + public static final Item PICKAXE_OF_THE_GOD_LEVEL20 = register("pickaxe_of_the_god_level20", id -> new Item(new Item.Properties().setId(id).pickaxe(PalaToolMaterials.PICKAXE_OF_THE_GOD_LEVEL20, 0.3F, -0.8F).component(DataComponents.UNBREAKABLE, Unit.INSTANCE))); + public static final Item PICKAXE_OF_THE_GOD_LEVEL21 = register("pickaxe_of_the_god_level21", id -> new Item(new Item.Properties().setId(id).pickaxe(PalaToolMaterials.PICKAXE_OF_THE_GOD_LEVEL21, 0.7F, -0.2F).component(DataComponents.UNBREAKABLE, Unit.INSTANCE))); + public static final Item PICKAXE_OF_THE_GOD_LEVEL22 = register("pickaxe_of_the_god_level22", id -> new Item(new Item.Properties().setId(id).pickaxe(PalaToolMaterials.PICKAXE_OF_THE_GOD_LEVEL22, 2.0F, 0.1F).component(DataComponents.UNBREAKABLE, Unit.INSTANCE))); + public static final Item PICKAXE_OF_THE_GOD_LEVEL23 = register("pickaxe_of_the_god_level23", id -> new Item(new Item.Properties().setId(id).pickaxe(PalaToolMaterials.PICKAXE_OF_THE_GOD_LEVEL23, 2.3F, 0.4F).component(DataComponents.UNBREAKABLE, Unit.INSTANCE))); + public static final Item PICKAXE_OF_THE_GOD_LEVEL24 = register("pickaxe_of_the_god_level24", id -> new Item(new Item.Properties().setId(id).pickaxe(PalaToolMaterials.PICKAXE_OF_THE_GOD_LEVEL24, 4.5F, 1.4F).component(DataComponents.UNBREAKABLE, Unit.INSTANCE))); + public static final Item PICKAXE_OF_THE_GOD_LEVEL25 = register("pickaxe_of_the_god_level25", id -> new Item(new Item.Properties().setId(id).pickaxe(PalaToolMaterials.PICKAXE_OF_THE_GOD_LEVEL25, 14.5F, 11.4F).component(DataComponents.UNBREAKABLE, Unit.INSTANCE))); + public static final Item PICKAXE_OF_THE_GOD_LEVEL3 = register("pickaxe_of_the_god_level3", id -> new Item(new Item.Properties().setId(id).pickaxe(PalaToolMaterials.PICKAXE_OF_THE_GOD_LEVEL3, 0.0F, -3.3F).component(DataComponents.UNBREAKABLE, Unit.INSTANCE))); + public static final Item PICKAXE_OF_THE_GOD_LEVEL4 = register("pickaxe_of_the_god_level4", id -> new Item(new Item.Properties().setId(id).pickaxe(PalaToolMaterials.PICKAXE_OF_THE_GOD_LEVEL4, 0.0F, -3.2F).component(DataComponents.UNBREAKABLE, Unit.INSTANCE))); + public static final Item PICKAXE_OF_THE_GOD_LEVEL5 = register("pickaxe_of_the_god_level5", id -> new Item(new Item.Properties().setId(id).pickaxe(PalaToolMaterials.PICKAXE_OF_THE_GOD_LEVEL5, 0.1F, -3.0F).component(DataComponents.UNBREAKABLE, Unit.INSTANCE))); + public static final Item PICKAXE_OF_THE_GOD_LEVEL7 = register("pickaxe_of_the_god_level7", id -> new Item(new Item.Properties().setId(id).pickaxe(PalaToolMaterials.PICKAXE_OF_THE_GOD_LEVEL7, 0.6F, -2.7F).component(DataComponents.UNBREAKABLE, Unit.INSTANCE))); + public static final Item PICKAXE_OF_THE_GOD_LEVEL8 = register("pickaxe_of_the_god_level8", id -> new Item(new Item.Properties().setId(id).pickaxe(PalaToolMaterials.PICKAXE_OF_THE_GOD_LEVEL8, 0.6F, -2.5F).component(DataComponents.UNBREAKABLE, Unit.INSTANCE))); + public static final Item PICKAXE_OF_THE_GOD_LEVEL9 = register("pickaxe_of_the_god_level9", id -> new Item(new Item.Properties().setId(id).pickaxe(PalaToolMaterials.PICKAXE_OF_THE_GOD_LEVEL9, 0.7F, -2.2F).component(DataComponents.UNBREAKABLE, Unit.INSTANCE))); + public static final Item TITANE_AXE = register("titane_axe", id -> new Item(new Item.Properties().setId(id).axe(PalaToolMaterials.TITANE_AXE, 1.8F, -3.0F))); + public static final Item TITANE_HAMMER = register("titane_hammer", id -> new Item(new Item.Properties().setId(id).pickaxe(PalaToolMaterials.TITANE_HAMMER, 3.0F, -3.2F))); + 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))); + 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))); + public static final Item AMETHYST_BOOTS = register("amethyst_boots", id -> new Item(new Item.Properties().setId(id).durability(15).humanoidArmor(PalaArmorMaterials.AMETHYST, ArmorType.BOOTS))); + public static final Item ENDIUM_HELMET = register("endium_helmet", id -> new Item(new Item.Properties().setId(id).durability(1024).humanoidArmor(PalaArmorMaterials.ENDIUM, ArmorType.HELMET))); + public static final Item ENDIUM_CHESTPLATE = register("endium_chestplate", id -> new Item(new Item.Properties().setId(id).durability(1024).humanoidArmor(PalaArmorMaterials.ENDIUM, ArmorType.CHESTPLATE))); + public static final Item ENDIUM_LEGGINGS = register("endium_leggings", id -> new Item(new Item.Properties().setId(id).durability(1024).humanoidArmor(PalaArmorMaterials.ENDIUM, ArmorType.LEGGINGS))); + public static final Item ENDIUM_BOOTS = register("endium_boots", id -> new Item(new Item.Properties().setId(id).durability(1024).humanoidArmor(PalaArmorMaterials.ENDIUM, ArmorType.BOOTS))); + public static final Item KISAKAY_HELMET = register("kisakay_helmet", id -> new Item(new Item.Properties().setId(id).durability(65).humanoidArmor(PalaArmorMaterials.KISAKAY, ArmorType.HELMET))); + public static final Item KISAKAY_CHESTPLATE = register("kisakay_chestplate", id -> new Item(new Item.Properties().setId(id).durability(65).humanoidArmor(PalaArmorMaterials.KISAKAY, ArmorType.CHESTPLATE))); + public static final Item KISAKAY_LEGGINGS = register("kisakay_leggings", id -> new Item(new Item.Properties().setId(id).durability(65).humanoidArmor(PalaArmorMaterials.KISAKAY, ArmorType.LEGGINGS))); + public static final Item KISAKAY_BOOTS = register("kisakay_boots", id -> new Item(new Item.Properties().setId(id).durability(65).humanoidArmor(PalaArmorMaterials.KISAKAY, ArmorType.BOOTS))); + public static final Item PALADIUM_HELMET = register("paladium_helmet", id -> new Item(new Item.Properties().setId(id).durability(45).humanoidArmor(PalaArmorMaterials.PALADIUM, ArmorType.HELMET))); + public static final Item PALADIUM_CHESTPLATE = register("paladium_chestplate", id -> new Item(new Item.Properties().setId(id).durability(45).humanoidArmor(PalaArmorMaterials.PALADIUM, ArmorType.CHESTPLATE))); + public static final Item PALADIUM_LEGGINGS = register("paladium_leggings", id -> new Item(new Item.Properties().setId(id).durability(45).humanoidArmor(PalaArmorMaterials.PALADIUM, ArmorType.LEGGINGS))); + public static final Item PALADIUM_BOOTS = register("paladium_boots", id -> new Item(new Item.Properties().setId(id).durability(45).humanoidArmor(PalaArmorMaterials.PALADIUM, ArmorType.BOOTS))); + public static final Item PALADIUM_GREEN_HELMET = register("paladium_green_helmet", id -> new Item(new Item.Properties().setId(id).durability(64).humanoidArmor(PalaArmorMaterials.PALADIUM_GREEN, ArmorType.HELMET))); + public static final Item PALADIUM_GREEN_CHESTPLATE = register("paladium_green_chestplate", id -> new Item(new Item.Properties().setId(id).durability(64).humanoidArmor(PalaArmorMaterials.PALADIUM_GREEN, ArmorType.CHESTPLATE))); + public static final Item PALADIUM_GREEN_LEGGINGS = register("paladium_green_leggings", id -> new Item(new Item.Properties().setId(id).durability(64).humanoidArmor(PalaArmorMaterials.PALADIUM_GREEN, ArmorType.LEGGINGS))); + public static final Item PALADIUM_GREEN_BOOTS = register("paladium_green_boots", id -> new Item(new Item.Properties().setId(id).durability(64).humanoidArmor(PalaArmorMaterials.PALADIUM_GREEN, ArmorType.BOOTS))); + public static final Item TITANE_HELMET = register("titane_helmet", id -> new Item(new Item.Properties().setId(id).durability(18).humanoidArmor(PalaArmorMaterials.TITANE, ArmorType.HELMET))); + public static final Item TITANE_CHESTPLATE = register("titane_chestplate", id -> new Item(new Item.Properties().setId(id).durability(18).humanoidArmor(PalaArmorMaterials.TITANE, ArmorType.CHESTPLATE))); + public static final Item TITANE_LEGGINGS = register("titane_leggings", id -> new Item(new Item.Properties().setId(id).durability(18).humanoidArmor(PalaArmorMaterials.TITANE, ArmorType.LEGGINGS))); + public static final Item TITANE_BOOTS = register("titane_boots", id -> new Item(new Item.Properties().setId(id).durability(18).humanoidArmor(PalaArmorMaterials.TITANE, ArmorType.BOOTS))); + public static final Item WEIGHTED_BOOTS = register("weighted_boots", id -> new Item(new Item.Properties().setId(id).durability(16).humanoidArmor(PalaArmorMaterials.WEIGHTED_BOOTS, ArmorType.BOOTS))); + public static final Item DYNAMITE = register("dynamite", id -> new DynamiteGunItem(id, 1.5F)); + public static final Item DYNAMITE_NINJA = register("dynamite_ninja", id -> new DynamiteGunItem(id, 1.5F)); + public static final Item ENDIUM_DYNAMITE = register("endium_dynamite", id -> new DynamiteGunItem(id, 1.8F)); public static void register() { } diff --git a/mods/pala/src/main/java/fr/surviepote/pala/PalaToolMaterials.java b/mods/pala/src/main/java/fr/surviepote/pala/PalaToolMaterials.java index 952d8c0..13ca7cd 100644 --- a/mods/pala/src/main/java/fr/surviepote/pala/PalaToolMaterials.java +++ b/mods/pala/src/main/java/fr/surviepote/pala/PalaToolMaterials.java @@ -71,7 +71,8 @@ public final class PalaToolMaterials { public static final ToolMaterial PICKAXE_OF_THE_GOD_LEVEL17 = new ToolMaterial(BlockTags.INCORRECT_FOR_NETHERITE_TOOL, 1, 6.3F, 0.0F, 19, repair("pickaxe_of_the_god_level17_repairs")); public static final ToolMaterial PICKAXE_OF_THE_GOD_LEVEL18 = new ToolMaterial(BlockTags.INCORRECT_FOR_NETHERITE_TOOL, 1, 6.3F, 0.0F, 19, repair("pickaxe_of_the_god_level18_repairs")); public static final ToolMaterial PICKAXE_OF_THE_GOD_LEVEL19 = new ToolMaterial(BlockTags.INCORRECT_FOR_NETHERITE_TOOL, 1, 7.8F, 0.0F, 25, repair("pickaxe_of_the_god_level19_repairs")); - public static final ToolMaterial PICKAXE_OF_THE_GOD_LEVEL2 = new ToolMaterial(BlockTags.INCORRECT_FOR_WOODEN_TOOL, 1, 1.0F, 0.0F, 0, repair("pickaxe_of_the_god_level2_repairs")); + // enchant 0->1 : MC 26.3 exige une valeur d'enchantement > 0. + public static final ToolMaterial PICKAXE_OF_THE_GOD_LEVEL2 = new ToolMaterial(BlockTags.INCORRECT_FOR_WOODEN_TOOL, 1, 1.0F, 0.0F, 1, repair("pickaxe_of_the_god_level2_repairs")); public static final ToolMaterial PICKAXE_OF_THE_GOD_LEVEL20 = new ToolMaterial(BlockTags.INCORRECT_FOR_NETHERITE_TOOL, 1, 9.8F, 0.0F, 28, repair("pickaxe_of_the_god_level20_repairs")); public static final ToolMaterial PICKAXE_OF_THE_GOD_LEVEL21 = new ToolMaterial(BlockTags.INCORRECT_FOR_NETHERITE_TOOL, 1, 9.8F, 0.0F, 32, repair("pickaxe_of_the_god_level21_repairs")); public static final ToolMaterial PICKAXE_OF_THE_GOD_LEVEL22 = new ToolMaterial(BlockTags.INCORRECT_FOR_NETHERITE_TOOL, 1, 12.8F, 0.0F, 40, repair("pickaxe_of_the_god_level22_repairs")); diff --git a/mods/pala/src/main/java/fr/surviepote/pala/item/DynamiteGunItem.java b/mods/pala/src/main/java/fr/surviepote/pala/item/DynamiteGunItem.java index c480550..48b6dad 100644 --- a/mods/pala/src/main/java/fr/surviepote/pala/item/DynamiteGunItem.java +++ b/mods/pala/src/main/java/fr/surviepote/pala/item/DynamiteGunItem.java @@ -20,8 +20,8 @@ public class DynamiteGunItem extends Item { private final float speed; - public DynamiteGunItem(float speed) { - super(new Properties().stacksTo(1)); + public DynamiteGunItem(net.minecraft.resources.ResourceKey id, float speed) { + super(new Properties().setId(id).stacksTo(1)); this.speed = speed; } diff --git a/mods/pala/src/main/java/fr/surviepote/pala/machine/PalaMachineBlock.java b/mods/pala/src/main/java/fr/surviepote/pala/machine/PalaMachineBlock.java index 47a4660..6376011 100644 --- a/mods/pala/src/main/java/fr/surviepote/pala/machine/PalaMachineBlock.java +++ b/mods/pala/src/main/java/fr/surviepote/pala/machine/PalaMachineBlock.java @@ -24,8 +24,8 @@ import net.minecraft.world.phys.BlockHitResult; // bouton Generate du crusher, vraies recettes, textures de faces. public class PalaMachineBlock extends Block implements EntityBlock { - public PalaMachineBlock() { - super(BlockBehaviour.Properties.of().strength(3.5F, 10.0F).sound(SoundType.METAL) + public PalaMachineBlock(BlockBehaviour.Properties properties) { + super(properties.strength(3.5F, 10.0F).sound(SoundType.METAL) .requiresCorrectToolForDrops()); } diff --git a/mods/pala/src/main/resources/data/pala/advancement/first_endium.json b/mods/pala/src/main/resources/data/pala/advancement/first_endium.json index 6c896ed..f46857a 100644 --- a/mods/pala/src/main/resources/data/pala/advancement/first_endium.json +++ b/mods/pala/src/main/resources/data/pala/advancement/first_endium.json @@ -12,7 +12,8 @@ "frame": "goal", "show_toast": true, "announce_to_chat": true, - "hidden": false + "hidden": false, + "background": "minecraft:gui/advancements/backgrounds/adventure" }, "criteria": { "has_nugget": { @@ -20,14 +21,20 @@ "conditions": { "items": [ { - "items": ["pala:endium_nugget"] + "items": [ + "pala:endium_nugget" + ] } ] } } }, - "requirements": [["has_nugget"]], + "requirements": [ + [ + "has_nugget" + ] + ], "rewards": { "experience": 4 } -} +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/advancement/first_endium_ingot.json b/mods/pala/src/main/resources/data/pala/advancement/first_endium_ingot.json index 22efb77..b4547d8 100644 --- a/mods/pala/src/main/resources/data/pala/advancement/first_endium_ingot.json +++ b/mods/pala/src/main/resources/data/pala/advancement/first_endium_ingot.json @@ -12,7 +12,8 @@ "frame": "challenge", "show_toast": true, "announce_to_chat": true, - "hidden": false + "hidden": false, + "background": "minecraft:gui/advancements/backgrounds/adventure" }, "criteria": { "has_ingot": { @@ -20,14 +21,20 @@ "conditions": { "items": [ { - "items": ["pala:endium_ingot"] + "items": [ + "pala:endium_ingot" + ] } ] } } }, - "requirements": [["has_ingot"]], + "requirements": [ + [ + "has_ingot" + ] + ], "rewards": { "experience": 4 } -} +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/recipe/amethyst_mixed_coal_recipe.json b/mods/pala/src/main/resources/data/pala/recipe/amethyst_mixed_coal_recipe.json index 25aafbf..83347be 100644 --- a/mods/pala/src/main/resources/data/pala/recipe/amethyst_mixed_coal_recipe.json +++ b/mods/pala/src/main/resources/data/pala/recipe/amethyst_mixed_coal_recipe.json @@ -4,21 +4,15 @@ "pattern": [ "#A#", "ABA", - " A" + " A " ], "key": { - "#": { - "item": "pala:paladium_stick" - }, - "A": { - "item": "pala:amethyst_ingot" - }, - "B": { - "item": "minecraft:coal" - } + "#": "pala:paladium_stick", + "A": "pala:amethyst_ingot", + "B": "minecraft:coal" }, "result": { "id": "pala:amethyst_mixed_coal", "count": 8 } -} +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/recipe/amethystarmorbodyrecipe.json b/mods/pala/src/main/resources/data/pala/recipe/amethystarmorbodyrecipe.json index d07f707..ceddbbd 100644 --- a/mods/pala/src/main/resources/data/pala/recipe/amethystarmorbodyrecipe.json +++ b/mods/pala/src/main/resources/data/pala/recipe/amethystarmorbodyrecipe.json @@ -7,12 +7,10 @@ "###" ], "key": { - "#": { - "item": "pala:amethyst_ingot" - } + "#": "pala:amethyst_ingot" }, "result": { "id": "pala:amethyst_chestplate", "count": 1 } -} +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/recipe/amethystarmorbootsrecipe.json b/mods/pala/src/main/resources/data/pala/recipe/amethystarmorbootsrecipe.json index 0f75496..0640baf 100644 --- a/mods/pala/src/main/resources/data/pala/recipe/amethystarmorbootsrecipe.json +++ b/mods/pala/src/main/resources/data/pala/recipe/amethystarmorbootsrecipe.json @@ -6,12 +6,10 @@ "##" ], "key": { - "#": { - "item": "pala:amethyst_ingot" - } + "#": "pala:amethyst_ingot" }, "result": { "id": "pala:amethyst_boots", "count": 1 } -} +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/recipe/amethystarmorhelmetrecipe.json b/mods/pala/src/main/resources/data/pala/recipe/amethystarmorhelmetrecipe.json index f52b07a..7efa29d 100644 --- a/mods/pala/src/main/resources/data/pala/recipe/amethystarmorhelmetrecipe.json +++ b/mods/pala/src/main/resources/data/pala/recipe/amethystarmorhelmetrecipe.json @@ -6,12 +6,10 @@ "# #" ], "key": { - "#": { - "item": "pala:amethyst_ingot" - } + "#": "pala:amethyst_ingot" }, "result": { "id": "pala:amethyst_helmet", "count": 1 } -} +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/recipe/amethystarmorleggingsrecipe.json b/mods/pala/src/main/resources/data/pala/recipe/amethystarmorleggingsrecipe.json index 90a5def..e943029 100644 --- a/mods/pala/src/main/resources/data/pala/recipe/amethystarmorleggingsrecipe.json +++ b/mods/pala/src/main/resources/data/pala/recipe/amethystarmorleggingsrecipe.json @@ -7,12 +7,10 @@ "# #" ], "key": { - "#": { - "item": "pala:amethyst_ingot" - } + "#": "pala:amethyst_ingot" }, "result": { "id": "pala:amethyst_leggings", "count": 1 } -} +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/recipe/amethystaxerecipe.json b/mods/pala/src/main/resources/data/pala/recipe/amethystaxerecipe.json index 100c35f..55b7535 100644 --- a/mods/pala/src/main/resources/data/pala/recipe/amethystaxerecipe.json +++ b/mods/pala/src/main/resources/data/pala/recipe/amethystaxerecipe.json @@ -7,15 +7,11 @@ " A" ], "key": { - "#": { - "item": "pala:amethyst_ingot" - }, - "A": { - "item": "minecraft:stick" - } + "#": "pala:amethyst_ingot", + "A": "minecraft:stick" }, "result": { "id": "pala:amethyst_axe", "count": 1 } -} +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/recipe/amethystblockorerecipe.json b/mods/pala/src/main/resources/data/pala/recipe/amethystblockorerecipe.json index 2c2c004..b345200 100644 --- a/mods/pala/src/main/resources/data/pala/recipe/amethystblockorerecipe.json +++ b/mods/pala/src/main/resources/data/pala/recipe/amethystblockorerecipe.json @@ -2,12 +2,10 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "pala:amethyst_ore_block" - } + "pala:amethyst_ore_block" ], "result": { "id": "pala:amethyst_ingot", "count": 9 } -} +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/recipe/amethysthammerrecipe.json b/mods/pala/src/main/resources/data/pala/recipe/amethysthammerrecipe.json index d37c13d..d8bc150 100644 --- a/mods/pala/src/main/resources/data/pala/recipe/amethysthammerrecipe.json +++ b/mods/pala/src/main/resources/data/pala/recipe/amethysthammerrecipe.json @@ -4,18 +4,14 @@ "pattern": [ "###", "###", - " A" + " A " ], "key": { - "#": { - "item": "pala:amethyst_ingot" - }, - "A": { - "item": "pala:amethyst_stick" - } + "#": "pala:amethyst_ingot", + "A": "pala:amethyst_stick" }, "result": { "id": "pala:amethyst_hammer", "count": 1 } -} +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/recipe/amethystoreblockrecipe.json b/mods/pala/src/main/resources/data/pala/recipe/amethystoreblockrecipe.json index 8069ee7..732a25c 100644 --- a/mods/pala/src/main/resources/data/pala/recipe/amethystoreblockrecipe.json +++ b/mods/pala/src/main/resources/data/pala/recipe/amethystoreblockrecipe.json @@ -7,12 +7,10 @@ "###" ], "key": { - "#": { - "item": "pala:amethyst_ingot" - } + "#": "pala:amethyst_ingot" }, "result": { "id": "pala:amethyst_ore_block", "count": 1 } -} +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/recipe/amethystoresmelting.json b/mods/pala/src/main/resources/data/pala/recipe/amethystoresmelting.json index 71cfc1f..cd5acdf 100644 --- a/mods/pala/src/main/resources/data/pala/recipe/amethystoresmelting.json +++ b/mods/pala/src/main/resources/data/pala/recipe/amethystoresmelting.json @@ -1,12 +1,10 @@ { "type": "minecraft:smelting", - "ingredient": { - "item": "pala:amethyst_ore" - }, + "ingredient": "pala:amethyst_ore", "result": { "id": "pala:amethyst_ingot", "count": 1 }, "experience": 2.0999999999999996, "cookingtime": 200 -} +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/recipe/amethystpickaxerecipe.json b/mods/pala/src/main/resources/data/pala/recipe/amethystpickaxerecipe.json index 85f1333..9d17992 100644 --- a/mods/pala/src/main/resources/data/pala/recipe/amethystpickaxerecipe.json +++ b/mods/pala/src/main/resources/data/pala/recipe/amethystpickaxerecipe.json @@ -3,19 +3,15 @@ "category": "equipment", "pattern": [ "###", - " A", - " A" + " A ", + " A " ], "key": { - "#": { - "item": "pala:amethyst_ingot" - }, - "A": { - "item": "minecraft:stick" - } + "#": "pala:amethyst_ingot", + "A": "minecraft:stick" }, "result": { "id": "pala:amethyst_pickaxe", "count": 1 } -} +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/recipe/amethystshovelrecipe.json b/mods/pala/src/main/resources/data/pala/recipe/amethystshovelrecipe.json index 4ee6209..e1055c3 100644 --- a/mods/pala/src/main/resources/data/pala/recipe/amethystshovelrecipe.json +++ b/mods/pala/src/main/resources/data/pala/recipe/amethystshovelrecipe.json @@ -7,15 +7,11 @@ "A" ], "key": { - "#": { - "item": "pala:amethyst_ingot" - }, - "A": { - "item": "minecraft:stick" - } + "#": "pala:amethyst_ingot", + "A": "minecraft:stick" }, "result": { "id": "pala:amethyst_shovel", "count": 1 } -} +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/recipe/amethyststickrecipe.json b/mods/pala/src/main/resources/data/pala/recipe/amethyststickrecipe.json index e34231e..ba1d7d6 100644 --- a/mods/pala/src/main/resources/data/pala/recipe/amethyststickrecipe.json +++ b/mods/pala/src/main/resources/data/pala/recipe/amethyststickrecipe.json @@ -6,12 +6,10 @@ "#" ], "key": { - "#": { - "item": "pala:amethyst_ingot" - } + "#": "pala:amethyst_ingot" }, "result": { "id": "pala:amethyst_stick", "count": 4 } -} +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/recipe/amethystswordrecipe.json b/mods/pala/src/main/resources/data/pala/recipe/amethystswordrecipe.json index 5e9292b..049dd86 100644 --- a/mods/pala/src/main/resources/data/pala/recipe/amethystswordrecipe.json +++ b/mods/pala/src/main/resources/data/pala/recipe/amethystswordrecipe.json @@ -7,15 +7,11 @@ "A" ], "key": { - "#": { - "item": "pala:amethyst_ingot" - }, - "A": { - "item": "minecraft:stick" - } + "#": "pala:amethyst_ingot", + "A": "minecraft:stick" }, "result": { "id": "pala:amethyst_sword", "count": 1 } -} +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/recipe/angelicwaterrecipe.json b/mods/pala/src/main/resources/data/pala/recipe/angelicwaterrecipe.json index dde943d..7ee4608 100644 --- a/mods/pala/src/main/resources/data/pala/recipe/angelicwaterrecipe.json +++ b/mods/pala/src/main/resources/data/pala/recipe/angelicwaterrecipe.json @@ -6,15 +6,11 @@ "A" ], "key": { - "#": { - "item": "minecraft:diamond" - }, - "A": { - "item": "minecraft:water_bucket" - } + "#": "minecraft:diamond", + "A": "minecraft:water_bucket" }, "result": { "id": "pala:angelic_water", "count": 1 } -} +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/recipe/caveblockrecipe.json b/mods/pala/src/main/resources/data/pala/recipe/caveblockrecipe.json index 8f86e46..5e3169a 100644 --- a/mods/pala/src/main/resources/data/pala/recipe/caveblockrecipe.json +++ b/mods/pala/src/main/resources/data/pala/recipe/caveblockrecipe.json @@ -7,15 +7,11 @@ "###" ], "key": { - "#": { - "item": "minecraft:glass" - }, - "A": { - "item": "pala:findium_gem" - } + "#": "minecraft:glass", + "A": "pala:findium_gem" }, "result": { "id": "pala:cave_block", "count": 1 } -} +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/recipe/compressedamethystrecipe.json b/mods/pala/src/main/resources/data/pala/recipe/compressedamethystrecipe.json index 2980a85..509b848 100644 --- a/mods/pala/src/main/resources/data/pala/recipe/compressedamethystrecipe.json +++ b/mods/pala/src/main/resources/data/pala/recipe/compressedamethystrecipe.json @@ -7,15 +7,11 @@ "###" ], "key": { - "#": { - "item": "pala:amethyst_ore_block" - }, - "A": { - "item": "pala:amethyst_ingot" - } + "#": "pala:amethyst_ore_block", + "A": "pala:amethyst_ingot" }, "result": { "id": "pala:compressed_amethyst", "count": 1 } -} +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/recipe/endiumarmorbodyrecipe.json b/mods/pala/src/main/resources/data/pala/recipe/endiumarmorbodyrecipe.json index bb9d832..734ec34 100644 --- a/mods/pala/src/main/resources/data/pala/recipe/endiumarmorbodyrecipe.json +++ b/mods/pala/src/main/resources/data/pala/recipe/endiumarmorbodyrecipe.json @@ -7,12 +7,10 @@ "###" ], "key": { - "#": { - "item": "pala:endium_ingot" - } + "#": "pala:endium_ingot" }, "result": { "id": "pala:endium_chestplate", "count": 1 } -} +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/recipe/endiumarmorbootsrecipe.json b/mods/pala/src/main/resources/data/pala/recipe/endiumarmorbootsrecipe.json index 528906f..b16d81c 100644 --- a/mods/pala/src/main/resources/data/pala/recipe/endiumarmorbootsrecipe.json +++ b/mods/pala/src/main/resources/data/pala/recipe/endiumarmorbootsrecipe.json @@ -6,12 +6,10 @@ "##" ], "key": { - "#": { - "item": "pala:endium_ingot" - } + "#": "pala:endium_ingot" }, "result": { "id": "pala:endium_boots", "count": 1 } -} +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/recipe/endiumarmorhelmetrecipe.json b/mods/pala/src/main/resources/data/pala/recipe/endiumarmorhelmetrecipe.json index 194f4d4..76dbeab 100644 --- a/mods/pala/src/main/resources/data/pala/recipe/endiumarmorhelmetrecipe.json +++ b/mods/pala/src/main/resources/data/pala/recipe/endiumarmorhelmetrecipe.json @@ -6,12 +6,10 @@ "# #" ], "key": { - "#": { - "item": "pala:endium_ingot" - } + "#": "pala:endium_ingot" }, "result": { "id": "pala:endium_helmet", "count": 1 } -} +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/recipe/endiumarmorleggingsrecipe.json b/mods/pala/src/main/resources/data/pala/recipe/endiumarmorleggingsrecipe.json index d7db87c..be09bff 100644 --- a/mods/pala/src/main/resources/data/pala/recipe/endiumarmorleggingsrecipe.json +++ b/mods/pala/src/main/resources/data/pala/recipe/endiumarmorleggingsrecipe.json @@ -7,12 +7,10 @@ "# #" ], "key": { - "#": { - "item": "pala:endium_ingot" - } + "#": "pala:endium_ingot" }, "result": { "id": "pala:endium_leggings", "count": 1 } -} +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/recipe/endiumaxerecipe.json b/mods/pala/src/main/resources/data/pala/recipe/endiumaxerecipe.json index 85f4db9..92ece0a 100644 --- a/mods/pala/src/main/resources/data/pala/recipe/endiumaxerecipe.json +++ b/mods/pala/src/main/resources/data/pala/recipe/endiumaxerecipe.json @@ -7,15 +7,11 @@ " A" ], "key": { - "#": { - "item": "pala:endium_ingot" - }, - "A": { - "item": "minecraft:stick" - } + "#": "pala:endium_ingot", + "A": "minecraft:stick" }, "result": { "id": "pala:endium_axe", "count": 1 } -} +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/recipe/endiumingotrecipe.json b/mods/pala/src/main/resources/data/pala/recipe/endiumingotrecipe.json index a0495ea..0384246 100644 --- a/mods/pala/src/main/resources/data/pala/recipe/endiumingotrecipe.json +++ b/mods/pala/src/main/resources/data/pala/recipe/endiumingotrecipe.json @@ -6,12 +6,10 @@ "##" ], "key": { - "#": { - "item": "pala:endium_nugget" - } + "#": "pala:endium_nugget" }, "result": { "id": "pala:endium_ingot", "count": 1 } -} +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/recipe/endiumpickaxerecipe.json b/mods/pala/src/main/resources/data/pala/recipe/endiumpickaxerecipe.json index 3532fd4..1484ed0 100644 --- a/mods/pala/src/main/resources/data/pala/recipe/endiumpickaxerecipe.json +++ b/mods/pala/src/main/resources/data/pala/recipe/endiumpickaxerecipe.json @@ -3,19 +3,15 @@ "category": "equipment", "pattern": [ "###", - " A", - " A" + " A ", + " A " ], "key": { - "#": { - "item": "pala:endium_ingot" - }, - "A": { - "item": "minecraft:stick" - } + "#": "pala:endium_ingot", + "A": "minecraft:stick" }, "result": { "id": "pala:endium_pickaxe", "count": 1 } -} +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/recipe/endiumswordrecipe.json b/mods/pala/src/main/resources/data/pala/recipe/endiumswordrecipe.json index 654f2de..9b6d5eb 100644 --- a/mods/pala/src/main/resources/data/pala/recipe/endiumswordrecipe.json +++ b/mods/pala/src/main/resources/data/pala/recipe/endiumswordrecipe.json @@ -7,15 +7,11 @@ "A" ], "key": { - "#": { - "item": "pala:endium_ingot" - }, - "A": { - "item": "minecraft:stick" - } + "#": "pala:endium_ingot", + "A": "minecraft:stick" }, "result": { "id": "pala:endium_sword", "count": 1 } -} +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/recipe/extrapolatedbucketrecipe.json b/mods/pala/src/main/resources/data/pala/recipe/extrapolatedbucketrecipe.json index 80c03d2..a13b6b3 100644 --- a/mods/pala/src/main/resources/data/pala/recipe/extrapolatedbucketrecipe.json +++ b/mods/pala/src/main/resources/data/pala/recipe/extrapolatedbucketrecipe.json @@ -3,15 +3,13 @@ "category": "misc", "pattern": [ "# #", - " #" + " # " ], "key": { - "#": { - "item": "pala:paladium_ingot" - } + "#": "pala:paladium_ingot" }, "result": { "id": "pala:extrapolated_bucket", "count": 1 } -} +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/recipe/fakewaterrecipe.json b/mods/pala/src/main/resources/data/pala/recipe/fakewaterrecipe.json index 2b79f86..c35ae01 100644 --- a/mods/pala/src/main/resources/data/pala/recipe/fakewaterrecipe.json +++ b/mods/pala/src/main/resources/data/pala/recipe/fakewaterrecipe.json @@ -6,15 +6,11 @@ "A" ], "key": { - "#": { - "item": "minecraft:cactus" - }, - "A": { - "item": "minecraft:water_bucket" - } + "#": "minecraft:cactus", + "A": "minecraft:water_bucket" }, "result": { "id": "pala:fake_water", "count": 1 } -} +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/recipe/findiumblockorerecipe.json b/mods/pala/src/main/resources/data/pala/recipe/findiumblockorerecipe.json index ae57266..7b31e2b 100644 --- a/mods/pala/src/main/resources/data/pala/recipe/findiumblockorerecipe.json +++ b/mods/pala/src/main/resources/data/pala/recipe/findiumblockorerecipe.json @@ -2,12 +2,10 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "pala:findium_ore_block" - } + "pala:findium_ore_block" ], "result": { "id": "pala:findium_gem", "count": 9 } -} +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/recipe/findiumoreblockrecipe.json b/mods/pala/src/main/resources/data/pala/recipe/findiumoreblockrecipe.json index 4d9dfb9..d4ceee7 100644 --- a/mods/pala/src/main/resources/data/pala/recipe/findiumoreblockrecipe.json +++ b/mods/pala/src/main/resources/data/pala/recipe/findiumoreblockrecipe.json @@ -7,12 +7,10 @@ "###" ], "key": { - "#": { - "item": "pala:findium_gem" - } + "#": "pala:findium_gem" }, "result": { "id": "pala:findium_ore_block", "count": 1 } -} +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/recipe/findiumoresmelting.json b/mods/pala/src/main/resources/data/pala/recipe/findiumoresmelting.json index 132788b..1e59c7c 100644 --- a/mods/pala/src/main/resources/data/pala/recipe/findiumoresmelting.json +++ b/mods/pala/src/main/resources/data/pala/recipe/findiumoresmelting.json @@ -1,12 +1,10 @@ { "type": "minecraft:smelting", - "ingredient": { - "item": "pala:findium_ore" - }, + "ingredient": "pala:findium_ore", "result": { "id": "pala:findium_gem", "count": 1 }, "experience": 1.4, "cookingtime": 200 -} +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/recipe/gold_mixed_coal_recipe.json b/mods/pala/src/main/resources/data/pala/recipe/gold_mixed_coal_recipe.json index dfb21ce..e6d888b 100644 --- a/mods/pala/src/main/resources/data/pala/recipe/gold_mixed_coal_recipe.json +++ b/mods/pala/src/main/resources/data/pala/recipe/gold_mixed_coal_recipe.json @@ -4,21 +4,15 @@ "pattern": [ "#A#", "ABA", - " A" + " A " ], "key": { - "#": { - "item": "pala:paladium_stick" - }, - "A": { - "item": "minecraft:gold_ingot" - }, - "B": { - "item": "minecraft:coal" - } + "#": "pala:paladium_stick", + "A": "minecraft:gold_ingot", + "B": "minecraft:coal" }, "result": { "id": "pala:gold_mixed_coal", "count": 8 } -} +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/recipe/greenpaladiumsmelting.json b/mods/pala/src/main/resources/data/pala/recipe/greenpaladiumsmelting.json index 8f16d5a..317cd9d 100644 --- a/mods/pala/src/main/resources/data/pala/recipe/greenpaladiumsmelting.json +++ b/mods/pala/src/main/resources/data/pala/recipe/greenpaladiumsmelting.json @@ -1,12 +1,10 @@ { "type": "minecraft:smelting", - "ingredient": { - "item": "pala:paladium_green_ore" - }, + "ingredient": "pala:paladium_green_ore", "result": { "id": "pala:paladium_green_ingot", "count": 1 }, "experience": 2.8, "cookingtime": 200 -} +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/recipe/hanggliderrecipe.json b/mods/pala/src/main/resources/data/pala/recipe/hanggliderrecipe.json index 83dd634..378ea25 100644 --- a/mods/pala/src/main/resources/data/pala/recipe/hanggliderrecipe.json +++ b/mods/pala/src/main/resources/data/pala/recipe/hanggliderrecipe.json @@ -7,15 +7,11 @@ "A" ], "key": { - "#": { - "item": "minecraft:cobweb" - }, - "A": { - "item": "pala:paladium_stick" - } + "#": "minecraft:cobweb", + "A": "pala:paladium_stick" }, "result": { "id": "pala:hang_glider", "count": 1 } -} +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/recipe/healstickrecipe.json b/mods/pala/src/main/resources/data/pala/recipe/healstickrecipe.json index 99a0bb0..8d44bcc 100644 --- a/mods/pala/src/main/resources/data/pala/recipe/healstickrecipe.json +++ b/mods/pala/src/main/resources/data/pala/recipe/healstickrecipe.json @@ -7,15 +7,11 @@ "A" ], "key": { - "#": { - "item": "pala:kiwano" - }, - "A": { - "item": "pala:paladium_stick" - } + "#": "pala:kiwano", + "A": "pala:paladium_stick" }, "result": { "id": "pala:heal_stick", "count": 1 } -} +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/recipe/hyperjumpstickrecipe.json b/mods/pala/src/main/resources/data/pala/recipe/hyperjumpstickrecipe.json index 307a1a5..7bfef95 100644 --- a/mods/pala/src/main/resources/data/pala/recipe/hyperjumpstickrecipe.json +++ b/mods/pala/src/main/resources/data/pala/recipe/hyperjumpstickrecipe.json @@ -7,15 +7,11 @@ "A" ], "key": { - "#": { - "item": "minecraft:slime_block" - }, - "A": { - "item": "pala:paladium_stick" - } + "#": "minecraft:slime_block", + "A": "pala:paladium_stick" }, "result": { "id": "pala:hyper_jump_stick", "count": 1 } -} +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/recipe/kisakay_ore_smelting_recipe.json b/mods/pala/src/main/resources/data/pala/recipe/kisakay_ore_smelting_recipe.json index 56c2dd0..2cad600 100644 --- a/mods/pala/src/main/resources/data/pala/recipe/kisakay_ore_smelting_recipe.json +++ b/mods/pala/src/main/resources/data/pala/recipe/kisakay_ore_smelting_recipe.json @@ -1,12 +1,10 @@ { "type": "minecraft:smelting", - "ingredient": { - "item": "pala:kisakay_ore" - }, + "ingredient": "pala:kisakay_ore", "result": { "id": "pala:kisakay_ingot", "count": 1 }, "experience": 1.0, "cookingtime": 200 -} +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/recipe/kisakayarmorbodyrecipe.json b/mods/pala/src/main/resources/data/pala/recipe/kisakayarmorbodyrecipe.json index fe56517..498e15c 100644 --- a/mods/pala/src/main/resources/data/pala/recipe/kisakayarmorbodyrecipe.json +++ b/mods/pala/src/main/resources/data/pala/recipe/kisakayarmorbodyrecipe.json @@ -7,12 +7,10 @@ "###" ], "key": { - "#": { - "item": "pala:kisakay_ingot" - } + "#": "pala:kisakay_ingot" }, "result": { "id": "pala:kisakay_chestplate", "count": 1 } -} +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/recipe/kisakayarmorbootsrecipe.json b/mods/pala/src/main/resources/data/pala/recipe/kisakayarmorbootsrecipe.json index 52c2d69..bdcdea2 100644 --- a/mods/pala/src/main/resources/data/pala/recipe/kisakayarmorbootsrecipe.json +++ b/mods/pala/src/main/resources/data/pala/recipe/kisakayarmorbootsrecipe.json @@ -6,12 +6,10 @@ "##" ], "key": { - "#": { - "item": "pala:kisakay_ingot" - } + "#": "pala:kisakay_ingot" }, "result": { "id": "pala:kisakay_boots", "count": 1 } -} +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/recipe/kisakayarmorhelmetrecipe.json b/mods/pala/src/main/resources/data/pala/recipe/kisakayarmorhelmetrecipe.json index 5930a38..e597f10 100644 --- a/mods/pala/src/main/resources/data/pala/recipe/kisakayarmorhelmetrecipe.json +++ b/mods/pala/src/main/resources/data/pala/recipe/kisakayarmorhelmetrecipe.json @@ -6,12 +6,10 @@ "# #" ], "key": { - "#": { - "item": "pala:kisakay_ingot" - } + "#": "pala:kisakay_ingot" }, "result": { "id": "pala:kisakay_helmet", "count": 1 } -} +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/recipe/kisakayarmorleggingsrecipe.json b/mods/pala/src/main/resources/data/pala/recipe/kisakayarmorleggingsrecipe.json index e8f981d..3f43a83 100644 --- a/mods/pala/src/main/resources/data/pala/recipe/kisakayarmorleggingsrecipe.json +++ b/mods/pala/src/main/resources/data/pala/recipe/kisakayarmorleggingsrecipe.json @@ -7,12 +7,10 @@ "# #" ], "key": { - "#": { - "item": "pala:kisakay_ingot" - } + "#": "pala:kisakay_ingot" }, "result": { "id": "pala:kisakay_leggings", "count": 1 } -} +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/recipe/kisakayaxerecipe.json b/mods/pala/src/main/resources/data/pala/recipe/kisakayaxerecipe.json index 66fcf67..454b7b4 100644 --- a/mods/pala/src/main/resources/data/pala/recipe/kisakayaxerecipe.json +++ b/mods/pala/src/main/resources/data/pala/recipe/kisakayaxerecipe.json @@ -7,15 +7,11 @@ " A" ], "key": { - "#": { - "item": "pala:kisakay_ingot" - }, - "A": { - "item": "minecraft:stick" - } + "#": "pala:kisakay_ingot", + "A": "minecraft:stick" }, "result": { "id": "pala:kisakay_axe", "count": 1 } -} +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/recipe/kisakayblockorerecipe.json b/mods/pala/src/main/resources/data/pala/recipe/kisakayblockorerecipe.json index 2b4d313..c26e758 100644 --- a/mods/pala/src/main/resources/data/pala/recipe/kisakayblockorerecipe.json +++ b/mods/pala/src/main/resources/data/pala/recipe/kisakayblockorerecipe.json @@ -2,12 +2,10 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "pala:kisakay_ore_block" - } + "pala:kisakay_ore_block" ], "result": { "id": "pala:kisakay_ingot", "count": 9 } -} +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/recipe/kisakayhoerecipe.json b/mods/pala/src/main/resources/data/pala/recipe/kisakayhoerecipe.json index 7de81de..b4a8155 100644 --- a/mods/pala/src/main/resources/data/pala/recipe/kisakayhoerecipe.json +++ b/mods/pala/src/main/resources/data/pala/recipe/kisakayhoerecipe.json @@ -7,15 +7,11 @@ " A" ], "key": { - "#": { - "item": "pala:kisakay_ingot" - }, - "A": { - "item": "minecraft:stick" - } + "#": "pala:kisakay_ingot", + "A": "minecraft:stick" }, "result": { "id": "pala:kisakay_hoe", "count": 1 } -} +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/recipe/kisakayoreblockrecipe.json b/mods/pala/src/main/resources/data/pala/recipe/kisakayoreblockrecipe.json index 1055313..e0b249f 100644 --- a/mods/pala/src/main/resources/data/pala/recipe/kisakayoreblockrecipe.json +++ b/mods/pala/src/main/resources/data/pala/recipe/kisakayoreblockrecipe.json @@ -7,12 +7,10 @@ "###" ], "key": { - "#": { - "item": "pala:kisakay_ingot" - } + "#": "pala:kisakay_ingot" }, "result": { "id": "pala:kisakay_ore_block", "count": 1 } -} +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/recipe/kisakaypickaxerecipe.json b/mods/pala/src/main/resources/data/pala/recipe/kisakaypickaxerecipe.json index 6f1a146..ef39de8 100644 --- a/mods/pala/src/main/resources/data/pala/recipe/kisakaypickaxerecipe.json +++ b/mods/pala/src/main/resources/data/pala/recipe/kisakaypickaxerecipe.json @@ -3,19 +3,15 @@ "category": "equipment", "pattern": [ "###", - " A", - " A" + " A ", + " A " ], "key": { - "#": { - "item": "pala:kisakay_ingot" - }, - "A": { - "item": "minecraft:stick" - } + "#": "pala:kisakay_ingot", + "A": "minecraft:stick" }, "result": { "id": "pala:kisakay_pickaxe", "count": 1 } -} +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/recipe/kisakayshovelrecipe.json b/mods/pala/src/main/resources/data/pala/recipe/kisakayshovelrecipe.json index 095e404..ac897f6 100644 --- a/mods/pala/src/main/resources/data/pala/recipe/kisakayshovelrecipe.json +++ b/mods/pala/src/main/resources/data/pala/recipe/kisakayshovelrecipe.json @@ -7,15 +7,11 @@ "A" ], "key": { - "#": { - "item": "pala:kisakay_ingot" - }, - "A": { - "item": "minecraft:stick" - } + "#": "pala:kisakay_ingot", + "A": "minecraft:stick" }, "result": { "id": "pala:kisakay_shovel", "count": 1 } -} +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/recipe/kisakayswordrecipe.json b/mods/pala/src/main/resources/data/pala/recipe/kisakayswordrecipe.json index 57be25a..96a3528 100644 --- a/mods/pala/src/main/resources/data/pala/recipe/kisakayswordrecipe.json +++ b/mods/pala/src/main/resources/data/pala/recipe/kisakayswordrecipe.json @@ -7,15 +7,11 @@ "A" ], "key": { - "#": { - "item": "pala:kisakay_ingot" - }, - "A": { - "item": "minecraft:stick" - } + "#": "pala:kisakay_ingot", + "A": "minecraft:stick" }, "result": { "id": "pala:kisakay_sword", "count": 1 } -} +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/recipe/palaapplerecipe.json b/mods/pala/src/main/resources/data/pala/recipe/palaapplerecipe.json index 416bcb2..2c51de4 100644 --- a/mods/pala/src/main/resources/data/pala/recipe/palaapplerecipe.json +++ b/mods/pala/src/main/resources/data/pala/recipe/palaapplerecipe.json @@ -7,15 +7,11 @@ "###" ], "key": { - "#": { - "item": "pala:paladium_ingot" - }, - "A": { - "item": "minecraft:apple" - } + "#": "pala:paladium_ingot", + "A": "minecraft:apple" }, "result": { "id": "pala:pala_apple", "count": 1 } -} +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/recipe/paladium_greenarmorbodyrecipe.json b/mods/pala/src/main/resources/data/pala/recipe/paladium_greenarmorbodyrecipe.json index 4d57816..e692d99 100644 --- a/mods/pala/src/main/resources/data/pala/recipe/paladium_greenarmorbodyrecipe.json +++ b/mods/pala/src/main/resources/data/pala/recipe/paladium_greenarmorbodyrecipe.json @@ -7,12 +7,10 @@ "###" ], "key": { - "#": { - "item": "pala:paladium_green_ingot" - } + "#": "pala:paladium_green_ingot" }, "result": { "id": "pala:paladium_green_chestplate", "count": 1 } -} +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/recipe/paladium_greenarmorbootsrecipe.json b/mods/pala/src/main/resources/data/pala/recipe/paladium_greenarmorbootsrecipe.json index e14e4e4..1fef351 100644 --- a/mods/pala/src/main/resources/data/pala/recipe/paladium_greenarmorbootsrecipe.json +++ b/mods/pala/src/main/resources/data/pala/recipe/paladium_greenarmorbootsrecipe.json @@ -6,12 +6,10 @@ "##" ], "key": { - "#": { - "item": "pala:paladium_green_ingot" - } + "#": "pala:paladium_green_ingot" }, "result": { "id": "pala:paladium_green_boots", "count": 1 } -} +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/recipe/paladium_greenarmorhelmetrecipe.json b/mods/pala/src/main/resources/data/pala/recipe/paladium_greenarmorhelmetrecipe.json index 4dde110..4054026 100644 --- a/mods/pala/src/main/resources/data/pala/recipe/paladium_greenarmorhelmetrecipe.json +++ b/mods/pala/src/main/resources/data/pala/recipe/paladium_greenarmorhelmetrecipe.json @@ -6,12 +6,10 @@ "# #" ], "key": { - "#": { - "item": "pala:paladium_green_ingot" - } + "#": "pala:paladium_green_ingot" }, "result": { "id": "pala:paladium_green_helmet", "count": 1 } -} +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/recipe/paladium_greenarmorleggingsrecipe.json b/mods/pala/src/main/resources/data/pala/recipe/paladium_greenarmorleggingsrecipe.json index 9d82e8b..23450e7 100644 --- a/mods/pala/src/main/resources/data/pala/recipe/paladium_greenarmorleggingsrecipe.json +++ b/mods/pala/src/main/resources/data/pala/recipe/paladium_greenarmorleggingsrecipe.json @@ -7,12 +7,10 @@ "# #" ], "key": { - "#": { - "item": "pala:paladium_green_ingot" - } + "#": "pala:paladium_green_ingot" }, "result": { "id": "pala:paladium_green_leggings", "count": 1 } -} +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/recipe/paladium_greenaxerecipe.json b/mods/pala/src/main/resources/data/pala/recipe/paladium_greenaxerecipe.json index a7f8b9d..022c582 100644 --- a/mods/pala/src/main/resources/data/pala/recipe/paladium_greenaxerecipe.json +++ b/mods/pala/src/main/resources/data/pala/recipe/paladium_greenaxerecipe.json @@ -7,15 +7,11 @@ " A" ], "key": { - "#": { - "item": "pala:paladium_green_ingot" - }, - "A": { - "item": "minecraft:stick" - } + "#": "pala:paladium_green_ingot", + "A": "minecraft:stick" }, "result": { "id": "pala:paladium_green_axe", "count": 1 } -} +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/recipe/paladium_greenblockorerecipe.json b/mods/pala/src/main/resources/data/pala/recipe/paladium_greenblockorerecipe.json index 0c22a56..1b6ce8f 100644 --- a/mods/pala/src/main/resources/data/pala/recipe/paladium_greenblockorerecipe.json +++ b/mods/pala/src/main/resources/data/pala/recipe/paladium_greenblockorerecipe.json @@ -2,12 +2,10 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "pala:paladium_green_ore_block" - } + "pala:paladium_green_ore_block" ], "result": { "id": "pala:paladium_green_ingot", "count": 9 } -} +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/recipe/paladium_greenoreblockrecipe.json b/mods/pala/src/main/resources/data/pala/recipe/paladium_greenoreblockrecipe.json index 6967476..9cb05b9 100644 --- a/mods/pala/src/main/resources/data/pala/recipe/paladium_greenoreblockrecipe.json +++ b/mods/pala/src/main/resources/data/pala/recipe/paladium_greenoreblockrecipe.json @@ -7,12 +7,10 @@ "###" ], "key": { - "#": { - "item": "pala:paladium_green_ingot" - } + "#": "pala:paladium_green_ingot" }, "result": { "id": "pala:paladium_green_ore_block", "count": 1 } -} +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/recipe/paladium_greenpickaxerecipe.json b/mods/pala/src/main/resources/data/pala/recipe/paladium_greenpickaxerecipe.json index c8fd7c0..26a6229 100644 --- a/mods/pala/src/main/resources/data/pala/recipe/paladium_greenpickaxerecipe.json +++ b/mods/pala/src/main/resources/data/pala/recipe/paladium_greenpickaxerecipe.json @@ -3,19 +3,15 @@ "category": "equipment", "pattern": [ "###", - " A", - " A" + " A ", + " A " ], "key": { - "#": { - "item": "pala:paladium_green_ingot" - }, - "A": { - "item": "minecraft:stick" - } + "#": "pala:paladium_green_ingot", + "A": "minecraft:stick" }, "result": { "id": "pala:paladium_green_pickaxe", "count": 1 } -} +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/recipe/paladium_greenshovelrecipe.json b/mods/pala/src/main/resources/data/pala/recipe/paladium_greenshovelrecipe.json index c3d66a4..e5bb3ea 100644 --- a/mods/pala/src/main/resources/data/pala/recipe/paladium_greenshovelrecipe.json +++ b/mods/pala/src/main/resources/data/pala/recipe/paladium_greenshovelrecipe.json @@ -7,15 +7,11 @@ "A" ], "key": { - "#": { - "item": "pala:paladium_green_ingot" - }, - "A": { - "item": "minecraft:stick" - } + "#": "pala:paladium_green_ingot", + "A": "minecraft:stick" }, "result": { "id": "pala:paladium_green_shovel", "count": 1 } -} +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/recipe/paladium_greenswordrecipe.json b/mods/pala/src/main/resources/data/pala/recipe/paladium_greenswordrecipe.json index 5713c48..4a8d637 100644 --- a/mods/pala/src/main/resources/data/pala/recipe/paladium_greenswordrecipe.json +++ b/mods/pala/src/main/resources/data/pala/recipe/paladium_greenswordrecipe.json @@ -7,15 +7,11 @@ "A" ], "key": { - "#": { - "item": "pala:paladium_green_ingot" - }, - "A": { - "item": "minecraft:stick" - } + "#": "pala:paladium_green_ingot", + "A": "minecraft:stick" }, "result": { "id": "pala:paladium_green_sword", "count": 1 } -} +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/recipe/paladium_ore_smelting_recipe.json b/mods/pala/src/main/resources/data/pala/recipe/paladium_ore_smelting_recipe.json index 4d23e6e..510801f 100644 --- a/mods/pala/src/main/resources/data/pala/recipe/paladium_ore_smelting_recipe.json +++ b/mods/pala/src/main/resources/data/pala/recipe/paladium_ore_smelting_recipe.json @@ -1,12 +1,10 @@ { "type": "minecraft:smelting", - "ingredient": { - "item": "pala:paladium_ore" - }, + "ingredient": "pala:paladium_ore", "result": { "id": "pala:paladium_ingot", "count": 1 }, "experience": 1.0, "cookingtime": 200 -} +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/recipe/paladiumarmorbodyrecipe.json b/mods/pala/src/main/resources/data/pala/recipe/paladiumarmorbodyrecipe.json index 2fabdaa..e5b288b 100644 --- a/mods/pala/src/main/resources/data/pala/recipe/paladiumarmorbodyrecipe.json +++ b/mods/pala/src/main/resources/data/pala/recipe/paladiumarmorbodyrecipe.json @@ -7,12 +7,10 @@ "###" ], "key": { - "#": { - "item": "pala:paladium_ingot" - } + "#": "pala:paladium_ingot" }, "result": { "id": "pala:paladium_chestplate", "count": 1 } -} +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/recipe/paladiumarmorbootsrecipe.json b/mods/pala/src/main/resources/data/pala/recipe/paladiumarmorbootsrecipe.json index c9977ee..f8c1785 100644 --- a/mods/pala/src/main/resources/data/pala/recipe/paladiumarmorbootsrecipe.json +++ b/mods/pala/src/main/resources/data/pala/recipe/paladiumarmorbootsrecipe.json @@ -6,12 +6,10 @@ "##" ], "key": { - "#": { - "item": "pala:paladium_ingot" - } + "#": "pala:paladium_ingot" }, "result": { "id": "pala:paladium_boots", "count": 1 } -} +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/recipe/paladiumarmorhelmetrecipe.json b/mods/pala/src/main/resources/data/pala/recipe/paladiumarmorhelmetrecipe.json index c7c8bf3..5944e75 100644 --- a/mods/pala/src/main/resources/data/pala/recipe/paladiumarmorhelmetrecipe.json +++ b/mods/pala/src/main/resources/data/pala/recipe/paladiumarmorhelmetrecipe.json @@ -6,12 +6,10 @@ "# #" ], "key": { - "#": { - "item": "pala:paladium_ingot" - } + "#": "pala:paladium_ingot" }, "result": { "id": "pala:paladium_helmet", "count": 1 } -} +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/recipe/paladiumarmorleggingsrecipe.json b/mods/pala/src/main/resources/data/pala/recipe/paladiumarmorleggingsrecipe.json index 6327858..613d054 100644 --- a/mods/pala/src/main/resources/data/pala/recipe/paladiumarmorleggingsrecipe.json +++ b/mods/pala/src/main/resources/data/pala/recipe/paladiumarmorleggingsrecipe.json @@ -7,12 +7,10 @@ "# #" ], "key": { - "#": { - "item": "pala:paladium_ingot" - } + "#": "pala:paladium_ingot" }, "result": { "id": "pala:paladium_leggings", "count": 1 } -} +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/recipe/paladiumaxerecipe.json b/mods/pala/src/main/resources/data/pala/recipe/paladiumaxerecipe.json index 90d989e..32ef5e4 100644 --- a/mods/pala/src/main/resources/data/pala/recipe/paladiumaxerecipe.json +++ b/mods/pala/src/main/resources/data/pala/recipe/paladiumaxerecipe.json @@ -7,15 +7,11 @@ " A" ], "key": { - "#": { - "item": "pala:paladium_ingot" - }, - "A": { - "item": "minecraft:stick" - } + "#": "pala:paladium_ingot", + "A": "minecraft:stick" }, "result": { "id": "pala:paladium_axe", "count": 1 } -} +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/recipe/paladiumblockorerecipe.json b/mods/pala/src/main/resources/data/pala/recipe/paladiumblockorerecipe.json index a19bdd6..2b73e11 100644 --- a/mods/pala/src/main/resources/data/pala/recipe/paladiumblockorerecipe.json +++ b/mods/pala/src/main/resources/data/pala/recipe/paladiumblockorerecipe.json @@ -2,12 +2,10 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "pala:paladium_ore_block" - } + "pala:paladium_ore_block" ], "result": { "id": "pala:paladium_ingot", "count": 9 } -} +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/recipe/paladiumcorerecipe.json b/mods/pala/src/main/resources/data/pala/recipe/paladiumcorerecipe.json index fb377e6..3bb2eab 100644 --- a/mods/pala/src/main/resources/data/pala/recipe/paladiumcorerecipe.json +++ b/mods/pala/src/main/resources/data/pala/recipe/paladiumcorerecipe.json @@ -7,15 +7,11 @@ "#A#" ], "key": { - "#": { - "item": "pala:titane_ingot" - }, - "A": { - "item": "pala:paladium_ingot" - } + "#": "pala:titane_ingot", + "A": "pala:paladium_ingot" }, "result": { "id": "pala:paladium_core", "count": 1 } -} +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/recipe/paladiumcrusherrecipe.json b/mods/pala/src/main/resources/data/pala/recipe/paladiumcrusherrecipe.json index 0e58975..1c4c314 100644 --- a/mods/pala/src/main/resources/data/pala/recipe/paladiumcrusherrecipe.json +++ b/mods/pala/src/main/resources/data/pala/recipe/paladiumcrusherrecipe.json @@ -7,21 +7,13 @@ "#B#" ], "key": { - "#": { - "item": "pala:paladium_core" - }, - "A": { - "item": "pala:compressed_amethyst" - }, - "B": { - "item": "pala:paladium_stick" - }, - "C": { - "item": "pala:findium_gem" - } + "#": "pala:paladium_core", + "A": "pala:compressed_amethyst", + "B": "pala:paladium_stick", + "C": "pala:findium_gem" }, "result": { "id": "pala:paladium_crusher", "count": 1 } -} +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/recipe/paladiumhammerrecipe.json b/mods/pala/src/main/resources/data/pala/recipe/paladiumhammerrecipe.json index 9fcaa2c..aba1d69 100644 --- a/mods/pala/src/main/resources/data/pala/recipe/paladiumhammerrecipe.json +++ b/mods/pala/src/main/resources/data/pala/recipe/paladiumhammerrecipe.json @@ -4,18 +4,14 @@ "pattern": [ "###", "###", - " A" + " A " ], "key": { - "#": { - "item": "pala:paladium_ingot" - }, - "A": { - "item": "pala:paladium_stick" - } + "#": "pala:paladium_ingot", + "A": "pala:paladium_stick" }, "result": { "id": "pala:paladium_hammer", "count": 1 } -} +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/recipe/paladiumoreblockrecipe.json b/mods/pala/src/main/resources/data/pala/recipe/paladiumoreblockrecipe.json index 596d56e..71249b9 100644 --- a/mods/pala/src/main/resources/data/pala/recipe/paladiumoreblockrecipe.json +++ b/mods/pala/src/main/resources/data/pala/recipe/paladiumoreblockrecipe.json @@ -7,12 +7,10 @@ "###" ], "key": { - "#": { - "item": "pala:paladium_ingot" - } + "#": "pala:paladium_ingot" }, "result": { "id": "pala:paladium_ore_block", "count": 1 } -} +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/recipe/paladiumpickaxerecipe.json b/mods/pala/src/main/resources/data/pala/recipe/paladiumpickaxerecipe.json index db14719..c3886d3 100644 --- a/mods/pala/src/main/resources/data/pala/recipe/paladiumpickaxerecipe.json +++ b/mods/pala/src/main/resources/data/pala/recipe/paladiumpickaxerecipe.json @@ -3,19 +3,15 @@ "category": "equipment", "pattern": [ "###", - " A", - " A" + " A ", + " A " ], "key": { - "#": { - "item": "pala:paladium_ingot" - }, - "A": { - "item": "minecraft:stick" - } + "#": "pala:paladium_ingot", + "A": "minecraft:stick" }, "result": { "id": "pala:paladium_pickaxe", "count": 1 } -} +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/recipe/paladiumshovelrecipe.json b/mods/pala/src/main/resources/data/pala/recipe/paladiumshovelrecipe.json index b5cbfd1..10fbad0 100644 --- a/mods/pala/src/main/resources/data/pala/recipe/paladiumshovelrecipe.json +++ b/mods/pala/src/main/resources/data/pala/recipe/paladiumshovelrecipe.json @@ -7,15 +7,11 @@ "A" ], "key": { - "#": { - "item": "pala:paladium_ingot" - }, - "A": { - "item": "minecraft:stick" - } + "#": "pala:paladium_ingot", + "A": "minecraft:stick" }, "result": { "id": "pala:paladium_shovel", "count": 1 } -} +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/recipe/paladiumstickrecipe.json b/mods/pala/src/main/resources/data/pala/recipe/paladiumstickrecipe.json index 2fc02c2..b32003b 100644 --- a/mods/pala/src/main/resources/data/pala/recipe/paladiumstickrecipe.json +++ b/mods/pala/src/main/resources/data/pala/recipe/paladiumstickrecipe.json @@ -6,12 +6,10 @@ "#" ], "key": { - "#": { - "item": "pala:paladium_ingot" - } + "#": "pala:paladium_ingot" }, "result": { "id": "pala:paladium_stick", "count": 4 } -} +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/recipe/paladiumswordrecipe.json b/mods/pala/src/main/resources/data/pala/recipe/paladiumswordrecipe.json index 3deba38..56b38f1 100644 --- a/mods/pala/src/main/resources/data/pala/recipe/paladiumswordrecipe.json +++ b/mods/pala/src/main/resources/data/pala/recipe/paladiumswordrecipe.json @@ -7,15 +7,11 @@ "A" ], "key": { - "#": { - "item": "pala:paladium_ingot" - }, - "A": { - "item": "minecraft:stick" - } + "#": "pala:paladium_ingot", + "A": "minecraft:stick" }, "result": { "id": "pala:paladium_sword", "count": 1 } -} +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/recipe/palamixedcoalrecipe.json b/mods/pala/src/main/resources/data/pala/recipe/palamixedcoalrecipe.json index 4bf143e..ef7b428 100644 --- a/mods/pala/src/main/resources/data/pala/recipe/palamixedcoalrecipe.json +++ b/mods/pala/src/main/resources/data/pala/recipe/palamixedcoalrecipe.json @@ -4,21 +4,15 @@ "pattern": [ "#A#", "ABA", - " A" + " A " ], "key": { - "#": { - "item": "pala:paladium_stick" - }, - "A": { - "item": "pala:paladium_ingot" - }, - "B": { - "item": "minecraft:coal" - } + "#": "pala:paladium_stick", + "A": "pala:paladium_ingot", + "B": "minecraft:coal" }, "result": { "id": "pala:pala_mixed_coal", "count": 8 } -} +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/recipe/pickaxeofthegodrecipe.json b/mods/pala/src/main/resources/data/pala/recipe/pickaxeofthegodrecipe.json index f2ae4d3..d580a5a 100644 --- a/mods/pala/src/main/resources/data/pala/recipe/pickaxeofthegodrecipe.json +++ b/mods/pala/src/main/resources/data/pala/recipe/pickaxeofthegodrecipe.json @@ -3,25 +3,17 @@ "category": "misc", "pattern": [ "#AB", - " C", - " C" + " C ", + " C " ], "key": { - "#": { - "item": "pala:amethyst_pickaxe" - }, - "A": { - "item": "pala:paladium_pickaxe" - }, - "B": { - "item": "pala:titane_pickaxe" - }, - "C": { - "item": "pala:paladium_stick" - } + "#": "pala:amethyst_pickaxe", + "A": "pala:paladium_pickaxe", + "B": "pala:titane_pickaxe", + "C": "pala:paladium_stick" }, "result": { "id": "pala:pickaxe_of_the_god", "count": 1 } -} +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/recipe/speedstickrecipe.json b/mods/pala/src/main/resources/data/pala/recipe/speedstickrecipe.json index 55bee2b..9569df9 100644 --- a/mods/pala/src/main/resources/data/pala/recipe/speedstickrecipe.json +++ b/mods/pala/src/main/resources/data/pala/recipe/speedstickrecipe.json @@ -7,15 +7,11 @@ "A" ], "key": { - "#": { - "item": "minecraft:leather_boots" - }, - "A": { - "item": "pala:paladium_stick" - } + "#": "minecraft:leather_boots", + "A": "pala:paladium_stick" }, "result": { "id": "pala:speed_stick", "count": 1 } -} +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/recipe/stickofgodrecipe.json b/mods/pala/src/main/resources/data/pala/recipe/stickofgodrecipe.json index 162cd2d..1043574 100644 --- a/mods/pala/src/main/resources/data/pala/recipe/stickofgodrecipe.json +++ b/mods/pala/src/main/resources/data/pala/recipe/stickofgodrecipe.json @@ -7,15 +7,11 @@ "A" ], "key": { - "#": { - "item": "pala:paladium_ingot" - }, - "A": { - "item": "pala:paladium_stick" - } + "#": "pala:paladium_ingot", + "A": "pala:paladium_stick" }, "result": { "id": "pala:stick_of_god", "count": 1 } -} +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/recipe/strenghtstickrecipe.json b/mods/pala/src/main/resources/data/pala/recipe/strenghtstickrecipe.json index 3829a70..0034f08 100644 --- a/mods/pala/src/main/resources/data/pala/recipe/strenghtstickrecipe.json +++ b/mods/pala/src/main/resources/data/pala/recipe/strenghtstickrecipe.json @@ -7,15 +7,11 @@ "A" ], "key": { - "#": { - "item": "pala:titane_sword" - }, - "A": { - "item": "pala:paladium_stick" - } + "#": "pala:titane_sword", + "A": "pala:paladium_stick" }, "result": { "id": "pala:strenght_stick", "count": 1 } -} +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/recipe/titane_mixed_coal_recipe.json b/mods/pala/src/main/resources/data/pala/recipe/titane_mixed_coal_recipe.json index 95a5f93..91e0018 100644 --- a/mods/pala/src/main/resources/data/pala/recipe/titane_mixed_coal_recipe.json +++ b/mods/pala/src/main/resources/data/pala/recipe/titane_mixed_coal_recipe.json @@ -4,21 +4,15 @@ "pattern": [ "#A#", "ABA", - " A" + " A " ], "key": { - "#": { - "item": "pala:paladium_stick" - }, - "A": { - "item": "pala:titane_ingot" - }, - "B": { - "item": "minecraft:coal" - } + "#": "pala:paladium_stick", + "A": "pala:titane_ingot", + "B": "minecraft:coal" }, "result": { "id": "pala:titane_mixed_coal", "count": 8 } -} +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/recipe/titanearmorbodyrecipe.json b/mods/pala/src/main/resources/data/pala/recipe/titanearmorbodyrecipe.json index a1fe9c5..0591f75 100644 --- a/mods/pala/src/main/resources/data/pala/recipe/titanearmorbodyrecipe.json +++ b/mods/pala/src/main/resources/data/pala/recipe/titanearmorbodyrecipe.json @@ -7,12 +7,10 @@ "###" ], "key": { - "#": { - "item": "pala:titane_ingot" - } + "#": "pala:titane_ingot" }, "result": { "id": "pala:titane_chestplate", "count": 1 } -} +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/recipe/titanearmorbootsrecipe.json b/mods/pala/src/main/resources/data/pala/recipe/titanearmorbootsrecipe.json index 6ff690c..bd93511 100644 --- a/mods/pala/src/main/resources/data/pala/recipe/titanearmorbootsrecipe.json +++ b/mods/pala/src/main/resources/data/pala/recipe/titanearmorbootsrecipe.json @@ -6,12 +6,10 @@ "##" ], "key": { - "#": { - "item": "pala:titane_ingot" - } + "#": "pala:titane_ingot" }, "result": { "id": "pala:titane_boots", "count": 1 } -} +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/recipe/titanearmorhelmetrecipe.json b/mods/pala/src/main/resources/data/pala/recipe/titanearmorhelmetrecipe.json index e059856..e89c375 100644 --- a/mods/pala/src/main/resources/data/pala/recipe/titanearmorhelmetrecipe.json +++ b/mods/pala/src/main/resources/data/pala/recipe/titanearmorhelmetrecipe.json @@ -6,12 +6,10 @@ "# #" ], "key": { - "#": { - "item": "pala:titane_ingot" - } + "#": "pala:titane_ingot" }, "result": { "id": "pala:titane_helmet", "count": 1 } -} +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/recipe/titanearmorleggingsrecipe.json b/mods/pala/src/main/resources/data/pala/recipe/titanearmorleggingsrecipe.json index 63f3a30..557a248 100644 --- a/mods/pala/src/main/resources/data/pala/recipe/titanearmorleggingsrecipe.json +++ b/mods/pala/src/main/resources/data/pala/recipe/titanearmorleggingsrecipe.json @@ -7,12 +7,10 @@ "# #" ], "key": { - "#": { - "item": "pala:titane_ingot" - } + "#": "pala:titane_ingot" }, "result": { "id": "pala:titane_leggings", "count": 1 } -} +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/recipe/titaneaxerecipe.json b/mods/pala/src/main/resources/data/pala/recipe/titaneaxerecipe.json index dbcf084..f4480e8 100644 --- a/mods/pala/src/main/resources/data/pala/recipe/titaneaxerecipe.json +++ b/mods/pala/src/main/resources/data/pala/recipe/titaneaxerecipe.json @@ -7,15 +7,11 @@ " A" ], "key": { - "#": { - "item": "pala:titane_ingot" - }, - "A": { - "item": "minecraft:stick" - } + "#": "pala:titane_ingot", + "A": "minecraft:stick" }, "result": { "id": "pala:titane_axe", "count": 1 } -} +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/recipe/titaneblockorerecipe.json b/mods/pala/src/main/resources/data/pala/recipe/titaneblockorerecipe.json index 8017679..0d61f7e 100644 --- a/mods/pala/src/main/resources/data/pala/recipe/titaneblockorerecipe.json +++ b/mods/pala/src/main/resources/data/pala/recipe/titaneblockorerecipe.json @@ -2,12 +2,10 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "pala:titane_ore_block" - } + "pala:titane_ore_block" ], "result": { "id": "pala:titane_ingot", "count": 9 } -} +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/recipe/titanehammerrecipe.json b/mods/pala/src/main/resources/data/pala/recipe/titanehammerrecipe.json index 09065e0..348c10b 100644 --- a/mods/pala/src/main/resources/data/pala/recipe/titanehammerrecipe.json +++ b/mods/pala/src/main/resources/data/pala/recipe/titanehammerrecipe.json @@ -4,18 +4,14 @@ "pattern": [ "###", "###", - " A" + " A " ], "key": { - "#": { - "item": "pala:titane_ingot" - }, - "A": { - "item": "pala:titane_stick" - } + "#": "pala:titane_ingot", + "A": "pala:titane_stick" }, "result": { "id": "pala:titane_hammer", "count": 1 } -} +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/recipe/titaneoreblockrecipe.json b/mods/pala/src/main/resources/data/pala/recipe/titaneoreblockrecipe.json index 7ee2edf..cbe835f 100644 --- a/mods/pala/src/main/resources/data/pala/recipe/titaneoreblockrecipe.json +++ b/mods/pala/src/main/resources/data/pala/recipe/titaneoreblockrecipe.json @@ -7,12 +7,10 @@ "###" ], "key": { - "#": { - "item": "pala:titane_ingot" - } + "#": "pala:titane_ingot" }, "result": { "id": "pala:titane_ore_block", "count": 1 } -} +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/recipe/titaneoresmelting.json b/mods/pala/src/main/resources/data/pala/recipe/titaneoresmelting.json index 7e4b51c..9d75979 100644 --- a/mods/pala/src/main/resources/data/pala/recipe/titaneoresmelting.json +++ b/mods/pala/src/main/resources/data/pala/recipe/titaneoresmelting.json @@ -1,12 +1,10 @@ { "type": "minecraft:smelting", - "ingredient": { - "item": "pala:titane_ore" - }, + "ingredient": "pala:titane_ore", "result": { "id": "pala:titane_ingot", "count": 1 }, "experience": 2.8, "cookingtime": 200 -} +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/recipe/titanepickaxerecipe.json b/mods/pala/src/main/resources/data/pala/recipe/titanepickaxerecipe.json index 907fe78..28ab5c8 100644 --- a/mods/pala/src/main/resources/data/pala/recipe/titanepickaxerecipe.json +++ b/mods/pala/src/main/resources/data/pala/recipe/titanepickaxerecipe.json @@ -3,19 +3,15 @@ "category": "equipment", "pattern": [ "###", - " A", - " A" + " A ", + " A " ], "key": { - "#": { - "item": "pala:titane_ingot" - }, - "A": { - "item": "minecraft:stick" - } + "#": "pala:titane_ingot", + "A": "minecraft:stick" }, "result": { "id": "pala:titane_pickaxe", "count": 1 } -} +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/recipe/titaneshovelrecipe.json b/mods/pala/src/main/resources/data/pala/recipe/titaneshovelrecipe.json index aec424d..85191ca 100644 --- a/mods/pala/src/main/resources/data/pala/recipe/titaneshovelrecipe.json +++ b/mods/pala/src/main/resources/data/pala/recipe/titaneshovelrecipe.json @@ -7,15 +7,11 @@ "A" ], "key": { - "#": { - "item": "pala:titane_ingot" - }, - "A": { - "item": "minecraft:stick" - } + "#": "pala:titane_ingot", + "A": "minecraft:stick" }, "result": { "id": "pala:titane_shovel", "count": 1 } -} +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/recipe/titanestickrecipe.json b/mods/pala/src/main/resources/data/pala/recipe/titanestickrecipe.json index fd86f91..d5c3371 100644 --- a/mods/pala/src/main/resources/data/pala/recipe/titanestickrecipe.json +++ b/mods/pala/src/main/resources/data/pala/recipe/titanestickrecipe.json @@ -6,12 +6,10 @@ "#" ], "key": { - "#": { - "item": "pala:titane_ingot" - } + "#": "pala:titane_ingot" }, "result": { "id": "pala:titane_stick", "count": 4 } -} +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/recipe/titaneswordrecipe.json b/mods/pala/src/main/resources/data/pala/recipe/titaneswordrecipe.json index 75dfd28..2140ca4 100644 --- a/mods/pala/src/main/resources/data/pala/recipe/titaneswordrecipe.json +++ b/mods/pala/src/main/resources/data/pala/recipe/titaneswordrecipe.json @@ -7,15 +7,11 @@ "A" ], "key": { - "#": { - "item": "pala:titane_ingot" - }, - "A": { - "item": "minecraft:stick" - } + "#": "pala:titane_ingot", + "A": "minecraft:stick" }, "result": { "id": "pala:titane_sword", "count": 1 } -} +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/recipe/trixiumblockorerecipe.json b/mods/pala/src/main/resources/data/pala/recipe/trixiumblockorerecipe.json index 6f422bd..0191ca2 100644 --- a/mods/pala/src/main/resources/data/pala/recipe/trixiumblockorerecipe.json +++ b/mods/pala/src/main/resources/data/pala/recipe/trixiumblockorerecipe.json @@ -2,12 +2,10 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "pala:trixium_ore_block" - } + "pala:trixium_ore_block" ], "result": { "id": "pala:trixium_gem", "count": 9 } -} +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/recipe/trixiumoreblockrecipe.json b/mods/pala/src/main/resources/data/pala/recipe/trixiumoreblockrecipe.json index 74bb1fd..77ef2ee 100644 --- a/mods/pala/src/main/resources/data/pala/recipe/trixiumoreblockrecipe.json +++ b/mods/pala/src/main/resources/data/pala/recipe/trixiumoreblockrecipe.json @@ -7,12 +7,10 @@ "###" ], "key": { - "#": { - "item": "pala:trixium_gem" - } + "#": "pala:trixium_gem" }, "result": { "id": "pala:trixium_ore_block", "count": 1 } -} +} \ No newline at end of file diff --git a/mods/pala/src/main/resources/data/pala/recipe/trixiumoresmelting.json b/mods/pala/src/main/resources/data/pala/recipe/trixiumoresmelting.json index f8ecb51..ff9eba2 100644 --- a/mods/pala/src/main/resources/data/pala/recipe/trixiumoresmelting.json +++ b/mods/pala/src/main/resources/data/pala/recipe/trixiumoresmelting.json @@ -1,12 +1,10 @@ { "type": "minecraft:smelting", - "ingredient": { - "item": "pala:trixium_ore" - }, + "ingredient": "pala:trixium_ore", "result": { "id": "pala:trixium_gem", "count": 1 }, "experience": 1.89, "cookingtime": 200 -} +} \ No newline at end of file diff --git a/server/config/packetfixer.properties b/server/config/packetfixer.properties index b6f2676..2b98861 100644 --- a/server/config/packetfixer.properties +++ b/server/config/packetfixer.properties @@ -1,7 +1,7 @@ #Packet Fixer config file. #Default values (minecraft default): nbtMaxSize 2097152, packetSize 1048576, decoderSize 8388608 and varInt21Size 3. #Max values are 2147483647 for packetSize/decoderSize/varInt21 and 9223372036854775807 for nbtMaxSize. -#Sun Oct 18 18:18:52 CEST 2026 +#Sun Oct 18 22:04:32 CEST 2026 allSizesUnlimited=true chunkPacketData=2097152 decoderSize=8388608 diff --git a/server/mods/pala-0.2.1.jar b/server/mods/pala-0.2.1.jar new file mode 100644 index 0000000..188f1c1 Binary files /dev/null and b/server/mods/pala-0.2.1.jar differ diff --git a/server/server.properties b/server/server.properties index c5a65bd..bf9488f 100644 --- a/server/server.properties +++ b/server/server.properties @@ -1,5 +1,5 @@ #Minecraft server properties -#Sun Oct 18 18:19:01 CEST 2026 +#Sun Oct 18 22:04:39 CEST 2026 accepts-transfers=false allow-flight=false broadcast-console-to-ops=true