From 3d7123bae6fbfa8f5f62c52d223e6ba5ed04f9ca Mon Sep 17 00:00:00 2001 From: thepigcat Date: Wed, 8 Jan 2025 18:10:11 +0100 Subject: [PATCH] fix merge error --- .../carbort/blockstates/bean_block.json | 13 ++ .../blockstates/bean_crystal_block.json | 7 + .../blockstates/reinforced_pedestal.json | 7 + .../carbort/models/block/bean_block.json | 6 + .../carbort/models/item/bean_block.json | 3 + .../carbort/models/item/bean_crystal.json | 6 + .../models/item/bean_crystal_block.json | 3 + .../models/item/reinforced_pedestal.json | 3 + .../advancement/recipes/tools/bean_wand.json | 32 ++++ .../carbort/loot_table/blocks/bean_block.json | 21 ++ .../data/carbort/recipe/bean_wand.json | 24 +++ .../carbort/tags/item/show_bean_meter.json | 5 + .../recipes/building_blocks/bean_block.json | 32 ++++ .../advancement/recipes/misc/bean.json | 32 ++++ .../resources/data/minecraft/recipe/bean.json | 13 ++ .../data/minecraft/recipe/bean_block.json | 18 ++ .../carbort/registries/CBBlocks.java | 3 + .../carbort/models/block/bean_block_1.json | 82 ++++++++ .../carbort/models/block/bean_block_2.json | 82 ++++++++ .../models/block/bean_crystal_block.json | 32 ++++ .../models/block/reinforced_pedestal.json | 179 ++++++++++++++++++ .../assets/carbort/models/entity/bean.bbmodel | 1 + .../carbort/textures/block/bean_block.png | Bin 0 -> 406 bytes .../carbort/textures/block/pedestal.png | Bin 0 -> 321 bytes .../textures/block/reinforced_bean_block.png | Bin 0 -> 380 bytes .../block/reinforced_bean_block_top.png | Bin 0 -> 249 bytes .../textures/block/reinforced_block.png | Bin 0 -> 373 bytes .../assets/carbort/textures/entity/bean.png | Bin 0 -> 304 bytes .../textures/gui/sprites/bean_score.png | Bin 0 -> 249 bytes .../gui/sprites/bean_score_liquid.png | Bin 0 -> 1679 bytes .../gui/sprites/bean_score_liquid.png.mcmeta | 24 +++ 31 files changed, 628 insertions(+) create mode 100644 src/generated/resources/assets/carbort/blockstates/bean_block.json create mode 100644 src/generated/resources/assets/carbort/blockstates/bean_crystal_block.json create mode 100644 src/generated/resources/assets/carbort/blockstates/reinforced_pedestal.json create mode 100644 src/generated/resources/assets/carbort/models/block/bean_block.json create mode 100644 src/generated/resources/assets/carbort/models/item/bean_block.json create mode 100644 src/generated/resources/assets/carbort/models/item/bean_crystal.json create mode 100644 src/generated/resources/assets/carbort/models/item/bean_crystal_block.json create mode 100644 src/generated/resources/assets/carbort/models/item/reinforced_pedestal.json create mode 100644 src/generated/resources/data/carbort/advancement/recipes/tools/bean_wand.json create mode 100644 src/generated/resources/data/carbort/loot_table/blocks/bean_block.json create mode 100644 src/generated/resources/data/carbort/recipe/bean_wand.json create mode 100644 src/generated/resources/data/carbort/tags/item/show_bean_meter.json create mode 100644 src/generated/resources/data/minecraft/advancement/recipes/building_blocks/bean_block.json create mode 100644 src/generated/resources/data/minecraft/advancement/recipes/misc/bean.json create mode 100644 src/generated/resources/data/minecraft/recipe/bean.json create mode 100644 src/generated/resources/data/minecraft/recipe/bean_block.json create mode 100644 src/main/resources/assets/carbort/models/block/bean_block_1.json create mode 100644 src/main/resources/assets/carbort/models/block/bean_block_2.json create mode 100644 src/main/resources/assets/carbort/models/block/bean_crystal_block.json create mode 100644 src/main/resources/assets/carbort/models/block/reinforced_pedestal.json create mode 100644 src/main/resources/assets/carbort/models/entity/bean.bbmodel create mode 100644 src/main/resources/assets/carbort/textures/block/bean_block.png create mode 100644 src/main/resources/assets/carbort/textures/block/pedestal.png create mode 100644 src/main/resources/assets/carbort/textures/block/reinforced_bean_block.png create mode 100644 src/main/resources/assets/carbort/textures/block/reinforced_bean_block_top.png create mode 100644 src/main/resources/assets/carbort/textures/block/reinforced_block.png create mode 100644 src/main/resources/assets/carbort/textures/entity/bean.png create mode 100644 src/main/resources/assets/carbort/textures/gui/sprites/bean_score.png create mode 100644 src/main/resources/assets/carbort/textures/gui/sprites/bean_score_liquid.png create mode 100644 src/main/resources/assets/carbort/textures/gui/sprites/bean_score_liquid.png.mcmeta diff --git a/src/generated/resources/assets/carbort/blockstates/bean_block.json b/src/generated/resources/assets/carbort/blockstates/bean_block.json new file mode 100644 index 0000000..843bc47 --- /dev/null +++ b/src/generated/resources/assets/carbort/blockstates/bean_block.json @@ -0,0 +1,13 @@ +{ + "variants": { + "stage=0": { + "model": "carbort:block/bean_block" + }, + "stage=1": { + "model": "carbort:block/bean_block_1" + }, + "stage=2": { + "model": "carbort:block/bean_block_2" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/carbort/blockstates/bean_crystal_block.json b/src/generated/resources/assets/carbort/blockstates/bean_crystal_block.json new file mode 100644 index 0000000..99eec52 --- /dev/null +++ b/src/generated/resources/assets/carbort/blockstates/bean_crystal_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "carbort:block/bean_crystal_block" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/carbort/blockstates/reinforced_pedestal.json b/src/generated/resources/assets/carbort/blockstates/reinforced_pedestal.json new file mode 100644 index 0000000..b3ec179 --- /dev/null +++ b/src/generated/resources/assets/carbort/blockstates/reinforced_pedestal.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "carbort:block/reinforced_pedestal" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/carbort/models/block/bean_block.json b/src/generated/resources/assets/carbort/models/block/bean_block.json new file mode 100644 index 0000000..bf017e5 --- /dev/null +++ b/src/generated/resources/assets/carbort/models/block/bean_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "carbort:block/bean_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/carbort/models/item/bean_block.json b/src/generated/resources/assets/carbort/models/item/bean_block.json new file mode 100644 index 0000000..d695965 --- /dev/null +++ b/src/generated/resources/assets/carbort/models/item/bean_block.json @@ -0,0 +1,3 @@ +{ + "parent": "carbort:block/bean_block" +} \ No newline at end of file diff --git a/src/generated/resources/assets/carbort/models/item/bean_crystal.json b/src/generated/resources/assets/carbort/models/item/bean_crystal.json new file mode 100644 index 0000000..bc7263b --- /dev/null +++ b/src/generated/resources/assets/carbort/models/item/bean_crystal.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "carbort:item/bean_crystal" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/carbort/models/item/bean_crystal_block.json b/src/generated/resources/assets/carbort/models/item/bean_crystal_block.json new file mode 100644 index 0000000..673d527 --- /dev/null +++ b/src/generated/resources/assets/carbort/models/item/bean_crystal_block.json @@ -0,0 +1,3 @@ +{ + "parent": "carbort:block/bean_crystal_block" +} \ No newline at end of file diff --git a/src/generated/resources/assets/carbort/models/item/reinforced_pedestal.json b/src/generated/resources/assets/carbort/models/item/reinforced_pedestal.json new file mode 100644 index 0000000..720b961 --- /dev/null +++ b/src/generated/resources/assets/carbort/models/item/reinforced_pedestal.json @@ -0,0 +1,3 @@ +{ + "parent": "carbort:block/reinforced_pedestal" +} \ No newline at end of file diff --git a/src/generated/resources/data/carbort/advancement/recipes/tools/bean_wand.json b/src/generated/resources/data/carbort/advancement/recipes/tools/bean_wand.json new file mode 100644 index 0000000..c23b66e --- /dev/null +++ b/src/generated/resources/data/carbort/advancement/recipes/tools/bean_wand.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_item": { + "conditions": { + "items": [ + { + "items": "carbort:bean" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "carbort:bean_wand" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_item" + ] + ], + "rewards": { + "recipes": [ + "carbort:bean_wand" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/carbort/loot_table/blocks/bean_block.json b/src/generated/resources/data/carbort/loot_table/blocks/bean_block.json new file mode 100644 index 0000000..9441461 --- /dev/null +++ b/src/generated/resources/data/carbort/loot_table/blocks/bean_block.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "carbort:bean_block" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "carbort:blocks/bean_block" +} \ No newline at end of file diff --git a/src/generated/resources/data/carbort/recipe/bean_wand.json b/src/generated/resources/data/carbort/recipe/bean_wand.json new file mode 100644 index 0000000..c2dde40 --- /dev/null +++ b/src/generated/resources/data/carbort/recipe/bean_wand.json @@ -0,0 +1,24 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "key": { + "B": { + "item": "carbort:bean_crystal" + }, + "L": { + "tag": "c:leathers" + }, + "S": { + "tag": "c:rods/wooden" + } + }, + "pattern": [ + " B", + "LS ", + "SL " + ], + "result": { + "count": 1, + "id": "carbort:bean_wand" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/carbort/tags/item/show_bean_meter.json b/src/generated/resources/data/carbort/tags/item/show_bean_meter.json new file mode 100644 index 0000000..bb19ecc --- /dev/null +++ b/src/generated/resources/data/carbort/tags/item/show_bean_meter.json @@ -0,0 +1,5 @@ +{ + "values": [ + "carbort:bean_wand" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/advancement/recipes/building_blocks/bean_block.json b/src/generated/resources/data/minecraft/advancement/recipes/building_blocks/bean_block.json new file mode 100644 index 0000000..136941d --- /dev/null +++ b/src/generated/resources/data/minecraft/advancement/recipes/building_blocks/bean_block.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_bean": { + "conditions": { + "items": [ + { + "items": "carbort:bean" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:bean_block" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_bean" + ] + ], + "rewards": { + "recipes": [ + "minecraft:bean_block" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/advancement/recipes/misc/bean.json b/src/generated/resources/data/minecraft/advancement/recipes/misc/bean.json new file mode 100644 index 0000000..d6796e8 --- /dev/null +++ b/src/generated/resources/data/minecraft/advancement/recipes/misc/bean.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_bean_block": { + "conditions": { + "items": [ + { + "items": "carbort:bean_block" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:bean" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_bean_block" + ] + ], + "rewards": { + "recipes": [ + "minecraft:bean" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/recipe/bean.json b/src/generated/resources/data/minecraft/recipe/bean.json new file mode 100644 index 0000000..333e769 --- /dev/null +++ b/src/generated/resources/data/minecraft/recipe/bean.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "carbort:bean_block" + } + ], + "result": { + "count": 9, + "id": "carbort:bean" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/recipe/bean_block.json b/src/generated/resources/data/minecraft/recipe/bean_block.json new file mode 100644 index 0000000..f124446 --- /dev/null +++ b/src/generated/resources/data/minecraft/recipe/bean_block.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "#": { + "item": "carbort:bean" + } + }, + "pattern": [ + "###", + "###", + "###" + ], + "result": { + "count": 1, + "id": "carbort:bean_block" + } +} \ No newline at end of file diff --git a/src/main/java/com/leclowndu93150/carbort/registries/CBBlocks.java b/src/main/java/com/leclowndu93150/carbort/registries/CBBlocks.java index 0e011c1..d953b87 100644 --- a/src/main/java/com/leclowndu93150/carbort/registries/CBBlocks.java +++ b/src/main/java/com/leclowndu93150/carbort/registries/CBBlocks.java @@ -2,6 +2,7 @@ import com.leclowndu93150.carbort.Carbort; import com.leclowndu93150.carbort.content.blocks.*; +import com.leclowndu93150.carbort.content.items.AngelBlockItem; import net.minecraft.world.item.BlockItem; import net.minecraft.world.item.Item; import net.minecraft.world.level.block.Block; @@ -37,6 +38,8 @@ public final class CBBlocks { BeanCrystalBlock::new, BlockBehaviour.Properties.of()); public static final DeferredBlock REINFORCED_PEDESTAL = registerBlockAndItem("reinforced_pedestal", ReinforcedPedestalBlock::new, BlockBehaviour.Properties.of()); + public static final DeferredBlock ANGEL_BLOCK = BLOCKS.registerBlock("angel_block", AngelBlock::new, BlockBehaviour.Properties.ofFullCopy(Blocks.IRON_BLOCK)); + public static final DeferredItem ANGEL_BLOCK_ITEM = CBItems.ITEMS.registerItem("angel_block", AngelBlockItem::new); public static final DeferredBlock BEANS = BLOCKS.register("beans", () -> new BeanCropBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.CARROTS))); public static final DeferredBlock BEDROCK_ORE = registerBlockAndItem("bedrock_ore", diff --git a/src/main/resources/assets/carbort/models/block/bean_block_1.json b/src/main/resources/assets/carbort/models/block/bean_block_1.json new file mode 100644 index 0000000..ff7e34e --- /dev/null +++ b/src/main/resources/assets/carbort/models/block/bean_block_1.json @@ -0,0 +1,82 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "carbort:block/bean_block", + "particle": "carbort:block/bean_block" + }, + "elements": [ + { + "from": [3, 0, 3], + "to": [13, 14, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [3, 0, 3]}, + "faces": { + "north": {"uv": [0, 0, 10, 14], "texture": "#0"}, + "east": {"uv": [0, 0, 10, 14], "texture": "#0"}, + "south": {"uv": [0, 0, 10, 14], "texture": "#0"}, + "west": {"uv": [0, 0, 10, 14], "texture": "#0"}, + "up": {"uv": [4, 4, 14, 14], "texture": "#0"}, + "down": {"uv": [0, 0, 10, 10], "texture": "#0"} + } + }, + { + "from": [1, 0, 5], + "to": [3, 4, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [1, 0, 5]}, + "faces": { + "north": {"uv": [5, 2, 7, 6], "texture": "#0"}, + "east": {"uv": [0, 0, 10, 4], "texture": "#0"}, + "south": {"uv": [3, 9, 5, 13], "texture": "#0"}, + "west": {"uv": [2, 0, 12, 4], "texture": "#0"}, + "up": {"uv": [7, 6, 9, 16], "texture": "#0"}, + "down": {"uv": [0, 0, 2, 10], "texture": "#0"} + } + }, + { + "from": [3, 0, 13], + "to": [11, 4, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [1, 0, 5]}, + "faces": { + "north": {"uv": [0, 0, 8, 4], "texture": "#0"}, + "east": {"uv": [13, 5, 15, 9], "texture": "#0"}, + "south": {"uv": [5, 0, 13, 4], "texture": "#0"}, + "west": {"uv": [0, 0, 2, 4], "texture": "#0"}, + "up": {"uv": [8, 5, 16, 7], "texture": "#0"}, + "down": {"uv": [0, 3, 8, 5], "texture": "#0"} + } + }, + { + "from": [5, 0, 1], + "to": [11, 2, 3], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 0, -7]}, + "faces": { + "north": {"uv": [0, 0, 6, 2], "texture": "#0"}, + "east": {"uv": [0, 0, 2, 2], "texture": "#0"}, + "south": {"uv": [0, 0, 6, 2], "texture": "#0"}, + "west": {"uv": [0, 0, 2, 2], "texture": "#0"}, + "up": {"uv": [0, 0, 6, 2], "texture": "#0"}, + "down": {"uv": [0, 0, 6, 2], "texture": "#0"} + } + }, + { + "from": [13, 0, 4], + "to": [15, 7, 10], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 0, 2]}, + "faces": { + "north": {"uv": [0, 0, 2, 7], "texture": "#0"}, + "east": {"uv": [3, 0, 9, 7], "texture": "#0"}, + "south": {"uv": [2, 0, 4, 7], "texture": "#0"}, + "west": {"uv": [0, 0, 6, 7], "texture": "#0"}, + "up": {"uv": [0, 0, 2, 6], "texture": "#0"}, + "down": {"uv": [0, 0, 2, 6], "texture": "#0"} + } + } + ], + "groups": [ + { + "name": "VoxelShapes", + "origin": [8, 8, 8], + "color": 0, + "children": [0, 1, 2, 3, 4] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/carbort/models/block/bean_block_2.json b/src/main/resources/assets/carbort/models/block/bean_block_2.json new file mode 100644 index 0000000..cbd75d0 --- /dev/null +++ b/src/main/resources/assets/carbort/models/block/bean_block_2.json @@ -0,0 +1,82 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "carbort:block/bean_block", + "particle": "carbort:block/bean_block" + }, + "elements": [ + { + "from": [5, 0, 5], + "to": [11, 12, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [3, 0, 3]}, + "faces": { + "north": {"uv": [0, 1, 6, 13], "texture": "#0"}, + "east": {"uv": [6, 0, 12, 12], "texture": "#0"}, + "south": {"uv": [0, 1, 6, 13], "texture": "#0"}, + "west": {"uv": [8, 0, 14, 12], "texture": "#0"}, + "up": {"uv": [8, 1, 14, 7], "texture": "#0"}, + "down": {"uv": [0, 0, 6, 6], "texture": "#0"} + } + }, + { + "from": [3, 0, 5], + "to": [5, 4, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [1, 0, 5]}, + "faces": { + "north": {"uv": [0, 6, 2, 10], "texture": "#0"}, + "east": {"uv": [0, 0, 6, 4], "texture": "#0"}, + "south": {"uv": [0, 0, 2, 4], "texture": "#0"}, + "west": {"uv": [0, 0, 6, 4], "texture": "#0"}, + "up": {"uv": [0, 2, 2, 8], "texture": "#0"}, + "down": {"uv": [0, 3, 2, 9], "texture": "#0"} + } + }, + { + "from": [5, 0, 11], + "to": [9, 2, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [1, 0, 3]}, + "faces": { + "north": {"uv": [5, 0, 9, 2], "texture": "#0"}, + "east": {"uv": [5, 0, 7, 2], "texture": "#0"}, + "south": {"uv": [5, 0, 9, 2], "texture": "#0"}, + "west": {"uv": [5, 0, 7, 2], "texture": "#0"}, + "up": {"uv": [5, 0, 9, 2], "texture": "#0"}, + "down": {"uv": [5, 0, 9, 2], "texture": "#0"} + } + }, + { + "from": [5, 0, 3], + "to": [11, 2, 5], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 0, -5]}, + "faces": { + "north": {"uv": [1, 3, 7, 5], "texture": "#0"}, + "east": {"uv": [11, 0, 13, 2], "texture": "#0"}, + "south": {"uv": [0, 0, 6, 2], "texture": "#0"}, + "west": {"uv": [5, 5, 7, 7], "texture": "#0"}, + "up": {"uv": [6, 1, 12, 3], "texture": "#0"}, + "down": {"uv": [0, 0, 6, 2], "texture": "#0"} + } + }, + { + "from": [11, 0, 6], + "to": [13, 5, 10], + "rotation": {"angle": 0, "axis": "y", "origin": [3, 0, 2]}, + "faces": { + "north": {"uv": [0, 0, 2, 5], "texture": "#0"}, + "east": {"uv": [3, 0, 7, 5], "texture": "#0"}, + "south": {"uv": [2, 0, 4, 5], "texture": "#0"}, + "west": {"uv": [0, 0, 6, 7], "texture": "#0"}, + "up": {"uv": [2, 1, 4, 5], "texture": "#0"}, + "down": {"uv": [5, 3, 7, 7], "texture": "#0"} + } + } + ], + "groups": [ + { + "name": "VoxelShapes", + "origin": [8, 8, 8], + "color": 0, + "children": [0, 1, 2, 3, 4] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/carbort/models/block/bean_crystal_block.json b/src/main/resources/assets/carbort/models/block/bean_crystal_block.json new file mode 100644 index 0000000..bbe854c --- /dev/null +++ b/src/main/resources/assets/carbort/models/block/bean_crystal_block.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:block/block", + "credit": "Made with Blockbench", + "textures": { + "0": "carbort:block/reinforced_bean_block", + "1": "carbort:block/reinforced_bean_block_top", + "particle": "carbort:block/reinforced_bean_block" + }, + "elements": [ + { + "from": [4, 0, 4], + "to": [12, 14, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [7, 0, 7]}, + "faces": { + "north": {"uv": [4, 1, 12, 15], "texture": "#0"}, + "east": {"uv": [4, 1, 12, 15], "texture": "#0"}, + "south": {"uv": [4, 1, 12, 15], "texture": "#0"}, + "west": {"uv": [4, 1, 12, 15], "texture": "#0"}, + "up": {"uv": [4, 4, 12, 12], "texture": "#1"}, + "down": {"uv": [0, 3, 8, 11], "texture": "#0"} + } + } + ], + "groups": [ + { + "name": "VoxelShapes", + "origin": [8, 8, 8], + "color": 0, + "children": [0] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/carbort/models/block/reinforced_pedestal.json b/src/main/resources/assets/carbort/models/block/reinforced_pedestal.json new file mode 100644 index 0000000..3df62bb --- /dev/null +++ b/src/main/resources/assets/carbort/models/block/reinforced_pedestal.json @@ -0,0 +1,179 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "1": "carbort:block/pedestal", + "particle": "carbort:block/reinforced_block" + }, + "elements": [ + { + "from": [10, 2, 7], + "to": [11, 4, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [12, 2, 7]}, + "color": 0, + "faces": { + "north": {"uv": [0, 0, 1, 2], "texture": "#missing"}, + "east": {"uv": [0, 0, 2, 2], "texture": "#missing"}, + "south": {"uv": [0, 0, 1, 2], "texture": "#missing"}, + "west": {"uv": [0, 0, 2, 2], "texture": "#missing"}, + "up": {"uv": [0, 0, 1, 2], "texture": "#missing"}, + "down": {"uv": [0, 0, 1, 2], "texture": "#missing"} + } + }, + { + "from": [5, 1, 5], + "to": [11, 5, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [7, 0, 6]}, + "faces": { + "north": {"uv": [0, 8, 6, 12], "texture": "#1"}, + "east": {"uv": [0, 8, 6, 12], "texture": "#1"}, + "south": {"uv": [0, 8, 6, 12], "texture": "#1"}, + "west": {"uv": [0, 8, 6, 12], "texture": "#1"}, + "up": {"uv": [0, 2, 6, 8], "texture": "#1"}, + "down": {"uv": [6, 2, 12, 8], "texture": "#1"} + } + }, + { + "from": [5, 4, 11], + "to": [11, 6, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 5, 7]}, + "faces": { + "north": {"uv": [0, 0, 6, 2], "texture": "#1"}, + "east": {"uv": [5, 0, 6, 2], "texture": "#1"}, + "south": {"uv": [0, 0, 6, 2], "texture": "#1"}, + "west": {"uv": [0, 0, 1, 2], "texture": "#1"}, + "up": {"uv": [0, 0, 6, 1], "texture": "#1"}, + "down": {"uv": [0, 1, 6, 2], "texture": "#1"} + } + }, + { + "from": [5, 4, 4], + "to": [11, 6, 5], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 5, 0]}, + "faces": { + "north": {"uv": [0, 0, 6, 2], "texture": "#1"}, + "east": {"uv": [5, 0, 6, 2], "texture": "#1"}, + "south": {"uv": [0, 0, 6, 2], "texture": "#1"}, + "west": {"uv": [0, 0, 1, 2], "texture": "#1"}, + "up": {"uv": [0, 0, 6, 1], "texture": "#1"}, + "down": {"uv": [0, 1, 6, 2], "texture": "#1"} + } + }, + { + "from": [11, 4, 5], + "to": [12, 6, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [7, 5, 6]}, + "faces": { + "north": {"uv": [5, 0, 6, 2], "texture": "#1"}, + "east": {"uv": [0, 0, 6, 2], "texture": "#1"}, + "south": {"uv": [0, 0, 1, 2], "texture": "#1"}, + "west": {"uv": [0, 0, 6, 2], "texture": "#1"}, + "up": {"uv": [0, 0, 6, 1], "rotation": 270, "texture": "#1"}, + "down": {"uv": [0, 1, 6, 2], "rotation": 90, "texture": "#1"} + } + }, + { + "from": [4, 4, 5], + "to": [5, 6, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 5, 6]}, + "faces": { + "north": {"uv": [5, 0, 6, 2], "texture": "#1"}, + "east": {"uv": [0, 0, 6, 2], "texture": "#1"}, + "south": {"uv": [0, 0, 1, 2], "texture": "#1"}, + "west": {"uv": [0, 0, 6, 2], "texture": "#1"}, + "up": {"uv": [0, 0, 6, 1], "rotation": 270, "texture": "#1"}, + "down": {"uv": [0, 1, 6, 2], "rotation": 90, "texture": "#1"} + } + }, + { + "from": [7, 0, 3], + "to": [9, 3, 5], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 5, 0]}, + "faces": { + "north": {"uv": [7, 4, 9, 7], "texture": "#1"}, + "east": {"uv": [6, 4, 8, 7], "texture": "#1"}, + "south": {"uv": [0, 0, 2, 3], "texture": "#1"}, + "west": {"uv": [8, 4, 10, 7], "texture": "#1"}, + "up": {"uv": [2, 4, 4, 6], "rotation": 90, "texture": "#1"}, + "down": {"uv": [10, 4, 12, 6], "rotation": 270, "texture": "#1"} + } + }, + { + "from": [7, 0, 11], + "to": [9, 3, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 5, 7]}, + "faces": { + "north": {"uv": [0, 0, 2, 3], "texture": "#1"}, + "east": {"uv": [8, 4, 10, 7], "texture": "#1"}, + "south": {"uv": [7, 4, 9, 7], "texture": "#1"}, + "west": {"uv": [6, 4, 8, 7], "texture": "#1"}, + "up": {"uv": [2, 4, 4, 6], "rotation": 90, "texture": "#1"}, + "down": {"uv": [1, 1, 3, 3], "rotation": 270, "texture": "#1"} + } + }, + { + "from": [11, 0, 7], + "to": [13, 3, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 5, 4]}, + "faces": { + "north": {"uv": [8, 3, 10, 6], "texture": "#1"}, + "east": {"uv": [0, 9, 2, 12], "texture": "#1"}, + "south": {"uv": [4, 9, 6, 12], "texture": "#1"}, + "west": {"uv": [0, 0, 2, 3], "texture": "#1"}, + "up": {"uv": [2, 4, 4, 6], "rotation": 90, "texture": "#1"}, + "down": {"uv": [10, 3, 12, 5], "rotation": 270, "texture": "#1"} + } + }, + { + "from": [3, 0, 7], + "to": [5, 3, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [7, 5, 4]}, + "faces": { + "north": {"uv": [3, 9, 5, 12], "texture": "#1"}, + "east": {"uv": [0, 0, 2, 3], "texture": "#1"}, + "south": {"uv": [9, 3, 11, 6], "texture": "#1"}, + "west": {"uv": [1, 9, 3, 12], "texture": "#1"}, + "up": {"uv": [2, 4, 4, 6], "rotation": 90, "texture": "#1"}, + "down": {"uv": [8, 6, 10, 8], "rotation": 270, "texture": "#1"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "thirdperson_lefthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "firstperson_righthand": { + "rotation": [0, 45, 0], + "scale": [0.4, 0.4, 0.4] + }, + "firstperson_lefthand": { + "rotation": [0, 225, 0], + "scale": [0.4, 0.4, 0.4] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.25, 0.25, 0.25] + }, + "gui": { + "rotation": [30, 225, 0], + "scale": [0.625, 0.625, 0.625] + }, + "fixed": { + "scale": [0.5, 0.5, 0.5] + } + }, + "groups": [ + { + "name": "VoxelShapes", + "origin": [8, 8, 8], + "color": 0, + "children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/carbort/models/entity/bean.bbmodel b/src/main/resources/assets/carbort/models/entity/bean.bbmodel new file mode 100644 index 0000000..9548afb --- /dev/null +++ b/src/main/resources/assets/carbort/models/entity/bean.bbmodel @@ -0,0 +1 @@ +{"meta":{"format_version":"4.10","model_format":"modded_entity","box_uv":true},"name":"bean","model_identifier":"","modded_entity_entity_class":"","modded_entity_version":"1.17","modded_entity_flip_y":true,"visible_box":[1,1,0],"variable_placeholders":"","variable_placeholder_buttons":[],"timeline_setups":[],"unhandled_root_fields":{},"resolution":{"width":16,"height":16},"elements":[{"name":"cube","box_uv":true,"rescale":false,"locked":false,"light_emission":0,"render_order":"default","allow_mirror_modeling":true,"from":[-1.5,0,-2],"to":[1.5,2,1],"autouv":0,"color":9,"origin":[0.5,0,0],"faces":{"north":{"uv":[3,3,6,5],"texture":0},"east":{"uv":[0,3,3,5],"texture":0},"south":{"uv":[9,3,12,5],"texture":0},"west":{"uv":[6,3,9,5],"texture":0},"up":{"uv":[6,3,3,0],"texture":0},"down":{"uv":[9,0,6,3],"texture":0}},"type":"cube","uuid":"21a8181c-aace-5b8b-f45c-decd33827861"},{"name":"cube","box_uv":true,"rescale":false,"locked":false,"light_emission":0,"render_order":"default","allow_mirror_modeling":true,"from":[-1,4.621320343559643,1.621320343559642],"to":[1,6.621320343559643,2.621320343559642],"autouv":0,"color":9,"rotation":[-45,0,0],"origin":[1,4.621320343559643,5.621320343559642],"uv_offset":[0,10],"faces":{"north":{"uv":[1,11,3,13],"texture":0},"east":{"uv":[0,11,1,13],"texture":0},"south":{"uv":[4,11,6,13],"texture":0},"west":{"uv":[3,11,4,13],"texture":0},"up":{"uv":[3,11,1,10],"texture":0},"down":{"uv":[5,10,3,11],"texture":0}},"type":"cube","uuid":"1602e9ba-7af9-63f9-3133-37d99ae8b7d9"},{"name":"cube","box_uv":true,"rescale":false,"locked":false,"light_emission":0,"render_order":"default","allow_mirror_modeling":true,"from":[-1,0,-2.75],"to":[1,2,-1.75],"autouv":0,"color":9,"origin":[0,0,-3.75],"uv_offset":[6,10],"faces":{"north":{"uv":[7,11,9,13],"texture":0},"east":{"uv":[6,11,7,13],"texture":0},"south":{"uv":[10,11,12,13],"texture":0},"west":{"uv":[9,11,10,13],"texture":0},"up":{"uv":[9,11,7,10],"texture":0},"down":{"uv":[11,10,9,11],"texture":0}},"type":"cube","uuid":"22a0c1e0-e329-704f-9592-c76e942504c8"},{"name":"cube","box_uv":true,"rescale":false,"locked":false,"light_emission":0,"render_order":"default","allow_mirror_modeling":true,"from":[-1.5,2.121320343559643,0.12132034355964239],"to":[1.5,4.121320343559643,3.1213203435596424],"autouv":0,"color":9,"rotation":[-45,0,0],"origin":[0.5,2.121320343559643,3.1213203435596424],"uv_offset":[0,5],"faces":{"north":{"uv":[3,8,6,10],"texture":0},"east":{"uv":[0,8,3,10],"texture":0},"south":{"uv":[9,8,12,10],"texture":0},"west":{"uv":[6,8,9,10],"texture":0},"up":{"uv":[6,8,3,5],"texture":0},"down":{"uv":[9,5,6,8],"texture":0}},"type":"cube","uuid":"dbb6585d-6ca1-aaf4-bc2a-79ce15556f70"}],"outliner":[{"name":"main","origin":[0,0,0],"color":0,"uuid":"fc9a8fd2-470a-bd54-f7c5-51bc0ba04011","export":true,"mirror_uv":false,"isOpen":true,"locked":false,"visibility":true,"autouv":0,"children":["21a8181c-aace-5b8b-f45c-decd33827861","22a0c1e0-e329-704f-9592-c76e942504c8","1602e9ba-7af9-63f9-3133-37d99ae8b7d9","dbb6585d-6ca1-aaf4-bc2a-79ce15556f70"]}],"textures":[{"path":"/home/thepigcat/IdeaProjects/Carbort/src/main/resources/assets/carbort/textures/entity/bean.png","name":"bean.png","folder":"","namespace":"","id":"0","group":"","width":16,"height":16,"uv_width":16,"uv_height":16,"particle":false,"use_as_default":false,"layers_enabled":false,"sync_to_project":"","render_mode":"default","render_sides":"auto","frame_time":1,"frame_order_type":"loop","frame_order":"","frame_interpolate":false,"visible":true,"internal":true,"saved":true,"uuid":"d006b4bd-f9df-8cd0-bdc0-11f9e8f462cc","relative_path":"../../textures/entity/bean.png","source":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAN5JREFUOE9jZEAC8+Id/r///JVBWVKU4e7z1wyCvNxg2aSFBxiR1SGzUSSQDQApevflGwPIwOJ1p4kzYEO213+Y6SAXwABeA0C2ghQK8XCB1QdM3cYIMwjkAoJeABkA0oysuDfIFO4SUDgQHQZkeQE5REEGwEIfFHgg20kORJABoGiEeYlgGBxrSvx/4+59jMDCFrggtVZ181GiFCXEkQMLliaQoxLkRVAsYSQkWODB4h4W77jEUQxANhU5FtCTLrrNMHlGkFNhTofFPyz0kQ3BlRpxpnFcmQddfOANAAAJ4JQR7a43CQAAAABJRU5ErkJggg=="}]} \ No newline at end of file diff --git a/src/main/resources/assets/carbort/textures/block/bean_block.png b/src/main/resources/assets/carbort/textures/block/bean_block.png new file mode 100644 index 0000000000000000000000000000000000000000..894e43d80ef43c6ddd6fdf1fe147f4856470d8e0 GIT binary patch literal 406 zcmV;H0crk;P)Px$P)S5VR5*=&ld*2XFcd{kQ?Ff+h?O}5k=g-eL#o(OzJj6u(LdoU5KE^nY?Of^ z44JK9l%-U3YCE(qJcp>B@@(JdbFW@*o+jxxK#`9CsGKKFhQ!u#sB0?cDP03VmJCRf zApo(pthYN%k&lS2WwCl~FUTSAuNWYbm$GC)=^85M1F?_^UAMWBLYBNJwqk3^60i2d z=8+tfu3Px#`$hwI;Xbhrk*rm%Q&~^S|{8r#xPx$Hc3Q5R5*>LlQByJF&xEzO1Ik%Y(2zUDAd-`!NozGb?_@Vh>N)R4eDobcJ88s zRzUkHIZOEu@6F?E7FbEi(ba>& zDa-;6L_|--9BgmW?)0e#KGk5w!Y;c6rpd)piF)AE6S32kC7`4<$RD3y6Y@YrmVgyO zg9ak9oLoP?E_TopG4;Totf!s0#&Vz^O|R#XoeuP)=@^=<-Q>sW!EWs^D-?^9eX10C zpDM*$cyDklf#;{Y44@m1*s84>XWekb`Ps?hB3(9b0ceeHPn80oy0>FtErD)0Vxv(Z zNfIdkHP35QT=%#mtgr270APx#vq?ljR5*?8kTD8_Fc^iumY$$sLS_e@Jw`oB#~#QVlrG}#;!qF=2OXS46ud$^ zB~(qp1NfHke)zw<|G}Ztdhoj6K0-?8M`N(QYFZx8_hRR=1_&vsnwC%n40@u|GqIWg z==8ivumJ#sDj=_W0MaBvNJ&+LNkpe-mtq%S zG{(I)iS1<KP)Px$FG)l}R5*=|lQB-iKoCVAmb+==71cs0BEbRDP;db*k&1J00V+;FOHYevqezH? zM2duzY=gCSJDnvcoOQgm6XjR-_y05BGrMQEllwn_)EEFN?`b3OL*JY#DZu0N16?fF zIX9E@gZ#_uC+_XNE&wo_J@v%LFuj}B3EL5`#^XpdvKgf-nr8qJ;pbxxfEC#%=pqERYatxODgYKuJb{2>58LffaFl;(iL1>U-rzZ8f_*4nrWY6E?q(8JtBfr?I#Fk zV9*?zsA`>{9VeK#t4$+li^D(ztVln>cD0Fwp>sD;GlT9HhRj_qD$ss8#VjJE#xz`X zkn+WMR6R9@(iP-B<^j}Z`^&WW`fbj3Kot4NFQiTtc4r&vD;i*1Lkqm!?LXijxy_~W T-ArLb00000NkvXXu0mjf9-f~> literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/carbort/textures/entity/bean.png b/src/main/resources/assets/carbort/textures/entity/bean.png new file mode 100644 index 0000000000000000000000000000000000000000..2879f78f0713f2df697931c813dded9cbfa4e3ac GIT binary patch literal 304 zcmV-00nh%4P)Px#>PbXFR5*>@k}VFxKoCY>Nfkc=l8Wly0)?*P1_W#+9>E>35H3Kf(5Mbpvzt;g^wmn!F)G|GIt^+_`l%@~> z?CN3AZ8PY$0f>|AYvR*jJsBxU1{kmQRv7roa~-a?d$WNgSA(n7g@Z{NoG|cJoymN6 z{2gMPWY2Dzs>2&Zk?{D%#EOMWi;eaj`;w*~5Jh=WYI|@=)6Wjz z1y8^UG}FCi5C*;)ul8C(oh0U6cHR8@y-wo_|B)Vg)@WR?IVK1I0000Px#vq?ljR7i>KmN6E>AP_{yyqw6=i+BW5lfpCD*n0$Wid2>~InY=nK@c`RL&}}^ zDA-*-v)up(ip%+{)+8M=9w5oAb~)b?+Uc845?w!J_NLJT0ABu{ylbU>o{wvCH`WEn zmT0Ui?G4QKvtCmetXAoFu~+Rt0SZun0u-PC1t{PbfW|sN&PY=4GsHO<)`hIdML0_> zQwHez0n_MVtizgA_hiI1*2cC&O;~YX*sj(aQO|65$C4;`00000NkvXXu0mjf%{F96 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/carbort/textures/gui/sprites/bean_score_liquid.png b/src/main/resources/assets/carbort/textures/gui/sprites/bean_score_liquid.png new file mode 100644 index 0000000000000000000000000000000000000000..31b2b46f6b1c869269b280e737bad549a4ff7452 GIT binary patch literal 1679 zcmV;A25|X_P)Px*Nl8RORCt{2oV||YMhwT9AeBD~8?XeIh8h)+!+kIMDdX~i!t1$cNo=&5fP70ioS z>-THdf)*dI=+1El65mA=sSEJ&!pqNf*cRbVXc&2jwqI#p#f-KKze>l}0rwyf3 z!E5BJigVlZv0igw3yyd&|BB$Atn)83y`bDE4kO<9^!y^eT~#n1^y0&LH0)EB=XDHdA?@tM{ozz6Q~WkL z5+2fis|t{b@YblD2sa)L`|1oOIueFXOX;ElT+uGl7Or!uWt6Kf=1p_*qVKA}Vv+q~Tj z;7TOH`wK)(xzDq+OT==2cYLGqpjVf>rmT#VwmY8VN?i^bs1qddPAtAUK`r;WB2%5n zO^&LS`IN>-B3J!* zYIj;Q)kyq7pQy*mzzb#t7(Q5GrZy~%L&?*#e5mQp_ZNt$F88B(0oF*Ob|TTGKccXY z52NPJ-u;D^4}AI@rhr#yXoBf14g|%8#tbSigskd{`wLJ)bcqGifhLSQc04y#MOmIZ z6{yUFQ-YcwsLR6bSTG_FPbOH=3AP~d!Z+pxu?hTPZ3QD}2}FVoqQnbHl0Y7n7cd9- zmP3g=^+8Bl6K7|>92mt5M9uVOzCm%B(wg79qfr5`3o#mIUcg91ox#9c`C)I5-%iPxPceA1DW@oyZ72O zQ74vYUI<-?6BR(P-=>Mm3*7vu8Y!_tl8+;a7w&-<)THV&UsQk@Ir@xdcREkJp!0%Q zsm_a8Jql4Z66Xc;f#<{vjRhg4jXI`zN56r{Jv(b3avwyw- zd9YyxL$zM6w{