From a15261bf239415d3faf8cedca5ff6d39bd62a880 Mon Sep 17 00:00:00 2001 From: TBPig <147127248+TBPig@users.noreply.github.com> Date: Wed, 3 Dec 2025 09:05:27 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=9F=BF=E7=89=A9?= =?UTF-8?q?=E5=A2=9E=E4=BA=A7=E9=85=8D=E6=96=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chaotic_raw_ore_and_earth_core_shard.json | 21 +++++++++ .../chaotic_raw_ore_and_earth_core_shard.json | 46 +++++++++++++++++++ .../data/recipe/SuperHeatingRecipeLoader.java | 13 ++++++ 3 files changed, 80 insertions(+) create mode 100644 src/generated/resources/data/anvilcraft/advancement/recipes/super_heating/chaotic_raw_ore_and_earth_core_shard.json create mode 100644 src/generated/resources/data/anvilcraft/recipe/super_heating/chaotic_raw_ore_and_earth_core_shard.json diff --git a/src/generated/resources/data/anvilcraft/advancement/recipes/super_heating/chaotic_raw_ore_and_earth_core_shard.json b/src/generated/resources/data/anvilcraft/advancement/recipes/super_heating/chaotic_raw_ore_and_earth_core_shard.json new file mode 100644 index 00000000..b748ad6d --- /dev/null +++ b/src/generated/resources/data/anvilcraft/advancement/recipes/super_heating/chaotic_raw_ore_and_earth_core_shard.json @@ -0,0 +1,21 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "anvilcraft:super_heating/chaotic_raw_ore_and_earth_core_shard" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "anvilcraft:super_heating/chaotic_raw_ore_and_earth_core_shard" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/anvilcraft/recipe/super_heating/chaotic_raw_ore_and_earth_core_shard.json b/src/generated/resources/data/anvilcraft/recipe/super_heating/chaotic_raw_ore_and_earth_core_shard.json new file mode 100644 index 00000000..768490f8 --- /dev/null +++ b/src/generated/resources/data/anvilcraft/recipe/super_heating/chaotic_raw_ore_and_earth_core_shard.json @@ -0,0 +1,46 @@ +{ + "type": "anvilcraft:super_heating", + "ingredients": [ + { + "count": 8, + "items": "anvilcraft_pigsplus:chaotic_raw_ore" + }, + { + "items": "anvilcraft:earth_core_shard" + } + ], + "results": [ + { + "count": 4, + "id": "minecraft:copper_ingot" + }, + { + "count": 4, + "id": "minecraft:gold_ingot" + }, + { + "count": 4, + "id": "anvilcraft:zinc_ingot" + }, + { + "count": 4, + "id": "anvilcraft:tin_ingot" + }, + { + "count": 4, + "id": "anvilcraft:titanium_ingot" + }, + { + "count": 4, + "id": "anvilcraft:tungsten_ingot" + }, + { + "count": 4, + "id": "anvilcraft:lead_ingot" + }, + { + "count": 4, + "id": "anvilcraft:silver_ingot" + } + ] +} \ No newline at end of file diff --git a/src/main/java/dev/anvilcraft/pigsplus/data/recipe/SuperHeatingRecipeLoader.java b/src/main/java/dev/anvilcraft/pigsplus/data/recipe/SuperHeatingRecipeLoader.java index da09cd4e..8301a231 100644 --- a/src/main/java/dev/anvilcraft/pigsplus/data/recipe/SuperHeatingRecipeLoader.java +++ b/src/main/java/dev/anvilcraft/pigsplus/data/recipe/SuperHeatingRecipeLoader.java @@ -20,5 +20,18 @@ public static void init(RegistrateRecipeProvider provider) { .result(ModItems.LEAD_INGOT, 0.3f) .result(ModItems.SILVER_INGOT, 0.3f) .save(provider, AnvilCraft.of("super_heating/chaotic_raw_ore")); + + SuperHeatingRecipe.builder() + .requires(AddonItems.CHAOTIC_RAW_ORE, 8) + .requires(ModItems.EARTH_CORE_SHARD) + .result(Items.COPPER_INGOT, 4) + .result(Items.GOLD_INGOT, 4) + .result(ModItems.ZINC_INGOT, 4) + .result(ModItems.TIN_INGOT, 4) + .result(ModItems.TITANIUM_INGOT, 4) + .result(ModItems.TUNGSTEN_INGOT, 4) + .result(ModItems.LEAD_INGOT, 4) + .result(ModItems.SILVER_INGOT, 4) + .save(provider, AnvilCraft.of("super_heating/chaotic_raw_ore_and_earth_core_shard")); } } From 3f935c6e8d6a6fd675a7c1a0b951b50d1bdc0e34 Mon Sep 17 00:00:00 2001 From: TBPig <147127248+TBPig@users.noreply.github.com> Date: Sat, 13 Dec 2025 18:07:59 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E7=8F=A0=E5=AE=9D=E5=8A=A0=E5=B7=A5=E5=8F=B0=E8=B4=B4=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anvilcraft/pigsplus/init/AddonBlocks.java | 3 +- .../block/auto_jewel_crafting_table.json | 392 +++++++++++++++++- .../block/auto_jewel_crafting_table_base.png | Bin 0 -> 1458 bytes .../auto_jewel_crafting_table_bottom.png | Bin 139 -> 0 bytes .../block/auto_jewel_crafting_table_glass.png | Bin 0 -> 393 bytes .../auto_jewel_crafting_table_grindstone.png | Bin 0 -> 583 bytes ...jewel_crafting_table_grindstone_wood_1.png | Bin 0 -> 535 bytes ...jewel_crafting_table_grindstone_wood_2.png | Bin 0 -> 383 bytes .../block/auto_jewel_crafting_table_item.png | Bin 0 -> 293 bytes .../auto_jewel_crafting_table_pillar.png | Bin 0 -> 601 bytes .../block/auto_jewel_crafting_table_side.png | Bin 132 -> 0 bytes .../block/auto_jewel_crafting_table_top.png | Bin 213 -> 0 bytes 12 files changed, 382 insertions(+), 13 deletions(-) create mode 100644 src/main/resources/assets/anvilcraft_pigsplus/textures/block/auto_jewel_crafting_table_base.png delete mode 100644 src/main/resources/assets/anvilcraft_pigsplus/textures/block/auto_jewel_crafting_table_bottom.png create mode 100644 src/main/resources/assets/anvilcraft_pigsplus/textures/block/auto_jewel_crafting_table_glass.png create mode 100644 src/main/resources/assets/anvilcraft_pigsplus/textures/block/auto_jewel_crafting_table_grindstone.png create mode 100644 src/main/resources/assets/anvilcraft_pigsplus/textures/block/auto_jewel_crafting_table_grindstone_wood_1.png create mode 100644 src/main/resources/assets/anvilcraft_pigsplus/textures/block/auto_jewel_crafting_table_grindstone_wood_2.png create mode 100644 src/main/resources/assets/anvilcraft_pigsplus/textures/block/auto_jewel_crafting_table_item.png create mode 100644 src/main/resources/assets/anvilcraft_pigsplus/textures/block/auto_jewel_crafting_table_pillar.png delete mode 100644 src/main/resources/assets/anvilcraft_pigsplus/textures/block/auto_jewel_crafting_table_side.png delete mode 100644 src/main/resources/assets/anvilcraft_pigsplus/textures/block/auto_jewel_crafting_table_top.png diff --git a/src/main/java/dev/anvilcraft/pigsplus/init/AddonBlocks.java b/src/main/java/dev/anvilcraft/pigsplus/init/AddonBlocks.java index 14335fd5..97c2b136 100644 --- a/src/main/java/dev/anvilcraft/pigsplus/init/AddonBlocks.java +++ b/src/main/java/dev/anvilcraft/pigsplus/init/AddonBlocks.java @@ -27,6 +27,7 @@ import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.SoundType; +import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.material.MapColor; import net.minecraft.world.level.storage.loot.entries.LootItem; import net.neoforged.neoforge.common.Tags; @@ -140,7 +141,7 @@ public class AddonBlocks { .block("auto_jewel_crafting_table", AutoJewelCraftingTableBlock::new) .lang("Auto Jewel Crafting Table") .initialProperties(() -> Blocks.IRON_BLOCK) - .properties(p -> p.strength(5.0f, 1200f)) + .properties(BlockBehaviour.Properties::noOcclusion) .blockstate(DataGenUtil::noExtraModelOrState) .simpleItem() .tag(BlockTags.MINEABLE_WITH_PICKAXE, BlockTags.NEEDS_IRON_TOOL) diff --git a/src/main/resources/assets/anvilcraft_pigsplus/models/block/auto_jewel_crafting_table.json b/src/main/resources/assets/anvilcraft_pigsplus/models/block/auto_jewel_crafting_table.json index d980b25e..f77fff4f 100644 --- a/src/main/resources/assets/anvilcraft_pigsplus/models/block/auto_jewel_crafting_table.json +++ b/src/main/resources/assets/anvilcraft_pigsplus/models/block/auto_jewel_crafting_table.json @@ -1,25 +1,393 @@ { - "format_version": "1.21.6", + "format_version": "1.9.0", "credit": "Made with Blockbench", "parent": "minecraft:block/cube", + "render_type": "minecraft:cutout", "textures": { - "0": "anvilcraft_pigsplus:block/auto_jewel_crafting_table_side", - "1": "anvilcraft_pigsplus:block/auto_jewel_crafting_table_top", - "2": "anvilcraft_pigsplus:block/auto_jewel_crafting_table_bottom", - "particle": "anvilcraft_pigsplus:block/auto_jewel_crafting_table_side" + "0": "anvilcraft_pigsplus:block/auto_jewel_crafting_table_base", + "1": "anvilcraft_pigsplus:block/auto_jewel_crafting_table_pillar", + "3": "anvilcraft_pigsplus:block/auto_jewel_crafting_table_item", + "4": "anvilcraft_pigsplus:block/auto_jewel_crafting_table_glass", + "5": "anvilcraft_pigsplus:block/auto_jewel_crafting_table_grindstone", + "6": "anvilcraft_pigsplus:block/auto_jewel_crafting_table_grindstone_wood_1", + "7": "anvilcraft_pigsplus:block/auto_jewel_crafting_table_grindstone_wood_2", + "particle": "anvilcraft_pigsplus:block/auto_jewel_crafting_table_base" }, "elements": [ + { + "from": [12, 0, 0], + "to": [16, 1, 4], + "faces": { + "north": {"uv": [8, 2.25, 9, 2.5], "texture": "#0"}, + "east": {"uv": [8, 2.5, 9, 2.75], "texture": "#0"}, + "south": {"uv": [8, 2.75, 9, 3], "texture": "#0"}, + "west": {"uv": [3, 8, 4, 8.25], "texture": "#0"}, + "up": {"uv": [8, 7, 7, 6], "texture": "#0"}, + "down": {"uv": [8, 7, 7, 8], "texture": "#0"} + } + }, + { + "from": [0, 1, 0], + "to": [16, 7, 16], + "faces": { + "north": {"uv": [4, 0, 8, 1.5], "texture": "#0"}, + "east": {"uv": [4, 1.5, 8, 3], "texture": "#0"}, + "south": {"uv": [4, 3, 8, 4.5], "texture": "#0"}, + "west": {"uv": [4, 4.5, 8, 6], "texture": "#0"}, + "up": {"uv": [4, 4, 0, 0], "texture": "#0"}, + "down": {"uv": [4, 4, 0, 8], "texture": "#0"} + } + }, { "from": [0, 0, 0], - "to": [16, 16, 16], + "to": [4, 1, 4], + "faces": { + "north": {"uv": [0, 8, 1, 8.25], "texture": "#0"}, + "east": {"uv": [8, 0, 9, 0.25], "texture": "#0"}, + "south": {"uv": [8, 0.25, 9, 0.5], "texture": "#0"}, + "west": {"uv": [8, 0.5, 9, 0.75], "texture": "#0"}, + "up": {"uv": [5, 7, 4, 6], "texture": "#0"}, + "down": {"uv": [6, 6, 5, 7], "texture": "#0"} + } + }, + { + "from": [0, 0, 12], + "to": [4, 1, 16], + "faces": { + "north": {"uv": [8, 0.75, 9, 1], "texture": "#0"}, + "east": {"uv": [1, 8, 2, 8.25], "texture": "#0"}, + "south": {"uv": [8, 1, 9, 1.25], "texture": "#0"}, + "west": {"uv": [8, 1.25, 9, 1.5], "texture": "#0"}, + "up": {"uv": [7, 7, 6, 6], "texture": "#0"}, + "down": {"uv": [5, 7, 4, 8], "texture": "#0"} + } + }, + { + "from": [12, 0, 12], + "to": [16, 1, 16], + "faces": { + "north": {"uv": [8, 1.5, 9, 1.75], "texture": "#0"}, + "east": {"uv": [8, 1.75, 9, 2], "texture": "#0"}, + "south": {"uv": [2, 8, 3, 8.25], "texture": "#0"}, + "west": {"uv": [8, 2, 9, 2.25], "texture": "#0"}, + "up": {"uv": [6, 8, 5, 7], "texture": "#0"}, + "down": {"uv": [7, 7, 6, 8], "texture": "#0"} + } + }, + { + "from": [13, 13, 13], + "to": [16, 15, 16], + "faces": { + "north": {"uv": [9.5, 6, 11, 7], "texture": "#1"}, + "east": {"uv": [9.5, 7, 11, 8], "texture": "#1"}, + "south": {"uv": [0, 10, 1.5, 11], "texture": "#1"}, + "west": {"uv": [1.5, 10, 3, 11], "texture": "#1"}, + "up": {"uv": [6, 3, 4.5, 1.5], "texture": "#1"}, + "down": {"uv": [4.5, 4.5, 3, 6], "texture": "#1"} + } + }, + { + "from": [0, 13, 0], + "to": [3, 15, 3], + "faces": { + "north": {"uv": [4, 8, 5.5, 9], "texture": "#1"}, + "east": {"uv": [8, 4, 9.5, 5], "texture": "#1"}, + "south": {"uv": [8, 5, 9.5, 6], "texture": "#1"}, + "west": {"uv": [5.5, 8, 7, 9], "texture": "#1"}, + "up": {"uv": [3, 1.5, 1.5, 0], "texture": "#1"}, + "down": {"uv": [3, 1.5, 1.5, 3], "texture": "#1"} + } + }, + { + "from": [0, 7, 0], + "to": [3, 9, 3], + "faces": { + "north": {"uv": [8, 6, 9.5, 7], "texture": "#1"}, + "east": {"uv": [7, 8, 8.5, 9], "texture": "#1"}, + "south": {"uv": [8, 7, 9.5, 8], "texture": "#1"}, + "west": {"uv": [8.5, 8, 10, 9], "texture": "#1"}, + "up": {"uv": [1.5, 4.5, 0, 3], "texture": "#1"}, + "down": {"uv": [4.5, 0, 3, 1.5], "texture": "#1"} + } + }, + { + "from": [0.5, 9, 0.5], + "to": [2.5, 13, 2.5], + "faces": { + "north": {"uv": [0, 6, 1, 8], "texture": "#1"}, + "east": {"uv": [6, 0, 7, 2], "texture": "#1"}, + "south": {"uv": [1, 6, 2, 8], "texture": "#1"}, + "west": {"uv": [2, 6, 3, 8], "texture": "#1"}, + "up": {"uv": [11, 9, 10, 8], "texture": "#1"}, + "down": {"uv": [10, 10, 9, 11], "texture": "#1"} + } + }, + { + "from": [13, 13, 0], + "to": [16, 15, 3], + "faces": { + "north": {"uv": [1, 8, 2.5, 9], "texture": "#1"}, + "east": {"uv": [8, 2, 9.5, 3], "texture": "#1"}, + "south": {"uv": [2.5, 8, 4, 9], "texture": "#1"}, + "west": {"uv": [8, 3, 9.5, 4], "texture": "#1"}, + "up": {"uv": [1.5, 1.5, 0, 0], "texture": "#1"}, + "down": {"uv": [1.5, 1.5, 0, 3], "texture": "#1"} + } + }, + { + "from": [13, 7, 0], + "to": [16, 9, 3], + "faces": { + "north": {"uv": [9, 0, 10.5, 1], "texture": "#1"}, + "east": {"uv": [1, 9, 2.5, 10], "texture": "#1"}, + "south": {"uv": [9, 1, 10.5, 2], "texture": "#1"}, + "west": {"uv": [2.5, 9, 4, 10], "texture": "#1"}, + "up": {"uv": [3, 4.5, 1.5, 3], "texture": "#1"}, + "down": {"uv": [4.5, 1.5, 3, 3], "texture": "#1"} + } + }, + { + "from": [13.5, 9, 0.5], + "to": [15.5, 13, 2.5], "faces": { - "north": {"uv": [0, 0, 16, 16], "texture": "#0"}, - "east": {"uv": [0, 0, 16, 16], "texture": "#0"}, - "south": {"uv": [0, 0, 16, 16], "texture": "#0"}, - "west": {"uv": [0, 0, 16, 16], "texture": "#0"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#1"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#2"} + "north": {"uv": [6, 2, 7, 4], "texture": "#1"}, + "east": {"uv": [3, 6, 4, 8], "texture": "#1"}, + "south": {"uv": [4, 6, 5, 8], "texture": "#1"}, + "west": {"uv": [6, 4, 7, 6], "texture": "#1"}, + "up": {"uv": [11, 10, 10, 9], "texture": "#1"}, + "down": {"uv": [11, 10, 10, 11], "texture": "#1"} + } + }, + { + "from": [0, 13, 13], + "to": [3, 15, 16], + "faces": { + "north": {"uv": [4, 9, 5.5, 10], "texture": "#1"}, + "east": {"uv": [5.5, 9, 7, 10], "texture": "#1"}, + "south": {"uv": [7, 9, 8.5, 10], "texture": "#1"}, + "west": {"uv": [8.5, 9, 10, 10], "texture": "#1"}, + "up": {"uv": [4.5, 4.5, 3, 3], "texture": "#1"}, + "down": {"uv": [1.5, 4.5, 0, 6], "texture": "#1"} + } + }, + { + "from": [0, 7, 13], + "to": [3, 9, 16], + "faces": { + "north": {"uv": [9.5, 2, 11, 3], "texture": "#1"}, + "east": {"uv": [9.5, 3, 11, 4], "texture": "#1"}, + "south": {"uv": [9.5, 4, 11, 5], "texture": "#1"}, + "west": {"uv": [9.5, 5, 11, 6], "texture": "#1"}, + "up": {"uv": [6, 1.5, 4.5, 0], "texture": "#1"}, + "down": {"uv": [3, 4.5, 1.5, 6], "texture": "#1"} + } + }, + { + "from": [0.5, 9, 13.5], + "to": [2.5, 13, 15.5], + "faces": { + "north": {"uv": [5, 6, 6, 8], "texture": "#1"}, + "east": {"uv": [6, 6, 7, 8], "texture": "#1"}, + "south": {"uv": [7, 0, 8, 2], "texture": "#1"}, + "west": {"uv": [7, 2, 8, 4], "texture": "#1"}, + "up": {"uv": [11.5, 1, 10.5, 0], "texture": "#1"}, + "down": {"uv": [11.5, 1, 10.5, 2], "texture": "#1"} + } + }, + { + "from": [13.5, 9, 13.5], + "to": [15.5, 13, 15.5], + "faces": { + "north": {"uv": [7, 4, 8, 6], "texture": "#1"}, + "east": {"uv": [7, 6, 8, 8], "texture": "#1"}, + "south": {"uv": [0, 8, 1, 10], "texture": "#1"}, + "west": {"uv": [8, 0, 9, 2], "texture": "#1"}, + "up": {"uv": [1, 12, 0, 11], "texture": "#1"}, + "down": {"uv": [2, 11, 1, 12], "texture": "#1"} + } + }, + { + "from": [13, 7, 13], + "to": [16, 9, 16], + "faces": { + "north": {"uv": [3, 10, 4.5, 11], "texture": "#1"}, + "east": {"uv": [4.5, 10, 6, 11], "texture": "#1"}, + "south": {"uv": [6, 10, 7.5, 11], "texture": "#1"}, + "west": {"uv": [7.5, 10, 9, 11], "texture": "#1"}, + "up": {"uv": [6, 4.5, 4.5, 3], "texture": "#1"}, + "down": {"uv": [6, 4.5, 4.5, 6], "texture": "#1"} + } + }, + { + "from": [12.5, 6.5, 9], + "to": [13.5, 9.5, 11], + "faces": { + "north": {"uv": [2, 9, 3, 12], "texture": "#7"}, + "east": {"uv": [0, 6, 2, 9], "texture": "#7"}, + "south": {"uv": [9, 2, 10, 5], "texture": "#7"}, + "west": {"uv": [6, 0, 8, 3], "texture": "#7"}, + "up": {"uv": [6, 11, 5, 9], "texture": "#7"}, + "down": {"uv": [7, 9, 6, 11], "texture": "#7"} + } + }, + { + "from": [10, 7.5, 7], + "to": [13, 14.5, 13], + "faces": { + "north": {"uv": [0, 7, 3, 14], "texture": "#5"}, + "east": {"uv": [0, 0, 6, 7], "texture": "#5"}, + "south": {"uv": [3, 7, 6, 14], "texture": "#5"}, + "west": {"uv": [6, 0, 12, 7], "texture": "#5"}, + "up": {"uv": [9, 13, 6, 7], "texture": "#5"}, + "down": {"uv": [12, 7, 9, 13], "texture": "#5"} + } + }, + { + "from": [6.5, 7.5, 7], + "to": [9.5, 14.5, 13], + "faces": { + "north": {"uv": [0, 7, 3, 14], "texture": "#5"}, + "east": {"uv": [0, 0, 6, 7], "texture": "#5"}, + "south": {"uv": [3, 7, 6, 14], "texture": "#5"}, + "west": {"uv": [6, 0, 12, 7], "texture": "#5"}, + "up": {"uv": [9, 13, 6, 7], "texture": "#5"}, + "down": {"uv": [12, 7, 9, 13], "texture": "#5"} + } + }, + { + "from": [3, 7.5, 7], + "to": [6, 14.5, 13], + "faces": { + "north": {"uv": [0, 7, 3, 14], "texture": "#5"}, + "east": {"uv": [0, 0, 6, 7], "texture": "#5"}, + "south": {"uv": [3, 7, 6, 14], "texture": "#5"}, + "west": {"uv": [6, 0, 12, 7], "texture": "#5"}, + "up": {"uv": [9, 13, 6, 7], "texture": "#5"}, + "down": {"uv": [12, 7, 9, 13], "texture": "#5"} + } + }, + { + "from": [2, 9.5, 8.5], + "to": [14, 12.5, 11.5], + "faces": { + "north": {"uv": [0, 0, 12, 3], "texture": "#6"}, + "east": {"uv": [0, 12, 3, 15], "texture": "#6"}, + "south": {"uv": [0, 3, 12, 6], "texture": "#6"}, + "west": {"uv": [12, 0, 15, 3], "texture": "#6"}, + "up": {"uv": [12, 9, 0, 6], "texture": "#6"}, + "down": {"uv": [12, 9, 0, 12], "texture": "#6"} + } + }, + { + "from": [2.5, 6.5, 9], + "to": [3.5, 9.5, 11], + "faces": { + "north": {"uv": [8, 0, 9, 3], "texture": "#7"}, + "east": {"uv": [0, 0, 2, 3], "texture": "#7"}, + "south": {"uv": [8, 3, 9, 6], "texture": "#7"}, + "west": {"uv": [2, 0, 4, 3], "texture": "#7"}, + "up": {"uv": [4, 11, 3, 9], "texture": "#7"}, + "down": {"uv": [5, 9, 4, 11], "texture": "#7"} + } + }, + { + "from": [9, 6.5, 9], + "to": [10.5, 9.5, 11], + "faces": { + "north": {"uv": [4, 6, 5.5, 9], "texture": "#7"}, + "east": {"uv": [4, 0, 6, 3], "texture": "#7"}, + "south": {"uv": [6, 6, 7.5, 9], "texture": "#7"}, + "west": {"uv": [4, 3, 6, 6], "texture": "#7"}, + "up": {"uv": [1.5, 11, 0, 9], "texture": "#7"}, + "down": {"uv": [10.5, 0, 9, 2], "texture": "#7"} + } + }, + { + "from": [5.5, 6.5, 9], + "to": [7, 9.5, 11], + "faces": { + "north": {"uv": [2, 6, 3.5, 9], "texture": "#7"}, + "east": {"uv": [0, 3, 2, 6], "texture": "#7"}, + "south": {"uv": [6, 3, 7.5, 6], "texture": "#7"}, + "west": {"uv": [2, 3, 4, 6], "texture": "#7"}, + "up": {"uv": [9.5, 8, 8, 6], "texture": "#7"}, + "down": {"uv": [9.5, 8, 8, 10], "texture": "#7"} + } + }, + { + "from": [5.5359, 7, 0], + "to": [9.5359, 8.5, 3], + "rotation": {"angle": 45, "axis": "y", "origin": [9, 0, 6]}, + "faces": { + "north": {"uv": [7, 2, 11, 3], "texture": "#3"}, + "east": {"uv": [7, 4, 10, 5], "texture": "#3"}, + "south": {"uv": [7, 3, 11, 4], "texture": "#3"}, + "west": {"uv": [7, 5, 10, 6], "texture": "#3"}, + "up": {"uv": [4, 3, 0, 0], "texture": "#3"}, + "down": {"uv": [4, 3, 0, 6], "texture": "#3"} + } + }, + { + "from": [8.60368, 7, 2.39391], + "to": [11.60368, 8, 5.39391], + "rotation": {"angle": -22.5, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [0, 6, 3, 7], "texture": "#3"}, + "east": {"uv": [3, 6, 6, 7], "texture": "#3"}, + "south": {"uv": [6, 6, 9, 7], "texture": "#3"}, + "west": {"uv": [7, 1, 10, 2], "texture": "#3"}, + "up": {"uv": [7, 3, 4, 0], "texture": "#3"}, + "down": {"uv": [7, 3, 4, 6], "texture": "#3"} + } + }, + { + "from": [0, 7, 0], + "to": [16, 15, 16], + "faces": { + "north": {"uv": [8, 0, 16, 4], "texture": "#4"}, + "east": {"uv": [8, 4, 16, 8], "texture": "#4"}, + "south": {"uv": [8, 8, 16, 12], "texture": "#4"}, + "west": {"uv": [8, 12, 16, 16], "texture": "#4"}, + "up": {"uv": [8, 8, 0, 0], "texture": "#4"}, + "down": {"uv": [0, 16, 0, 16], "texture": "#4"} + } + }, + { + "from": [6, 15, 5.82843], + "to": [10, 15, 9.82843], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 15, 7.82843]}, + "faces": { + "north": {"uv": [0, 2, 4, 2], "texture": "#4"}, + "east": {"uv": [0, 2, 4, 2], "texture": "#4"}, + "south": {"uv": [0, 2, 4, 2], "texture": "#4"}, + "west": {"uv": [0, 2, 4, 2], "texture": "#4"}, + "up": {"uv": [3, 9, 5, 11], "rotation": 90, "texture": "#4"}, + "down": {"uv": [3, 9, 5, 11], "rotation": 270, "texture": "#4"} } } + ], + "groups": [ + { + "name": "group", + "origin": [0, 0, 0], + "color": 0, + "children": [0, 1, 2, 3, 4] + }, + { + "name": "group", + "origin": [0, 0, 0], + "color": 0, + "children": [5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16] + }, + { + "name": "group", + "origin": [0, 0, 0], + "color": 0, + "children": [17, 18, 19, 20, 21, 22, 23, 24] + }, + 25, + 26, + 27, + 28 ] } \ No newline at end of file diff --git a/src/main/resources/assets/anvilcraft_pigsplus/textures/block/auto_jewel_crafting_table_base.png b/src/main/resources/assets/anvilcraft_pigsplus/textures/block/auto_jewel_crafting_table_base.png new file mode 100644 index 0000000000000000000000000000000000000000..fe1bf365c3117d2e93135f5181eceecf1a1635a0 GIT binary patch literal 1458 zcmV;j1x@;iP)Px#1am@3R0s$N2z&@+hyVZp32;bRa{vHbSpWcBSph3f{gD6w1xHClK~#90?U+rE z+(ZzDAG^Cfe`_<{~y|FW0=pESX*LDhP5TX{qic|9?{lXo<4o*Ul>4Z?F~-P zPN}L209#s)kB(cLT zs?tt0NF>O@Odd~g&S7oYu@hTah;VU2=ilAj01O)e`8eNkEX?1E$~z~&5+Sqs45if0 zi_1>#+gYtOCTs1LQlzOGHUehzna^|CdBNv-RrxegO5vOX@WQ!T7ycg5v2peGzH^S! zmQdWHlmZxD1166rJ_5opF4v_`jc{>NmHKOIEl-|II)4~e189}Lves9D@EX{u0{2Zv z1Z`>k?kS}x*JWqdl~UBM_6s8suwM0@-Y%p(3o8Sw)?uX{Km-)4g4458pxtS$wGa7l zw?z|Dm3q5;oHLzXbA0p&=;nTiF&X*Mkspf?YGa140@hle0zl^)x@i##B0#Y!d@gIF zJ39|u#jkADanP8I>GaxP584MnSNQ?o7syzig*`$(&V3o|JGT#s0$aBB526Z49v`ax zf(W61reV2Uw)(J9dQtvzH*yj8(Pv&Ct+jYc1uv zec64juPDBZVcRjv$x*~ENz$D#?hB*;Z(DJ5v$#W7{vFyF!_}Wx{?pnnz^8h!EXvXMci4YphZ?3@fm_%dw>=RjKp zl2rTaumcqJ2hf|ZMoHRES8CAc2SCfN9v?lzmTSstBX-sP37Iy8bNV6}A{C)u8DxQ) zdS}YLqoEu2GES0&ByD%7sT-Q6VR^g2)ioxVBl#{)hGox|rLXs4REW)DG5Q>s04aNdF&UMu{6T4-&CqBmb)n$N&Yw&s zXrp=acIxldbsM)*CSPA&u~^J^dVB!4ZhH!Xwd{Xi7@GZUnmjbR6T188*YW2sUN*4( z(DB1}-wdyG??H!6j?mO?D!h3+-MJ_9=Lpu8OePcZd`wZS?)Y`@9vwQ8CL7Uf8b;Y@ zM+8F~IJ^kLL(26-XxMgt!l8~Yq(4V6CSx|6VN5p2`Tj#m`i+nv6+sAh-uDX7`5w40 z=byiL+4MhpgdabK)(9OQY{J9PA^L}*k3adW`MaE-Otv3QL?ZxZv)O-p`#T`*-w4D1 z{OpADvy;8ggfPta<$QRr|Jmyyq{zX;PCDIasU7T M07*qoM6N<$f~VWZV*mgE literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/anvilcraft_pigsplus/textures/block/auto_jewel_crafting_table_bottom.png b/src/main/resources/assets/anvilcraft_pigsplus/textures/block/auto_jewel_crafting_table_bottom.png deleted file mode 100644 index c0ed50f91732b2a515d734b7bcf9f834484c895e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 139 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|4xTQKAr*7pOfuwUP!M4LeUg92 zK_;_+108ZA3C$Zf9bkNU;K=<8Z!bOF^PFWtU#s-yshjx(l{Gm(Idkmi__pU7F9XB> l|KhJLZUN0=1DVClup)u;{>CFuR{%vAJYD@<);T3K0RU`QFW&$F diff --git a/src/main/resources/assets/anvilcraft_pigsplus/textures/block/auto_jewel_crafting_table_glass.png b/src/main/resources/assets/anvilcraft_pigsplus/textures/block/auto_jewel_crafting_table_glass.png new file mode 100644 index 0000000000000000000000000000000000000000..9f9aad9f8c02444e915e04f82d5ec9571bf5ec76 GIT binary patch literal 393 zcmV;40e1e0P)h-3y{Er3Aq&<1}68c5rsD!`RgimHGt zzt);m2{pT50bKX=t%+w!6=>UaU97eC?E_suBMk;LIY$7Fp)HWifJzJS3%i`AUjjl) zEFH><0Lhu4g}M`}`9RT%4Zbd_v*je@fY&rupnNG6L+R=RPKbI7q%;a>+j$8tsoD(G z^_-&a1EB=@Kq&6FUP}M}2i%dGokdG3A_fqM6Obf)AD}}1+XuM(#0R+G^7qmQo&W#< n|NlMl6yg8?00v1!K~w_(A(_H!e}XMm00000NkvXXu0mjfDeb0| literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/anvilcraft_pigsplus/textures/block/auto_jewel_crafting_table_grindstone.png b/src/main/resources/assets/anvilcraft_pigsplus/textures/block/auto_jewel_crafting_table_grindstone.png new file mode 100644 index 0000000000000000000000000000000000000000..9d61a333ee2e6c4da6987bc50d56e1477da69780 GIT binary patch literal 583 zcmV-N0=WH&P)Px#1am@3R0s$N2z&@+hyVZp32;bRa{vHbSpWcBSph3f{gD6w0o+MMK~z|U?N?n( z!!Q&*8!c%%q>drtPgS4QpDHqj6LCq{gFeW~Zqp`dM#YyM7_>L1H|OT#T()?5e)`r; zgH|g5z^c`d_&OK>z`-~eYXJZy{QHN;1rn%q)8O@O3*9tOs>bg91G;JaWX>G{0LEI} z-QECz=L3LJwHGD7k^H29Rx3X_leSv<3T5StNj_s^NR4>`e2^6wYkTh$MsRXt?SM-@ zS1yO;B-S5dxoS0(s(Z`3S$E*pNUT~tICR{G&ARJtp;GmLJBCWWFxkO4pU7A{*h}&_ zCi$gUG9iH8KFZ0$vDn$jjg6rSlOK#5+<;hR;qBl`$eWWDK;sCLhN7H1dXsVP=qHQa z1mI*!NdZg<^c_y_?N~LOlwA3Zv3Bw`tmJah!6+t-=LE@OBtI#DmRZsZO8F`LyAf5u zZ*u`o%YNNm0RZ+NpQG_oehNz-B-vp2nt1=4_ob&=cIsA#kqevrKskv=zPx#1am@3R0s$N2z&@+hyVZp32;bRa{vHbSpWcBSph3f{gD6w0jxh|XAaAhu{=`T&p?1`@dx6&G3_<>a}&4=Ep@v!2$dMAp=*xH=b7OuhAClpt=&0rH%jJiq6P zwMHccIu~ea#gCsaNfGa}0>W@Ct5y`W}ivorr^5wDy;5n1a`iRjI>*J9N5Q17u5Q4VZ{A-=ZXn92N@cpS8W!|;m94gt@o$+?*8%QB=f(ZU^BPp`1Qx0gL_lJ)Z9Kd#MInAHx%sW_RoNtn%fu5 Zjd#(G0cp#o>Y)Gt002ovPDHLkV1lzs@7(|Z literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/anvilcraft_pigsplus/textures/block/auto_jewel_crafting_table_grindstone_wood_2.png b/src/main/resources/assets/anvilcraft_pigsplus/textures/block/auto_jewel_crafting_table_grindstone_wood_2.png new file mode 100644 index 0000000000000000000000000000000000000000..e342589f14fce8b857d2663c47ea9f3414c1e984 GIT binary patch literal 383 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}EX7WqAsj$Z z!;#Vf4nJ#6*HHqqg7Qi9ih^o-U3d5v^~h8TK7A5OAIEn{qOAo%2T1tJ}87 z?#BxssQjba*0vFz1=a6 z?eedhdyCZgjpEiNe0cmc%kRMRgNKeS{+hYv)Z6mgo@|@@#KdakSPnd5H0Ivd+bAJ* z=-B0B2ejoD^fs=OkC|mJ9T`yGxJP~F1+TlTo1!?ERIzWlaylzpZ2#K>u@fe>w_lI7 zzv1Vk`*qW;S(&0#ak$QZF3Q${x%ido{nn_;o2=!s46gBW9XdZvT7Pv9 zw*zbH+O$}O=IMVP-Fm+*_?P#umNfk$&qKbPI-WZ;8&x^YRX>!S@Zzi~`WU)8Y%S9d ZW{w5-QqGi}F#!e|gQu&X%Q~loCIE!RnPmU~ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/anvilcraft_pigsplus/textures/block/auto_jewel_crafting_table_item.png b/src/main/resources/assets/anvilcraft_pigsplus/textures/block/auto_jewel_crafting_table_item.png new file mode 100644 index 0000000000000000000000000000000000000000..6a8c67c963f1bc3467ef77cbe1b2604d85620947 GIT binary patch literal 293 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|Sc;uILpXq- zh9ji|$mcBZh%9Dch=~MYMs2^p6M=%eJY5_^EP9h`s{{P+D`tbH?ZXOU=Ir*2QoNd)%1$Fg938i<1TnkU$6PM6SN=!_2 z6uxr+1Pa<38yn->`Inz9VE*8l)m{8>>)Zv5;qi6KPZ-$To-q9S`B*s2RX*;ms)Y37 d1d#w1hGsXr&!<#wI{|&c;OXk;vd$@?2>^XnY+wKY literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/anvilcraft_pigsplus/textures/block/auto_jewel_crafting_table_pillar.png b/src/main/resources/assets/anvilcraft_pigsplus/textures/block/auto_jewel_crafting_table_pillar.png new file mode 100644 index 0000000000000000000000000000000000000000..31c89b7503df5259cc7d9f6c924be68c556f2f25 GIT binary patch literal 601 zcmV-f0;c_mP)Px#1am@3R0s$N2z&@+hyVZp32;bRa{vHbSpWcBSph3f{gD6w0q#jeK~z|U?UgZa z6G0G#KcDXsuPyA$#gR-w2SQL#Akjs%{PA=M3WPxX2kT-P>~(UnOp(lL?$|ZEM0EF> z8IRUC`{vEe4nDlUJOFI$mWdf7{?*6N10JBy09d=jm{H3DH2XcpaLA{x-`s!yh74d< z&fG_|uOabzwZ@pyA6Ak#`+aO~0P>C9vaD;zTzm~3H>W4}NjtVGr%cS4=B`P*K)qVK zANJ#-MXaq=C)-4n!AP~FOn{h2`hp2HAI4{oB}wzxHxBCRRAonS1jwA zH?LkEVlR+Go4KzFS^_Dz*di}n*`)`H;V?Eo`Lm}BmqbrNcREA@xrAtM?an2gO`lNY zg*z96qf_AXyV~pS*VTxwKxhg=epOCgFIc-{epWixx{A>k&{Lon$mh6!# zUXX>}b72+I__1$*tAJ>!8LfY9yh-)0*IQ4YPemqLh8P{&^^ci`RdzKy>kS7fZfo{6e=OfS)$6AysT3DP9$vYp`PbnF#@qy;-v9q2Dq5<53^tG< a%nVwd%+H0NZc7G=FnGH9xvXB6Tglm(e*66Vo3CxUs&@3P`K=kh z_!yU^wA~fak_R`{7R Date: Sat, 13 Dec 2025 20:23:06 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E7=9A=87=E5=AE=B6=E7=A0=82=E8=BD=AE=E8=B4=B4=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anvilcraft/pigsplus/init/AddonBlocks.java | 2 +- .../blockstates/auto_royal_grindstone.json | 5 +- .../models/block/auto_royal_grindstone.json | 240 ++++++++++++++++- .../block/auto_royal_grindstone_overload.json | 246 ++++++++++++++++++ .../textures/block/auto_royal_grindstone.png | Bin 281 -> 0 bytes .../block/auto_royal_grindstone_base.png | Bin 0 -> 690 bytes .../auto_royal_grindstone_base_overload.png | Bin 0 -> 1146 bytes .../block/auto_royal_grindstone_frame.png | Bin 0 -> 328 bytes .../block/auto_royal_grindstone_glass.png | Bin 0 -> 302 bytes .../block/auto_royal_grindstone_stone.png | Bin 0 -> 377 bytes 10 files changed, 482 insertions(+), 11 deletions(-) create mode 100644 src/main/resources/assets/anvilcraft_pigsplus/models/block/auto_royal_grindstone_overload.json delete mode 100644 src/main/resources/assets/anvilcraft_pigsplus/textures/block/auto_royal_grindstone.png create mode 100644 src/main/resources/assets/anvilcraft_pigsplus/textures/block/auto_royal_grindstone_base.png create mode 100644 src/main/resources/assets/anvilcraft_pigsplus/textures/block/auto_royal_grindstone_base_overload.png create mode 100644 src/main/resources/assets/anvilcraft_pigsplus/textures/block/auto_royal_grindstone_frame.png create mode 100644 src/main/resources/assets/anvilcraft_pigsplus/textures/block/auto_royal_grindstone_glass.png create mode 100644 src/main/resources/assets/anvilcraft_pigsplus/textures/block/auto_royal_grindstone_stone.png diff --git a/src/main/java/dev/anvilcraft/pigsplus/init/AddonBlocks.java b/src/main/java/dev/anvilcraft/pigsplus/init/AddonBlocks.java index 97c2b136..c87b8b18 100644 --- a/src/main/java/dev/anvilcraft/pigsplus/init/AddonBlocks.java +++ b/src/main/java/dev/anvilcraft/pigsplus/init/AddonBlocks.java @@ -185,7 +185,7 @@ public class AddonBlocks { .block("auto_royal_grindstone", AutoRoyalGrindstoneBlock::new) .lang("Auto Royal Grindstone") .initialProperties(() -> Blocks.IRON_BLOCK) - .properties(p -> p.strength(5.0f, 1200f)) + .properties(p -> p.strength(5.0f, 1200f).noOcclusion()) .blockstate(DataGenUtil::noExtraModelOrState) .simpleItem() .tag(BlockTags.MINEABLE_WITH_PICKAXE, BlockTags.NEEDS_IRON_TOOL) diff --git a/src/main/resources/assets/anvilcraft_pigsplus/blockstates/auto_royal_grindstone.json b/src/main/resources/assets/anvilcraft_pigsplus/blockstates/auto_royal_grindstone.json index 44f0c41f..9d1e994f 100644 --- a/src/main/resources/assets/anvilcraft_pigsplus/blockstates/auto_royal_grindstone.json +++ b/src/main/resources/assets/anvilcraft_pigsplus/blockstates/auto_royal_grindstone.json @@ -1,6 +1,9 @@ { "variants": { - "": { + "overload=true": { + "model": "anvilcraft_pigsplus:block/auto_royal_grindstone_overload" + }, + "overload=false": { "model": "anvilcraft_pigsplus:block/auto_royal_grindstone" } } diff --git a/src/main/resources/assets/anvilcraft_pigsplus/models/block/auto_royal_grindstone.json b/src/main/resources/assets/anvilcraft_pigsplus/models/block/auto_royal_grindstone.json index 58c5f3a9..e057d380 100644 --- a/src/main/resources/assets/anvilcraft_pigsplus/models/block/auto_royal_grindstone.json +++ b/src/main/resources/assets/anvilcraft_pigsplus/models/block/auto_royal_grindstone.json @@ -2,23 +2,245 @@ "format_version": "1.9.0", "credit": "Made with Blockbench", "parent": "minecraft:block/cube", + "render_type": "minecraft:cutout", "texture_size": [32, 32], "textures": { - "0": "anvilcraft_pigsplus:block/auto_royal_grindstone", - "particle": "anvilcraft_pigsplus:block/auto_royal_grindstone" + "2": "anvilcraft_pigsplus:block/auto_royal_grindstone_base", + "3": "anvilcraft_pigsplus:block/auto_royal_grindstone_stone", + "4": "anvilcraft_pigsplus:block/auto_royal_grindstone_glass", + "8": "anvilcraft_pigsplus:block/auto_royal_grindstone_frame", + "particle": "anvilcraft_pigsplus:block/auto_royal_grindstone_base" }, "elements": [ { - "from": [0, 0, 0], + "name": "base", + "from": [1, 1, 1], + "to": [15, 8, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [7, 0, 8]}, + "faces": { + "north": {"uv": [0, 10.5, 6, 14], "texture": "#2"}, + "east": {"uv": [0, 10.5, 6, 14], "texture": "#2"}, + "south": {"uv": [0, 10.5, 6, 14], "texture": "#2"}, + "west": {"uv": [0, 10.5, 6, 14], "texture": "#2"}, + "up": {"uv": [16, 7, 9, 0], "texture": "#2"}, + "down": {"uv": [7, 0, 0, 7], "texture": "#2"} + } + }, + { + "name": "glass", + "from": [0, 9, 0], "to": [16, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 9, 0]}, + "faces": { + "north": {"uv": [8, 0, 16, 3.5], "texture": "#4"}, + "east": {"uv": [8, 0, 16, 3.5], "texture": "#4"}, + "south": {"uv": [8, 0, 16, 3.5], "texture": "#4"}, + "west": {"uv": [8, 0, 16, 3.5], "texture": "#4"}, + "up": {"uv": [8, 8, 0, 0], "texture": "#4"}, + "down": {"uv": [8, 8, 0, 16], "texture": "#4"} + } + }, + { + "name": "glass", + "from": [0, 16, 0], + "to": [16, 9, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 16, 0]}, + "faces": { + "north": {"uv": [8, 0, 16, 3.5], "texture": "#4"}, + "east": {"uv": [8, 0, 16, 3.5], "texture": "#4"}, + "south": {"uv": [8, 0, 16, 3.5], "texture": "#4"}, + "west": {"uv": [8, 0, 16, 3.5], "texture": "#4"}, + "up": {"uv": [8, 16, 0, 8], "texture": "#4"}, + "down": {"uv": [8, 0, 0, 8], "texture": "#4"} + } + }, + { + "name": "output", + "from": [6, 16, 6], + "to": [10, 16, 10], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 16, 8]}, + "faces": { + "north": {"uv": [0, 1, 2, 1], "texture": "#4"}, + "east": {"uv": [0, 1, 2, 1], "texture": "#4"}, + "south": {"uv": [0, 1, 2, 1], "texture": "#4"}, + "west": {"uv": [0, 1, 2, 1], "texture": "#4"}, + "up": {"uv": [11, 5, 13, 7], "rotation": 90, "texture": "#4"}, + "down": {"uv": [11, 5, 13, 7], "rotation": 270, "texture": "#4"} + } + }, + { + "from": [13, 0, 0], + "to": [16, 9, 3], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [6, 0, 9, 9], "texture": "#8"}, + "east": {"uv": [0, 0, 3, 9], "texture": "#8"}, + "south": {"uv": [3, 0, 6, 9], "texture": "#8"}, + "west": {"uv": [3, 0, 6, 9], "texture": "#8"}, + "up": {"uv": [12, 3, 9, 0], "texture": "#8"}, + "down": {"uv": [12, 3, 9, 6], "texture": "#8"} + } + }, + { + "from": [13, 0, 13], + "to": [16, 9, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [3, 0, 6, 9], "texture": "#8"}, + "east": {"uv": [6, 0, 9, 9], "texture": "#8"}, + "south": {"uv": [0, 0, 3, 9], "texture": "#8"}, + "west": {"uv": [3, 0, 6, 9], "texture": "#8"}, + "up": {"uv": [12, 3, 9, 0], "rotation": 90, "texture": "#8"}, + "down": {"uv": [12, 3, 9, 6], "rotation": 270, "texture": "#8"} + } + }, + { + "from": [0, 0, 13], + "to": [3, 9, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [3, 0, 6, 9], "texture": "#8"}, + "east": {"uv": [3, 0, 6, 9], "texture": "#8"}, + "south": {"uv": [6, 0, 9, 9], "texture": "#8"}, + "west": {"uv": [0, 0, 3, 9], "texture": "#8"}, + "up": {"uv": [12, 3, 9, 0], "rotation": 180, "texture": "#8"}, + "down": {"uv": [12, 3, 9, 6], "rotation": 180, "texture": "#8"} + } + }, + { + "from": [0, 0, 0], + "to": [3, 9, 3], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 9], "texture": "#8"}, + "east": {"uv": [3, 0, 6, 9], "texture": "#8"}, + "south": {"uv": [3, 0, 6, 9], "texture": "#8"}, + "west": {"uv": [6, 0, 9, 9], "texture": "#8"}, + "up": {"uv": [12, 3, 9, 0], "rotation": 270, "texture": "#8"}, + "down": {"uv": [12, 3, 9, 6], "rotation": 90, "texture": "#8"} + } + }, + { + "from": [3, 6, 0], + "to": [13, 9, 3], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [0, 10, 10, 13], "texture": "#8"}, + "east": {"uv": [3, 0, 6, 3], "texture": "#8"}, + "south": {"uv": [0, 13, 10, 16], "texture": "#8"}, + "west": {"uv": [3, 0, 6, 3], "texture": "#8"}, + "up": {"uv": [0, 13, 10, 16], "texture": "#8"}, + "down": {"uv": [0, 10, 10, 13], "texture": "#8"} + } + }, + { + "from": [13, 6, 3], + "to": [16, 9, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [3, 0, 6, 3], "texture": "#8"}, + "east": {"uv": [0, 10, 10, 13], "texture": "#8"}, + "south": {"uv": [3, 0, 6, 3], "texture": "#8"}, + "west": {"uv": [0, 13, 10, 16], "texture": "#8"}, + "up": {"uv": [0, 13, 10, 16], "rotation": 90, "texture": "#8"}, + "down": {"uv": [0, 10, 10, 13], "rotation": 270, "texture": "#8"} + } + }, + { + "from": [3, 6, 13], + "to": [13, 9, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [0, 13, 10, 16], "texture": "#8"}, + "east": {"uv": [3, 0, 6, 3], "texture": "#8"}, + "south": {"uv": [0, 10, 10, 13], "texture": "#8"}, + "west": {"uv": [3, 0, 6, 3], "texture": "#8"}, + "up": {"uv": [0, 13, 10, 16], "rotation": 180, "texture": "#8"}, + "down": {"uv": [0, 10, 10, 13], "rotation": 180, "texture": "#8"} + } + }, + { + "from": [0, 6, 3], + "to": [3, 9, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [3, 0, 6, 3], "texture": "#8"}, + "east": {"uv": [0, 13, 10, 16], "texture": "#8"}, + "south": {"uv": [3, 0, 6, 3], "texture": "#8"}, + "west": {"uv": [0, 10, 10, 13], "texture": "#8"}, + "up": {"uv": [0, 13, 10, 16], "rotation": 270, "texture": "#8"}, + "down": {"uv": [0, 10, 10, 13], "rotation": 90, "texture": "#8"} + } + }, + { + "from": [5.5, 9, 5], + "to": [10.5, 15, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [12, 1, 10]}, "faces": { - "north": {"uv": [0, 0, 8, 8], "texture": "#0"}, - "east": {"uv": [8, 0, 16, 8], "texture": "#0"}, - "south": {"uv": [0, 0, 8, 8], "texture": "#0"}, - "west": {"uv": [8, 0, 16, 8], "texture": "#0"}, - "up": {"uv": [8, 16, 0, 8], "texture": "#0"}, - "down": {"uv": [16, 8, 8, 16], "texture": "#0"} + "north": {"uv": [0, 0, 5, 6], "texture": "#3"}, + "east": {"uv": [5, 0, 11, 6], "texture": "#3"}, + "south": {"uv": [0, 0, 5, 6], "texture": "#3"}, + "west": {"uv": [5, 0, 11, 6], "texture": "#3"}, + "up": {"uv": [0, 0, 5, 6], "texture": "#3"}, + "down": {"uv": [0, 0, 5, 6], "texture": "#3"} } + }, + { + "from": [4, 10.5, 6.5], + "to": [12, 13.5, 9.5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, + "faces": { + "north": {"uv": [0, 6, 8, 9], "texture": "#3"}, + "east": {"uv": [8, 6, 11, 9], "texture": "#3"}, + "south": {"uv": [0, 6, 8, 9], "texture": "#3"}, + "west": {"uv": [8, 6, 11, 9], "texture": "#3"}, + "up": {"uv": [0, 6, 8, 9], "texture": "#3"}, + "down": {"uv": [0, 6, 8, 9], "texture": "#3"} + } + }, + { + "from": [4.5, 8, 7], + "to": [5.5, 11, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [4, 8, 7]}, + "faces": { + "north": {"uv": [2, 9, 3, 12], "texture": "#3"}, + "east": {"uv": [0, 9, 2, 12], "texture": "#3"}, + "south": {"uv": [2, 9, 3, 12], "texture": "#3"}, + "west": {"uv": [0, 9, 2, 12], "texture": "#3"}, + "up": {"uv": [3, 9, 5, 10], "texture": "#3"}, + "down": {"uv": [3, 9, 5, 10], "texture": "#3"} + } + }, + { + "from": [10.5, 8, 7], + "to": [11.5, 11, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 8, 7]}, + "faces": { + "north": {"uv": [2, 9, 3, 12], "texture": "#3"}, + "east": {"uv": [0, 9, 2, 12], "texture": "#3"}, + "south": {"uv": [2, 9, 3, 12], "texture": "#3"}, + "west": {"uv": [0, 9, 2, 12], "texture": "#3"}, + "up": {"uv": [3, 9, 5, 10], "texture": "#3"}, + "down": {"uv": [3, 9, 5, 10], "texture": "#3"} + } + } + ], + "groups": [ + 0, + 1, + 2, + 3, + { + "name": "frame", + "origin": [8, 8, 8], + "color": 0, + "children": [4, 5, 6, 7, 8, 9, 10, 11] + }, + { + "name": "grindstone", + "origin": [0, 0, 0], + "color": 0, + "children": [12, 13, 14, 15] } ] } \ No newline at end of file diff --git a/src/main/resources/assets/anvilcraft_pigsplus/models/block/auto_royal_grindstone_overload.json b/src/main/resources/assets/anvilcraft_pigsplus/models/block/auto_royal_grindstone_overload.json new file mode 100644 index 00000000..974c39be --- /dev/null +++ b/src/main/resources/assets/anvilcraft_pigsplus/models/block/auto_royal_grindstone_overload.json @@ -0,0 +1,246 @@ +{ + "format_version": "1.9.0", + "credit": "Made with Blockbench", + "parent": "minecraft:block/cube", + "render_type": "minecraft:cutout", + "texture_size": [32, 32], + "textures": { + "2": "anvilcraft_pigsplus:block/auto_royal_grindstone_base_overload", + "3": "anvilcraft_pigsplus:block/auto_royal_grindstone_stone", + "4": "anvilcraft_pigsplus:block/auto_royal_grindstone_glass", + "8": "anvilcraft_pigsplus:block/auto_royal_grindstone_frame", + "particle": "anvilcraft_pigsplus:block/auto_royal_grindstone_base_overload" + }, + "elements": [ + { + "name": "base", + "from": [1, 1, 1], + "to": [15, 8, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [7, 0, 8]}, + "faces": { + "north": {"uv": [0, 10.5, 6, 14], "texture": "#2"}, + "east": {"uv": [0, 10.5, 6, 14], "texture": "#2"}, + "south": {"uv": [0, 10.5, 6, 14], "texture": "#2"}, + "west": {"uv": [0, 10.5, 6, 14], "texture": "#2"}, + "up": {"uv": [16, 7, 9, 0], "texture": "#2"}, + "down": {"uv": [7, 0, 0, 7], "texture": "#2"} + } + }, + { + "name": "glass", + "from": [0, 9, 0], + "to": [16, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 9, 0]}, + "faces": { + "north": {"uv": [8, 0, 16, 3.5], "texture": "#4"}, + "east": {"uv": [8, 0, 16, 3.5], "texture": "#4"}, + "south": {"uv": [8, 0, 16, 3.5], "texture": "#4"}, + "west": {"uv": [8, 0, 16, 3.5], "texture": "#4"}, + "up": {"uv": [8, 8, 0, 0], "texture": "#4"}, + "down": {"uv": [8, 8, 0, 16], "texture": "#4"} + } + }, + { + "name": "glass", + "from": [0, 16, 0], + "to": [16, 9, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 16, 0]}, + "faces": { + "north": {"uv": [8, 0, 16, 3.5], "texture": "#4"}, + "east": {"uv": [8, 0, 16, 3.5], "texture": "#4"}, + "south": {"uv": [8, 0, 16, 3.5], "texture": "#4"}, + "west": {"uv": [8, 0, 16, 3.5], "texture": "#4"}, + "up": {"uv": [8, 16, 0, 8], "texture": "#4"}, + "down": {"uv": [8, 0, 0, 8], "texture": "#4"} + } + }, + { + "name": "output", + "from": [6, 16, 6], + "to": [10, 16, 10], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 16, 8]}, + "faces": { + "north": {"uv": [0, 1, 2, 1], "texture": "#4"}, + "east": {"uv": [0, 1, 2, 1], "texture": "#4"}, + "south": {"uv": [0, 1, 2, 1], "texture": "#4"}, + "west": {"uv": [0, 1, 2, 1], "texture": "#4"}, + "up": {"uv": [11, 5, 13, 7], "rotation": 180, "texture": "#4"}, + "down": {"uv": [11, 5, 13, 7], "rotation": 180, "texture": "#4"} + } + }, + { + "from": [13, 0, 0], + "to": [16, 9, 3], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [6, 0, 9, 9], "texture": "#8"}, + "east": {"uv": [0, 0, 3, 9], "texture": "#8"}, + "south": {"uv": [3, 0, 6, 9], "texture": "#8"}, + "west": {"uv": [3, 0, 6, 9], "texture": "#8"}, + "up": {"uv": [12, 3, 9, 0], "texture": "#8"}, + "down": {"uv": [12, 3, 9, 6], "texture": "#8"} + } + }, + { + "from": [13, 0, 13], + "to": [16, 9, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [3, 0, 6, 9], "texture": "#8"}, + "east": {"uv": [6, 0, 9, 9], "texture": "#8"}, + "south": {"uv": [0, 0, 3, 9], "texture": "#8"}, + "west": {"uv": [3, 0, 6, 9], "texture": "#8"}, + "up": {"uv": [12, 3, 9, 0], "rotation": 90, "texture": "#8"}, + "down": {"uv": [12, 3, 9, 6], "rotation": 270, "texture": "#8"} + } + }, + { + "from": [0, 0, 13], + "to": [3, 9, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [3, 0, 6, 9], "texture": "#8"}, + "east": {"uv": [3, 0, 6, 9], "texture": "#8"}, + "south": {"uv": [6, 0, 9, 9], "texture": "#8"}, + "west": {"uv": [0, 0, 3, 9], "texture": "#8"}, + "up": {"uv": [12, 3, 9, 0], "rotation": 180, "texture": "#8"}, + "down": {"uv": [12, 3, 9, 6], "rotation": 180, "texture": "#8"} + } + }, + { + "from": [0, 0, 0], + "to": [3, 9, 3], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 9], "texture": "#8"}, + "east": {"uv": [3, 0, 6, 9], "texture": "#8"}, + "south": {"uv": [3, 0, 6, 9], "texture": "#8"}, + "west": {"uv": [6, 0, 9, 9], "texture": "#8"}, + "up": {"uv": [12, 3, 9, 0], "rotation": 270, "texture": "#8"}, + "down": {"uv": [12, 3, 9, 6], "rotation": 90, "texture": "#8"} + } + }, + { + "from": [3, 6, 0], + "to": [13, 9, 3], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [0, 10, 10, 13], "texture": "#8"}, + "east": {"uv": [3, 0, 6, 3], "texture": "#8"}, + "south": {"uv": [0, 13, 10, 16], "texture": "#8"}, + "west": {"uv": [3, 0, 6, 3], "texture": "#8"}, + "up": {"uv": [0, 13, 10, 16], "texture": "#8"}, + "down": {"uv": [0, 10, 10, 13], "texture": "#8"} + } + }, + { + "from": [13, 6, 3], + "to": [16, 9, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [3, 0, 6, 3], "texture": "#8"}, + "east": {"uv": [0, 10, 10, 13], "texture": "#8"}, + "south": {"uv": [3, 0, 6, 3], "texture": "#8"}, + "west": {"uv": [0, 13, 10, 16], "texture": "#8"}, + "up": {"uv": [0, 13, 10, 16], "rotation": 90, "texture": "#8"}, + "down": {"uv": [0, 10, 10, 13], "rotation": 270, "texture": "#8"} + } + }, + { + "from": [3, 6, 13], + "to": [13, 9, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [0, 13, 10, 16], "texture": "#8"}, + "east": {"uv": [3, 0, 6, 3], "texture": "#8"}, + "south": {"uv": [0, 10, 10, 13], "texture": "#8"}, + "west": {"uv": [3, 0, 6, 3], "texture": "#8"}, + "up": {"uv": [0, 13, 10, 16], "rotation": 180, "texture": "#8"}, + "down": {"uv": [0, 10, 10, 13], "rotation": 180, "texture": "#8"} + } + }, + { + "from": [0, 6, 3], + "to": [3, 9, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [3, 0, 6, 3], "texture": "#8"}, + "east": {"uv": [0, 13, 10, 16], "texture": "#8"}, + "south": {"uv": [3, 0, 6, 3], "texture": "#8"}, + "west": {"uv": [0, 10, 10, 13], "texture": "#8"}, + "up": {"uv": [0, 13, 10, 16], "rotation": 270, "texture": "#8"}, + "down": {"uv": [0, 10, 10, 13], "rotation": 90, "texture": "#8"} + } + }, + { + "from": [5.5, 9, 5], + "to": [10.5, 15, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [12, 1, 10]}, + "faces": { + "north": {"uv": [0, 0, 5, 6], "texture": "#3"}, + "east": {"uv": [5, 0, 11, 6], "texture": "#3"}, + "south": {"uv": [0, 0, 5, 6], "texture": "#3"}, + "west": {"uv": [5, 0, 11, 6], "texture": "#3"}, + "up": {"uv": [0, 0, 5, 6], "texture": "#3"}, + "down": {"uv": [0, 0, 5, 6], "texture": "#3"} + } + }, + { + "from": [4, 10.5, 6.5], + "to": [12, 13.5, 9.5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, + "faces": { + "north": {"uv": [0, 6, 8, 9], "texture": "#3"}, + "east": {"uv": [8, 6, 11, 9], "texture": "#3"}, + "south": {"uv": [0, 6, 8, 9], "texture": "#3"}, + "west": {"uv": [8, 6, 11, 9], "texture": "#3"}, + "up": {"uv": [0, 6, 8, 9], "texture": "#3"}, + "down": {"uv": [0, 6, 8, 9], "texture": "#3"} + } + }, + { + "from": [4.5, 8, 7], + "to": [5.5, 11, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [4, 8, 7]}, + "faces": { + "north": {"uv": [2, 9, 3, 12], "texture": "#3"}, + "east": {"uv": [0, 9, 2, 12], "texture": "#3"}, + "south": {"uv": [2, 9, 3, 12], "texture": "#3"}, + "west": {"uv": [0, 9, 2, 12], "texture": "#3"}, + "up": {"uv": [3, 9, 5, 10], "texture": "#3"}, + "down": {"uv": [3, 9, 5, 10], "texture": "#3"} + } + }, + { + "from": [10.5, 8, 7], + "to": [11.5, 11, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 8, 7]}, + "faces": { + "north": {"uv": [2, 9, 3, 12], "texture": "#3"}, + "east": {"uv": [0, 9, 2, 12], "texture": "#3"}, + "south": {"uv": [2, 9, 3, 12], "texture": "#3"}, + "west": {"uv": [0, 9, 2, 12], "texture": "#3"}, + "up": {"uv": [3, 9, 5, 10], "texture": "#3"}, + "down": {"uv": [3, 9, 5, 10], "texture": "#3"} + } + } + ], + "groups": [ + 0, + 1, + 2, + 3, + { + "name": "frame", + "origin": [8, 8, 8], + "color": 0, + "children": [4, 5, 6, 7, 8, 9, 10, 11] + }, + { + "name": "grindstone", + "origin": [0, 0, 0], + "color": 0, + "children": [12, 13, 14, 15] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/anvilcraft_pigsplus/textures/block/auto_royal_grindstone.png b/src/main/resources/assets/anvilcraft_pigsplus/textures/block/auto_royal_grindstone.png deleted file mode 100644 index 9444548ba556097cd8fe418cec4b7410df17e3fd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 281 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1SJ1Ryj={W&Uv~xhE&XX6Ly>TumaB(0p^m) z|4P@dQZCv3uXJ+H1bcSbV>WzCTu#-pw$!Hgoa=o5-aSm|R8maigReC&zQ5le%5mxP z(iwUZqDv%;?E)rWKAfiG>NUG8U;;PSAx4)g)d5!KJm0$9IJS7#wTtfSd%&Wza=|T= zX$!d3Y;*3Vl^Zb`#KjurYc9Ka(7iNsSDLbuch{C#aTUzzUCM#X%bOYW68Fuv;`5qx zmAy}>zwpLqhi3=3Wj}k!-1Mxp#kj_u^#Sj{|F<|ABlbSsc*nOK=%N4ry>{Fz0W#P? bK4WHhKC8}8cbd2wP=vwL)z4*}Q$iB}#WZlv diff --git a/src/main/resources/assets/anvilcraft_pigsplus/textures/block/auto_royal_grindstone_base.png b/src/main/resources/assets/anvilcraft_pigsplus/textures/block/auto_royal_grindstone_base.png new file mode 100644 index 0000000000000000000000000000000000000000..c9af6e5c8d26760d8a534e8fb3783ff778541ed2 GIT binary patch literal 690 zcmV;j0!{siP)8RBMaZbjY}80GCq}w3m}prhKgD=Dzu$W%Y2u9 zlhe}~N`R)De#vDnckcN==bO5XCr^9Q$Bp@${&}}@M;0mzet*HUaspOXh^dNFzZ-3vf zBCISgXEHtm<=OIC)XI1eoRzrO%StO@>HwU@{X8J;h#bZ@*4Jfjt}OQ|xBa`HjX!d7 z(v+?3ZGY$6L0!^N#Gz4ay=k0#?F5WN#=`1>@!H;3`LbK{|3^_M)s;s>dO}+(ZM^6# zufFySkta!49q-jXe@Mio)gwM zV0(sV&_kf%P;=Xa1oPaGTcq4q?xXwDFDeZ6X^CL;7-)%69-x(Ga(CMlutC> z{)j?QQz@bKV9rMo5oNL_1jAvDXWTH!aP~E40$nB#(B1PW-LhAv^ zT;yXE$b>O@9*_xR>cG?i#~+iJUCyoMZ_Y1g*Zvs2vIE>`a(MRUwSRtmu{mIT90-sB zMh{pHCwJ44v1I@T*49?#;mhYzU0n2MwZlV^_a9_uXII9BK=%MJioeH_0hVCt)uvQ# z%@1Ut@%LEjZ{H0#aqSLdic>?aH2MQ|!A`+-WBN6mI&caA0RR60^KY{N000I_L_t&o Y05bu0Az(6?H~;_u07*qoM6N<$f@a%54*&oF literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/anvilcraft_pigsplus/textures/block/auto_royal_grindstone_base_overload.png b/src/main/resources/assets/anvilcraft_pigsplus/textures/block/auto_royal_grindstone_base_overload.png new file mode 100644 index 0000000000000000000000000000000000000000..e522dded2514e5bd09e891fc3aaa02a8a9dc8ee6 GIT binary patch literal 1146 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=ERjK$ubD;;FYl4egmB5hW46K32*3xq68y`AMmI6}bgK)eHls47YguJQ{>uF6ifOi{PD zbs{}UK3djZt>nqvW6s4qD1-ZCERRDRmN*N_31y=g{ z<>lpi<;HsXMd|v6mX?v90`zGE;%B09k2gXakl<5wp<;IRwdJb`TMuUx6%m z$bfOL4e(WI9uwO;`_OE8&AXomZm0N5% z)^;dy$g%v-U(da%^k}Q7*xHclfGwV^TRRO;%FXKZlqyf%zHWNm@-Js+f4{e9=JzzM zt6{Gh6@w>VW)R`!y?cRigHQLmo6HX$evDi3>GSb&&0mav*2=Ej7R9f2MTTM3sw8W( zpD}hp0yp}4m9!abcKW3;9O7$uUhQ1=$c*Ey3nR-u_J%ckG>&}SdvJ$}_I}=k#5z8O zs7k5RTNrli+9%1fVc$+!pk5xEcE7mClNT8Xu6uR+x_&3aHS_Jv*GnU3%zwP-awk9U z#yvYuT>Z+sYLyc6lj5HXr+QCnQBkc?(B|5fte#S6bH6(*Zgp5>_LZBr?I%l5l?L8v-T<4IC6j zQ_E(kdY?Zz>8#ZJk2dqC7IjW7;ynL(rm3BJNr|(3&Ovvj?qE%hrWJGIr!IY-ax(9% zwTSDo(tAMU7MPNEc6Uo(YSf9?&E_Q=9`Rj1*SKQglGH-$zx#YMD?8WrvPDbtdY$(E z@>~D$w&csE)y+mM6-95%r!JJ2TM#();c@dt72IdD=C`~&_59P0b==B%M>qYbD4Lt$ zbn(K9kW(RAPhD!c_g)uxylRzO>AY==SG|&d+aqcGY`;?H@h4ZFlzizBx&CZzrMRuy zQD>vO4gaRTu&S%rvpoA7F!t&`PpSJ{a^h#T0x)J9BWxvYW4`1Gp4gqbAp6?|-nq~J zs@-}h2}I|A`<6JL-&5!A`iSR4o4xS+NsJp=Z+W)QTpTu~apqz%Aal_|SH`|sXS6yd h+jT5HcVLF$eg-Rx#?Ka&UpIpa08dvxmvv4FO#o7m-g*E4 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/anvilcraft_pigsplus/textures/block/auto_royal_grindstone_frame.png b/src/main/resources/assets/anvilcraft_pigsplus/textures/block/auto_royal_grindstone_frame.png new file mode 100644 index 0000000000000000000000000000000000000000..200e91fa3beeed34dd924226c9d9100309694323 GIT binary patch literal 328 zcmV-O0k{5%P)XfI>Y>T=nO2Iz>TVl9j&DtYgr|B|s^D_H zP@d(T1`37f9#;ieCyF9-S>~BXa_>$6r7X`IRa*=O{(x-wydSUNii=laZD3Y_5)@sr zd>!iw00pkN53>TlL|^Q}qd!q_oNfGe?$B~z(}0~8(8pyQ%barp=|r0{NQId?4aVVw zGEt!G4b!RasIZz;l{pu000030{~|$^uK)l521!Ig aR09CA;+jUkZf}GD0000q;CN%xl?#<9Y?q_Qkkm}SkamxoYG0qQ_ znG*^Zq&l-sdB@OXQm|y&frBSb@Jy0y-a0|B=FJQCm@NrOxon1CH#cYnt4!c_3W=z! zx0RJDZj8@7(S0uU42#Z>)ei4Y`?3@nZYX=k%{WJS_9-UC_l#cO{+Q=D1`2LGz&(+B vM*|o+ls4)Eefj^tz2xhoKn5GgyUYxmR;2qhFA=N(iZFP(`njxgN@xNA{lI}e literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/anvilcraft_pigsplus/textures/block/auto_royal_grindstone_stone.png b/src/main/resources/assets/anvilcraft_pigsplus/textures/block/auto_royal_grindstone_stone.png new file mode 100644 index 0000000000000000000000000000000000000000..5c30c25c3cf3e9be6a7b065b31656423902bc731 GIT binary patch literal 377 zcmV-<0fzpGP)y<-CJt&$jI)D_10O&?iJ!qqS2tr^SV)+Fu#m6-2_!HP zHvW~6LK%SblGgxj2VmeNZQtv?_uSvRPknuRA75NXko+m&?CA(nhX+AtU2pVZwukur z{!*|Y)d+9nP;&}P#TNb&S=b{R+Lk8156_SAQh={&ttU3@LNkg*yM_T>-*FMm z5imeRDVmXroo6+hGe^LV>}>aKa28CYDG9o!3CkJ?Gv;^_NPLQBG~jb}e=A5Nx*vfm z7nxjK$-Km!0B?uIss9S1r~B|zfX-IC=L+zj>>7)m`x=NLdYw-XhXj6kI-Adrw6B43 zeRDUKn|v;-U`dG?L?e4xRVs^{tqxYz(#S3Xtf|c#OaK4?|Nrg2)VBZt00v1!K~w_( XkxX&%Hh>d000000NkvXXu0mjfAsCzx literal 0 HcmV?d00001 From 1fd1fa9e8615f294f868ff17c5d18677d1156374 Mon Sep 17 00:00:00 2001 From: TBPig <147127248+TBPig@users.noreply.github.com> Date: Sat, 13 Dec 2025 21:38:38 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E4=B8=89=E7=A7=8D?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=9C=BA=E5=99=A8=E7=9A=84=E8=B4=B4=E5=9B=BE?= =?UTF-8?q?=EF=BC=9B=E4=BF=AE=E6=94=B9=E7=89=88=E6=9C=AC=E5=8F=B7=E4=B8=BA?= =?UTF-8?q?0.1.6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 2 +- .../anvilcraft/pigsplus/init/AddonBlocks.java | 2 +- .../auto_jewel_crafting_table.json | 5 +- .../auto_royal_smithing_table.json | 5 +- .../block/auto_jewel_crafting_table.json | 484 +++++++----------- .../auto_jewel_crafting_table_overload.json | 273 ++++++++++ .../models/block/auto_royal_grindstone.json | 8 +- .../block/auto_royal_grindstone_overload.json | 8 +- .../block/auto_royal_smithing_table.json | 203 +++++++- .../auto_royal_smithing_table_overload.json | 202 ++++++++ .../block/auto_jewel_crafting_table_base.png | Bin 1458 -> 0 bytes .../block/auto_jewel_crafting_table_gems.png | Bin 0 -> 295 bytes .../block/auto_jewel_crafting_table_glass.png | Bin 393 -> 0 bytes .../auto_jewel_crafting_table_grindstone.png | Bin 583 -> 0 bytes ...jewel_crafting_table_grindstone_wood_1.png | Bin 535 -> 0 bytes ...jewel_crafting_table_grindstone_wood_2.png | Bin 383 -> 0 bytes .../block/auto_jewel_crafting_table_item.png | Bin 293 -> 0 bytes .../auto_jewel_crafting_table_pillar.png | Bin 601 -> 0 bytes .../block/auto_jewel_crafting_table_stone.png | Bin 0 -> 370 bytes ...ndstone_base.png => auto_machine_base.png} | Bin ...oad.png => auto_machine_base_overload.png} | Bin ...stone_frame.png => auto_machine_frame.png} | Bin ...stone_glass.png => auto_machine_glass.png} | Bin .../block/auto_royal_smithing_table_core.png | Bin 0 -> 274 bytes .../block/auto_royal_smithing_table_top.png | Bin 958 -> 0 bytes 25 files changed, 865 insertions(+), 327 deletions(-) create mode 100644 src/main/resources/assets/anvilcraft_pigsplus/models/block/auto_jewel_crafting_table_overload.json create mode 100644 src/main/resources/assets/anvilcraft_pigsplus/models/block/auto_royal_smithing_table_overload.json delete mode 100644 src/main/resources/assets/anvilcraft_pigsplus/textures/block/auto_jewel_crafting_table_base.png create mode 100644 src/main/resources/assets/anvilcraft_pigsplus/textures/block/auto_jewel_crafting_table_gems.png delete mode 100644 src/main/resources/assets/anvilcraft_pigsplus/textures/block/auto_jewel_crafting_table_glass.png delete mode 100644 src/main/resources/assets/anvilcraft_pigsplus/textures/block/auto_jewel_crafting_table_grindstone.png delete mode 100644 src/main/resources/assets/anvilcraft_pigsplus/textures/block/auto_jewel_crafting_table_grindstone_wood_1.png delete mode 100644 src/main/resources/assets/anvilcraft_pigsplus/textures/block/auto_jewel_crafting_table_grindstone_wood_2.png delete mode 100644 src/main/resources/assets/anvilcraft_pigsplus/textures/block/auto_jewel_crafting_table_item.png delete mode 100644 src/main/resources/assets/anvilcraft_pigsplus/textures/block/auto_jewel_crafting_table_pillar.png create mode 100644 src/main/resources/assets/anvilcraft_pigsplus/textures/block/auto_jewel_crafting_table_stone.png rename src/main/resources/assets/anvilcraft_pigsplus/textures/block/{auto_royal_grindstone_base.png => auto_machine_base.png} (100%) rename src/main/resources/assets/anvilcraft_pigsplus/textures/block/{auto_royal_grindstone_base_overload.png => auto_machine_base_overload.png} (100%) rename src/main/resources/assets/anvilcraft_pigsplus/textures/block/{auto_royal_grindstone_frame.png => auto_machine_frame.png} (100%) rename src/main/resources/assets/anvilcraft_pigsplus/textures/block/{auto_royal_grindstone_glass.png => auto_machine_glass.png} (100%) create mode 100644 src/main/resources/assets/anvilcraft_pigsplus/textures/block/auto_royal_smithing_table_core.png delete mode 100644 src/main/resources/assets/anvilcraft_pigsplus/textures/block/auto_royal_smithing_table_top.png diff --git a/gradle.properties b/gradle.properties index d6fd2f5b..4f8cf595 100644 --- a/gradle.properties +++ b/gradle.properties @@ -21,7 +21,7 @@ curseforge_id=1380275 mod_id=anvilcraft_pigsplus mod_name=AnvilCraft-PigsPlus mod_license=LGPL-3.0 license -mod_version=0.1.5 +mod_version=0.1.6 maven_group=dev.anvilcraft.pigsplus mod_authors=TB_pig mod_description=tools made by TB_pig diff --git a/src/main/java/dev/anvilcraft/pigsplus/init/AddonBlocks.java b/src/main/java/dev/anvilcraft/pigsplus/init/AddonBlocks.java index c87b8b18..9b91c611 100644 --- a/src/main/java/dev/anvilcraft/pigsplus/init/AddonBlocks.java +++ b/src/main/java/dev/anvilcraft/pigsplus/init/AddonBlocks.java @@ -163,7 +163,7 @@ public class AddonBlocks { .block("auto_royal_smithing_table", AutoRoyalSmithingTableBlock::new) .lang("Auto Royal Smithing Table") .initialProperties(() -> Blocks.IRON_BLOCK) - .properties(p -> p.strength(5.0f, 1200f)) + .properties(p -> p.strength(5.0f, 1200f).noOcclusion()) .blockstate(DataGenUtil::noExtraModelOrState) .simpleItem() .tag(BlockTags.MINEABLE_WITH_PICKAXE, BlockTags.NEEDS_IRON_TOOL) diff --git a/src/main/resources/assets/anvilcraft_pigsplus/blockstates/auto_jewel_crafting_table.json b/src/main/resources/assets/anvilcraft_pigsplus/blockstates/auto_jewel_crafting_table.json index 29479cea..72bf5f76 100644 --- a/src/main/resources/assets/anvilcraft_pigsplus/blockstates/auto_jewel_crafting_table.json +++ b/src/main/resources/assets/anvilcraft_pigsplus/blockstates/auto_jewel_crafting_table.json @@ -1,6 +1,9 @@ { "variants": { - "": { + "overload=true": { + "model": "anvilcraft_pigsplus:block/auto_jewel_crafting_table_overload" + }, + "overload=false": { "model": "anvilcraft_pigsplus:block/auto_jewel_crafting_table" } } diff --git a/src/main/resources/assets/anvilcraft_pigsplus/blockstates/auto_royal_smithing_table.json b/src/main/resources/assets/anvilcraft_pigsplus/blockstates/auto_royal_smithing_table.json index 9102c0c1..9e3b7aa4 100644 --- a/src/main/resources/assets/anvilcraft_pigsplus/blockstates/auto_royal_smithing_table.json +++ b/src/main/resources/assets/anvilcraft_pigsplus/blockstates/auto_royal_smithing_table.json @@ -1,6 +1,9 @@ { "variants": { - "": { + "overload=true": { + "model": "anvilcraft_pigsplus:block/auto_royal_smithing_table_overload" + }, + "overload=false": { "model": "anvilcraft_pigsplus:block/auto_royal_smithing_table" } } diff --git a/src/main/resources/assets/anvilcraft_pigsplus/models/block/auto_jewel_crafting_table.json b/src/main/resources/assets/anvilcraft_pigsplus/models/block/auto_jewel_crafting_table.json index f77fff4f..1a0ac11e 100644 --- a/src/main/resources/assets/anvilcraft_pigsplus/models/block/auto_jewel_crafting_table.json +++ b/src/main/resources/assets/anvilcraft_pigsplus/models/block/auto_jewel_crafting_table.json @@ -3,391 +3,271 @@ "credit": "Made with Blockbench", "parent": "minecraft:block/cube", "render_type": "minecraft:cutout", + "texture_size": [32, 32], "textures": { - "0": "anvilcraft_pigsplus:block/auto_jewel_crafting_table_base", - "1": "anvilcraft_pigsplus:block/auto_jewel_crafting_table_pillar", - "3": "anvilcraft_pigsplus:block/auto_jewel_crafting_table_item", - "4": "anvilcraft_pigsplus:block/auto_jewel_crafting_table_glass", - "5": "anvilcraft_pigsplus:block/auto_jewel_crafting_table_grindstone", - "6": "anvilcraft_pigsplus:block/auto_jewel_crafting_table_grindstone_wood_1", - "7": "anvilcraft_pigsplus:block/auto_jewel_crafting_table_grindstone_wood_2", - "particle": "anvilcraft_pigsplus:block/auto_jewel_crafting_table_base" + "2": "anvilcraft_pigsplus:block/auto_machine_base", + "4": "anvilcraft_pigsplus:block/auto_machine_glass", + "8": "anvilcraft_pigsplus:block/auto_machine_frame", + "9": "anvilcraft_pigsplus:block/auto_jewel_crafting_table_gems", + "12": "anvilcraft_pigsplus:block/auto_jewel_crafting_table_stone", + "particle": "anvilcraft_pigsplus:block/auto_machine_base" }, "elements": [ { - "from": [12, 0, 0], - "to": [16, 1, 4], + "name": "base", + "from": [1, 1, 1], + "to": [15, 8, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [7, 0, 8]}, "faces": { - "north": {"uv": [8, 2.25, 9, 2.5], "texture": "#0"}, - "east": {"uv": [8, 2.5, 9, 2.75], "texture": "#0"}, - "south": {"uv": [8, 2.75, 9, 3], "texture": "#0"}, - "west": {"uv": [3, 8, 4, 8.25], "texture": "#0"}, - "up": {"uv": [8, 7, 7, 6], "texture": "#0"}, - "down": {"uv": [8, 7, 7, 8], "texture": "#0"} + "north": {"uv": [0, 10.5, 6, 14], "texture": "#2"}, + "east": {"uv": [0, 10.5, 6, 14], "texture": "#2"}, + "south": {"uv": [0, 10.5, 6, 14], "texture": "#2"}, + "west": {"uv": [0, 10.5, 6, 14], "texture": "#2"}, + "up": {"uv": [16, 7, 9, 0], "texture": "#2"}, + "down": {"uv": [7, 0, 0, 7], "texture": "#2"} } }, { - "from": [0, 1, 0], - "to": [16, 7, 16], + "name": "glass", + "from": [0, 9, 0], + "to": [16, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 9, 0]}, "faces": { - "north": {"uv": [4, 0, 8, 1.5], "texture": "#0"}, - "east": {"uv": [4, 1.5, 8, 3], "texture": "#0"}, - "south": {"uv": [4, 3, 8, 4.5], "texture": "#0"}, - "west": {"uv": [4, 4.5, 8, 6], "texture": "#0"}, - "up": {"uv": [4, 4, 0, 0], "texture": "#0"}, - "down": {"uv": [4, 4, 0, 8], "texture": "#0"} - } - }, - { - "from": [0, 0, 0], - "to": [4, 1, 4], - "faces": { - "north": {"uv": [0, 8, 1, 8.25], "texture": "#0"}, - "east": {"uv": [8, 0, 9, 0.25], "texture": "#0"}, - "south": {"uv": [8, 0.25, 9, 0.5], "texture": "#0"}, - "west": {"uv": [8, 0.5, 9, 0.75], "texture": "#0"}, - "up": {"uv": [5, 7, 4, 6], "texture": "#0"}, - "down": {"uv": [6, 6, 5, 7], "texture": "#0"} - } - }, - { - "from": [0, 0, 12], - "to": [4, 1, 16], - "faces": { - "north": {"uv": [8, 0.75, 9, 1], "texture": "#0"}, - "east": {"uv": [1, 8, 2, 8.25], "texture": "#0"}, - "south": {"uv": [8, 1, 9, 1.25], "texture": "#0"}, - "west": {"uv": [8, 1.25, 9, 1.5], "texture": "#0"}, - "up": {"uv": [7, 7, 6, 6], "texture": "#0"}, - "down": {"uv": [5, 7, 4, 8], "texture": "#0"} - } - }, - { - "from": [12, 0, 12], - "to": [16, 1, 16], - "faces": { - "north": {"uv": [8, 1.5, 9, 1.75], "texture": "#0"}, - "east": {"uv": [8, 1.75, 9, 2], "texture": "#0"}, - "south": {"uv": [2, 8, 3, 8.25], "texture": "#0"}, - "west": {"uv": [8, 2, 9, 2.25], "texture": "#0"}, - "up": {"uv": [6, 8, 5, 7], "texture": "#0"}, - "down": {"uv": [7, 7, 6, 8], "texture": "#0"} - } - }, - { - "from": [13, 13, 13], - "to": [16, 15, 16], - "faces": { - "north": {"uv": [9.5, 6, 11, 7], "texture": "#1"}, - "east": {"uv": [9.5, 7, 11, 8], "texture": "#1"}, - "south": {"uv": [0, 10, 1.5, 11], "texture": "#1"}, - "west": {"uv": [1.5, 10, 3, 11], "texture": "#1"}, - "up": {"uv": [6, 3, 4.5, 1.5], "texture": "#1"}, - "down": {"uv": [4.5, 4.5, 3, 6], "texture": "#1"} - } - }, - { - "from": [0, 13, 0], - "to": [3, 15, 3], - "faces": { - "north": {"uv": [4, 8, 5.5, 9], "texture": "#1"}, - "east": {"uv": [8, 4, 9.5, 5], "texture": "#1"}, - "south": {"uv": [8, 5, 9.5, 6], "texture": "#1"}, - "west": {"uv": [5.5, 8, 7, 9], "texture": "#1"}, - "up": {"uv": [3, 1.5, 1.5, 0], "texture": "#1"}, - "down": {"uv": [3, 1.5, 1.5, 3], "texture": "#1"} - } - }, - { - "from": [0, 7, 0], - "to": [3, 9, 3], - "faces": { - "north": {"uv": [8, 6, 9.5, 7], "texture": "#1"}, - "east": {"uv": [7, 8, 8.5, 9], "texture": "#1"}, - "south": {"uv": [8, 7, 9.5, 8], "texture": "#1"}, - "west": {"uv": [8.5, 8, 10, 9], "texture": "#1"}, - "up": {"uv": [1.5, 4.5, 0, 3], "texture": "#1"}, - "down": {"uv": [4.5, 0, 3, 1.5], "texture": "#1"} + "north": {"uv": [8, 0, 16, 3.5], "texture": "#4"}, + "east": {"uv": [8, 0, 16, 3.5], "texture": "#4"}, + "south": {"uv": [8, 0, 16, 3.5], "texture": "#4"}, + "west": {"uv": [8, 0, 16, 3.5], "texture": "#4"}, + "up": {"uv": [8, 8, 0, 0], "texture": "#4"}, + "down": {"uv": [8, 8, 0, 16], "texture": "#4"} } }, { - "from": [0.5, 9, 0.5], - "to": [2.5, 13, 2.5], + "name": "glass", + "from": [0, 16, 0], + "to": [16, 9, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 16, 0]}, "faces": { - "north": {"uv": [0, 6, 1, 8], "texture": "#1"}, - "east": {"uv": [6, 0, 7, 2], "texture": "#1"}, - "south": {"uv": [1, 6, 2, 8], "texture": "#1"}, - "west": {"uv": [2, 6, 3, 8], "texture": "#1"}, - "up": {"uv": [11, 9, 10, 8], "texture": "#1"}, - "down": {"uv": [10, 10, 9, 11], "texture": "#1"} + "north": {"uv": [8, 0, 16, 3.5], "texture": "#4"}, + "east": {"uv": [8, 0, 16, 3.5], "texture": "#4"}, + "south": {"uv": [8, 0, 16, 3.5], "texture": "#4"}, + "west": {"uv": [8, 0, 16, 3.5], "texture": "#4"}, + "up": {"uv": [8, 16, 0, 8], "texture": "#4"}, + "down": {"uv": [8, 0, 0, 8], "texture": "#4"} } }, { - "from": [13, 13, 0], - "to": [16, 15, 3], + "name": "output", + "from": [6, 16, 6], + "to": [10, 16, 10], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 16, 8]}, "faces": { - "north": {"uv": [1, 8, 2.5, 9], "texture": "#1"}, - "east": {"uv": [8, 2, 9.5, 3], "texture": "#1"}, - "south": {"uv": [2.5, 8, 4, 9], "texture": "#1"}, - "west": {"uv": [8, 3, 9.5, 4], "texture": "#1"}, - "up": {"uv": [1.5, 1.5, 0, 0], "texture": "#1"}, - "down": {"uv": [1.5, 1.5, 0, 3], "texture": "#1"} + "north": {"uv": [0, 1, 2, 1], "texture": "#4"}, + "east": {"uv": [0, 1, 2, 1], "texture": "#4"}, + "south": {"uv": [0, 1, 2, 1], "texture": "#4"}, + "west": {"uv": [0, 1, 2, 1], "texture": "#4"}, + "up": {"uv": [11, 5, 13, 7], "rotation": 90, "texture": "#4"}, + "down": {"uv": [11, 5, 13, 7], "rotation": 270, "texture": "#4"} } }, { - "from": [13, 7, 0], + "from": [13, 0, 0], "to": [16, 9, 3], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [9, 0, 10.5, 1], "texture": "#1"}, - "east": {"uv": [1, 9, 2.5, 10], "texture": "#1"}, - "south": {"uv": [9, 1, 10.5, 2], "texture": "#1"}, - "west": {"uv": [2.5, 9, 4, 10], "texture": "#1"}, - "up": {"uv": [3, 4.5, 1.5, 3], "texture": "#1"}, - "down": {"uv": [4.5, 1.5, 3, 3], "texture": "#1"} - } - }, - { - "from": [13.5, 9, 0.5], - "to": [15.5, 13, 2.5], - "faces": { - "north": {"uv": [6, 2, 7, 4], "texture": "#1"}, - "east": {"uv": [3, 6, 4, 8], "texture": "#1"}, - "south": {"uv": [4, 6, 5, 8], "texture": "#1"}, - "west": {"uv": [6, 4, 7, 6], "texture": "#1"}, - "up": {"uv": [11, 10, 10, 9], "texture": "#1"}, - "down": {"uv": [11, 10, 10, 11], "texture": "#1"} - } - }, - { - "from": [0, 13, 13], - "to": [3, 15, 16], - "faces": { - "north": {"uv": [4, 9, 5.5, 10], "texture": "#1"}, - "east": {"uv": [5.5, 9, 7, 10], "texture": "#1"}, - "south": {"uv": [7, 9, 8.5, 10], "texture": "#1"}, - "west": {"uv": [8.5, 9, 10, 10], "texture": "#1"}, - "up": {"uv": [4.5, 4.5, 3, 3], "texture": "#1"}, - "down": {"uv": [1.5, 4.5, 0, 6], "texture": "#1"} + "north": {"uv": [6, 0, 9, 9], "texture": "#8"}, + "east": {"uv": [0, 0, 3, 9], "texture": "#8"}, + "south": {"uv": [3, 0, 6, 9], "texture": "#8"}, + "west": {"uv": [3, 0, 6, 9], "texture": "#8"}, + "up": {"uv": [12, 3, 9, 0], "texture": "#8"}, + "down": {"uv": [12, 3, 9, 6], "texture": "#8"} } }, { - "from": [0, 7, 13], - "to": [3, 9, 16], - "faces": { - "north": {"uv": [9.5, 2, 11, 3], "texture": "#1"}, - "east": {"uv": [9.5, 3, 11, 4], "texture": "#1"}, - "south": {"uv": [9.5, 4, 11, 5], "texture": "#1"}, - "west": {"uv": [9.5, 5, 11, 6], "texture": "#1"}, - "up": {"uv": [6, 1.5, 4.5, 0], "texture": "#1"}, - "down": {"uv": [3, 4.5, 1.5, 6], "texture": "#1"} - } - }, - { - "from": [0.5, 9, 13.5], - "to": [2.5, 13, 15.5], - "faces": { - "north": {"uv": [5, 6, 6, 8], "texture": "#1"}, - "east": {"uv": [6, 6, 7, 8], "texture": "#1"}, - "south": {"uv": [7, 0, 8, 2], "texture": "#1"}, - "west": {"uv": [7, 2, 8, 4], "texture": "#1"}, - "up": {"uv": [11.5, 1, 10.5, 0], "texture": "#1"}, - "down": {"uv": [11.5, 1, 10.5, 2], "texture": "#1"} - } - }, - { - "from": [13.5, 9, 13.5], - "to": [15.5, 13, 15.5], - "faces": { - "north": {"uv": [7, 4, 8, 6], "texture": "#1"}, - "east": {"uv": [7, 6, 8, 8], "texture": "#1"}, - "south": {"uv": [0, 8, 1, 10], "texture": "#1"}, - "west": {"uv": [8, 0, 9, 2], "texture": "#1"}, - "up": {"uv": [1, 12, 0, 11], "texture": "#1"}, - "down": {"uv": [2, 11, 1, 12], "texture": "#1"} - } - }, - { - "from": [13, 7, 13], + "from": [13, 0, 13], "to": [16, 9, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [3, 10, 4.5, 11], "texture": "#1"}, - "east": {"uv": [4.5, 10, 6, 11], "texture": "#1"}, - "south": {"uv": [6, 10, 7.5, 11], "texture": "#1"}, - "west": {"uv": [7.5, 10, 9, 11], "texture": "#1"}, - "up": {"uv": [6, 4.5, 4.5, 3], "texture": "#1"}, - "down": {"uv": [6, 4.5, 4.5, 6], "texture": "#1"} + "north": {"uv": [3, 0, 6, 9], "texture": "#8"}, + "east": {"uv": [6, 0, 9, 9], "texture": "#8"}, + "south": {"uv": [0, 0, 3, 9], "texture": "#8"}, + "west": {"uv": [3, 0, 6, 9], "texture": "#8"}, + "up": {"uv": [12, 3, 9, 0], "rotation": 90, "texture": "#8"}, + "down": {"uv": [12, 3, 9, 6], "rotation": 270, "texture": "#8"} } }, { - "from": [12.5, 6.5, 9], - "to": [13.5, 9.5, 11], + "from": [0, 0, 13], + "to": [3, 9, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [2, 9, 3, 12], "texture": "#7"}, - "east": {"uv": [0, 6, 2, 9], "texture": "#7"}, - "south": {"uv": [9, 2, 10, 5], "texture": "#7"}, - "west": {"uv": [6, 0, 8, 3], "texture": "#7"}, - "up": {"uv": [6, 11, 5, 9], "texture": "#7"}, - "down": {"uv": [7, 9, 6, 11], "texture": "#7"} + "north": {"uv": [3, 0, 6, 9], "texture": "#8"}, + "east": {"uv": [3, 0, 6, 9], "texture": "#8"}, + "south": {"uv": [6, 0, 9, 9], "texture": "#8"}, + "west": {"uv": [0, 0, 3, 9], "texture": "#8"}, + "up": {"uv": [12, 3, 9, 0], "rotation": 180, "texture": "#8"}, + "down": {"uv": [12, 3, 9, 6], "rotation": 180, "texture": "#8"} } }, { - "from": [10, 7.5, 7], - "to": [13, 14.5, 13], + "from": [0, 0, 0], + "to": [3, 9, 3], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 7, 3, 14], "texture": "#5"}, - "east": {"uv": [0, 0, 6, 7], "texture": "#5"}, - "south": {"uv": [3, 7, 6, 14], "texture": "#5"}, - "west": {"uv": [6, 0, 12, 7], "texture": "#5"}, - "up": {"uv": [9, 13, 6, 7], "texture": "#5"}, - "down": {"uv": [12, 7, 9, 13], "texture": "#5"} + "north": {"uv": [0, 0, 3, 9], "texture": "#8"}, + "east": {"uv": [3, 0, 6, 9], "texture": "#8"}, + "south": {"uv": [3, 0, 6, 9], "texture": "#8"}, + "west": {"uv": [6, 0, 9, 9], "texture": "#8"}, + "up": {"uv": [12, 3, 9, 0], "rotation": 270, "texture": "#8"}, + "down": {"uv": [12, 3, 9, 6], "rotation": 90, "texture": "#8"} } }, { - "from": [6.5, 7.5, 7], - "to": [9.5, 14.5, 13], + "from": [3, 6, 0], + "to": [13, 9, 3], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 7, 3, 14], "texture": "#5"}, - "east": {"uv": [0, 0, 6, 7], "texture": "#5"}, - "south": {"uv": [3, 7, 6, 14], "texture": "#5"}, - "west": {"uv": [6, 0, 12, 7], "texture": "#5"}, - "up": {"uv": [9, 13, 6, 7], "texture": "#5"}, - "down": {"uv": [12, 7, 9, 13], "texture": "#5"} + "north": {"uv": [0, 10, 10, 13], "texture": "#8"}, + "east": {"uv": [3, 0, 6, 3], "texture": "#8"}, + "south": {"uv": [0, 13, 10, 16], "texture": "#8"}, + "west": {"uv": [3, 0, 6, 3], "texture": "#8"}, + "up": {"uv": [0, 13, 10, 16], "texture": "#8"}, + "down": {"uv": [0, 10, 10, 13], "texture": "#8"} } }, { - "from": [3, 7.5, 7], - "to": [6, 14.5, 13], + "from": [13, 6, 3], + "to": [16, 9, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 7, 3, 14], "texture": "#5"}, - "east": {"uv": [0, 0, 6, 7], "texture": "#5"}, - "south": {"uv": [3, 7, 6, 14], "texture": "#5"}, - "west": {"uv": [6, 0, 12, 7], "texture": "#5"}, - "up": {"uv": [9, 13, 6, 7], "texture": "#5"}, - "down": {"uv": [12, 7, 9, 13], "texture": "#5"} + "north": {"uv": [3, 0, 6, 3], "texture": "#8"}, + "east": {"uv": [0, 10, 10, 13], "texture": "#8"}, + "south": {"uv": [3, 0, 6, 3], "texture": "#8"}, + "west": {"uv": [0, 13, 10, 16], "texture": "#8"}, + "up": {"uv": [0, 13, 10, 16], "rotation": 90, "texture": "#8"}, + "down": {"uv": [0, 10, 10, 13], "rotation": 270, "texture": "#8"} } }, { - "from": [2, 9.5, 8.5], - "to": [14, 12.5, 11.5], + "from": [3, 6, 13], + "to": [13, 9, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0, 12, 3], "texture": "#6"}, - "east": {"uv": [0, 12, 3, 15], "texture": "#6"}, - "south": {"uv": [0, 3, 12, 6], "texture": "#6"}, - "west": {"uv": [12, 0, 15, 3], "texture": "#6"}, - "up": {"uv": [12, 9, 0, 6], "texture": "#6"}, - "down": {"uv": [12, 9, 0, 12], "texture": "#6"} + "north": {"uv": [0, 13, 10, 16], "texture": "#8"}, + "east": {"uv": [3, 0, 6, 3], "texture": "#8"}, + "south": {"uv": [0, 10, 10, 13], "texture": "#8"}, + "west": {"uv": [3, 0, 6, 3], "texture": "#8"}, + "up": {"uv": [0, 13, 10, 16], "rotation": 180, "texture": "#8"}, + "down": {"uv": [0, 10, 10, 13], "rotation": 180, "texture": "#8"} } }, { - "from": [2.5, 6.5, 9], - "to": [3.5, 9.5, 11], + "from": [0, 6, 3], + "to": [3, 9, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [8, 0, 9, 3], "texture": "#7"}, - "east": {"uv": [0, 0, 2, 3], "texture": "#7"}, - "south": {"uv": [8, 3, 9, 6], "texture": "#7"}, - "west": {"uv": [2, 0, 4, 3], "texture": "#7"}, - "up": {"uv": [4, 11, 3, 9], "texture": "#7"}, - "down": {"uv": [5, 9, 4, 11], "texture": "#7"} + "north": {"uv": [3, 0, 6, 3], "texture": "#8"}, + "east": {"uv": [0, 13, 10, 16], "texture": "#8"}, + "south": {"uv": [3, 0, 6, 3], "texture": "#8"}, + "west": {"uv": [0, 10, 10, 13], "texture": "#8"}, + "up": {"uv": [0, 13, 10, 16], "rotation": 270, "texture": "#8"}, + "down": {"uv": [0, 10, 10, 13], "rotation": 90, "texture": "#8"} } }, { - "from": [9, 6.5, 9], - "to": [10.5, 9.5, 11], + "from": [4, 8, 9], + "to": [8, 9, 12], + "rotation": {"angle": -22.5, "axis": "y", "origin": [4, 8, 9]}, "faces": { - "north": {"uv": [4, 6, 5.5, 9], "texture": "#7"}, - "east": {"uv": [4, 0, 6, 3], "texture": "#7"}, - "south": {"uv": [6, 6, 7.5, 9], "texture": "#7"}, - "west": {"uv": [4, 3, 6, 6], "texture": "#7"}, - "up": {"uv": [1.5, 11, 0, 9], "texture": "#7"}, - "down": {"uv": [10.5, 0, 9, 2], "texture": "#7"} + "north": {"uv": [3, 0, 7, 1], "texture": "#9"}, + "east": {"uv": [7, 4, 10, 5], "texture": "#9"}, + "south": {"uv": [3, 4, 7, 5], "texture": "#9"}, + "west": {"uv": [0, 4, 3, 5], "texture": "#9"}, + "up": {"uv": [3, 1, 7, 4], "texture": "#9"}, + "down": {"uv": [3, 5, 7, 8], "texture": "#9"} } }, { - "from": [5.5, 6.5, 9], - "to": [7, 9.5, 11], + "from": [9, 8, 5], + "to": [12, 9, 8], + "rotation": {"angle": 45, "axis": "y", "origin": [9, 8, 5]}, "faces": { - "north": {"uv": [2, 6, 3.5, 9], "texture": "#7"}, - "east": {"uv": [0, 3, 2, 6], "texture": "#7"}, - "south": {"uv": [6, 3, 7.5, 6], "texture": "#7"}, - "west": {"uv": [2, 3, 4, 6], "texture": "#7"}, - "up": {"uv": [9.5, 8, 8, 6], "texture": "#7"}, - "down": {"uv": [9.5, 8, 8, 10], "texture": "#7"} + "north": {"uv": [13, 3, 16, 4], "texture": "#9"}, + "east": {"uv": [7, 3, 10, 4], "texture": "#9"}, + "south": {"uv": [10, 7, 13, 8], "texture": "#9"}, + "west": {"uv": [10, 3, 13, 4], "texture": "#9"}, + "up": {"uv": [10, 4, 13, 7], "texture": "#9"}, + "down": {"uv": [10, 0, 13, 3], "texture": "#9"} } }, { - "from": [5.5359, 7, 0], - "to": [9.5359, 8.5, 3], - "rotation": {"angle": 45, "axis": "y", "origin": [9, 0, 6]}, + "from": [6.5, 9, 5], + "to": [9.5, 15, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [7, 9, 5]}, "faces": { - "north": {"uv": [7, 2, 11, 3], "texture": "#3"}, - "east": {"uv": [7, 4, 10, 5], "texture": "#3"}, - "south": {"uv": [7, 3, 11, 4], "texture": "#3"}, - "west": {"uv": [7, 5, 10, 6], "texture": "#3"}, - "up": {"uv": [4, 3, 0, 0], "texture": "#3"}, - "down": {"uv": [4, 3, 0, 6], "texture": "#3"} + "north": {"uv": [0, 3, 1.5, 6], "texture": "#12"}, + "east": {"uv": [0, 0, 3, 3], "texture": "#12"}, + "south": {"uv": [2.5, 3, 4, 6], "texture": "#12"}, + "west": {"uv": [3, 0, 6, 3], "texture": "#12"}, + "up": {"uv": [1.5, 3, 3, 6], "texture": "#12"}, + "down": {"uv": [4.5, 3, 6, 6], "texture": "#12"} } }, { - "from": [8.60368, 7, 2.39391], - "to": [11.60368, 8, 5.39391], - "rotation": {"angle": -22.5, "axis": "y", "origin": [8, 0, 8]}, + "from": [5.5, 10.5, 6.5], + "to": [10.5, 13.5, 9.5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, "faces": { - "north": {"uv": [0, 6, 3, 7], "texture": "#3"}, - "east": {"uv": [3, 6, 6, 7], "texture": "#3"}, - "south": {"uv": [6, 6, 9, 7], "texture": "#3"}, - "west": {"uv": [7, 1, 10, 2], "texture": "#3"}, - "up": {"uv": [7, 3, 4, 0], "texture": "#3"}, - "down": {"uv": [7, 3, 4, 6], "texture": "#3"} + "north": {"uv": [0, 6, 2.5, 7.5], "texture": "#12"}, + "east": {"uv": [3, 6, 4.5, 7.5], "texture": "#12"}, + "south": {"uv": [0, 6, 2.5, 7.5], "texture": "#12"}, + "west": {"uv": [4.5, 6, 6, 7.5], "texture": "#12"}, + "up": {"uv": [0, 6, 2.5, 7.5], "texture": "#12"}, + "down": {"uv": [0, 6, 2.5, 7.5], "texture": "#12"} } }, { - "from": [0, 7, 0], - "to": [16, 15, 16], + "from": [6, 8, 7], + "to": [7, 11, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 8, 7]}, "faces": { - "north": {"uv": [8, 0, 16, 4], "texture": "#4"}, - "east": {"uv": [8, 4, 16, 8], "texture": "#4"}, - "south": {"uv": [8, 8, 16, 12], "texture": "#4"}, - "west": {"uv": [8, 12, 16, 16], "texture": "#4"}, - "up": {"uv": [8, 8, 0, 0], "texture": "#4"}, - "down": {"uv": [0, 16, 0, 16], "texture": "#4"} + "north": {"uv": [0, 7.5, 0.5, 9], "texture": "#12"}, + "east": {"uv": [0, 7.5, 1, 9], "texture": "#12"}, + "south": {"uv": [0, 7.5, 0.5, 9], "texture": "#12"}, + "west": {"uv": [0, 7.5, 1, 9], "texture": "#12"}, + "up": {"uv": [1, 7.5, 1.5, 8.5], "texture": "#12"}, + "down": {"uv": [1, 7.5, 1.5, 8.5], "texture": "#12"} } }, { - "from": [6, 15, 5.82843], - "to": [10, 15, 9.82843], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 15, 7.82843]}, + "from": [9, 8, 7], + "to": [10, 11, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 7]}, "faces": { - "north": {"uv": [0, 2, 4, 2], "texture": "#4"}, - "east": {"uv": [0, 2, 4, 2], "texture": "#4"}, - "south": {"uv": [0, 2, 4, 2], "texture": "#4"}, - "west": {"uv": [0, 2, 4, 2], "texture": "#4"}, - "up": {"uv": [3, 9, 5, 11], "rotation": 90, "texture": "#4"}, - "down": {"uv": [3, 9, 5, 11], "rotation": 270, "texture": "#4"} + "north": {"uv": [0, 7.5, 0.5, 9], "texture": "#12"}, + "east": {"uv": [0, 7.5, 1, 9], "texture": "#12"}, + "south": {"uv": [0, 7.5, 0.5, 9], "texture": "#12"}, + "west": {"uv": [0, 7.5, 1, 9], "texture": "#12"}, + "up": {"uv": [1, 7.5, 1.5, 8.5], "texture": "#12"}, + "down": {"uv": [1, 7.5, 1.5, 8.5], "texture": "#12"} } } ], "groups": [ + 0, + 1, + 2, + 3, { - "name": "group", - "origin": [0, 0, 0], + "name": "frame", + "origin": [8, 8, 8], "color": 0, - "children": [0, 1, 2, 3, 4] + "children": [4, 5, 6, 7, 8, 9, 10, 11] }, { - "name": "group", - "origin": [0, 0, 0], + "name": "jewelry", + "origin": [8, 8, 8], "color": 0, - "children": [5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16] - }, - { - "name": "group", - "origin": [0, 0, 0], - "color": 0, - "children": [17, 18, 19, 20, 21, 22, 23, 24] - }, - 25, - 26, - 27, - 28 + "children": [12, 13, 14, 15, 16, 17] + } ] } \ No newline at end of file diff --git a/src/main/resources/assets/anvilcraft_pigsplus/models/block/auto_jewel_crafting_table_overload.json b/src/main/resources/assets/anvilcraft_pigsplus/models/block/auto_jewel_crafting_table_overload.json new file mode 100644 index 00000000..85e0127a --- /dev/null +++ b/src/main/resources/assets/anvilcraft_pigsplus/models/block/auto_jewel_crafting_table_overload.json @@ -0,0 +1,273 @@ +{ + "format_version": "1.9.0", + "credit": "Made with Blockbench", + "parent": "minecraft:block/cube", + "render_type": "minecraft:cutout", + "texture_size": [32, 32], + "textures": { + "2": "anvilcraft_pigsplus:block/auto_machine_base_overload", + "4": "anvilcraft_pigsplus:block/auto_machine_glass", + "8": "anvilcraft_pigsplus:block/auto_machine_frame", + "9": "anvilcraft_pigsplus:block/auto_jewel_crafting_table_gems", + "12": "anvilcraft_pigsplus:block/auto_jewel_crafting_table_stone", + "particle": "anvilcraft_pigsplus:block/auto_machine_base_overload" + }, + "elements": [ + { + "name": "base", + "from": [1, 1, 1], + "to": [15, 8, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [7, 0, 8]}, + "faces": { + "north": {"uv": [0, 10.5, 6, 14], "texture": "#2"}, + "east": {"uv": [0, 10.5, 6, 14], "texture": "#2"}, + "south": {"uv": [0, 10.5, 6, 14], "texture": "#2"}, + "west": {"uv": [0, 10.5, 6, 14], "texture": "#2"}, + "up": {"uv": [16, 7, 9, 0], "texture": "#2"}, + "down": {"uv": [7, 0, 0, 7], "texture": "#2"} + } + }, + { + "name": "glass", + "from": [0, 9, 0], + "to": [16, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 9, 0]}, + "faces": { + "north": {"uv": [8, 0, 16, 3.5], "texture": "#4"}, + "east": {"uv": [8, 0, 16, 3.5], "texture": "#4"}, + "south": {"uv": [8, 0, 16, 3.5], "texture": "#4"}, + "west": {"uv": [8, 0, 16, 3.5], "texture": "#4"}, + "up": {"uv": [8, 8, 0, 0], "texture": "#4"}, + "down": {"uv": [8, 8, 0, 16], "texture": "#4"} + } + }, + { + "name": "glass", + "from": [0, 16, 0], + "to": [16, 9, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 16, 0]}, + "faces": { + "north": {"uv": [8, 0, 16, 3.5], "texture": "#4"}, + "east": {"uv": [8, 0, 16, 3.5], "texture": "#4"}, + "south": {"uv": [8, 0, 16, 3.5], "texture": "#4"}, + "west": {"uv": [8, 0, 16, 3.5], "texture": "#4"}, + "up": {"uv": [8, 16, 0, 8], "texture": "#4"}, + "down": {"uv": [8, 0, 0, 8], "texture": "#4"} + } + }, + { + "name": "output", + "from": [6, 16, 6], + "to": [10, 16, 10], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 16, 8]}, + "faces": { + "north": {"uv": [0, 1, 2, 1], "texture": "#4"}, + "east": {"uv": [0, 1, 2, 1], "texture": "#4"}, + "south": {"uv": [0, 1, 2, 1], "texture": "#4"}, + "west": {"uv": [0, 1, 2, 1], "texture": "#4"}, + "up": {"uv": [11, 5, 13, 7], "rotation": 90, "texture": "#4"}, + "down": {"uv": [11, 5, 13, 7], "rotation": 270, "texture": "#4"} + } + }, + { + "from": [13, 0, 0], + "to": [16, 9, 3], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [6, 0, 9, 9], "texture": "#8"}, + "east": {"uv": [0, 0, 3, 9], "texture": "#8"}, + "south": {"uv": [3, 0, 6, 9], "texture": "#8"}, + "west": {"uv": [3, 0, 6, 9], "texture": "#8"}, + "up": {"uv": [12, 3, 9, 0], "texture": "#8"}, + "down": {"uv": [12, 3, 9, 6], "texture": "#8"} + } + }, + { + "from": [13, 0, 13], + "to": [16, 9, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [3, 0, 6, 9], "texture": "#8"}, + "east": {"uv": [6, 0, 9, 9], "texture": "#8"}, + "south": {"uv": [0, 0, 3, 9], "texture": "#8"}, + "west": {"uv": [3, 0, 6, 9], "texture": "#8"}, + "up": {"uv": [12, 3, 9, 0], "rotation": 90, "texture": "#8"}, + "down": {"uv": [12, 3, 9, 6], "rotation": 270, "texture": "#8"} + } + }, + { + "from": [0, 0, 13], + "to": [3, 9, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [3, 0, 6, 9], "texture": "#8"}, + "east": {"uv": [3, 0, 6, 9], "texture": "#8"}, + "south": {"uv": [6, 0, 9, 9], "texture": "#8"}, + "west": {"uv": [0, 0, 3, 9], "texture": "#8"}, + "up": {"uv": [12, 3, 9, 0], "rotation": 180, "texture": "#8"}, + "down": {"uv": [12, 3, 9, 6], "rotation": 180, "texture": "#8"} + } + }, + { + "from": [0, 0, 0], + "to": [3, 9, 3], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 9], "texture": "#8"}, + "east": {"uv": [3, 0, 6, 9], "texture": "#8"}, + "south": {"uv": [3, 0, 6, 9], "texture": "#8"}, + "west": {"uv": [6, 0, 9, 9], "texture": "#8"}, + "up": {"uv": [12, 3, 9, 0], "rotation": 270, "texture": "#8"}, + "down": {"uv": [12, 3, 9, 6], "rotation": 90, "texture": "#8"} + } + }, + { + "from": [3, 6, 0], + "to": [13, 9, 3], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [0, 10, 10, 13], "texture": "#8"}, + "east": {"uv": [3, 0, 6, 3], "texture": "#8"}, + "south": {"uv": [0, 13, 10, 16], "texture": "#8"}, + "west": {"uv": [3, 0, 6, 3], "texture": "#8"}, + "up": {"uv": [0, 13, 10, 16], "texture": "#8"}, + "down": {"uv": [0, 10, 10, 13], "texture": "#8"} + } + }, + { + "from": [13, 6, 3], + "to": [16, 9, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [3, 0, 6, 3], "texture": "#8"}, + "east": {"uv": [0, 10, 10, 13], "texture": "#8"}, + "south": {"uv": [3, 0, 6, 3], "texture": "#8"}, + "west": {"uv": [0, 13, 10, 16], "texture": "#8"}, + "up": {"uv": [0, 13, 10, 16], "rotation": 90, "texture": "#8"}, + "down": {"uv": [0, 10, 10, 13], "rotation": 270, "texture": "#8"} + } + }, + { + "from": [3, 6, 13], + "to": [13, 9, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [0, 13, 10, 16], "texture": "#8"}, + "east": {"uv": [3, 0, 6, 3], "texture": "#8"}, + "south": {"uv": [0, 10, 10, 13], "texture": "#8"}, + "west": {"uv": [3, 0, 6, 3], "texture": "#8"}, + "up": {"uv": [0, 13, 10, 16], "rotation": 180, "texture": "#8"}, + "down": {"uv": [0, 10, 10, 13], "rotation": 180, "texture": "#8"} + } + }, + { + "from": [0, 6, 3], + "to": [3, 9, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [3, 0, 6, 3], "texture": "#8"}, + "east": {"uv": [0, 13, 10, 16], "texture": "#8"}, + "south": {"uv": [3, 0, 6, 3], "texture": "#8"}, + "west": {"uv": [0, 10, 10, 13], "texture": "#8"}, + "up": {"uv": [0, 13, 10, 16], "rotation": 270, "texture": "#8"}, + "down": {"uv": [0, 10, 10, 13], "rotation": 90, "texture": "#8"} + } + }, + { + "from": [4, 8, 9], + "to": [8, 9, 12], + "rotation": {"angle": -22.5, "axis": "y", "origin": [4, 8, 9]}, + "faces": { + "north": {"uv": [3, 0, 7, 1], "texture": "#9"}, + "east": {"uv": [7, 4, 10, 5], "texture": "#9"}, + "south": {"uv": [3, 4, 7, 5], "texture": "#9"}, + "west": {"uv": [0, 4, 3, 5], "texture": "#9"}, + "up": {"uv": [3, 1, 7, 4], "texture": "#9"}, + "down": {"uv": [3, 5, 7, 8], "texture": "#9"} + } + }, + { + "from": [9, 8, 5], + "to": [12, 9, 8], + "rotation": {"angle": 45, "axis": "y", "origin": [9, 8, 5]}, + "faces": { + "north": {"uv": [13, 3, 16, 4], "texture": "#9"}, + "east": {"uv": [7, 3, 10, 4], "texture": "#9"}, + "south": {"uv": [10, 7, 13, 8], "texture": "#9"}, + "west": {"uv": [10, 3, 13, 4], "texture": "#9"}, + "up": {"uv": [10, 4, 13, 7], "texture": "#9"}, + "down": {"uv": [10, 0, 13, 3], "texture": "#9"} + } + }, + { + "from": [6.5, 9, 5], + "to": [9.5, 15, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [7, 9, 5]}, + "faces": { + "north": {"uv": [0, 3, 1.5, 6], "texture": "#12"}, + "east": {"uv": [0, 0, 3, 3], "texture": "#12"}, + "south": {"uv": [2.5, 3, 4, 6], "texture": "#12"}, + "west": {"uv": [3, 0, 6, 3], "texture": "#12"}, + "up": {"uv": [1.5, 3, 3, 6], "texture": "#12"}, + "down": {"uv": [4.5, 3, 6, 6], "texture": "#12"} + } + }, + { + "from": [5.5, 10.5, 6.5], + "to": [10.5, 13.5, 9.5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, + "faces": { + "north": {"uv": [0, 6, 2.5, 7.5], "texture": "#12"}, + "east": {"uv": [3, 6, 4.5, 7.5], "texture": "#12"}, + "south": {"uv": [0, 6, 2.5, 7.5], "texture": "#12"}, + "west": {"uv": [4.5, 6, 6, 7.5], "texture": "#12"}, + "up": {"uv": [0, 6, 2.5, 7.5], "texture": "#12"}, + "down": {"uv": [0, 6, 2.5, 7.5], "texture": "#12"} + } + }, + { + "from": [6, 8, 7], + "to": [7, 11, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 8, 7]}, + "faces": { + "north": {"uv": [0, 7.5, 0.5, 9], "texture": "#12"}, + "east": {"uv": [0, 7.5, 1, 9], "texture": "#12"}, + "south": {"uv": [0, 7.5, 0.5, 9], "texture": "#12"}, + "west": {"uv": [0, 7.5, 1, 9], "texture": "#12"}, + "up": {"uv": [1, 7.5, 1.5, 8.5], "texture": "#12"}, + "down": {"uv": [1, 7.5, 1.5, 8.5], "texture": "#12"} + } + }, + { + "from": [9, 8, 7], + "to": [10, 11, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 7]}, + "faces": { + "north": {"uv": [0, 7.5, 0.5, 9], "texture": "#12"}, + "east": {"uv": [0, 7.5, 1, 9], "texture": "#12"}, + "south": {"uv": [0, 7.5, 0.5, 9], "texture": "#12"}, + "west": {"uv": [0, 7.5, 1, 9], "texture": "#12"}, + "up": {"uv": [1, 7.5, 1.5, 8.5], "texture": "#12"}, + "down": {"uv": [1, 7.5, 1.5, 8.5], "texture": "#12"} + } + } + ], + "groups": [ + 0, + 1, + 2, + 3, + { + "name": "frame", + "origin": [8, 8, 8], + "color": 0, + "children": [4, 5, 6, 7, 8, 9, 10, 11] + }, + { + "name": "jewelry", + "origin": [8, 8, 8], + "color": 0, + "children": [12, 13, 14, 15, 16, 17] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/anvilcraft_pigsplus/models/block/auto_royal_grindstone.json b/src/main/resources/assets/anvilcraft_pigsplus/models/block/auto_royal_grindstone.json index e057d380..17ca55f2 100644 --- a/src/main/resources/assets/anvilcraft_pigsplus/models/block/auto_royal_grindstone.json +++ b/src/main/resources/assets/anvilcraft_pigsplus/models/block/auto_royal_grindstone.json @@ -5,11 +5,11 @@ "render_type": "minecraft:cutout", "texture_size": [32, 32], "textures": { - "2": "anvilcraft_pigsplus:block/auto_royal_grindstone_base", + "2": "anvilcraft_pigsplus:block/auto_machine_base", "3": "anvilcraft_pigsplus:block/auto_royal_grindstone_stone", - "4": "anvilcraft_pigsplus:block/auto_royal_grindstone_glass", - "8": "anvilcraft_pigsplus:block/auto_royal_grindstone_frame", - "particle": "anvilcraft_pigsplus:block/auto_royal_grindstone_base" + "4": "anvilcraft_pigsplus:block/auto_machine_glass", + "8": "anvilcraft_pigsplus:block/auto_machine_frame", + "particle": "anvilcraft_pigsplus:block/auto_machine_base" }, "elements": [ { diff --git a/src/main/resources/assets/anvilcraft_pigsplus/models/block/auto_royal_grindstone_overload.json b/src/main/resources/assets/anvilcraft_pigsplus/models/block/auto_royal_grindstone_overload.json index 974c39be..737bbf82 100644 --- a/src/main/resources/assets/anvilcraft_pigsplus/models/block/auto_royal_grindstone_overload.json +++ b/src/main/resources/assets/anvilcraft_pigsplus/models/block/auto_royal_grindstone_overload.json @@ -5,11 +5,11 @@ "render_type": "minecraft:cutout", "texture_size": [32, 32], "textures": { - "2": "anvilcraft_pigsplus:block/auto_royal_grindstone_base_overload", + "2": "anvilcraft_pigsplus:block/auto_machine_base_overload", "3": "anvilcraft_pigsplus:block/auto_royal_grindstone_stone", - "4": "anvilcraft_pigsplus:block/auto_royal_grindstone_glass", - "8": "anvilcraft_pigsplus:block/auto_royal_grindstone_frame", - "particle": "anvilcraft_pigsplus:block/auto_royal_grindstone_base_overload" + "4": "anvilcraft_pigsplus:block/auto_machine_glass", + "8": "anvilcraft_pigsplus:block/auto_machine_frame", + "particle": "anvilcraft_pigsplus:block/auto_machine_base_overload" }, "elements": [ { diff --git a/src/main/resources/assets/anvilcraft_pigsplus/models/block/auto_royal_smithing_table.json b/src/main/resources/assets/anvilcraft_pigsplus/models/block/auto_royal_smithing_table.json index 45ce9451..18c52269 100644 --- a/src/main/resources/assets/anvilcraft_pigsplus/models/block/auto_royal_smithing_table.json +++ b/src/main/resources/assets/anvilcraft_pigsplus/models/block/auto_royal_smithing_table.json @@ -1,25 +1,202 @@ { - "credit": "Made by XeKr with Blockbench", + "format_version": "1.9.0", + "credit": "Made with Blockbench", "parent": "minecraft:block/cube", + "render_type": "minecraft:cutout", + "texture_size": [32, 32], "textures": { - "down": "anvilcraft:block/royal_smithing_table_bottom", - "particle": "anvilcraft:block/royal_smithing_table_front", - "south": "anvilcraft:block/royal_smithing_table_front", - "up": "anvilcraft_pigsplus:block/auto_royal_smithing_table_top", - "west": "anvilcraft:block/royal_smithing_table_side" + "2": "anvilcraft_pigsplus:block/auto_machine_base", + "3": "anvilcraft_pigsplus:block/auto_royal_smithing_table_core", + "4": "anvilcraft_pigsplus:block/auto_machine_glass", + "8": "anvilcraft_pigsplus:block/auto_machine_frame", + "particle": "anvilcraft_pigsplus:block/auto_machine_base" }, "elements": [ { - "from": [0, 0, 0], + "name": "base", + "from": [1, 1, 1], + "to": [15, 8, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [7, 0, 8]}, + "faces": { + "north": {"uv": [0, 10.5, 6, 14], "texture": "#2"}, + "east": {"uv": [0, 10.5, 6, 14], "texture": "#2"}, + "south": {"uv": [0, 10.5, 6, 14], "texture": "#2"}, + "west": {"uv": [0, 10.5, 6, 14], "texture": "#2"}, + "up": {"uv": [16, 7, 9, 0], "texture": "#2"}, + "down": {"uv": [7, 0, 0, 7], "texture": "#2"} + } + }, + { + "name": "glass", + "from": [0, 9, 0], "to": [16, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 9, 0]}, + "faces": { + "north": {"uv": [8, 0, 16, 3.5], "texture": "#4"}, + "east": {"uv": [8, 0, 16, 3.5], "texture": "#4"}, + "south": {"uv": [8, 0, 16, 3.5], "texture": "#4"}, + "west": {"uv": [8, 0, 16, 3.5], "texture": "#4"}, + "up": {"uv": [8, 8, 0, 0], "texture": "#4"}, + "down": {"uv": [8, 8, 0, 16], "texture": "#4"} + } + }, + { + "name": "glass", + "from": [0, 16, 0], + "to": [16, 9, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 16, 0]}, + "faces": { + "north": {"uv": [8, 0, 16, 3.5], "texture": "#4"}, + "east": {"uv": [8, 0, 16, 3.5], "texture": "#4"}, + "south": {"uv": [8, 0, 16, 3.5], "texture": "#4"}, + "west": {"uv": [8, 0, 16, 3.5], "texture": "#4"}, + "up": {"uv": [8, 16, 0, 8], "texture": "#4"}, + "down": {"uv": [8, 0, 0, 8], "texture": "#4"} + } + }, + { + "name": "output", + "from": [6, 16, 6], + "to": [10, 16, 10], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 16, 8]}, "faces": { - "north": {"uv": [0, 0, 16, 16], "texture": "#south", "cullface": "north"}, - "east": {"uv": [0, 0, 16, 16], "texture": "#west", "cullface": "east"}, - "south": {"uv": [0, 0, 16, 16], "texture": "#south", "cullface": "south"}, - "west": {"uv": [0, 0, 16, 16], "texture": "#west", "cullface": "west"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#up", "cullface": "up"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#down", "cullface": "down"} + "north": {"uv": [0, 1, 2, 1], "texture": "#4"}, + "east": {"uv": [0, 1, 2, 1], "texture": "#4"}, + "south": {"uv": [0, 1, 2, 1], "texture": "#4"}, + "west": {"uv": [0, 1, 2, 1], "texture": "#4"}, + "up": {"uv": [11, 5, 13, 7], "rotation": 90, "texture": "#4"}, + "down": {"uv": [11, 5, 13, 7], "rotation": 270, "texture": "#4"} + } + }, + { + "from": [13, 0, 0], + "to": [16, 9, 3], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [6, 0, 9, 9], "texture": "#8"}, + "east": {"uv": [0, 0, 3, 9], "texture": "#8"}, + "south": {"uv": [3, 0, 6, 9], "texture": "#8"}, + "west": {"uv": [3, 0, 6, 9], "texture": "#8"}, + "up": {"uv": [12, 3, 9, 0], "texture": "#8"}, + "down": {"uv": [12, 3, 9, 6], "texture": "#8"} + } + }, + { + "from": [13, 0, 13], + "to": [16, 9, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [3, 0, 6, 9], "texture": "#8"}, + "east": {"uv": [6, 0, 9, 9], "texture": "#8"}, + "south": {"uv": [0, 0, 3, 9], "texture": "#8"}, + "west": {"uv": [3, 0, 6, 9], "texture": "#8"}, + "up": {"uv": [12, 3, 9, 0], "rotation": 90, "texture": "#8"}, + "down": {"uv": [12, 3, 9, 6], "rotation": 270, "texture": "#8"} + } + }, + { + "from": [0, 0, 13], + "to": [3, 9, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [3, 0, 6, 9], "texture": "#8"}, + "east": {"uv": [3, 0, 6, 9], "texture": "#8"}, + "south": {"uv": [6, 0, 9, 9], "texture": "#8"}, + "west": {"uv": [0, 0, 3, 9], "texture": "#8"}, + "up": {"uv": [12, 3, 9, 0], "rotation": 180, "texture": "#8"}, + "down": {"uv": [12, 3, 9, 6], "rotation": 180, "texture": "#8"} + } + }, + { + "from": [0, 0, 0], + "to": [3, 9, 3], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 9], "texture": "#8"}, + "east": {"uv": [3, 0, 6, 9], "texture": "#8"}, + "south": {"uv": [3, 0, 6, 9], "texture": "#8"}, + "west": {"uv": [6, 0, 9, 9], "texture": "#8"}, + "up": {"uv": [12, 3, 9, 0], "rotation": 270, "texture": "#8"}, + "down": {"uv": [12, 3, 9, 6], "rotation": 90, "texture": "#8"} + } + }, + { + "from": [3, 6, 0], + "to": [13, 9, 3], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [0, 10, 10, 13], "texture": "#8"}, + "east": {"uv": [3, 0, 6, 3], "texture": "#8"}, + "south": {"uv": [0, 13, 10, 16], "texture": "#8"}, + "west": {"uv": [3, 0, 6, 3], "texture": "#8"}, + "up": {"uv": [0, 13, 10, 16], "texture": "#8"}, + "down": {"uv": [0, 10, 10, 13], "texture": "#8"} + } + }, + { + "from": [13, 6, 3], + "to": [16, 9, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [3, 0, 6, 3], "texture": "#8"}, + "east": {"uv": [0, 10, 10, 13], "texture": "#8"}, + "south": {"uv": [3, 0, 6, 3], "texture": "#8"}, + "west": {"uv": [0, 13, 10, 16], "texture": "#8"}, + "up": {"uv": [0, 13, 10, 16], "rotation": 90, "texture": "#8"}, + "down": {"uv": [0, 10, 10, 13], "rotation": 270, "texture": "#8"} + } + }, + { + "from": [3, 6, 13], + "to": [13, 9, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [0, 13, 10, 16], "texture": "#8"}, + "east": {"uv": [3, 0, 6, 3], "texture": "#8"}, + "south": {"uv": [0, 10, 10, 13], "texture": "#8"}, + "west": {"uv": [3, 0, 6, 3], "texture": "#8"}, + "up": {"uv": [0, 13, 10, 16], "rotation": 180, "texture": "#8"}, + "down": {"uv": [0, 10, 10, 13], "rotation": 180, "texture": "#8"} + } + }, + { + "from": [0, 6, 3], + "to": [3, 9, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [3, 0, 6, 3], "texture": "#8"}, + "east": {"uv": [0, 13, 10, 16], "texture": "#8"}, + "south": {"uv": [3, 0, 6, 3], "texture": "#8"}, + "west": {"uv": [0, 10, 10, 13], "texture": "#8"}, + "up": {"uv": [0, 13, 10, 16], "rotation": 270, "texture": "#8"}, + "down": {"uv": [0, 10, 10, 13], "rotation": 90, "texture": "#8"} + } + }, + { + "from": [5, 7, 5], + "to": [11, 13, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 7, 5]}, + "faces": { + "north": {"uv": [0, 0, 6, 6], "texture": "#3"}, + "east": {"uv": [0, 0, 6, 6], "texture": "#3"}, + "south": {"uv": [0, 0, 6, 6], "texture": "#3"}, + "west": {"uv": [0, 0, 6, 6], "texture": "#3"}, + "up": {"uv": [6, 0, 12, 6], "texture": "#3"}, + "down": {"uv": [6, 6, 12, 12], "texture": "#3"} } } + ], + "groups": [ + 0, + 1, + 2, + 3, + { + "name": "frame", + "origin": [8, 8, 8], + "color": 0, + "children": [4, 5, 6, 7, 8, 9, 10, 11] + }, + 12 ] } \ No newline at end of file diff --git a/src/main/resources/assets/anvilcraft_pigsplus/models/block/auto_royal_smithing_table_overload.json b/src/main/resources/assets/anvilcraft_pigsplus/models/block/auto_royal_smithing_table_overload.json new file mode 100644 index 00000000..78f49f91 --- /dev/null +++ b/src/main/resources/assets/anvilcraft_pigsplus/models/block/auto_royal_smithing_table_overload.json @@ -0,0 +1,202 @@ +{ + "format_version": "1.9.0", + "credit": "Made with Blockbench", + "parent": "minecraft:block/cube", + "render_type": "minecraft:cutout", + "texture_size": [32, 32], + "textures": { + "2": "anvilcraft_pigsplus:block/auto_machine_base_overload", + "3": "anvilcraft_pigsplus:block/auto_royal_smithing_table_core", + "4": "anvilcraft_pigsplus:block/auto_machine_glass", + "8": "anvilcraft_pigsplus:block/auto_machine_frame", + "particle": "anvilcraft_pigsplus:block/auto_machine_base_overload" + }, + "elements": [ + { + "name": "base", + "from": [1, 1, 1], + "to": [15, 8, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [7, 0, 8]}, + "faces": { + "north": {"uv": [0, 10.5, 6, 14], "texture": "#2"}, + "east": {"uv": [0, 10.5, 6, 14], "texture": "#2"}, + "south": {"uv": [0, 10.5, 6, 14], "texture": "#2"}, + "west": {"uv": [0, 10.5, 6, 14], "texture": "#2"}, + "up": {"uv": [16, 7, 9, 0], "texture": "#2"}, + "down": {"uv": [7, 0, 0, 7], "texture": "#2"} + } + }, + { + "name": "glass", + "from": [0, 9, 0], + "to": [16, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 9, 0]}, + "faces": { + "north": {"uv": [8, 0, 16, 3.5], "texture": "#4"}, + "east": {"uv": [8, 0, 16, 3.5], "texture": "#4"}, + "south": {"uv": [8, 0, 16, 3.5], "texture": "#4"}, + "west": {"uv": [8, 0, 16, 3.5], "texture": "#4"}, + "up": {"uv": [8, 8, 0, 0], "texture": "#4"}, + "down": {"uv": [8, 8, 0, 16], "texture": "#4"} + } + }, + { + "name": "glass", + "from": [0, 16, 0], + "to": [16, 9, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 16, 0]}, + "faces": { + "north": {"uv": [8, 0, 16, 3.5], "texture": "#4"}, + "east": {"uv": [8, 0, 16, 3.5], "texture": "#4"}, + "south": {"uv": [8, 0, 16, 3.5], "texture": "#4"}, + "west": {"uv": [8, 0, 16, 3.5], "texture": "#4"}, + "up": {"uv": [8, 16, 0, 8], "texture": "#4"}, + "down": {"uv": [8, 0, 0, 8], "texture": "#4"} + } + }, + { + "name": "output", + "from": [6, 16, 6], + "to": [10, 16, 10], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 16, 8]}, + "faces": { + "north": {"uv": [0, 1, 2, 1], "texture": "#4"}, + "east": {"uv": [0, 1, 2, 1], "texture": "#4"}, + "south": {"uv": [0, 1, 2, 1], "texture": "#4"}, + "west": {"uv": [0, 1, 2, 1], "texture": "#4"}, + "up": {"uv": [11, 5, 13, 7], "rotation": 90, "texture": "#4"}, + "down": {"uv": [11, 5, 13, 7], "rotation": 270, "texture": "#4"} + } + }, + { + "from": [13, 0, 0], + "to": [16, 9, 3], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [6, 0, 9, 9], "texture": "#8"}, + "east": {"uv": [0, 0, 3, 9], "texture": "#8"}, + "south": {"uv": [3, 0, 6, 9], "texture": "#8"}, + "west": {"uv": [3, 0, 6, 9], "texture": "#8"}, + "up": {"uv": [12, 3, 9, 0], "texture": "#8"}, + "down": {"uv": [12, 3, 9, 6], "texture": "#8"} + } + }, + { + "from": [13, 0, 13], + "to": [16, 9, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [3, 0, 6, 9], "texture": "#8"}, + "east": {"uv": [6, 0, 9, 9], "texture": "#8"}, + "south": {"uv": [0, 0, 3, 9], "texture": "#8"}, + "west": {"uv": [3, 0, 6, 9], "texture": "#8"}, + "up": {"uv": [12, 3, 9, 0], "rotation": 90, "texture": "#8"}, + "down": {"uv": [12, 3, 9, 6], "rotation": 270, "texture": "#8"} + } + }, + { + "from": [0, 0, 13], + "to": [3, 9, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [3, 0, 6, 9], "texture": "#8"}, + "east": {"uv": [3, 0, 6, 9], "texture": "#8"}, + "south": {"uv": [6, 0, 9, 9], "texture": "#8"}, + "west": {"uv": [0, 0, 3, 9], "texture": "#8"}, + "up": {"uv": [12, 3, 9, 0], "rotation": 180, "texture": "#8"}, + "down": {"uv": [12, 3, 9, 6], "rotation": 180, "texture": "#8"} + } + }, + { + "from": [0, 0, 0], + "to": [3, 9, 3], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 9], "texture": "#8"}, + "east": {"uv": [3, 0, 6, 9], "texture": "#8"}, + "south": {"uv": [3, 0, 6, 9], "texture": "#8"}, + "west": {"uv": [6, 0, 9, 9], "texture": "#8"}, + "up": {"uv": [12, 3, 9, 0], "rotation": 270, "texture": "#8"}, + "down": {"uv": [12, 3, 9, 6], "rotation": 90, "texture": "#8"} + } + }, + { + "from": [3, 6, 0], + "to": [13, 9, 3], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [0, 10, 10, 13], "texture": "#8"}, + "east": {"uv": [3, 0, 6, 3], "texture": "#8"}, + "south": {"uv": [0, 13, 10, 16], "texture": "#8"}, + "west": {"uv": [3, 0, 6, 3], "texture": "#8"}, + "up": {"uv": [0, 13, 10, 16], "texture": "#8"}, + "down": {"uv": [0, 10, 10, 13], "texture": "#8"} + } + }, + { + "from": [13, 6, 3], + "to": [16, 9, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [3, 0, 6, 3], "texture": "#8"}, + "east": {"uv": [0, 10, 10, 13], "texture": "#8"}, + "south": {"uv": [3, 0, 6, 3], "texture": "#8"}, + "west": {"uv": [0, 13, 10, 16], "texture": "#8"}, + "up": {"uv": [0, 13, 10, 16], "rotation": 90, "texture": "#8"}, + "down": {"uv": [0, 10, 10, 13], "rotation": 270, "texture": "#8"} + } + }, + { + "from": [3, 6, 13], + "to": [13, 9, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [0, 13, 10, 16], "texture": "#8"}, + "east": {"uv": [3, 0, 6, 3], "texture": "#8"}, + "south": {"uv": [0, 10, 10, 13], "texture": "#8"}, + "west": {"uv": [3, 0, 6, 3], "texture": "#8"}, + "up": {"uv": [0, 13, 10, 16], "rotation": 180, "texture": "#8"}, + "down": {"uv": [0, 10, 10, 13], "rotation": 180, "texture": "#8"} + } + }, + { + "from": [0, 6, 3], + "to": [3, 9, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [3, 0, 6, 3], "texture": "#8"}, + "east": {"uv": [0, 13, 10, 16], "texture": "#8"}, + "south": {"uv": [3, 0, 6, 3], "texture": "#8"}, + "west": {"uv": [0, 10, 10, 13], "texture": "#8"}, + "up": {"uv": [0, 13, 10, 16], "rotation": 270, "texture": "#8"}, + "down": {"uv": [0, 10, 10, 13], "rotation": 90, "texture": "#8"} + } + }, + { + "from": [5, 7, 5], + "to": [11, 13, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 7, 5]}, + "faces": { + "north": {"uv": [0, 0, 6, 6], "texture": "#3"}, + "east": {"uv": [0, 0, 6, 6], "texture": "#3"}, + "south": {"uv": [0, 0, 6, 6], "texture": "#3"}, + "west": {"uv": [0, 0, 6, 6], "texture": "#3"}, + "up": {"uv": [6, 0, 12, 6], "texture": "#3"}, + "down": {"uv": [6, 6, 12, 12], "texture": "#3"} + } + } + ], + "groups": [ + 0, + 1, + 2, + 3, + { + "name": "frame", + "origin": [8, 8, 8], + "color": 0, + "children": [4, 5, 6, 7, 8, 9, 10, 11] + }, + 12 + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/anvilcraft_pigsplus/textures/block/auto_jewel_crafting_table_base.png b/src/main/resources/assets/anvilcraft_pigsplus/textures/block/auto_jewel_crafting_table_base.png deleted file mode 100644 index fe1bf365c3117d2e93135f5181eceecf1a1635a0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1458 zcmV;j1x@;iP)Px#1am@3R0s$N2z&@+hyVZp32;bRa{vHbSpWcBSph3f{gD6w1xHClK~#90?U+rE z+(ZzDAG^Cfe`_<{~y|FW0=pESX*LDhP5TX{qic|9?{lXo<4o*Ul>4Z?F~-P zPN}L209#s)kB(cLT zs?tt0NF>O@Odd~g&S7oYu@hTah;VU2=ilAj01O)e`8eNkEX?1E$~z~&5+Sqs45if0 zi_1>#+gYtOCTs1LQlzOGHUehzna^|CdBNv-RrxegO5vOX@WQ!T7ycg5v2peGzH^S! zmQdWHlmZxD1166rJ_5opF4v_`jc{>NmHKOIEl-|II)4~e189}Lves9D@EX{u0{2Zv z1Z`>k?kS}x*JWqdl~UBM_6s8suwM0@-Y%p(3o8Sw)?uX{Km-)4g4458pxtS$wGa7l zw?z|Dm3q5;oHLzXbA0p&=;nTiF&X*Mkspf?YGa140@hle0zl^)x@i##B0#Y!d@gIF zJ39|u#jkADanP8I>GaxP584MnSNQ?o7syzig*`$(&V3o|JGT#s0$aBB526Z49v`ax zf(W61reV2Uw)(J9dQtvzH*yj8(Pv&Ct+jYc1uv zec64juPDBZVcRjv$x*~ENz$D#?hB*;Z(DJ5v$#W7{vFyF!_}Wx{?pnnz^8h!EXvXMci4YphZ?3@fm_%dw>=RjKp zl2rTaumcqJ2hf|ZMoHRES8CAc2SCfN9v?lzmTSstBX-sP37Iy8bNV6}A{C)u8DxQ) zdS}YLqoEu2GES0&ByD%7sT-Q6VR^g2)ioxVBl#{)hGox|rLXs4REW)DG5Q>s04aNdF&UMu{6T4-&CqBmb)n$N&Yw&s zXrp=acIxldbsM)*CSPA&u~^J^dVB!4ZhH!Xwd{Xi7@GZUnmjbR6T188*YW2sUN*4( z(DB1}-wdyG??H!6j?mO?D!h3+-MJ_9=Lpu8OePcZd`wZS?)Y`@9vwQ8CL7Uf8b;Y@ zM+8F~IJ^kLL(26-XxMgt!l8~Yq(4V6CSx|6VN5p2`Tj#m`i+nv6+sAh-uDX7`5w40 z=byiL+4MhpgdabK)(9OQY{J9PA^L}*k3adW`MaE-Otv3QL?ZxZv)O-p`#T`*-w4D1 z{OpADvy;8ggfPta<$QRr|Jmyyq{zX;PCDIasU7T M07*qoM6N<$f~VWZV*mgE diff --git a/src/main/resources/assets/anvilcraft_pigsplus/textures/block/auto_jewel_crafting_table_gems.png b/src/main/resources/assets/anvilcraft_pigsplus/textures/block/auto_jewel_crafting_table_gems.png new file mode 100644 index 0000000000000000000000000000000000000000..e6cc4dda4f8f4ddbaab8c0c18727b147f8422682 GIT binary patch literal 295 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`cRXDjLn`LH>0irrC_$pN->937 zm9^PGuq4s7xoo||8nM}-8>3kkYy4w57(GET+e|;9V;ZaIv1@F6A{QSe{PL9${?De( zHvdzh-M#O7o(F8$m|^TTfmeA-&n&AmKDIxYQpG{l zVe@>{(%!Lao%Hlz?)1{kS6=(MU2irnQ(iH(VJE{Hv+p-cxK5h-3y{Er3Aq&<1}68c5rsD!`RgimHGt zzt);m2{pT50bKX=t%+w!6=>UaU97eC?E_suBMk;LIY$7Fp)HWifJzJS3%i`AUjjl) zEFH><0Lhu4g}M`}`9RT%4Zbd_v*je@fY&rupnNG6L+R=RPKbI7q%;a>+j$8tsoD(G z^_-&a1EB=@Kq&6FUP}M}2i%dGokdG3A_fqM6Obf)AD}}1+XuM(#0R+G^7qmQo&W#< n|NlMl6yg8?00v1!K~w_(A(_H!e}XMm00000NkvXXu0mjfDeb0| diff --git a/src/main/resources/assets/anvilcraft_pigsplus/textures/block/auto_jewel_crafting_table_grindstone.png b/src/main/resources/assets/anvilcraft_pigsplus/textures/block/auto_jewel_crafting_table_grindstone.png deleted file mode 100644 index 9d61a333ee2e6c4da6987bc50d56e1477da69780..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 583 zcmV-N0=WH&P)Px#1am@3R0s$N2z&@+hyVZp32;bRa{vHbSpWcBSph3f{gD6w0o+MMK~z|U?N?n( z!!Q&*8!c%%q>drtPgS4QpDHqj6LCq{gFeW~Zqp`dM#YyM7_>L1H|OT#T()?5e)`r; zgH|g5z^c`d_&OK>z`-~eYXJZy{QHN;1rn%q)8O@O3*9tOs>bg91G;JaWX>G{0LEI} z-QECz=L3LJwHGD7k^H29Rx3X_leSv<3T5StNj_s^NR4>`e2^6wYkTh$MsRXt?SM-@ zS1yO;B-S5dxoS0(s(Z`3S$E*pNUT~tICR{G&ARJtp;GmLJBCWWFxkO4pU7A{*h}&_ zCi$gUG9iH8KFZ0$vDn$jjg6rSlOK#5+<;hR;qBl`$eWWDK;sCLhN7H1dXsVP=qHQa z1mI*!NdZg<^c_y_?N~LOlwA3Zv3Bw`tmJah!6+t-=LE@OBtI#DmRZsZO8F`LyAf5u zZ*u`o%YNNm0RZ+NpQG_oehNz-B-vp2nt1=4_ob&=cIsA#kqevrKskv=zPx#1am@3R0s$N2z&@+hyVZp32;bRa{vHbSpWcBSph3f{gD6w0jxh|XAaAhu{=`T&p?1`@dx6&G3_<>a}&4=Ep@v!2$dMAp=*xH=b7OuhAClpt=&0rH%jJiq6P zwMHccIu~ea#gCsaNfGa}0>W@Ct5y`W}ivorr^5wDy;5n1a`iRjI>*J9N5Q17u5Q4VZ{A-=ZXn92N@cpS8W!|;m94gt@o$+?*8%QB=f(ZU^BPp`1Qx0gL_lJ)Z9Kd#MInAHx%sW_RoNtn%fu5 Zjd#(G0cp#o>Y)Gt002ovPDHLkV1lzs@7(|Z diff --git a/src/main/resources/assets/anvilcraft_pigsplus/textures/block/auto_jewel_crafting_table_grindstone_wood_2.png b/src/main/resources/assets/anvilcraft_pigsplus/textures/block/auto_jewel_crafting_table_grindstone_wood_2.png deleted file mode 100644 index e342589f14fce8b857d2663c47ea9f3414c1e984..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 383 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}EX7WqAsj$Z z!;#Vf4nJ#6*HHqqg7Qi9ih^o-U3d5v^~h8TK7A5OAIEn{qOAo%2T1tJ}87 z?#BxssQjba*0vFz1=a6 z?eedhdyCZgjpEiNe0cmc%kRMRgNKeS{+hYv)Z6mgo@|@@#KdakSPnd5H0Ivd+bAJ* z=-B0B2ejoD^fs=OkC|mJ9T`yGxJP~F1+TlTo1!?ERIzWlaylzpZ2#K>u@fe>w_lI7 zzv1Vk`*qW;S(&0#ak$QZF3Q${x%ido{nn_;o2=!s46gBW9XdZvT7Pv9 zw*zbH+O$}O=IMVP-Fm+*_?P#umNfk$&qKbPI-WZ;8&x^YRX>!S@Zzi~`WU)8Y%S9d ZW{w5-QqGi}F#!e|gQu&X%Q~loCIE!RnPmU~ diff --git a/src/main/resources/assets/anvilcraft_pigsplus/textures/block/auto_jewel_crafting_table_item.png b/src/main/resources/assets/anvilcraft_pigsplus/textures/block/auto_jewel_crafting_table_item.png deleted file mode 100644 index 6a8c67c963f1bc3467ef77cbe1b2604d85620947..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 293 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|Sc;uILpXq- zh9ji|$mcBZh%9Dch=~MYMs2^p6M=%eJY5_^EP9h`s{{P+D`tbH?ZXOU=Ir*2QoNd)%1$Fg938i<1TnkU$6PM6SN=!_2 z6uxr+1Pa<38yn->`Inz9VE*8l)m{8>>)Zv5;qi6KPZ-$To-q9S`B*s2RX*;ms)Y37 d1d#w1hGsXr&!<#wI{|&c;OXk;vd$@?2>^XnY+wKY diff --git a/src/main/resources/assets/anvilcraft_pigsplus/textures/block/auto_jewel_crafting_table_pillar.png b/src/main/resources/assets/anvilcraft_pigsplus/textures/block/auto_jewel_crafting_table_pillar.png deleted file mode 100644 index 31c89b7503df5259cc7d9f6c924be68c556f2f25..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 601 zcmV-f0;c_mP)Px#1am@3R0s$N2z&@+hyVZp32;bRa{vHbSpWcBSph3f{gD6w0q#jeK~z|U?UgZa z6G0G#KcDXsuPyA$#gR-w2SQL#Akjs%{PA=M3WPxX2kT-P>~(UnOp(lL?$|ZEM0EF> z8IRUC`{vEe4nDlUJOFI$mWdf7{?*6N10JBy09d=jm{H3DH2XcpaLA{x-`s!yh74d< z&fG_|uOabzwZ@pyA6Ak#`+aO~0P>C9vaD;zTzm~3H>W4}NjtVGr%cS4=B`P*K)qVK zANJ#-MXaq=C)-4n!AP~FOn{h2`hp2HAI4{oB}wzxHxBCRRAonS1jwA zH?LkEVlR+Go4KzFS^_Dz*di}n*`)`H;V?Eo`Lm}BmqbrNcREA@xrAtM?an2gO`lNY zg*z96qf_AXyV~pS*VTxwKxhg=epOCgFIc-{epWixx{A>k&{Lon$mh6!# zUXX>}b72+I__1$*tAJ>!8LfY9yh-)0*IQ4YPemqLh8P{&^^cif*o_gp5c<_A-9(;tJ#24sQBp|k>^uJCtODx@`huO^~ze6(l za+q&s0WwT zLDW?r(^(C`GJs)5~5aAZ<-Q2cjs7e~EO(%gX6| zwh@>Kx5n%SY~h=2-4e4KFcZ+jyR-@K@&0yRiZ5>;-qXX~90(8X@O!P}=ht`MZ$Up! zxY_Rx!e`T~z3B&B?*jyw)cI=XqiI@jBgS!tth&`p`PD-BYDyUXjB%q{O#ydnw<4(3 zHW6Jn!6sJPZess`0G4qEoB?OR8E^)y8~6qQ0RR8Kd@-K@000I_L_t&o01Ehjj=-;C Qd;kCd07*qoM6N<$f~3l%tN;K2 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/anvilcraft_pigsplus/textures/block/auto_royal_grindstone_base.png b/src/main/resources/assets/anvilcraft_pigsplus/textures/block/auto_machine_base.png similarity index 100% rename from src/main/resources/assets/anvilcraft_pigsplus/textures/block/auto_royal_grindstone_base.png rename to src/main/resources/assets/anvilcraft_pigsplus/textures/block/auto_machine_base.png diff --git a/src/main/resources/assets/anvilcraft_pigsplus/textures/block/auto_royal_grindstone_base_overload.png b/src/main/resources/assets/anvilcraft_pigsplus/textures/block/auto_machine_base_overload.png similarity index 100% rename from src/main/resources/assets/anvilcraft_pigsplus/textures/block/auto_royal_grindstone_base_overload.png rename to src/main/resources/assets/anvilcraft_pigsplus/textures/block/auto_machine_base_overload.png diff --git a/src/main/resources/assets/anvilcraft_pigsplus/textures/block/auto_royal_grindstone_frame.png b/src/main/resources/assets/anvilcraft_pigsplus/textures/block/auto_machine_frame.png similarity index 100% rename from src/main/resources/assets/anvilcraft_pigsplus/textures/block/auto_royal_grindstone_frame.png rename to src/main/resources/assets/anvilcraft_pigsplus/textures/block/auto_machine_frame.png diff --git a/src/main/resources/assets/anvilcraft_pigsplus/textures/block/auto_royal_grindstone_glass.png b/src/main/resources/assets/anvilcraft_pigsplus/textures/block/auto_machine_glass.png similarity index 100% rename from src/main/resources/assets/anvilcraft_pigsplus/textures/block/auto_royal_grindstone_glass.png rename to src/main/resources/assets/anvilcraft_pigsplus/textures/block/auto_machine_glass.png diff --git a/src/main/resources/assets/anvilcraft_pigsplus/textures/block/auto_royal_smithing_table_core.png b/src/main/resources/assets/anvilcraft_pigsplus/textures/block/auto_royal_smithing_table_core.png new file mode 100644 index 0000000000000000000000000000000000000000..55faff7caa97219c2fdcffa382d60e628b445773 GIT binary patch literal 274 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`$30yfLn`LHnPA9u$U(rh{*X|2 zf`fLT_S+-3ygvBEIp)~3xpQn3Kd7w{v4W*3LQ_MNC(+b+S7PVwrDwIv(%a_luXoe= z`%~J!N#V)u>?;P6+Y4-L1!I%et*kMNjkq8%`>kmESINHDPh9h_JgnZon=y=wld)bj z$s%J>hcCOSdf_B-`S0Q$5;M)Sp0!8bd4Kgk>#kgJH9ktDRO1nB=uUNWl*1lmGwk$Rs`mGT1;~VrJ;?cVNv_ S(lP;xFnGH9xvX8U}f zi7AzZCsS>JrnYB>M3hAM`dB6B=jtVb)aX^@765fKFxc2v6eK2Rr1^l#~=$>Fbx5m+O@q>*W`v>l<2HTIw4Z z=^Gj80#)c1SLT%@R_NvxD?<%%Ni9w;$}A|!%+FH*8JL)qUs__TR9c#uVwIMdW}1|e zVyc^zXq=*JXqb|yo0wv3sGDMJoMLWjXknCQn4|=?z9cgZVSipRG#G#Zq7RbMH`Fr# zIT^&Z@-NCv1-b%crJbP-SRO^pMjzx5B!}5SM1Xz;vfv>D3MP2yrse^Iv>X_AI#XtF z1EXZNr;B5Vg@5nly?KuuL|W|yj+j|<%Fa9?#OpP$Y0{yotDiWA-Oih?b$$Z72cxJc ztE&G*QC}62cC|y_gmSpHeYmrmZI+L*-2MB-?{@Z1fBE>~+rYsVca9PA8>6aBU4$rbi3o?yYXRXMv^tFa*9iFMg*F9W9=H5=`k zMcp6%*SsRS?Y78|yIhk(Rv-SpF From 24ec1101c05a991a76005d2b03c71e86919e9a80 Mon Sep 17 00:00:00 2001 From: TBPig <147127248+TBPig@users.noreply.github.com> Date: Sat, 13 Dec 2025 21:50:34 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E6=96=B9?= =?UTF-8?q?=E4=BD=BF=E5=85=B6=E8=B4=B4=E5=90=88=E6=96=B0=E6=9D=90=E8=B4=A8?= =?UTF-8?q?=EF=BC=9B=E4=BF=AE=E6=94=B9=E8=B4=B4=E5=9B=BE=E9=98=B2=E6=AD=A2?= =?UTF-8?q?=E6=B8=B2=E6=9F=93=E9=87=8D=E5=8F=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../recipe/auto_jewel_crafting_table.json | 12 ++++++-- .../recipe/auto_royal_grindstone.json | 14 ++++++--- .../recipe/auto_royal_smithing_table.json | 14 ++++++--- .../anvilcraft/pigsplus/init/AddonBlocks.java | 28 +++++++++++------- .../block/auto_jewel_crafting_table.json | 6 ++-- .../auto_jewel_crafting_table_overload.json | 6 ++-- .../models/block/auto_royal_grindstone.json | 6 ++-- .../block/auto_royal_grindstone_overload.json | 6 ++-- .../block/auto_royal_smithing_table.json | 6 ++-- .../auto_royal_smithing_table_overload.json | 6 ++-- .../block/auto_royal_smithing_table_core.png | Bin 274 -> 273 bytes 11 files changed, 64 insertions(+), 40 deletions(-) diff --git a/src/generated/resources/data/anvilcraft_pigsplus/recipe/auto_jewel_crafting_table.json b/src/generated/resources/data/anvilcraft_pigsplus/recipe/auto_jewel_crafting_table.json index b9540114..f3350037 100644 --- a/src/generated/resources/data/anvilcraft_pigsplus/recipe/auto_jewel_crafting_table.json +++ b/src/generated/resources/data/anvilcraft_pigsplus/recipe/auto_jewel_crafting_table.json @@ -2,6 +2,12 @@ "type": "minecraft:crafting_shaped", "category": "building", "key": { + "G": { + "item": "minecraft:glass" + }, + "I": { + "item": "minecraft:iron_ingot" + }, "J": { "item": "anvilcraft:jewelcrafting_table" }, @@ -13,9 +19,9 @@ } }, "pattern": [ - " K ", - " J ", - " M " + "GKG", + "GJG", + "IMI" ], "result": { "count": 1, diff --git a/src/generated/resources/data/anvilcraft_pigsplus/recipe/auto_royal_grindstone.json b/src/generated/resources/data/anvilcraft_pigsplus/recipe/auto_royal_grindstone.json index acea8a1d..dfae023f 100644 --- a/src/generated/resources/data/anvilcraft_pigsplus/recipe/auto_royal_grindstone.json +++ b/src/generated/resources/data/anvilcraft_pigsplus/recipe/auto_royal_grindstone.json @@ -3,19 +3,25 @@ "category": "building", "key": { "G": { - "item": "anvilcraft:royal_grindstone" + "item": "minecraft:glass" + }, + "I": { + "item": "minecraft:iron_ingot" }, "K": { "item": "anvilcraft_pigsplus:karakuri_component" }, "M": { "item": "anvilcraft:magnetoelectric_core" + }, + "R": { + "item": "anvilcraft:royal_grindstone" } }, "pattern": [ - " K ", - " G ", - " M " + "GKG", + "GRG", + "IMI" ], "result": { "count": 1, diff --git a/src/generated/resources/data/anvilcraft_pigsplus/recipe/auto_royal_smithing_table.json b/src/generated/resources/data/anvilcraft_pigsplus/recipe/auto_royal_smithing_table.json index 80b21e59..87cc1fdb 100644 --- a/src/generated/resources/data/anvilcraft_pigsplus/recipe/auto_royal_smithing_table.json +++ b/src/generated/resources/data/anvilcraft_pigsplus/recipe/auto_royal_smithing_table.json @@ -2,20 +2,26 @@ "type": "minecraft:crafting_shaped", "category": "building", "key": { + "G": { + "item": "minecraft:glass" + }, + "I": { + "item": "minecraft:iron_ingot" + }, "K": { "item": "anvilcraft_pigsplus:karakuri_component" }, "M": { "item": "anvilcraft:magnetoelectric_core" }, - "S": { + "R": { "item": "anvilcraft:royal_smithing_table" } }, "pattern": [ - " K ", - " S ", - " M " + "GKG", + "GRG", + "IMI" ], "result": { "count": 1, diff --git a/src/main/java/dev/anvilcraft/pigsplus/init/AddonBlocks.java b/src/main/java/dev/anvilcraft/pigsplus/init/AddonBlocks.java index 9b91c611..e87bddd4 100644 --- a/src/main/java/dev/anvilcraft/pigsplus/init/AddonBlocks.java +++ b/src/main/java/dev/anvilcraft/pigsplus/init/AddonBlocks.java @@ -146,12 +146,14 @@ public class AddonBlocks { .simpleItem() .tag(BlockTags.MINEABLE_WITH_PICKAXE, BlockTags.NEEDS_IRON_TOOL) .recipe((ctx, provider) -> ShapedRecipeBuilder.shaped(RecipeCategory.BUILDING_BLOCKS, ctx.get()) - .pattern(" K ") - .pattern(" J ") - .pattern(" M ") + .pattern("GKG") + .pattern("GJG") + .pattern("IMI") .define('K', AddonItems.KARAKURI_COMPONENT) .define('J', ModBlocks.JEWEL_CRAFTING_TABLE) .define('M', ModBlocks.MAGNETO_ELECTRIC_CORE_BLOCK) + .define('G', Blocks.GLASS) + .define('I', Items.IRON_INGOT) .unlockedBy( AnvilCraftDatagen.hasItem(ModBlocks.JEWEL_CRAFTING_TABLE), AnvilCraftDatagen.has(ModBlocks.JEWEL_CRAFTING_TABLE) @@ -168,12 +170,14 @@ public class AddonBlocks { .simpleItem() .tag(BlockTags.MINEABLE_WITH_PICKAXE, BlockTags.NEEDS_IRON_TOOL) .recipe((ctx, provider) -> ShapedRecipeBuilder.shaped(RecipeCategory.BUILDING_BLOCKS, ctx.get()) - .pattern(" K ") - .pattern(" S ") - .pattern(" M ") + .pattern("GKG") + .pattern("GRG") + .pattern("IMI") .define('K', AddonItems.KARAKURI_COMPONENT) - .define('S', ModBlocks.ROYAL_SMITHING_TABLE) + .define('R', ModBlocks.ROYAL_SMITHING_TABLE) .define('M', ModBlocks.MAGNETO_ELECTRIC_CORE_BLOCK) + .define('G', Blocks.GLASS) + .define('I', Items.IRON_INGOT) .unlockedBy( AnvilCraftDatagen.hasItem(ModBlocks.ROYAL_SMITHING_TABLE), AnvilCraftDatagen.has(ModBlocks.ROYAL_SMITHING_TABLE) @@ -190,12 +194,14 @@ public class AddonBlocks { .simpleItem() .tag(BlockTags.MINEABLE_WITH_PICKAXE, BlockTags.NEEDS_IRON_TOOL) .recipe((ctx, provider) -> ShapedRecipeBuilder.shaped(RecipeCategory.BUILDING_BLOCKS, ctx.get()) - .pattern(" K ") - .pattern(" G ") - .pattern(" M ") + .pattern("GKG") + .pattern("GRG") + .pattern("IMI") .define('K', AddonItems.KARAKURI_COMPONENT) - .define('G', ModBlocks.ROYAL_GRINDSTONE) + .define('R', ModBlocks.ROYAL_GRINDSTONE) .define('M', ModBlocks.MAGNETO_ELECTRIC_CORE_BLOCK) + .define('G', Blocks.GLASS) + .define('I', Items.IRON_INGOT) .unlockedBy( AnvilCraftDatagen.hasItem(ModBlocks.ROYAL_GRINDSTONE), AnvilCraftDatagen.has(ModBlocks.ROYAL_GRINDSTONE) diff --git a/src/main/resources/assets/anvilcraft_pigsplus/models/block/auto_jewel_crafting_table.json b/src/main/resources/assets/anvilcraft_pigsplus/models/block/auto_jewel_crafting_table.json index 1a0ac11e..5aecc507 100644 --- a/src/main/resources/assets/anvilcraft_pigsplus/models/block/auto_jewel_crafting_table.json +++ b/src/main/resources/assets/anvilcraft_pigsplus/models/block/auto_jewel_crafting_table.json @@ -43,9 +43,9 @@ }, { "name": "glass", - "from": [0, 16, 0], - "to": [16, 9, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [0, 16, 0]}, + "from": [0.01, 15.995, 0.01], + "to": [15.99, 9.005, 15.99], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 12.5, 8]}, "faces": { "north": {"uv": [8, 0, 16, 3.5], "texture": "#4"}, "east": {"uv": [8, 0, 16, 3.5], "texture": "#4"}, diff --git a/src/main/resources/assets/anvilcraft_pigsplus/models/block/auto_jewel_crafting_table_overload.json b/src/main/resources/assets/anvilcraft_pigsplus/models/block/auto_jewel_crafting_table_overload.json index 85e0127a..5a532671 100644 --- a/src/main/resources/assets/anvilcraft_pigsplus/models/block/auto_jewel_crafting_table_overload.json +++ b/src/main/resources/assets/anvilcraft_pigsplus/models/block/auto_jewel_crafting_table_overload.json @@ -43,9 +43,9 @@ }, { "name": "glass", - "from": [0, 16, 0], - "to": [16, 9, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [0, 16, 0]}, + "from": [0.01, 15.995, 0.01], + "to": [15.99, 9.005, 15.99], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 12.5, 8]}, "faces": { "north": {"uv": [8, 0, 16, 3.5], "texture": "#4"}, "east": {"uv": [8, 0, 16, 3.5], "texture": "#4"}, diff --git a/src/main/resources/assets/anvilcraft_pigsplus/models/block/auto_royal_grindstone.json b/src/main/resources/assets/anvilcraft_pigsplus/models/block/auto_royal_grindstone.json index 17ca55f2..72099267 100644 --- a/src/main/resources/assets/anvilcraft_pigsplus/models/block/auto_royal_grindstone.json +++ b/src/main/resources/assets/anvilcraft_pigsplus/models/block/auto_royal_grindstone.json @@ -42,9 +42,9 @@ }, { "name": "glass", - "from": [0, 16, 0], - "to": [16, 9, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [0, 16, 0]}, + "from": [0.01, 15.995, 0.01], + "to": [15.99, 9.005, 15.99], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 12.5, 8]}, "faces": { "north": {"uv": [8, 0, 16, 3.5], "texture": "#4"}, "east": {"uv": [8, 0, 16, 3.5], "texture": "#4"}, diff --git a/src/main/resources/assets/anvilcraft_pigsplus/models/block/auto_royal_grindstone_overload.json b/src/main/resources/assets/anvilcraft_pigsplus/models/block/auto_royal_grindstone_overload.json index 737bbf82..79085647 100644 --- a/src/main/resources/assets/anvilcraft_pigsplus/models/block/auto_royal_grindstone_overload.json +++ b/src/main/resources/assets/anvilcraft_pigsplus/models/block/auto_royal_grindstone_overload.json @@ -42,9 +42,9 @@ }, { "name": "glass", - "from": [0, 16, 0], - "to": [16, 9, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [0, 16, 0]}, + "from": [0.01, 15.995, 0.01], + "to": [15.99, 9.005, 15.99], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 12.5, 8]}, "faces": { "north": {"uv": [8, 0, 16, 3.5], "texture": "#4"}, "east": {"uv": [8, 0, 16, 3.5], "texture": "#4"}, diff --git a/src/main/resources/assets/anvilcraft_pigsplus/models/block/auto_royal_smithing_table.json b/src/main/resources/assets/anvilcraft_pigsplus/models/block/auto_royal_smithing_table.json index 18c52269..96a00ebb 100644 --- a/src/main/resources/assets/anvilcraft_pigsplus/models/block/auto_royal_smithing_table.json +++ b/src/main/resources/assets/anvilcraft_pigsplus/models/block/auto_royal_smithing_table.json @@ -42,9 +42,9 @@ }, { "name": "glass", - "from": [0, 16, 0], - "to": [16, 9, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [0, 16, 0]}, + "from": [0.01, 15.995, 0.01], + "to": [15.99, 9.005, 15.99], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 12.5, 8]}, "faces": { "north": {"uv": [8, 0, 16, 3.5], "texture": "#4"}, "east": {"uv": [8, 0, 16, 3.5], "texture": "#4"}, diff --git a/src/main/resources/assets/anvilcraft_pigsplus/models/block/auto_royal_smithing_table_overload.json b/src/main/resources/assets/anvilcraft_pigsplus/models/block/auto_royal_smithing_table_overload.json index 78f49f91..5484ff23 100644 --- a/src/main/resources/assets/anvilcraft_pigsplus/models/block/auto_royal_smithing_table_overload.json +++ b/src/main/resources/assets/anvilcraft_pigsplus/models/block/auto_royal_smithing_table_overload.json @@ -42,9 +42,9 @@ }, { "name": "glass", - "from": [0, 16, 0], - "to": [16, 9, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [0, 16, 0]}, + "from": [0.01, 15.995, 0.01], + "to": [15.99, 9.005, 15.99], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 12.5, 8]}, "faces": { "north": {"uv": [8, 0, 16, 3.5], "texture": "#4"}, "east": {"uv": [8, 0, 16, 3.5], "texture": "#4"}, diff --git a/src/main/resources/assets/anvilcraft_pigsplus/textures/block/auto_royal_smithing_table_core.png b/src/main/resources/assets/anvilcraft_pigsplus/textures/block/auto_royal_smithing_table_core.png index 55faff7caa97219c2fdcffa382d60e628b445773..f133303806f138584980cfff59e96f5406af74ad 100644 GIT binary patch delta 245 zcmVVoa!0LOKd==GZ)Lo0!VKsZ057x*x-X`$jcif)y7zdb?5NWsPYFgthJ z)o+7V!^JNXCJSpz`X#|XIDuYBXPQB7EbVs+nVE4a13`V}{p)ieg08P(>jO1H7DJ#Q vr9o*xyZ`_I|Npa3c^4TMSsE)i(o)2Q7i4l+Dhe?~0*`5QliAmrO?)G!&ha6CN`U1F}O zd^TNJ&=8yL6^Hd1j_c$_Z`9#?zq Date: Sun, 14 Dec 2025 15:21:35 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8F=AF=E8=B0=83?= =?UTF-8?q?=E5=BC=8F=E8=83=BD=E9=87=8F=E8=BD=AC=E6=8D=A2=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anvilcraft_pigsplus/lang/en_ud.json | 1 + .../anvilcraft_pigsplus/lang/en_us.json | 1 + .../item/adjustable_power_converter.json | 3 + .../misc/adjustable_power_converter.json | 32 ++++ .../blocks/adjustable_power_converter.json | 21 +++ .../recipe/adjustable_power_converter.json | 24 +++ .../tags/block/mineable/pickaxe.json | 1 + .../block/AdjustablePowerConverterBlock.java | 91 +++++++++++ .../AdjustablePowerConverterBlockEntity.java | 148 ++++++++++++++++++ .../ElectricEnchantingTableBlockEntity.java | 5 +- .../event/CapabilitiesEventListener.java | 6 + .../pigsplus/init/AddonBlockEntities.java | 6 + .../anvilcraft/pigsplus/init/AddonBlocks.java | 23 ++- .../integration/jade/AddonJadePlugin.java | 2 - .../adjustable_power_converter.json | 7 + .../anvilcraft_pigsplus/lang/zh_cn.json | 1 + .../block/adjustable_power_converter.json | 49 ++++++ .../block/adjustable_power_converter_core.png | Bin 0 -> 155 bytes .../adjustable_power_converter_frame.png | Bin 0 -> 98 bytes 19 files changed, 416 insertions(+), 5 deletions(-) create mode 100644 src/generated/resources/assets/anvilcraft_pigsplus/models/item/adjustable_power_converter.json create mode 100644 src/generated/resources/data/anvilcraft_pigsplus/advancement/recipes/misc/adjustable_power_converter.json create mode 100644 src/generated/resources/data/anvilcraft_pigsplus/loot_table/blocks/adjustable_power_converter.json create mode 100644 src/generated/resources/data/anvilcraft_pigsplus/recipe/adjustable_power_converter.json create mode 100644 src/main/java/dev/anvilcraft/pigsplus/block/AdjustablePowerConverterBlock.java create mode 100644 src/main/java/dev/anvilcraft/pigsplus/block/entity/AdjustablePowerConverterBlockEntity.java create mode 100644 src/main/resources/assets/anvilcraft_pigsplus/blockstates/adjustable_power_converter.json create mode 100644 src/main/resources/assets/anvilcraft_pigsplus/models/block/adjustable_power_converter.json create mode 100644 src/main/resources/assets/anvilcraft_pigsplus/textures/block/adjustable_power_converter_core.png create mode 100644 src/main/resources/assets/anvilcraft_pigsplus/textures/block/adjustable_power_converter_frame.png diff --git a/src/generated/resources/assets/anvilcraft_pigsplus/lang/en_ud.json b/src/generated/resources/assets/anvilcraft_pigsplus/lang/en_ud.json index 3029ca2a..be4f9c42 100644 --- a/src/generated/resources/assets/anvilcraft_pigsplus/lang/en_ud.json +++ b/src/generated/resources/assets/anvilcraft_pigsplus/lang/en_ud.json @@ -32,6 +32,7 @@ "anvilcraft_pigsplus.configuration.section.anvilcraft_pigsplus.server.toml": "uoıʇɐɹnbıɟuoƆ ɹǝʌɹǝS snןdsbıԀ ʇɟɐɹɔןıʌuⱯ", "anvilcraft_pigsplus.configuration.section.anvilcraft_pigsplus.server.toml.title": "uoıʇɐɹnbıɟuoƆ ɹǝʌɹǝS snןdsbıԀ ʇɟɐɹɔןıʌuⱯ", "anvilcraft_pigsplus.configuration.title": "uoıʇɐɹnbıɟuoƆ snןdsbıԀ ʇɟɐɹɔןıʌuⱯ", + "block.anvilcraft_pigsplus.adjustable_power_converter": "ɹǝʇɹǝʌuoƆ ɹǝʍoԀ ǝןqɐʇsnظpⱯ", "block.anvilcraft_pigsplus.auto_jewel_crafting_table": "ǝןqɐ⟘ buıʇɟɐɹƆ ןǝʍǝſ oʇnⱯ", "block.anvilcraft_pigsplus.auto_royal_grindstone": "ǝuoʇspuıɹ⅁ ןɐʎoᴚ oʇnⱯ", "block.anvilcraft_pigsplus.auto_royal_smithing_table": "ǝןqɐ⟘ buıɥʇıɯS ןɐʎoᴚ oʇnⱯ", diff --git a/src/generated/resources/assets/anvilcraft_pigsplus/lang/en_us.json b/src/generated/resources/assets/anvilcraft_pigsplus/lang/en_us.json index 4847acb5..4dab7d63 100644 --- a/src/generated/resources/assets/anvilcraft_pigsplus/lang/en_us.json +++ b/src/generated/resources/assets/anvilcraft_pigsplus/lang/en_us.json @@ -32,6 +32,7 @@ "anvilcraft_pigsplus.configuration.section.anvilcraft_pigsplus.server.toml": "Anvilcraft Pigsplus Server Configuration", "anvilcraft_pigsplus.configuration.section.anvilcraft_pigsplus.server.toml.title": "Anvilcraft Pigsplus Server Configuration", "anvilcraft_pigsplus.configuration.title": "Anvilcraft Pigsplus Configuration", + "block.anvilcraft_pigsplus.adjustable_power_converter": "Adjustable Power Converter", "block.anvilcraft_pigsplus.auto_jewel_crafting_table": "Auto Jewel Crafting Table", "block.anvilcraft_pigsplus.auto_royal_grindstone": "Auto Royal Grindstone", "block.anvilcraft_pigsplus.auto_royal_smithing_table": "Auto Royal Smithing Table", diff --git a/src/generated/resources/assets/anvilcraft_pigsplus/models/item/adjustable_power_converter.json b/src/generated/resources/assets/anvilcraft_pigsplus/models/item/adjustable_power_converter.json new file mode 100644 index 00000000..e83ce398 --- /dev/null +++ b/src/generated/resources/assets/anvilcraft_pigsplus/models/item/adjustable_power_converter.json @@ -0,0 +1,3 @@ +{ + "parent": "anvilcraft_pigsplus:block/adjustable_power_converter" +} \ No newline at end of file diff --git a/src/generated/resources/data/anvilcraft_pigsplus/advancement/recipes/misc/adjustable_power_converter.json b/src/generated/resources/data/anvilcraft_pigsplus/advancement/recipes/misc/adjustable_power_converter.json new file mode 100644 index 00000000..668a3202 --- /dev/null +++ b/src/generated/resources/data/anvilcraft_pigsplus/advancement/recipes/misc/adjustable_power_converter.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_karakuri_component": { + "conditions": { + "items": [ + { + "items": "anvilcraft_pigsplus:karakuri_component" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "anvilcraft_pigsplus:adjustable_power_converter" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_karakuri_component" + ] + ], + "rewards": { + "recipes": [ + "anvilcraft_pigsplus:adjustable_power_converter" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/anvilcraft_pigsplus/loot_table/blocks/adjustable_power_converter.json b/src/generated/resources/data/anvilcraft_pigsplus/loot_table/blocks/adjustable_power_converter.json new file mode 100644 index 00000000..1559def7 --- /dev/null +++ b/src/generated/resources/data/anvilcraft_pigsplus/loot_table/blocks/adjustable_power_converter.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "anvilcraft_pigsplus:adjustable_power_converter" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "anvilcraft_pigsplus:blocks/adjustable_power_converter" +} \ No newline at end of file diff --git a/src/generated/resources/data/anvilcraft_pigsplus/recipe/adjustable_power_converter.json b/src/generated/resources/data/anvilcraft_pigsplus/recipe/adjustable_power_converter.json new file mode 100644 index 00000000..396082d9 --- /dev/null +++ b/src/generated/resources/data/anvilcraft_pigsplus/recipe/adjustable_power_converter.json @@ -0,0 +1,24 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "A": { + "item": "minecraft:copper_ingot" + }, + "B": { + "item": "anvilcraft:power_converter_big" + }, + "C": { + "item": "anvilcraft_pigsplus:karakuri_component" + } + }, + "pattern": [ + "ABA", + "BCB", + "ABA" + ], + "result": { + "count": 1, + "id": "anvilcraft_pigsplus:adjustable_power_converter" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json b/src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json index bffa9cda..c336b4bd 100644 --- a/src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json +++ b/src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json @@ -7,6 +7,7 @@ "anvilcraft_pigsplus:auto_jewel_crafting_table", "anvilcraft_pigsplus:auto_royal_smithing_table", "anvilcraft_pigsplus:auto_royal_grindstone", + "anvilcraft_pigsplus:adjustable_power_converter", "anvilcraft_pigsplus:chaotic_raw_ore_block", "anvilcraft_pigsplus:deepslate_chaotic_ore", "anvilcraft_pigsplus:enchanted_generator", diff --git a/src/main/java/dev/anvilcraft/pigsplus/block/AdjustablePowerConverterBlock.java b/src/main/java/dev/anvilcraft/pigsplus/block/AdjustablePowerConverterBlock.java new file mode 100644 index 00000000..77520e8e --- /dev/null +++ b/src/main/java/dev/anvilcraft/pigsplus/block/AdjustablePowerConverterBlock.java @@ -0,0 +1,91 @@ +package dev.anvilcraft.pigsplus.block; + +import com.mojang.serialization.MapCodec; +import dev.anvilcraft.pigsplus.block.entity.AdjustablePowerConverterBlockEntity; +import dev.anvilcraft.pigsplus.init.AddonBlockEntities; +import dev.dubhe.anvilcraft.api.hammer.IHammerRemovable; +import dev.dubhe.anvilcraft.api.power.IPowerComponent; +import dev.dubhe.anvilcraft.block.better.BetterBaseEntityBlock; +import dev.dubhe.anvilcraft.init.ModMenuTypes; +import dev.dubhe.anvilcraft.network.SliderInitPacket; +import net.minecraft.core.BlockPos; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.InteractionResult; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.BaseEntityBlock; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.RenderShape; +import net.minecraft.world.level.block.entity.BlockEntity; +import net.minecraft.world.level.block.entity.BlockEntityTicker; +import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.block.state.StateDefinition; +import net.minecraft.world.level.block.state.properties.BlockStateProperties; +import net.minecraft.world.level.block.state.properties.BooleanProperty; +import net.minecraft.world.phys.BlockHitResult; +import net.neoforged.neoforge.network.PacketDistributor; +import org.jetbrains.annotations.Nullable; + +public class AdjustablePowerConverterBlock extends BetterBaseEntityBlock implements IHammerRemovable { + public static final BooleanProperty POWERED = BlockStateProperties.POWERED; + public static final BooleanProperty OVERLOAD = IPowerComponent.OVERLOAD; + + public AdjustablePowerConverterBlock(Properties properties) { + super(properties); + this.registerDefaultState(this.stateDefinition.any() + .setValue(POWERED, false) + .setValue(OVERLOAD, true)); + } + + @Override + protected MapCodec codec() { + return simpleCodec(AdjustablePowerConverterBlock::new); + } + + @Override + @SuppressWarnings({"UnreachableCode"}) + public InteractionResult use( + BlockState state, + Level level, + BlockPos pos, + Player player, + InteractionHand hand, + BlockHitResult hit + ) { + if (level.isClientSide) { + return InteractionResult.SUCCESS; + } + if (level.getBlockEntity(pos) instanceof AdjustablePowerConverterBlockEntity entity + && player instanceof ServerPlayer serverPlayer) { + ModMenuTypes.open(serverPlayer, entity, pos); + PacketDistributor.sendToPlayer(serverPlayer, new SliderInitPacket(entity.getPowerTarget())); + } + return InteractionResult.SUCCESS; + } + @Nullable + @Override + public BlockEntityTicker getTicker(Level level, BlockState state, BlockEntityType type) { + if (level.isClientSide) { + return null; + } + return createTickerHelper(type, AddonBlockEntities.ADJUSTABLE_POWER_CONVERTER.get(), + (level1, blockPos, blockState, blockEntity) -> blockEntity.tick()); + } + + @Override + public BlockEntity newBlockEntity(BlockPos pos, BlockState state) { + return new AdjustablePowerConverterBlockEntity(AddonBlockEntities.ADJUSTABLE_POWER_CONVERTER.get(), pos, state); + } + + @Override + protected void createBlockStateDefinition(StateDefinition.Builder builder) { + builder.add(POWERED, OVERLOAD); + } + + @Override + public RenderShape getRenderShape(BlockState state) { + return RenderShape.MODEL; + } +} \ No newline at end of file diff --git a/src/main/java/dev/anvilcraft/pigsplus/block/entity/AdjustablePowerConverterBlockEntity.java b/src/main/java/dev/anvilcraft/pigsplus/block/entity/AdjustablePowerConverterBlockEntity.java new file mode 100644 index 00000000..d9f9355f --- /dev/null +++ b/src/main/java/dev/anvilcraft/pigsplus/block/entity/AdjustablePowerConverterBlockEntity.java @@ -0,0 +1,148 @@ +package dev.anvilcraft.pigsplus.block.entity; + +import dev.anvilcraft.pigsplus.init.AddonBlocks; +import dev.dubhe.anvilcraft.AnvilCraft; +import dev.dubhe.anvilcraft.api.power.IPowerConsumer; +import dev.dubhe.anvilcraft.api.power.IPowerProducer; +import dev.dubhe.anvilcraft.api.power.PowerComponentType; +import dev.dubhe.anvilcraft.api.power.PowerGrid; +import dev.dubhe.anvilcraft.inventory.SliderMenu; +import lombok.Getter; +import lombok.Setter; +import net.minecraft.core.BlockPos; +import net.minecraft.core.HolderLookup; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.network.chat.Component; +import net.minecraft.world.MenuProvider; +import net.minecraft.world.entity.player.Inventory; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.inventory.AbstractContainerMenu; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.entity.BlockEntity; +import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraft.world.level.block.state.BlockState; +import net.neoforged.neoforge.energy.EnergyStorage; +import org.jetbrains.annotations.Nullable; + +@Getter +public class AdjustablePowerConverterBlockEntity extends BlockEntity + implements IPowerConsumer, IPowerProducer, MenuProvider { + private PowerGrid grid = null; + private int power = 0; + @Setter + private int powerTarget = 16; + + public final EnergyStorage feEnergy = new EnergyStorage(128000000); + + public AdjustablePowerConverterBlockEntity(BlockEntityType type, BlockPos pos, BlockState blockState) { + super(type, pos, blockState); + } + + @Override + protected void saveAdditional(CompoundTag tag, HolderLookup.Provider registries) { + super.saveAdditional(tag, registries); + tag.putInt("feEnergy", feEnergy.getEnergyStored()); + tag.putInt("power", power); + tag.putInt("powerTarget", powerTarget); + } + + @Override + public void loadAdditional(CompoundTag tag, HolderLookup.Provider registries) { + super.loadAdditional(tag, registries); + feEnergy.receiveEnergy(tag.getInt("feEnergy"), false); + power = tag.getInt("power"); + powerTarget = tag.getInt("powerTarget"); + } + + @Override + public @Nullable Level getCurrentLevel() { + return getLevel(); + } + + @Override + public BlockPos getPos() { + return getBlockPos(); + } + + @Override + public void setGrid(@Nullable PowerGrid grid) { + this.grid = grid; + } + + @Override + public @Nullable PowerGrid getGrid() { + return this.grid; + } + + @Override + public int getOutputPower() { + return Math.max(this.power, 0); + } + + @Override + public int getInputPower() { + return this.power < 0 ? -this.power : 0; + } + + @Override + public PowerComponentType getComponentType() { + return this.power >= 0 ? PowerComponentType.PRODUCER : PowerComponentType.CONSUMER; + } + @Override + public int getRange() { + return 2; + } + + + public void tick() { + if (level == null || level.isClientSide()) return; + + int prevPower = power; + if (powerTarget >= 0) { + fe2kw(); + } else { + kw2fe(); + } + if (prevPower != power) { + grid.markChanged(); + } + } + + private void fe2kw() { + power = 0; + int feConverted = powerTarget * AnvilCraft.CONFIG.powerConverter.powerConverterEfficiency; + if (feEnergy.getEnergyStored() < feConverted) return; + + feEnergy.extractEnergy(feConverted, false); + power = powerTarget; + } + + private void kw2fe() { + power = powerTarget; + if (grid == null || !grid.isWorking()) return; + + // 如果存储满了，停止消耗电网能量 + if (feEnergy.getEnergyStored() == feEnergy.getMaxEnergyStored()) { + power = 0; + return; + } + + int feConverted = -power * AnvilCraft.CONFIG.powerConverter.powerConverterEfficiency; + feEnergy.receiveEnergy(feConverted, false); + } + + @Override + public Component getDisplayName() { + return AddonBlocks.ADJUSTABLE_POWER_CONVERTER.get().getName(); + } + + @Override + public @Nullable AbstractContainerMenu createMenu(int i, Inventory inventory, Player player) { + if (player.isSpectator()) return null; + return new SliderMenu(i, this::setPowerTarget); + } + + public EnergyStorage getEnergyStorage() { + return this.feEnergy; + } +} \ No newline at end of file diff --git a/src/main/java/dev/anvilcraft/pigsplus/block/entity/ElectricEnchantingTableBlockEntity.java b/src/main/java/dev/anvilcraft/pigsplus/block/entity/ElectricEnchantingTableBlockEntity.java index fd72fbab..579c6a4b 100644 --- a/src/main/java/dev/anvilcraft/pigsplus/block/entity/ElectricEnchantingTableBlockEntity.java +++ b/src/main/java/dev/anvilcraft/pigsplus/block/entity/ElectricEnchantingTableBlockEntity.java @@ -1,5 +1,6 @@ package dev.anvilcraft.pigsplus.block.entity; +import dev.anvilcraft.pigsplus.block.ElectricEnchantingTableBlock; import dev.anvilcraft.pigsplus.util.BlockUtil; import dev.anvilcraft.pigsplus.util.ChiseledBookShelfUtil; import dev.dubhe.anvilcraft.AnvilCraft; @@ -150,8 +151,8 @@ public void gridTick() { */ public void tick(Level level1, BlockPos blockPos) { this.flushState(level1, blockPos); - if (grid == null) return; - if (level1.getBlockState(blockPos).getValue(ChargerBlock.POWERED)) return; + if (grid == null || !grid.isWorking()) return; + if (level1.getBlockState(blockPos).getValue(ElectricEnchantingTableBlock.POWERED)) return; if (time == 0) moveItemToTransformingSlot(); if (time > 0 && isGridWorking()) time--; diff --git a/src/main/java/dev/anvilcraft/pigsplus/event/CapabilitiesEventListener.java b/src/main/java/dev/anvilcraft/pigsplus/event/CapabilitiesEventListener.java index 2e18af62..11d47c7a 100644 --- a/src/main/java/dev/anvilcraft/pigsplus/event/CapabilitiesEventListener.java +++ b/src/main/java/dev/anvilcraft/pigsplus/event/CapabilitiesEventListener.java @@ -24,5 +24,11 @@ public static void registerCapabilities(final RegisterCapabilitiesEvent event) { (be, side) -> be.getItemHandler() ) ); + + event.registerBlockEntity( + Capabilities.EnergyStorage.BLOCK, + AddonBlockEntities.ADJUSTABLE_POWER_CONVERTER.get(), + (be, side) -> be.getEnergyStorage() + ); } } diff --git a/src/main/java/dev/anvilcraft/pigsplus/init/AddonBlockEntities.java b/src/main/java/dev/anvilcraft/pigsplus/init/AddonBlockEntities.java index eda04691..83075851 100644 --- a/src/main/java/dev/anvilcraft/pigsplus/init/AddonBlockEntities.java +++ b/src/main/java/dev/anvilcraft/pigsplus/init/AddonBlockEntities.java @@ -7,6 +7,7 @@ import dev.anvilcraft.pigsplus.block.entity.CauldronOutputBlockEntity; import dev.anvilcraft.pigsplus.block.entity.ElectricEnchantingTableBlockEntity; import dev.anvilcraft.pigsplus.block.entity.EnchantedGeneratorBlockEntity; +import dev.anvilcraft.pigsplus.block.entity.AdjustablePowerConverterBlockEntity; import dev.anvilcraft.pigsplus.block.entity.SculkExtractorBlockEntity; import dev.anvilcraft.pigsplus.client.renderer.blockentity.EnchantedGeneratorRenderer; import dev.anvilcraft.pigsplus.client.renderer.blockentity.ElectricEnchantingTableRenderer; @@ -51,6 +52,11 @@ public class AddonBlockEntities { .validBlock(AddonBlocks.SCULK_EXTRACTOR) .register(); + public static final BlockEntityEntry ADJUSTABLE_POWER_CONVERTER = + REGISTRATE.blockEntity("adjustable_power_converter", AdjustablePowerConverterBlockEntity::new) + .validBlock(AddonBlocks.ADJUSTABLE_POWER_CONVERTER) + .register(); + public static void register() { } } \ No newline at end of file diff --git a/src/main/java/dev/anvilcraft/pigsplus/init/AddonBlocks.java b/src/main/java/dev/anvilcraft/pigsplus/init/AddonBlocks.java index e87bddd4..3b1d5f2b 100644 --- a/src/main/java/dev/anvilcraft/pigsplus/init/AddonBlocks.java +++ b/src/main/java/dev/anvilcraft/pigsplus/init/AddonBlocks.java @@ -1,6 +1,7 @@ package dev.anvilcraft.pigsplus.init; import com.tterrag.registrate.util.entry.BlockEntry; +import dev.anvilcraft.pigsplus.block.AdjustablePowerConverterBlock; import dev.anvilcraft.pigsplus.block.AutoJewelCraftingTableBlock; import dev.anvilcraft.pigsplus.block.AutoRoyalGrindstoneBlock; import dev.anvilcraft.pigsplus.block.AutoRoyalSmithingTableBlock; @@ -209,6 +210,25 @@ public class AddonBlocks { .save(provider)) .register(); + public static final BlockEntry ADJUSTABLE_POWER_CONVERTER = REGISTRATE + .block("adjustable_power_converter", AdjustablePowerConverterBlock::new) + .lang("Adjustable Power Converter") + .initialProperties(() -> Blocks.IRON_BLOCK) + .properties(p -> p.noOcclusion().isValidSpawn(Blocks::never)) + .blockstate(DataGenUtil::noExtraModelOrState) + .simpleItem() + .tag(BlockTags.MINEABLE_WITH_PICKAXE) + .recipe((ctx, provider) -> ShapedRecipeBuilder.shaped(RecipeCategory.MISC, ctx.get()) + .pattern("ABA") + .pattern("BCB") + .pattern("ABA") + .define('A', Items.COPPER_INGOT) + .define('B', ModBlocks.POWER_CONVERTER_BIG) + .define('C', AddonItems.KARAKURI_COMPONENT) + .unlockedBy(AnvilCraftDatagen.hasItem(AddonItems.KARAKURI_COMPONENT), AnvilCraftDatagen.has(AddonItems.KARAKURI_COMPONENT)) + .save(provider)) + .register(); + public static final BlockEntry CHAOTIC_RAW_ORE_BLOCK = REGISTRATE .block("chaotic_raw_ore_block", Block::new) .lang("Chaotic Raw Ore Block") @@ -320,7 +340,8 @@ public class AddonBlocks { .lang("Sculk Extractor") .initialProperties(() -> Blocks.SCULK) .properties(p -> p.mapColor(MapColor.COLOR_BLACK).strength(4.0F, 3.0F).sound(SoundType.SCULK_CATALYST).lightLevel((state) -> 9)) - .blockstate(DataGenUtil::noExtraModelOrState).simpleItem() + .blockstate(DataGenUtil::noExtraModelOrState) + .simpleItem() .tag(BlockTags.MINEABLE_WITH_HOE) .recipe((ctx, provider) -> ShapedRecipeBuilder.shaped(RecipeCategory.MISC, ctx.get()) .pattern(" S ") diff --git a/src/main/java/dev/anvilcraft/pigsplus/integration/jade/AddonJadePlugin.java b/src/main/java/dev/anvilcraft/pigsplus/integration/jade/AddonJadePlugin.java index 625f1322..c7d0868a 100644 --- a/src/main/java/dev/anvilcraft/pigsplus/integration/jade/AddonJadePlugin.java +++ b/src/main/java/dev/anvilcraft/pigsplus/integration/jade/AddonJadePlugin.java @@ -14,14 +14,12 @@ public class AddonJadePlugin implements IWailaPlugin { @Override public void register(IWailaCommonRegistration registration) { // registration.registerItemStorage(CrabTrapStorageProvider.INSTANCE, CrabTrapBlockEntity.class); -// registration.registerBlockDataProvider(HeatableBlockProvider.INSTANCE, Block.class); registration.registerBlockDataProvider(ElectricEnchantingTableProvider.INSTANCE, ElectricEnchantingTableBlockEntity.class); } @Override public void registerClient(IWailaClientRegistration registration) { // registration.registerItemStorageClient(CrabTrapStorageProvider.INSTANCE); -// registration.registerBlockComponent(HeatableBlockProvider.INSTANCE, Block.class); registration.registerBlockComponent(ElectricEnchantingTableProvider.INSTANCE, ElectricEnchantingTableBlock.class); } } diff --git a/src/main/resources/assets/anvilcraft_pigsplus/blockstates/adjustable_power_converter.json b/src/main/resources/assets/anvilcraft_pigsplus/blockstates/adjustable_power_converter.json new file mode 100644 index 00000000..59aa4e39 --- /dev/null +++ b/src/main/resources/assets/anvilcraft_pigsplus/blockstates/adjustable_power_converter.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "anvilcraft_pigsplus:block/adjustable_power_converter" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/anvilcraft_pigsplus/lang/zh_cn.json b/src/main/resources/assets/anvilcraft_pigsplus/lang/zh_cn.json index 5af4901b..8c236be3 100644 --- a/src/main/resources/assets/anvilcraft_pigsplus/lang/zh_cn.json +++ b/src/main/resources/assets/anvilcraft_pigsplus/lang/zh_cn.json @@ -32,6 +32,7 @@ "anvilcraft_pigsplus.configuration.section.anvilcraft_pigsplus.server.toml": "铁砧工艺：猪+ 服务端配置", "anvilcraft_pigsplus.configuration.section.anvilcraft_pigsplus.server.toml.title": "铁砧工艺：猪+ 服务端配置", "anvilcraft_pigsplus.configuration.title": "铁砧工艺：猪+ 配置", + "block.anvilcraft_pigsplus.adjustable_power_converter": "可调式能量转换器", "block.anvilcraft_pigsplus.auto_jewel_crafting_table": "自动珠宝加工台", "block.anvilcraft_pigsplus.auto_royal_grindstone": "自动皇家砂轮", "block.anvilcraft_pigsplus.auto_royal_smithing_table": "自动皇家锻造台", diff --git a/src/main/resources/assets/anvilcraft_pigsplus/models/block/adjustable_power_converter.json b/src/main/resources/assets/anvilcraft_pigsplus/models/block/adjustable_power_converter.json new file mode 100644 index 00000000..12eaec35 --- /dev/null +++ b/src/main/resources/assets/anvilcraft_pigsplus/models/block/adjustable_power_converter.json @@ -0,0 +1,49 @@ +{ + "credit": "Made with Blockbench", + "parent": "minecraft:block/cube", + "render_type": "minecraft:cutout", + "textures": { + "0": "anvilcraft_pigsplus:block/adjustable_power_converter_frame", + "1": "anvilcraft_pigsplus:block/adjustable_power_converter_core", + "particle": "anvilcraft_pigsplus:block/adjustable_power_converter_frame" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#0"} + } + }, + { + "from": [0.01, 15.99, 0.01], + "to": [15.99, 0.01, 15.99], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [0, 0, 15.98, 16], "texture": "#0"}, + "east": {"uv": [0, 0, 15.98, 16], "texture": "#0"}, + "south": {"uv": [0, 0, 15.98, 16], "texture": "#0"}, + "west": {"uv": [0, 0, 15.98, 16], "texture": "#0"}, + "up": {"uv": [0, 0, 15.98, 15.98], "texture": "#0"}, + "down": {"uv": [0, 0, 15.98, 15.98], "texture": "#0"} + } + }, + { + "from": [4, 4, 4], + "to": [12, 12, 12], + "faces": { + "north": {"uv": [0, 0, 8, 8], "texture": "#1"}, + "east": {"uv": [0, 0, 8, 8], "texture": "#1"}, + "south": {"uv": [0, 0, 8, 8], "texture": "#1"}, + "west": {"uv": [0, 0, 8, 8], "texture": "#1"}, + "up": {"uv": [0, 0, 8, 8], "texture": "#1"}, + "down": {"uv": [0, 0, 8, 8], "texture": "#1"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/anvilcraft_pigsplus/textures/block/adjustable_power_converter_core.png b/src/main/resources/assets/anvilcraft_pigsplus/textures/block/adjustable_power_converter_core.png new file mode 100644 index 0000000000000000000000000000000000000000..ecaf5f6ce5cbf8b293727e1f1948a49e94cb1f99 GIT binary patch literal 155 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`NuDl_Ar`&KCiA{Nw`Z0sFzam< zoNvR;3_|F`MkPg+dGeu;9=bPGNlF00j0u*H=G03ZvHUNvTzEF) z69%!AbEn_y?6@Lm)(~NzY}zp6f*k8&26+aCYp(?UfBht`0JM$4)78&qol`;+04T~d A%>V!Z literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/anvilcraft_pigsplus/textures/block/adjustable_power_converter_frame.png b/src/main/resources/assets/anvilcraft_pigsplus/textures/block/adjustable_power_converter_frame.png new file mode 100644 index 0000000000000000000000000000000000000000..99dbc81b9e43961a3fa3413474316527174fe4b9 GIT binary patch literal 98 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`nw~C>Ar`&Ke_{@PnBOSm(8)Mo vTjHN_V2U*}^WhbYi`jal7#Mq|q@^>YmUAAR&+z&NP!ofvtDnm{r-UW|k$)Se literal 0 HcmV?d00001