From e3e7590e707b1780ba18dba352c69d7649027431 Mon Sep 17 00:00:00 2001 From: Val Date: Sat, 1 Jun 2024 11:35:22 -0500 Subject: [PATCH] remove blocks pt2 --- src/main/java/mc/lunar/Blahaj.java | 2 - src/main/java/mc/lunar/BlahajClient.java | 13 -- src/main/java/mc/lunar/block/CBlock.java | 37 --- src/main/java/mc/lunar/block/ModBlocks.java | 148 ------------ .../assets/blahaj/blockstates/ace_shark.json | 5 - .../blahaj/blockstates/agender_shark.json | 5 - .../assets/blahaj/blockstates/aro_shark.json | 5 - .../blahaj/blockstates/aroace_shark.json | 5 - .../assets/blahaj/blockstates/bi_shark.json | 5 - .../assets/blahaj/blockstates/blue_shark.json | 5 - .../assets/blahaj/blockstates/bread.json | 5 - .../blahaj/blockstates/demiboy_shark.json | 5 - .../blahaj/blockstates/demigirl_shark.json | 5 - .../assets/blahaj/blockstates/enby_shark.json | 5 - .../assets/blahaj/blockstates/gay_shark.json | 5 - .../blahaj/blockstates/genderfluid_shark.json | 5 - .../blahaj/blockstates/genderqueer_shark.json | 5 - .../assets/blahaj/blockstates/gray_shark.json | 5 - .../blahaj/blockstates/greyrose_shark.json | 5 - .../blahaj/blockstates/intersex_shark.json | 5 - .../blahaj/blockstates/lesbian_shark.json | 5 - .../assets/blahaj/blockstates/pan_shark.json | 5 - .../assets/blahaj/blockstates/pink_shark.json | 5 - .../assets/blahaj/blockstates/poly_shark.json | 5 - .../blahaj/blockstates/pride_shark.json | 5 - .../blahaj/blockstates/trans_shark.json | 5 - .../resources/assets/blahaj/lang/en_us.json | 64 +++--- .../resources/assets/blahaj/lang/sv_se.json | 13 -- .../assets/blahaj/models/block/ace_shark.json | 6 - .../blahaj/models/block/agender_shark.json | 6 - .../assets/blahaj/models/block/aro_shark.json | 6 - .../blahaj/models/block/aroace_shark.json | 6 - .../assets/blahaj/models/block/bi_shark.json | 6 - .../blahaj/models/block/blahaj_backpack.json | 3 - .../blahaj/models/block/blue_shark.json | 174 -------------- .../blahaj/models/block/blue_whale.json | 134 ----------- .../assets/blahaj/models/block/bread.json | 49 ---- .../blahaj/models/block/demiboy_shark.json | 6 - .../blahaj/models/block/demigirl_shark.json | 6 - .../models/block/demiromantic_shark.json | 6 - .../blahaj/models/block/demisexual_shark.json | 6 - .../blahaj/models/block/enby_shark.json | 6 - .../assets/blahaj/models/block/gay_shark.json | 6 - .../models/block/genderfluid_shark.json | 6 - .../models/block/genderqueer_shark.json | 6 - .../blahaj/models/block/gray_shark.json | 6 - .../models/block/greyromantic_shark.json | 6 - .../blahaj/models/block/greyrose_shark.json | 6 - .../blahaj/models/block/greysexual_shark.json | 6 - .../blahaj/models/block/intersex_shark.json | 6 - .../blahaj/models/block/killer_whale.json | 7 - .../blahaj/models/block/lesbian_shark.json | 6 - .../assets/blahaj/models/block/pan_shark.json | 6 - .../blahaj/models/block/pink_shark.json | 6 - .../blahaj/models/block/poly_shark.json | 6 - .../blahaj/models/block/pride_shark.json | 6 - .../assets/blahaj/models/block/seal.json | 216 ------------------ .../blahaj/models/block/trans_shark.json | 6 - .../blahaj/textures/model/blahaj_backpack.png | Bin 3402 -> 0 bytes 59 files changed, 32 insertions(+), 1082 deletions(-) delete mode 100644 src/main/java/mc/lunar/BlahajClient.java delete mode 100644 src/main/java/mc/lunar/block/CBlock.java delete mode 100644 src/main/java/mc/lunar/block/ModBlocks.java delete mode 100644 src/main/resources/assets/blahaj/blockstates/ace_shark.json delete mode 100644 src/main/resources/assets/blahaj/blockstates/agender_shark.json delete mode 100644 src/main/resources/assets/blahaj/blockstates/aro_shark.json delete mode 100644 src/main/resources/assets/blahaj/blockstates/aroace_shark.json delete mode 100644 src/main/resources/assets/blahaj/blockstates/bi_shark.json delete mode 100644 src/main/resources/assets/blahaj/blockstates/blue_shark.json delete mode 100644 src/main/resources/assets/blahaj/blockstates/bread.json delete mode 100644 src/main/resources/assets/blahaj/blockstates/demiboy_shark.json delete mode 100644 src/main/resources/assets/blahaj/blockstates/demigirl_shark.json delete mode 100644 src/main/resources/assets/blahaj/blockstates/enby_shark.json delete mode 100644 src/main/resources/assets/blahaj/blockstates/gay_shark.json delete mode 100644 src/main/resources/assets/blahaj/blockstates/genderfluid_shark.json delete mode 100644 src/main/resources/assets/blahaj/blockstates/genderqueer_shark.json delete mode 100644 src/main/resources/assets/blahaj/blockstates/gray_shark.json delete mode 100644 src/main/resources/assets/blahaj/blockstates/greyrose_shark.json delete mode 100644 src/main/resources/assets/blahaj/blockstates/intersex_shark.json delete mode 100644 src/main/resources/assets/blahaj/blockstates/lesbian_shark.json delete mode 100644 src/main/resources/assets/blahaj/blockstates/pan_shark.json delete mode 100644 src/main/resources/assets/blahaj/blockstates/pink_shark.json delete mode 100644 src/main/resources/assets/blahaj/blockstates/poly_shark.json delete mode 100644 src/main/resources/assets/blahaj/blockstates/pride_shark.json delete mode 100644 src/main/resources/assets/blahaj/blockstates/trans_shark.json delete mode 100644 src/main/resources/assets/blahaj/lang/sv_se.json delete mode 100644 src/main/resources/assets/blahaj/models/block/ace_shark.json delete mode 100644 src/main/resources/assets/blahaj/models/block/agender_shark.json delete mode 100644 src/main/resources/assets/blahaj/models/block/aro_shark.json delete mode 100644 src/main/resources/assets/blahaj/models/block/aroace_shark.json delete mode 100644 src/main/resources/assets/blahaj/models/block/bi_shark.json delete mode 100644 src/main/resources/assets/blahaj/models/block/blahaj_backpack.json delete mode 100644 src/main/resources/assets/blahaj/models/block/blue_shark.json delete mode 100644 src/main/resources/assets/blahaj/models/block/blue_whale.json delete mode 100644 src/main/resources/assets/blahaj/models/block/bread.json delete mode 100644 src/main/resources/assets/blahaj/models/block/demiboy_shark.json delete mode 100644 src/main/resources/assets/blahaj/models/block/demigirl_shark.json delete mode 100644 src/main/resources/assets/blahaj/models/block/demiromantic_shark.json delete mode 100644 src/main/resources/assets/blahaj/models/block/demisexual_shark.json delete mode 100644 src/main/resources/assets/blahaj/models/block/enby_shark.json delete mode 100644 src/main/resources/assets/blahaj/models/block/gay_shark.json delete mode 100644 src/main/resources/assets/blahaj/models/block/genderfluid_shark.json delete mode 100644 src/main/resources/assets/blahaj/models/block/genderqueer_shark.json delete mode 100644 src/main/resources/assets/blahaj/models/block/gray_shark.json delete mode 100644 src/main/resources/assets/blahaj/models/block/greyromantic_shark.json delete mode 100644 src/main/resources/assets/blahaj/models/block/greyrose_shark.json delete mode 100644 src/main/resources/assets/blahaj/models/block/greysexual_shark.json delete mode 100644 src/main/resources/assets/blahaj/models/block/intersex_shark.json delete mode 100644 src/main/resources/assets/blahaj/models/block/killer_whale.json delete mode 100644 src/main/resources/assets/blahaj/models/block/lesbian_shark.json delete mode 100644 src/main/resources/assets/blahaj/models/block/pan_shark.json delete mode 100644 src/main/resources/assets/blahaj/models/block/pink_shark.json delete mode 100644 src/main/resources/assets/blahaj/models/block/poly_shark.json delete mode 100644 src/main/resources/assets/blahaj/models/block/pride_shark.json delete mode 100644 src/main/resources/assets/blahaj/models/block/seal.json delete mode 100644 src/main/resources/assets/blahaj/models/block/trans_shark.json delete mode 100644 src/main/resources/assets/blahaj/textures/model/blahaj_backpack.png diff --git a/src/main/java/mc/lunar/Blahaj.java b/src/main/java/mc/lunar/Blahaj.java index 4c0d63c..67d2b18 100644 --- a/src/main/java/mc/lunar/Blahaj.java +++ b/src/main/java/mc/lunar/Blahaj.java @@ -1,6 +1,5 @@ package mc.lunar; -import mc.lunar.block.ModBlocks; import net.fabricmc.api.ModInitializer; import org.slf4j.Logger; @@ -17,7 +16,6 @@ public class Blahaj implements ModInitializer { @Override public void onInitialize() { ModItemGroups.registerItemGroups(); - //ModBlocks.register(); ModItems.registerModItems(); } } \ No newline at end of file diff --git a/src/main/java/mc/lunar/BlahajClient.java b/src/main/java/mc/lunar/BlahajClient.java deleted file mode 100644 index 5e199e5..0000000 --- a/src/main/java/mc/lunar/BlahajClient.java +++ /dev/null @@ -1,13 +0,0 @@ -package mc.lunar; - -import mc.lunar.block.ModBlocks; -import net.fabricmc.api.ClientModInitializer; - -public class BlahajClient implements ClientModInitializer { - - - @Override - public void onInitializeClient() { - ModBlocks.registerClient(); - } -} \ No newline at end of file diff --git a/src/main/java/mc/lunar/block/CBlock.java b/src/main/java/mc/lunar/block/CBlock.java deleted file mode 100644 index 494c5a7..0000000 --- a/src/main/java/mc/lunar/block/CBlock.java +++ /dev/null @@ -1,37 +0,0 @@ -package mc.lunar.block; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.block.HorizontalFacingBlock; -import net.minecraft.block.ShapeContext; -import net.minecraft.item.ItemPlacementContext; -import net.minecraft.state.StateManager; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.Direction; -import net.minecraft.util.shape.VoxelShape; -import net.minecraft.world.BlockView; - -public class CBlock extends HorizontalFacingBlock { - - protected static final VoxelShape SHAPE = Block.createCuboidShape(4.0, 0.0, 4.0, 12.0, 8.0, 12.0); - - public CBlock(Settings settings) { - super(settings); - this.setDefaultState(this.stateManager.getDefaultState().with(FACING, Direction.NORTH)); - } - - public VoxelShape getOutlineShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context) { - return SHAPE; - } - - @Override - public BlockState getPlacementState(ItemPlacementContext ctx) { - return this.getDefaultState().with(FACING, ctx.getHorizontalPlayerFacing().getOpposite()); - } - - - protected void appendProperties(StateManager.Builder builder) { - builder.add(FACING); - } - -} diff --git a/src/main/java/mc/lunar/block/ModBlocks.java b/src/main/java/mc/lunar/block/ModBlocks.java deleted file mode 100644 index 76f7015..0000000 --- a/src/main/java/mc/lunar/block/ModBlocks.java +++ /dev/null @@ -1,148 +0,0 @@ -package mc.lunar.block; - -import mc.lunar.item.CItem; -import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap; -import net.minecraft.block.AbstractBlock; -import net.minecraft.block.Block; -import net.minecraft.block.Blocks; -import net.minecraft.client.render.RenderLayer; -import net.minecraft.item.Item; -import net.minecraft.registry.Registries; -import net.minecraft.registry.Registry; -import net.minecraft.util.Identifier; -import static mc.lunar.Blahaj.MOD_ID; - - -public class ModBlocks { - - public static final Identifier BLAHAJ_ID = new Identifier(MOD_ID, "blue_shark"); - public static final Identifier ACE_BLAHAJ = new Identifier(MOD_ID, "ace_shark"); - public static final Identifier AGENDER_BLAHAJ = new Identifier(MOD_ID, "agender_shark"); - public static final Identifier ARO_BLAHAJ = new Identifier(MOD_ID, "aro_shark"); - public static final Identifier AROACE_BLAHAJ = new Identifier(MOD_ID, "aroace_shark"); - public static final Identifier TRANS_BLAHAJ = new Identifier(MOD_ID, "trans_shark"); - public static final Identifier BI_BLAHAJ = new Identifier(MOD_ID, "bi_shark"); - public static final Identifier BAGUETTE = new Identifier(MOD_ID, "bread"); - public static final Identifier DEMIBOY_BLAHAJ = new Identifier(MOD_ID, "demiboy_shark"); - public static final Identifier DEMIGIRL_BLAHAJ = new Identifier(MOD_ID, "demigirl_shark"); - public static final Identifier ENBY_BLAHAJ = new Identifier(MOD_ID, "enby_shark"); - public static final Identifier RAINBOWDASH_BLAHAJ = new Identifier(MOD_ID, "gay_shark"); - public static final Identifier GENDERFLUID_BLAHAJ = new Identifier(MOD_ID, "genderfluid_shark"); - public static final Identifier GENDERQUEER_BLAHAJ = new Identifier(MOD_ID, "genderqueer_shark"); - public static final Identifier GRAY_BLAHAJ = new Identifier(MOD_ID, "gray_shark"); - public static final Identifier GRAYROSE_BLAHAJ = new Identifier(MOD_ID, "greyrose_shark"); - public static final Identifier INTERSEX_BLAHAJ = new Identifier(MOD_ID, "intersex_shark"); - public static final Identifier LESPONY_BLAHAJ = new Identifier(MOD_ID, "lesbian_shark"); - public static final Identifier PAN_BLAHAJ = new Identifier(MOD_ID, "pan_shark"); - public static final Identifier PINK_BLAHAJ = new Identifier(MOD_ID, "pink_shark"); - public static final Identifier POLY_BLAHAJ = new Identifier(MOD_ID, "poly_shark"); - public static final Identifier PRIDE_BLAHAJ = new Identifier(MOD_ID, "pride_shark"); - - public static Block BLAHAJ_BLOCK; - public static Item BLAHAJ_ITEM; - public static Block AROACE_BLAHAJ_BLOCK; - public static Item AROACE_BLAHAJ_ITEM; - public static Block ACE_BLAHAJ_BLOCK; - public static Item ACE_BLAHAJ_ITEM; - public static Block AGENDER_BLAHAJ_BLOCK; - public static Item AGENDER_BLAHAJ_ITEM; - public static Block ARO_BLAHAJ_BLOCK; - public static Item ARO_BLAHAJ_ITEM; - public static Block TRANS_BLAHAJ_BLOCK; - public static Item TRANS_BLAHAJ_ITEM; - public static Block BI_BLAHAJ_BLOCK; - public static Item BI_BLAHAJ_ITEM; - public static Block BAGUETTE_BLOCK; - public static Item BAGUETTE_ITEM; - public static Block DEMIBOY_BLAHAJ_BLOCK; - public static Item DEMIBOY_BLAHAJ_ITEM; - public static Block DEMIGIRL_BLAHAJ_BLOCK; - public static Item DEMIGIRL_BLAHAJ_ITEM; - public static Block ENBY_BLAHAJ_BLOCK; - public static Item ENBY_BLAHAJ_ITEM; - public static Block RAINBOWDASH_BLAHAJ_BLOCK; - public static Item RAINBOWDASH_BLAHAJ_ITEM; - public static Block GENDERFLUID_BLAHAJ_BLOCK; - public static Item GENDERFLUID_BLAHAJ_ITEM; - public static Block GENDERQUEER_BLAHAJ_BLOCK; - public static Item GENDERQUEER_BLAHAJ_ITEM; - public static Block GRAY_BLAHAJ_BLOCK; - public static Item GRAY_BLAHAJ_ITEM; - public static Block GRAYROSE_BLAHAJ_BLOCK; - public static Item GRAYROSE_BLAHAJ_ITEM; - public static Block INTERSEX_BLAHAJ_BLOCK; - public static Item INTERSEX_BLAHAJ_ITEM; - public static Block LESPONY_BLAHAJ_BLOCK; - public static Item LESPONY_BLAHAJ_ITEM; - public static Block PAN_BLAHAJ_BLOCK; - public static Item PAN_BLAHAJ_ITEM; - public static Block PINK_BLAHAJ_BLOCK; - public static Item PINK_BLAHAJ_ITEM; - public static Block POLY_BLAHAJ_BLOCK; - public static Item POLY_BLAHAJ_ITEM; - public static Block PRIDE_BLAHAJ_BLOCK; - public static Item PRIDE_BLAHAJ_ITEM; - - - public static void register() { - GRAY_BLAHAJ_BLOCK = Registry.register(Registries.BLOCK, GRAY_BLAHAJ, new CBlock(AbstractBlock.Settings.copy(Blocks.WHITE_WOOL))); - BLAHAJ_BLOCK = Registry.register(Registries.BLOCK, BLAHAJ_ID, new CBlock(AbstractBlock.Settings.copy(Blocks.WHITE_WOOL))); - BAGUETTE_BLOCK = Registry.register(Registries.BLOCK, BAGUETTE, new CBlock(AbstractBlock.Settings.copy(Blocks.WHITE_WOOL))); - - ACE_BLAHAJ_BLOCK = Registry.register(Registries.BLOCK, ACE_BLAHAJ, new CBlock(AbstractBlock.Settings.copy(Blocks.WHITE_WOOL))); - AGENDER_BLAHAJ_BLOCK = Registry.register(Registries.BLOCK, AGENDER_BLAHAJ, new CBlock(AbstractBlock.Settings.copy(Blocks.WHITE_WOOL))); - ARO_BLAHAJ_BLOCK = Registry.register(Registries.BLOCK, ARO_BLAHAJ, new CBlock(AbstractBlock.Settings.copy(Blocks.WHITE_WOOL))); - AROACE_BLAHAJ_BLOCK = Registry.register(Registries.BLOCK, AROACE_BLAHAJ, new CBlock(AbstractBlock.Settings.copy(Blocks.WHITE_WOOL))); - TRANS_BLAHAJ_BLOCK = Registry.register(Registries.BLOCK, TRANS_BLAHAJ, new CBlock(AbstractBlock.Settings.copy(Blocks.WHITE_WOOL))); - BI_BLAHAJ_BLOCK = Registry.register(Registries.BLOCK, BI_BLAHAJ, new CBlock(AbstractBlock.Settings.copy(Blocks.WHITE_WOOL))); - DEMIBOY_BLAHAJ_BLOCK = Registry.register(Registries.BLOCK, DEMIBOY_BLAHAJ, new CBlock(AbstractBlock.Settings.copy(Blocks.WHITE_WOOL))); - DEMIGIRL_BLAHAJ_BLOCK = Registry.register(Registries.BLOCK, DEMIGIRL_BLAHAJ, new CBlock(AbstractBlock.Settings.copy(Blocks.WHITE_WOOL))); - ENBY_BLAHAJ_BLOCK = Registry.register(Registries.BLOCK, ENBY_BLAHAJ, new CBlock(AbstractBlock.Settings.copy(Blocks.WHITE_WOOL))); - RAINBOWDASH_BLAHAJ_BLOCK = Registry.register(Registries.BLOCK, RAINBOWDASH_BLAHAJ, new CBlock(AbstractBlock.Settings.copy(Blocks.WHITE_WOOL))); - GENDERFLUID_BLAHAJ_BLOCK = Registry.register(Registries.BLOCK, GENDERFLUID_BLAHAJ, new CBlock(AbstractBlock.Settings.copy(Blocks.WHITE_WOOL))); - GENDERQUEER_BLAHAJ_BLOCK = Registry.register(Registries.BLOCK, GENDERQUEER_BLAHAJ, new CBlock(AbstractBlock.Settings.copy(Blocks.WHITE_WOOL))); - GRAYROSE_BLAHAJ_BLOCK = Registry.register(Registries.BLOCK, GRAYROSE_BLAHAJ, new CBlock(AbstractBlock.Settings.copy(Blocks.WHITE_WOOL))); - INTERSEX_BLAHAJ_BLOCK = Registry.register(Registries.BLOCK, INTERSEX_BLAHAJ, new CBlock(AbstractBlock.Settings.copy(Blocks.WHITE_WOOL))); - LESPONY_BLAHAJ_BLOCK = Registry.register(Registries.BLOCK, LESPONY_BLAHAJ, new CBlock(AbstractBlock.Settings.copy(Blocks.WHITE_WOOL))); - PAN_BLAHAJ_BLOCK = Registry.register(Registries.BLOCK, PAN_BLAHAJ, new CBlock(AbstractBlock.Settings.copy(Blocks.WHITE_WOOL))); - PINK_BLAHAJ_BLOCK = Registry.register(Registries.BLOCK, PINK_BLAHAJ, new CBlock(AbstractBlock.Settings.copy(Blocks.WHITE_WOOL))); - POLY_BLAHAJ_BLOCK = Registry.register(Registries.BLOCK, POLY_BLAHAJ, new CBlock(AbstractBlock.Settings.copy(Blocks.WHITE_WOOL))); - PRIDE_BLAHAJ_BLOCK = Registry.register(Registries.BLOCK, PRIDE_BLAHAJ, new CBlock(AbstractBlock.Settings.copy(Blocks.WHITE_WOOL))); - - - - GRAY_BLAHAJ_ITEM = Registry.register(Registries.ITEM, GRAY_BLAHAJ, new CItem(GRAY_BLAHAJ_BLOCK, new Item.Settings().maxCount(1), "block.blahaj.gray_shark.tooltip")); - BLAHAJ_ITEM = Registry.register(Registries.ITEM, BLAHAJ_ID, new CItem(BLAHAJ_BLOCK, new Item.Settings().maxCount(1), "block.blahaj.blue_shark.tooltip")); - BAGUETTE_ITEM = Registry.register(Registries.ITEM, BAGUETTE, new CItem(BAGUETTE_BLOCK, new Item.Settings().maxCount(1), null)); - ACE_BLAHAJ_ITEM = Registry.register(Registries.ITEM, ACE_BLAHAJ, new CItem(ACE_BLAHAJ_BLOCK, new Item.Settings().maxCount(1), "block.blahaj.ace_shark.tooltip")); - AGENDER_BLAHAJ_ITEM = Registry.register(Registries.ITEM, AGENDER_BLAHAJ, new CItem(AGENDER_BLAHAJ_BLOCK, new Item.Settings().maxCount(1), "block.blahaj.agender_shark.tooltip")); - ARO_BLAHAJ_ITEM = Registry.register(Registries.ITEM, ARO_BLAHAJ, new CItem(ARO_BLAHAJ_BLOCK, new Item.Settings().maxCount(1), "block.blahaj.aro_shark.tooltip")); - AROACE_BLAHAJ_ITEM = Registry.register(Registries.ITEM, AROACE_BLAHAJ, new CItem(AROACE_BLAHAJ_BLOCK, new Item.Settings().maxCount(1), "block.blahaj.aroace_shark.tooltip")); - TRANS_BLAHAJ_ITEM = Registry.register(Registries.ITEM, TRANS_BLAHAJ, new CItem(TRANS_BLAHAJ_BLOCK, new Item.Settings().maxCount(1), "block.blahaj.trans_shark.tooltip")); - BI_BLAHAJ_ITEM = Registry.register(Registries.ITEM, BI_BLAHAJ, new CItem(BI_BLAHAJ_BLOCK, new Item.Settings().maxCount(1), "block.blahaj.bi_shark.tooltip")); - DEMIBOY_BLAHAJ_ITEM = Registry.register(Registries.ITEM, DEMIBOY_BLAHAJ, new CItem(DEMIBOY_BLAHAJ_BLOCK, new Item.Settings().maxCount(1), "block.blahaj.demiboy_shark.tooltip")); - DEMIGIRL_BLAHAJ_ITEM = Registry.register(Registries.ITEM, DEMIGIRL_BLAHAJ, new CItem(DEMIGIRL_BLAHAJ_BLOCK, new Item.Settings().maxCount(1), "block.blahaj.demigirl_shark.tooltip")); - ENBY_BLAHAJ_ITEM = Registry.register(Registries.ITEM, ENBY_BLAHAJ, new CItem(ENBY_BLAHAJ_BLOCK, new Item.Settings().maxCount(1), "block.blahaj.enby_shark.tooltip")); - RAINBOWDASH_BLAHAJ_ITEM = Registry.register(Registries.ITEM, RAINBOWDASH_BLAHAJ, new CItem(RAINBOWDASH_BLAHAJ_BLOCK, new Item.Settings().maxCount(1), "block.blahaj.gay_shark.tooltip")); - GENDERFLUID_BLAHAJ_ITEM = Registry.register(Registries.ITEM, GENDERFLUID_BLAHAJ, new CItem(GENDERFLUID_BLAHAJ_BLOCK, new Item.Settings().maxCount(1), "block.blahaj.genderfluid_shark.tooltip")); - GENDERQUEER_BLAHAJ_ITEM = Registry.register(Registries.ITEM, GENDERQUEER_BLAHAJ, new CItem(GENDERQUEER_BLAHAJ_BLOCK, new Item.Settings().maxCount(1), "block.blahaj.genderqueer_shark.tooltip")); - GRAYROSE_BLAHAJ_ITEM = Registry.register(Registries.ITEM, GRAYROSE_BLAHAJ, new CItem(GRAYROSE_BLAHAJ_BLOCK, new Item.Settings().maxCount(1), "block.blahaj.greyrose_shark.tooltip")); - INTERSEX_BLAHAJ_ITEM = Registry.register(Registries.ITEM, INTERSEX_BLAHAJ, new CItem(INTERSEX_BLAHAJ_BLOCK, new Item.Settings().maxCount(1), "block.blahaj.intersex_shark.tooltip")); - LESPONY_BLAHAJ_ITEM = Registry.register(Registries.ITEM, LESPONY_BLAHAJ, new CItem(LESPONY_BLAHAJ_BLOCK, new Item.Settings().maxCount(1), "block.blahaj.lesbian_shark.tooltip")); - PAN_BLAHAJ_ITEM = Registry.register(Registries.ITEM, PAN_BLAHAJ, new CItem(PAN_BLAHAJ_BLOCK, new Item.Settings().maxCount(1), "block.blahaj.pan_shark.tooltip")); - PINK_BLAHAJ_ITEM = Registry.register(Registries.ITEM, PINK_BLAHAJ, new CItem(PINK_BLAHAJ_BLOCK, new Item.Settings().maxCount(1), "block.blahaj.pink_shark.tooltip")); - POLY_BLAHAJ_ITEM = Registry.register(Registries.ITEM, POLY_BLAHAJ, new CItem(POLY_BLAHAJ_BLOCK, new Item.Settings().maxCount(1), "block.blahaj.poly_shark.tooltip")); - PRIDE_BLAHAJ_ITEM = Registry.register(Registries.ITEM, PRIDE_BLAHAJ, new CItem(PRIDE_BLAHAJ_BLOCK, new Item.Settings().maxCount(1), "block.blahaj.pride_shark.tooltip")); - - - - } - - public static void registerClient() { - BlockRenderLayerMap.INSTANCE.putBlock(GRAY_BLAHAJ_BLOCK, RenderLayer.getCutout()); - BlockRenderLayerMap.INSTANCE.putBlock(BLAHAJ_BLOCK, RenderLayer.getCutout()); - BlockRenderLayerMap.INSTANCE.putBlock(BAGUETTE_BLOCK, RenderLayer.getCutout()); - } -} - - diff --git a/src/main/resources/assets/blahaj/blockstates/ace_shark.json b/src/main/resources/assets/blahaj/blockstates/ace_shark.json deleted file mode 100644 index 175d444..0000000 --- a/src/main/resources/assets/blahaj/blockstates/ace_shark.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "blahaj:block/ace_shark" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/blahaj/blockstates/agender_shark.json b/src/main/resources/assets/blahaj/blockstates/agender_shark.json deleted file mode 100644 index 14ad33f..0000000 --- a/src/main/resources/assets/blahaj/blockstates/agender_shark.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "blahaj:block/aro_shark" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/blahaj/blockstates/aro_shark.json b/src/main/resources/assets/blahaj/blockstates/aro_shark.json deleted file mode 100644 index 14ad33f..0000000 --- a/src/main/resources/assets/blahaj/blockstates/aro_shark.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "blahaj:block/aro_shark" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/blahaj/blockstates/aroace_shark.json b/src/main/resources/assets/blahaj/blockstates/aroace_shark.json deleted file mode 100644 index 5b60738..0000000 --- a/src/main/resources/assets/blahaj/blockstates/aroace_shark.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "blahaj:block/aroace_shark" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/blahaj/blockstates/bi_shark.json b/src/main/resources/assets/blahaj/blockstates/bi_shark.json deleted file mode 100644 index 7f65e3a..0000000 --- a/src/main/resources/assets/blahaj/blockstates/bi_shark.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "blahaj:block/bi_shark" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/blahaj/blockstates/blue_shark.json b/src/main/resources/assets/blahaj/blockstates/blue_shark.json deleted file mode 100644 index ec61a48..0000000 --- a/src/main/resources/assets/blahaj/blockstates/blue_shark.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "blahaj:block/blue_shark" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/blahaj/blockstates/bread.json b/src/main/resources/assets/blahaj/blockstates/bread.json deleted file mode 100644 index 90c54b2..0000000 --- a/src/main/resources/assets/blahaj/blockstates/bread.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "blahaj:block/bread" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/blahaj/blockstates/demiboy_shark.json b/src/main/resources/assets/blahaj/blockstates/demiboy_shark.json deleted file mode 100644 index 613f44a..0000000 --- a/src/main/resources/assets/blahaj/blockstates/demiboy_shark.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "blahaj:block/demiboy_shark" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/blahaj/blockstates/demigirl_shark.json b/src/main/resources/assets/blahaj/blockstates/demigirl_shark.json deleted file mode 100644 index 8283456..0000000 --- a/src/main/resources/assets/blahaj/blockstates/demigirl_shark.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "blahaj:block/demigirl_shark" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/blahaj/blockstates/enby_shark.json b/src/main/resources/assets/blahaj/blockstates/enby_shark.json deleted file mode 100644 index 19de029..0000000 --- a/src/main/resources/assets/blahaj/blockstates/enby_shark.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "blahaj:block/enby_shark" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/blahaj/blockstates/gay_shark.json b/src/main/resources/assets/blahaj/blockstates/gay_shark.json deleted file mode 100644 index f186be2..0000000 --- a/src/main/resources/assets/blahaj/blockstates/gay_shark.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "blahaj:block/gay_shark" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/blahaj/blockstates/genderfluid_shark.json b/src/main/resources/assets/blahaj/blockstates/genderfluid_shark.json deleted file mode 100644 index 8dfb466..0000000 --- a/src/main/resources/assets/blahaj/blockstates/genderfluid_shark.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "blahaj:block/genderfluid_shark" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/blahaj/blockstates/genderqueer_shark.json b/src/main/resources/assets/blahaj/blockstates/genderqueer_shark.json deleted file mode 100644 index fbfe0bf..0000000 --- a/src/main/resources/assets/blahaj/blockstates/genderqueer_shark.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "blahaj:block/genderqueer_shark" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/blahaj/blockstates/gray_shark.json b/src/main/resources/assets/blahaj/blockstates/gray_shark.json deleted file mode 100644 index c97cefc..0000000 --- a/src/main/resources/assets/blahaj/blockstates/gray_shark.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "blahaj:block/gray_shark" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/blahaj/blockstates/greyrose_shark.json b/src/main/resources/assets/blahaj/blockstates/greyrose_shark.json deleted file mode 100644 index f8a86a6..0000000 --- a/src/main/resources/assets/blahaj/blockstates/greyrose_shark.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "blahaj:block/greyrose_shark" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/blahaj/blockstates/intersex_shark.json b/src/main/resources/assets/blahaj/blockstates/intersex_shark.json deleted file mode 100644 index bb3c5fb..0000000 --- a/src/main/resources/assets/blahaj/blockstates/intersex_shark.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "blahaj:block/intersex_shark" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/blahaj/blockstates/lesbian_shark.json b/src/main/resources/assets/blahaj/blockstates/lesbian_shark.json deleted file mode 100644 index 033de77..0000000 --- a/src/main/resources/assets/blahaj/blockstates/lesbian_shark.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "blahaj:block/lesbian_shark" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/blahaj/blockstates/pan_shark.json b/src/main/resources/assets/blahaj/blockstates/pan_shark.json deleted file mode 100644 index c0f4752..0000000 --- a/src/main/resources/assets/blahaj/blockstates/pan_shark.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "blahaj:block/pan_shark" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/blahaj/blockstates/pink_shark.json b/src/main/resources/assets/blahaj/blockstates/pink_shark.json deleted file mode 100644 index 86b4029..0000000 --- a/src/main/resources/assets/blahaj/blockstates/pink_shark.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "blahaj:block/pink_shark" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/blahaj/blockstates/poly_shark.json b/src/main/resources/assets/blahaj/blockstates/poly_shark.json deleted file mode 100644 index 88754b3..0000000 --- a/src/main/resources/assets/blahaj/blockstates/poly_shark.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "blahaj:block/poly_shark" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/blahaj/blockstates/pride_shark.json b/src/main/resources/assets/blahaj/blockstates/pride_shark.json deleted file mode 100644 index a46b34f..0000000 --- a/src/main/resources/assets/blahaj/blockstates/pride_shark.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "blahaj:block/pride_shark" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/blahaj/blockstates/trans_shark.json b/src/main/resources/assets/blahaj/blockstates/trans_shark.json deleted file mode 100644 index ad5a4f6..0000000 --- a/src/main/resources/assets/blahaj/blockstates/trans_shark.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "blahaj:block/trans_shark" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/blahaj/lang/en_us.json b/src/main/resources/assets/blahaj/lang/en_us.json index da1e3eb..ddb790b 100644 --- a/src/main/resources/assets/blahaj/lang/en_us.json +++ b/src/main/resources/assets/blahaj/lang/en_us.json @@ -1,36 +1,36 @@ { - "block.blahaj.blue_shark": "Soft Toy Shark", - "block.blahaj.blue_shark.tooltip": "a.k.a. Blahaj", - "block.blahaj.gray_shark": "Gray Toy Shark", - "block.blahaj.gray_shark.tooltip": "a.k.a. Klappar Haj", - "block.blahaj.trans_shark": "Trans Toy Shark", - "block.blahaj.trans_shark.tooltip": "a.k.a. Beyou Blahaj", - "block.blahaj.blue_whale": "Soft Toy Blue Whale", - "block.blahaj.blue_whale.tooltip": "a.k.a. Blavingad. Holds a stack of items.", - "block.blahaj.killer_whale": "Soft Toy Killer Whale", - "block.blahaj.killer_whale.tooltip": "a.k.a. Blavingad. Holds a stack of items.", - "block.blahaj.seal": "Seal plushie", - "block.blahaj.Seal.tooltip": "a.k.a. Sorensen", - "block.blahaj.bread": "Baguette", - "block.blahaj.bread.tooltip": "Nicole made me add this", - "block.blahaj.ace_shark": "Ace Pride Shark", - "block.blahaj.agender_shark": "Agender Pride Shark", - "block.blahaj.aro_shark": "Aro Pride Shark", - "block.blahaj.aroace_shark": "Aroace Pride Shark", - "block.blahaj.bi_shark": "Bi Pride Shark", - "block.blahaj.demiboy_shark": "Demiboy Pride Shark", - "block.blahaj.demigirl_shark": "Demigirl Pride Shark", - "block.blahaj.enby_shark": "nonbinary Pride Shark", - "block.blahaj.gay_shark": "Gay Pride Shark", - "block.blahaj.genderfluid_shark": "Genderfluid Pride Shark", - "block.blahaj.genderqueer_shark": "Genderqueer Pride Shark", - "block.blahaj.greyrose_shark": "Greyrose Pride Shark", - "block.blahaj.intersex_shark": "Intersex Pride Shark", - "block.blahaj.lesbian_shark": "Lesbian Pride Shark", - "block.blahaj.pan_shark": "Pansexual Pride Shark", - "block.blahaj.pink_shark": "Pink Shark", - "block.blahaj.poly_shark": "Poly Pride Shark", - "block.blahaj.pride_shark": "Pride Pride Shark", + "item.blahaj.blue_shark": "Soft Toy Shark", + "item.blahaj.blue_shark.tooltip": "a.k.a. Blahaj", + "item.blahaj.gray_shark": "Gray Toy Shark", + "item.blahaj.gray_shark.tooltip": "a.k.a. Klappar Haj", + "item.blahaj.trans_shark": "Trans Toy Shark", + "item.blahaj.trans_shark.tooltip": "a.k.a. Beyou Blahaj", + "item.blahaj.blue_whale": "Soft Toy Blue Whale", + "item.blahaj.blue_whale.tooltip": "a.k.a. Blavingad. Holds a stack of items.", + "item.blahaj.killer_whale": "Soft Toy Killer Whale", + "item.blahaj.killer_whale.tooltip": "a.k.a. Blavingad. Holds a stack of items.", + "item.blahaj.seal": "Seal plushie", + "item.blahaj.Seal.tooltip": "a.k.a. Sorensen", + "item.blahaj.bread": "Baguette", + "item.blahaj.bread.tooltip": "Nicole made me add this", + "item.blahaj.ace_shark": "Ace Pride Shark", + "item.blahaj.agender_shark": "Agender Pride Shark", + "item.blahaj.aro_shark": "Aro Pride Shark", + "item.blahaj.aroace_shark": "Aroace Pride Shark", + "item.blahaj.bi_shark": "Bi Pride Shark", + "item.blahaj.demiboy_shark": "Demiboy Pride Shark", + "item.blahaj.demigirl_shark": "Demigirl Pride Shark", + "item.blahaj.enby_shark": "nonbinary Pride Shark", + "item.blahaj.gay_shark": "Gay Pride Shark", + "item.blahaj.genderfluid_shark": "Genderfluid Pride Shark", + "item.blahaj.genderqueer_shark": "Genderqueer Pride Shark", + "item.blahaj.greyrose_shark": "Greyrose Pride Shark", + "item.blahaj.intersex_shark": "Intersex Pride Shark", + "item.blahaj.lesbian_shark": "Lesbian Pride Shark", + "item.blahaj.pan_shark": "Pansexual Pride Shark", + "item.blahaj.pink_shark": "Pink Shark", + "item.blahaj.poly_shark": "Poly Pride Shark", + "item.blahaj.pride_shark": "Pride Pride Shark", "itemgroup.blahaj": "Blahaj" diff --git a/src/main/resources/assets/blahaj/lang/sv_se.json b/src/main/resources/assets/blahaj/lang/sv_se.json deleted file mode 100644 index 583f772..0000000 --- a/src/main/resources/assets/blahaj/lang/sv_se.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "item.blahaj.blue_shark": "Mjukleksak Haj", - "item.blahaj.blue_shark.tooltip": "alias Blåhaj", - "item.blahaj.gray_shark": "Mjukleksak Gråhaj", - "item.blahaj.gray_shark.tooltip": "alias Klappar Haj", - "item.blahaj.trans_shark": "Mjukleksak Rosahaj", - "item.blahaj.trans_shark.tooltip": "alias Beyou Blåhaj", - "item.blahaj.blue_whale": "Mjukleksak Blåval", - "item.blahaj.blue_whale.tooltip": "alias Blåvingad. Kan innehålla en hög med föremål", - "item.blahaj.bread": "Brödkudde", - "tooltip.blahaj.owner.craft": "Skapad av %s", - "tooltip.blahaj.owner.rename": "%s av %s" -} diff --git a/src/main/resources/assets/blahaj/models/block/ace_shark.json b/src/main/resources/assets/blahaj/models/block/ace_shark.json deleted file mode 100644 index 25ffbab..0000000 --- a/src/main/resources/assets/blahaj/models/block/ace_shark.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "blahaj:item/blue_shark", - "textures": { - "0": "blahaj:item/ace_shark" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/blahaj/models/block/agender_shark.json b/src/main/resources/assets/blahaj/models/block/agender_shark.json deleted file mode 100644 index 74b9d1c..0000000 --- a/src/main/resources/assets/blahaj/models/block/agender_shark.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "blahaj:item/blue_shark", - "textures": { - "0": "blahaj:item/agender_shark" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/blahaj/models/block/aro_shark.json b/src/main/resources/assets/blahaj/models/block/aro_shark.json deleted file mode 100644 index 0e0da19..0000000 --- a/src/main/resources/assets/blahaj/models/block/aro_shark.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "blahaj:item/blue_shark", - "textures": { - "0": "blahaj:item/aro_shark" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/blahaj/models/block/aroace_shark.json b/src/main/resources/assets/blahaj/models/block/aroace_shark.json deleted file mode 100644 index 67b8701..0000000 --- a/src/main/resources/assets/blahaj/models/block/aroace_shark.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "blahaj:item/blue_shark", - "textures": { - "0": "blahaj:item/aroace_shark" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/blahaj/models/block/bi_shark.json b/src/main/resources/assets/blahaj/models/block/bi_shark.json deleted file mode 100644 index 9acaea9..0000000 --- a/src/main/resources/assets/blahaj/models/block/bi_shark.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "blahaj:item/blue_shark", - "textures": { - "0": "blahaj:item/bi_shark" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/blahaj/models/block/blahaj_backpack.json b/src/main/resources/assets/blahaj/models/block/blahaj_backpack.json deleted file mode 100644 index 022302e..0000000 --- a/src/main/resources/assets/blahaj/models/block/blahaj_backpack.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "travelersbackpack:item/travelers_backpack" -} \ No newline at end of file diff --git a/src/main/resources/assets/blahaj/models/block/blue_shark.json b/src/main/resources/assets/blahaj/models/block/blue_shark.json deleted file mode 100644 index 8ade49c..0000000 --- a/src/main/resources/assets/blahaj/models/block/blue_shark.json +++ /dev/null @@ -1,174 +0,0 @@ -{ - "texture_size": [32, 32], - "textures": { - "0": "blahaj:item/shork" - }, - "elements": [ - { - "name": "shork", - "from": [6, 6, 0], - "to": [10, 10, 9], - "faces": { - "north": {"uv": [4.5, 4.5, 6.5, 6.5], "texture": "#0"}, - "east": {"uv": [0, 4.5, 4.5, 6.5], "texture": "#0"}, - "south": {"uv": [11, 4.5, 13, 6.5], "texture": "#0"}, - "west": {"uv": [6.5, 4.5, 11, 6.5], "texture": "#0"}, - "up": {"uv": [6.5, 4.5, 4.5, 0], "texture": "#0"}, - "down": {"uv": [8.5, 0, 6.5, 4.5], "texture": "#0"} - } - }, - { - "name": "tail", - "from": [7, 7, 9], - "to": [9, 9, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 15.5]}, - "faces": { - "north": {"uv": [3.5, 10, 4.5, 11], "texture": "#0"}, - "east": {"uv": [0, 10, 3.5, 11], "texture": "#0"}, - "south": {"uv": [8, 10, 9, 11], "texture": "#0"}, - "west": {"uv": [4.5, 10, 8, 11], "texture": "#0"}, - "up": {"uv": [4.5, 10, 3.5, 6.5], "texture": "#0"}, - "down": {"uv": [5.5, 6.5, 4.5, 10], "texture": "#0"} - } - }, - { - "name": "tail base", - "from": [6.5, 6.5, 9], - "to": [9.5, 9.5, 11], - "faces": { - "north": {"uv": [1, 12, 2.5, 13.5], "texture": "#0"}, - "east": {"uv": [0, 12, 1, 13.5], "texture": "#0"}, - "south": {"uv": [3.5, 12, 5, 13.5], "texture": "#0"}, - "west": {"uv": [2.5, 12, 3.5, 13.5], "texture": "#0"}, - "up": {"uv": [2.5, 12, 1, 11], "texture": "#0"}, - "down": {"uv": [4, 11, 2.5, 12], "texture": "#0"} - } - }, - { - "name": "tail stabilizer", - "from": [7.5, 8, 14], - "to": [8.5, 12, 16], - "rotation": {"angle": 22.5, "axis": "x", "origin": [8, 9, 15]}, - "faces": { - "north": {"uv": [1, 1, 1.5, 3], "texture": "#0"}, - "east": {"uv": [0, 1, 1, 3], "texture": "#0"}, - "south": {"uv": [2.5, 1, 3, 3], "texture": "#0"}, - "west": {"uv": [1.5, 1, 2.5, 3], "texture": "#0"}, - "up": {"uv": [1.5, 1, 1, 0], "texture": "#0"}, - "down": {"uv": [2, 0, 1.5, 1], "texture": "#0"} - } - }, - { - "name": "left pectoral", - "from": [5, 5, 6], - "to": [6, 7, 10], - "rotation": {"angle": 22.5, "axis": "x", "origin": [6, 7, 7]}, - "faces": { - "north": {"uv": [7.5, 8.5, 8, 9.5], "texture": "#0"}, - "east": {"uv": [5.5, 8.5, 7.5, 9.5], "texture": "#0"}, - "south": {"uv": [10, 8.5, 10.5, 9.5], "texture": "#0"}, - "west": {"uv": [8, 8.5, 10, 9.5], "texture": "#0"}, - "up": {"uv": [8, 8.5, 7.5, 6.5], "texture": "#0"}, - "down": {"uv": [8.5, 6.5, 8, 8.5], "texture": "#0"} - } - }, - { - "name": "right pectoral", - "from": [10, 5, 6], - "to": [11, 7, 10], - "shade": false, - "rotation": {"angle": 22.5, "axis": "x", "origin": [10, 7, 7]}, - "faces": { - "north": {"uv": [8, 8.5, 7.5, 9.5], "texture": "#0"}, - "east": {"uv": [10, 8.5, 8, 9.5], "texture": "#0"}, - "south": {"uv": [10.5, 8.5, 10, 9.5], "texture": "#0"}, - "west": {"uv": [7.5, 8.5, 5.5, 9.5], "texture": "#0"}, - "up": {"uv": [7.5, 8.5, 8, 6.5], "texture": "#0"}, - "down": {"uv": [8, 6.5, 8.5, 8.5], "texture": "#0"} - } - }, - { - "name": "dorsal fin", - "from": [7, 9, 5], - "to": [9, 14, 8], - "rotation": {"angle": 22.5, "axis": "x", "origin": [8, 10, 7]}, - "faces": { - "north": {"uv": [10, 1.5, 11, 4], "texture": "#0"}, - "east": {"uv": [8.5, 1.5, 10, 4], "texture": "#0"}, - "south": {"uv": [12.5, 1.5, 13.5, 4], "texture": "#0"}, - "west": {"uv": [11, 1.5, 12.5, 4], "texture": "#0"}, - "up": {"uv": [11, 1.5, 10, 0], "texture": "#0"}, - "down": {"uv": [12, 0, 11, 1.5], "texture": "#0"} - } - }, - { - "name": "back dorsal", - "from": [7.5, 8.5, 12], - "to": [8.5, 9.5, 13], - "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 9, 12.5]}, - "faces": { - "north": {"uv": [2.5, 0.5, 3, 1], "texture": "#0"}, - "east": {"uv": [2, 0.5, 2.5, 1], "texture": "#0"}, - "south": {"uv": [3.5, 0.5, 4, 1], "texture": "#0"}, - "west": {"uv": [3, 0.5, 3.5, 1], "texture": "#0"}, - "up": {"uv": [3, 0.5, 2.5, 0], "texture": "#0"}, - "down": {"uv": [3.5, 0, 3, 0.5], "texture": "#0"} - } - }, - { - "name": "mouf back", - "from": [6, 6, 1], - "to": [10, 7, 1], - "faces": { - "north": {"uv": [0, 3.5, 2, 4], "texture": "#0"}, - "east": {"uv": [0, 3.5, 0, 4], "texture": "#0"}, - "south": {"uv": [2, 3.5, 4, 4], "texture": "#0"}, - "west": {"uv": [2, 3.5, 2, 4], "texture": "#0"}, - "up": {"uv": [2, 3.5, 0, 3.5], "texture": "#0"}, - "down": {"uv": [4, 3.5, 2, 3.5], "texture": "#0"} - } - }, - { - "name": "mouf top", - "from": [6, 7, 0], - "to": [10, 7, 1], - "faces": { - "north": {"uv": [0.5, 3.5, 2.5, 3.5], "texture": "#0"}, - "east": {"uv": [0, 3.5, 0.5, 3.5], "texture": "#0"}, - "south": {"uv": [3, 3.5, 5, 3.5], "texture": "#0"}, - "west": {"uv": [2.5, 3.5, 3, 3.5], "texture": "#0"}, - "up": {"uv": [2.5, 3.5, 0.5, 3], "texture": "#0"}, - "down": {"uv": [4.5, 3, 2.5, 3.5], "texture": "#0"} - } - } - ], - "display": { - "thirdperson_righthand": { - "rotation": [140, -60, 105], - "translation": [-5, -2.25, 3.75], - "scale": [1.15, 1.15, 1.15] - }, - "firstperson_righthand": { - "rotation": [70, -55, 60], - "translation": [-3.25, 1.25, 1] - }, - "ground": { - "rotation": [0, 90, 0], - "translation": [0, 2, 0], - "scale": [0.5, 0.5, 0.5] - }, - "gui": { - "rotation": [30, 135, 0], - "translation": [0.19, -0.25, 0], - "scale": [1.15, 1.15, 1.15] - }, - "head": { - "translation": [0, 9, 0], - "scale": [1.25, 1.25, 1.25] - }, - "fixed": { - "rotation": [0, -90, 0], - "translation": [0, -1, -3] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/blahaj/models/block/blue_whale.json b/src/main/resources/assets/blahaj/models/block/blue_whale.json deleted file mode 100644 index 62708ae..0000000 --- a/src/main/resources/assets/blahaj/models/block/blue_whale.json +++ /dev/null @@ -1,134 +0,0 @@ -{ - "credit": "Made with Blockbench", - "texture_size": [32, 32], - "textures": { - "0": "blahaj:item/blue_whale", - "particle": "blahaj:item/blue_whale" - }, - "elements": [ - { - "name": "tail stabilizer", - "from": [4, 7, 14], - "to": [12, 9, 16], - "rotation": {"angle": 0, "axis": "x", "origin": [8, 9, 15]}, - "faces": { - "north": {"uv": [7, 7, 11, 8], "texture": "#0"}, - "east": {"uv": [6, 7, 7, 8], "texture": "#0"}, - "south": {"uv": [12, 7, 16, 8], "texture": "#0"}, - "west": {"uv": [11, 7, 12, 8], "texture": "#0"}, - "up": {"uv": [11, 7, 7, 6], "texture": "#0"}, - "down": {"uv": [15, 6, 11, 7], "texture": "#0"} - } - }, - { - "name": "right pectoral", - "from": [11, 7, 3], - "to": [15, 8, 5], - "rotation": {"angle": -22.5, "axis": "y", "origin": [11, 7, 3]}, - "faces": { - "north": {"uv": [7, 9, 9, 9.5], "texture": "#0"}, - "east": {"uv": [6, 9, 7, 9.5], "texture": "#0"}, - "south": {"uv": [10, 9, 12, 9.5], "texture": "#0"}, - "west": {"uv": [9, 9, 10, 9.5], "texture": "#0"}, - "up": {"uv": [9, 9, 7, 8], "texture": "#0"}, - "down": {"uv": [11, 8, 9, 9], "texture": "#0"} - } - }, - { - "name": "left pectoral", - "from": [1, 7, 3], - "to": [5, 8, 5], - "rotation": {"angle": 22.5, "axis": "y", "origin": [5, 7, 3]}, - "faces": { - "north": {"uv": [1, 9.5, 3, 10], "texture": "#0"}, - "east": {"uv": [0, 9.5, 1, 10], "texture": "#0"}, - "south": {"uv": [4, 9.5, 6, 10], "texture": "#0"}, - "west": {"uv": [3, 9.5, 4, 10], "texture": "#0"}, - "up": {"uv": [3, 9.5, 1, 8.5], "texture": "#0"}, - "down": {"uv": [5, 8.5, 3, 9.5], "texture": "#0"} - } - }, - { - "name": "whael", - "from": [5, 6, 0], - "to": [11, 10, 8], - "faces": { - "north": {"uv": [4, 4, 7, 6], "texture": "#0"}, - "east": {"uv": [0, 4, 4, 6], "texture": "#0"}, - "south": {"uv": [11, 4, 14, 6], "texture": "#0"}, - "west": {"uv": [7, 4, 11, 6], "texture": "#0"}, - "up": {"uv": [7, 4, 4, 0], "texture": "#0"}, - "down": {"uv": [10, 0, 7, 4], "texture": "#0"} - } - }, - { - "name": "tail", - "from": [6.5, 7, 11], - "to": [9.5, 9, 14], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 15.5]}, - "faces": { - "north": {"uv": [1.5, 7.5, 3, 8.5], "texture": "#0"}, - "east": {"uv": [0, 7.5, 1.5, 8.5], "texture": "#0"}, - "south": {"uv": [4.5, 7.5, 6, 8.5], "texture": "#0"}, - "west": {"uv": [3, 7.5, 4.5, 8.5], "texture": "#0"}, - "up": {"uv": [3, 7.5, 1.5, 6], "texture": "#0"}, - "down": {"uv": [4.5, 6, 3, 7.5], "texture": "#0"} - } - }, - { - "name": "dorsal fin", - "from": [7.5, 10, 5], - "to": [8.5, 13, 7], - "rotation": {"angle": 22.5, "axis": "x", "origin": [8, 10, 5]}, - "faces": { - "north": {"uv": [11, 1, 11.5, 2.5], "texture": "#0"}, - "east": {"uv": [10, 1, 11, 2.5], "texture": "#0"}, - "south": {"uv": [12.5, 1, 13, 2.5], "texture": "#0"}, - "west": {"uv": [11.5, 1, 12.5, 2.5], "texture": "#0"}, - "up": {"uv": [11.5, 1, 11, 0], "texture": "#0"}, - "down": {"uv": [12, 0, 11.5, 1], "texture": "#0"} - } - }, - { - "from": [6, 6.5, 8], - "to": [10, 9.5, 11], - "faces": { - "north": {"uv": [1.5, 11.5, 3.5, 13], "texture": "#0"}, - "east": {"uv": [0, 11.5, 1.5, 13], "texture": "#0"}, - "south": {"uv": [5, 11.5, 7, 13], "texture": "#0"}, - "west": {"uv": [3.5, 11.5, 5, 13], "texture": "#0"}, - "up": {"uv": [3.5, 11.5, 1.5, 10], "texture": "#0"}, - "down": {"uv": [5.5, 10, 3.5, 11.5], "texture": "#0"} - } - } - ], - "display": { - "thirdperson_righthand": { - "rotation": [130, -60, 100], - "translation": [-4, -1.5, 3.25], - "scale": [1.1, 1.1, 1.1] - }, - "firstperson_righthand": { - "rotation": [70, -55, 60], - "translation": [-3.25, 1.25, 1] - }, - "ground": { - "rotation": [0, 90, 0], - "translation": [0, 2, 0], - "scale": [0.5, 0.5, 0.5] - }, - "gui": { - "rotation": [30, 135, 0], - "translation": [-0.4, 0, 0], - "scale": [0.98, 0.98, 0.98] - }, - "head": { - "translation": [0, 9, 0], - "scale": [1.25, 1.25, 1.25] - }, - "fixed": { - "rotation": [0, -90, 0], - "translation": [0, -1, -3] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/blahaj/models/block/bread.json b/src/main/resources/assets/blahaj/models/block/bread.json deleted file mode 100644 index 04e3624..0000000 --- a/src/main/resources/assets/blahaj/models/block/bread.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "texture_size": [32, 32], - "textures": { - "0": "blahaj:item/bred", - "particle": "#0" - }, - "elements": [ - { - "name": "shork", - "from": [5, 5, -1], - "to": [11, 11, 16], - "faces": { - "north": {"uv": [8.5, 3, 11.5, 6], "texture": "#0"}, - "east": {"uv": [0, 0, 8.5, 3], "texture": "#0"}, - "south": {"uv": [8.5, 0, 11.5, 3], "texture": "#0"}, - "west": {"uv": [0, 3, 8.5, 6], "texture": "#0"}, - "up": {"uv": [3, 14.5, 0, 6], "texture": "#0"}, - "down": {"uv": [6, 6, 3, 14.5], "texture": "#0"} - } - } - ], - "display": { - "thirdperson_righthand": { - "rotation": [-48.96, 12.4, -13.43], - "translation": [-3.75, -2.5, 3] - }, - "firstperson_righthand": { - "rotation": [-90, 32, 0], - "translation": [-4.5, 1.25, 1] - }, - "ground": { - "scale": [0.5, 0.5, 0.5] - }, - "gui": { - "rotation": [30, 135, 0], - "translation": [0.36, 0, 0], - "scale": [0.98, 0.98, 0.98] - }, - "head": { - "rotation": [0, 90, 0], - "translation": [0, 10, 0], - "scale": [1.25, 1.25, 1.25] - }, - "fixed": { - "rotation": [0, -90, 0], - "translation": [0, -1, -3.5] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/blahaj/models/block/demiboy_shark.json b/src/main/resources/assets/blahaj/models/block/demiboy_shark.json deleted file mode 100644 index 4b73271..0000000 --- a/src/main/resources/assets/blahaj/models/block/demiboy_shark.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "blahaj:item/blue_shark", - "textures": { - "0": "blahaj:item/demiboy_shark" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/blahaj/models/block/demigirl_shark.json b/src/main/resources/assets/blahaj/models/block/demigirl_shark.json deleted file mode 100644 index fafa56b..0000000 --- a/src/main/resources/assets/blahaj/models/block/demigirl_shark.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "blahaj:item/blue_shark", - "textures": { - "0": "blahaj:item/demigirl_shark" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/blahaj/models/block/demiromantic_shark.json b/src/main/resources/assets/blahaj/models/block/demiromantic_shark.json deleted file mode 100644 index 446c206..0000000 --- a/src/main/resources/assets/blahaj/models/block/demiromantic_shark.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "blahaj:item/blue_shark", - "textures": { - "0": "blahaj:item/demi_r_shark" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/blahaj/models/block/demisexual_shark.json b/src/main/resources/assets/blahaj/models/block/demisexual_shark.json deleted file mode 100644 index a2a485d..0000000 --- a/src/main/resources/assets/blahaj/models/block/demisexual_shark.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "blahaj:item/blue_shark", - "textures": { - "0": "blahaj:item/demi_s_shark" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/blahaj/models/block/enby_shark.json b/src/main/resources/assets/blahaj/models/block/enby_shark.json deleted file mode 100644 index bce66dc..0000000 --- a/src/main/resources/assets/blahaj/models/block/enby_shark.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "blahaj:item/blue_shark", - "textures": { - "0": "blahaj:item/enby_shark" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/blahaj/models/block/gay_shark.json b/src/main/resources/assets/blahaj/models/block/gay_shark.json deleted file mode 100644 index fd866d3..0000000 --- a/src/main/resources/assets/blahaj/models/block/gay_shark.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "blahaj:item/blue_shark", - "textures": { - "0": "blahaj:item/gay_shark" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/blahaj/models/block/genderfluid_shark.json b/src/main/resources/assets/blahaj/models/block/genderfluid_shark.json deleted file mode 100644 index 60f1f3f..0000000 --- a/src/main/resources/assets/blahaj/models/block/genderfluid_shark.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "blahaj:item/blue_shark", - "textures": { - "0": "blahaj:item/genderfluid_shark" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/blahaj/models/block/genderqueer_shark.json b/src/main/resources/assets/blahaj/models/block/genderqueer_shark.json deleted file mode 100644 index 02d30bf..0000000 --- a/src/main/resources/assets/blahaj/models/block/genderqueer_shark.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "blahaj:item/blue_shark", - "textures": { - "0": "blahaj:item/genderqueer_shark" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/blahaj/models/block/gray_shark.json b/src/main/resources/assets/blahaj/models/block/gray_shark.json deleted file mode 100644 index 73e8ba2..0000000 --- a/src/main/resources/assets/blahaj/models/block/gray_shark.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "blahaj:item/blue_shark", - "textures": { - "0": "blahaj:item/gray_shork" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/blahaj/models/block/greyromantic_shark.json b/src/main/resources/assets/blahaj/models/block/greyromantic_shark.json deleted file mode 100644 index 3b70f08..0000000 --- a/src/main/resources/assets/blahaj/models/block/greyromantic_shark.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "blahaj:item/blue_shark", - "textures": { - "0": "blahaj:item/grey_r_shark" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/blahaj/models/block/greyrose_shark.json b/src/main/resources/assets/blahaj/models/block/greyrose_shark.json deleted file mode 100644 index ec9253b..0000000 --- a/src/main/resources/assets/blahaj/models/block/greyrose_shark.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "blahaj:item/blue_shark", - "textures": { - "0": "blahaj:item/greyrose_shark" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/blahaj/models/block/greysexual_shark.json b/src/main/resources/assets/blahaj/models/block/greysexual_shark.json deleted file mode 100644 index 6026ae7..0000000 --- a/src/main/resources/assets/blahaj/models/block/greysexual_shark.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "blahaj:item/blue_shark", - "textures": { - "0": "blahaj:item/grey_s_shark" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/blahaj/models/block/intersex_shark.json b/src/main/resources/assets/blahaj/models/block/intersex_shark.json deleted file mode 100644 index ff228dd..0000000 --- a/src/main/resources/assets/blahaj/models/block/intersex_shark.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "blahaj:item/blue_shark", - "textures": { - "0": "blahaj:item/intersex_shark" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/blahaj/models/block/killer_whale.json b/src/main/resources/assets/blahaj/models/block/killer_whale.json deleted file mode 100644 index aafb3d8..0000000 --- a/src/main/resources/assets/blahaj/models/block/killer_whale.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "blahaj:item/blue_whale", - "textures": { - "0": "blahaj:item/killer_whale", - "particle": "blahaj:item/killer_whale" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/blahaj/models/block/lesbian_shark.json b/src/main/resources/assets/blahaj/models/block/lesbian_shark.json deleted file mode 100644 index eead001..0000000 --- a/src/main/resources/assets/blahaj/models/block/lesbian_shark.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "blahaj:item/blue_shark", - "textures": { - "0": "blahaj:item/lesbian_shark" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/blahaj/models/block/pan_shark.json b/src/main/resources/assets/blahaj/models/block/pan_shark.json deleted file mode 100644 index bf51132..0000000 --- a/src/main/resources/assets/blahaj/models/block/pan_shark.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "blahaj:item/blue_shark", - "textures": { - "0": "blahaj:item/pan_shark" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/blahaj/models/block/pink_shark.json b/src/main/resources/assets/blahaj/models/block/pink_shark.json deleted file mode 100644 index bfe879b..0000000 --- a/src/main/resources/assets/blahaj/models/block/pink_shark.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "blahaj:item/blue_shark", - "textures": { - "0": "blahaj:item/pink_shork" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/blahaj/models/block/poly_shark.json b/src/main/resources/assets/blahaj/models/block/poly_shark.json deleted file mode 100644 index 3998a92..0000000 --- a/src/main/resources/assets/blahaj/models/block/poly_shark.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "blahaj:item/blue_shark", - "textures": { - "0": "blahaj:item/poly_shark" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/blahaj/models/block/pride_shark.json b/src/main/resources/assets/blahaj/models/block/pride_shark.json deleted file mode 100644 index 9b6dc3e..0000000 --- a/src/main/resources/assets/blahaj/models/block/pride_shark.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "blahaj:item/blue_shark", - "textures": { - "0": "blahaj:item/pride_shark" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/blahaj/models/block/seal.json b/src/main/resources/assets/blahaj/models/block/seal.json deleted file mode 100644 index 22347a6..0000000 --- a/src/main/resources/assets/blahaj/models/block/seal.json +++ /dev/null @@ -1,216 +0,0 @@ -{ - "texture_size": [32, 32], - "textures": { - "0": "blahaj:item/seal", - "particle": "blahaj:item/seal" - }, - "elements": [ - { - "name": "mainBody", - "from": [4, 0, 3], - "to": [12, 6, 13], - "rotation": {"angle": 0, "axis": "y", "origin": [0, -1, 0]}, - "faces": { - "north": {"uv": [4, 1.5, 6, 3], "texture": "#0"}, - "east": {"uv": [0, 2.5, 2.5, 4], "texture": "#0"}, - "south": {"uv": [4, 0, 6, 1.5], "texture": "#0"}, - "west": {"uv": [0, 4, 2.5, 5.5], "texture": "#0"}, - "up": {"uv": [2, 2.5, 0, 0], "texture": "#0"}, - "down": {"uv": [4, 0, 2, 2.5], "texture": "#0"} - } - }, - { - "name": "leftSide", - "from": [3, 1, 4], - "to": [4, 5, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [0, -1, 0]}, - "faces": { - "north": {"uv": [8.5, 0, 8.75, 1], "texture": "#0"}, - "east": {"uv": [6, 0, 8, 1], "texture": "#0"}, - "south": {"uv": [8.5, 1, 8.75, 2], "texture": "#0"}, - "west": {"uv": [6, 1, 8, 2], "texture": "#0"}, - "up": {"uv": [8.25, 0, 8.5, 2], "texture": "#0"}, - "down": {"uv": [8, 0, 8.25, 2], "texture": "#0"} - } - }, - { - "name": "rightSide", - "from": [12, 1, 4], - "to": [13, 5, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [16, -1, 0]}, - "faces": { - "north": {"uv": [8.75, 0, 8.5, 1], "texture": "#0"}, - "east": {"uv": [8, 1, 6, 2], "texture": "#0"}, - "south": {"uv": [8.75, 1, 8.5, 2], "texture": "#0"}, - "west": {"uv": [8, 0, 6, 1], "texture": "#0"}, - "up": {"uv": [8.5, 0, 8.25, 2], "texture": "#0"}, - "down": {"uv": [8.25, 0, 8, 2], "texture": "#0"} - } - }, - { - "name": "front", - "from": [5, 1, 2], - "to": [11, 5, 3], - "rotation": {"angle": 0, "axis": "y", "origin": [0, -1, 0]}, - "faces": { - "north": {"uv": [0, 5.5, 3, 7.5], "texture": "#0"}, - "east": {"uv": [3, 5.5, 3.5, 7.5], "texture": "#0"}, - "south": {"uv": [3.5, 5.5, 6.5, 7.5], "texture": "#0"}, - "west": {"uv": [6.5, 5.5, 7, 7.5], "texture": "#0"}, - "up": {"uv": [6.5, 5.5, 3.5, 5], "texture": "#0"}, - "down": {"uv": [3, 7.5, 0, 8], "texture": "#0"} - } - }, - { - "name": "back", - "from": [5, 1, 13], - "to": [11, 5, 14], - "rotation": {"angle": 0, "axis": "y", "origin": [0, -1, 0]}, - "faces": { - "north": {"uv": [0.25, 8.25, 1.75, 9.25], "texture": "#0"}, - "east": {"uv": [1.75, 8.25, 2, 9.25], "texture": "#0"}, - "south": {"uv": [2, 8.25, 3.5, 9.25], "texture": "#0"}, - "west": {"uv": [0, 8.25, 0.25, 9.25], "texture": "#0"}, - "up": {"uv": [1.75, 8.25, 0.25, 8], "texture": "#0"}, - "down": {"uv": [1.75, 9.25, 0.25, 9.5], "texture": "#0"} - } - }, - { - "name": "tail", - "from": [7.5, 3, 14], - "to": [8.5, 4, 15.5], - "rotation": {"angle": 0, "axis": "y", "origin": [0, -1, 0]}, - "faces": { - "north": {"uv": [3.75, 8.75, 4, 9], "texture": "#0"}, - "east": {"uv": [3.75, 7.75, 4.25, 8], "texture": "#0"}, - "south": {"uv": [4, 8.75, 4.25, 9], "texture": "#0"}, - "west": {"uv": [3.75, 8, 4.25, 8.25], "texture": "#0"}, - "up": {"uv": [4.25, 8.75, 4, 8.25], "texture": "#0"}, - "down": {"uv": [4, 8.25, 3.75, 8.75], "texture": "#0"} - } - }, - { - "name": "flipperLeft", - "from": [7, 2, 14], - "to": [7.5, 3.25, 16], - "rotation": {"angle": 45, "axis": "z", "origin": [7, 2, 2]}, - "faces": { - "north": {"uv": [4.5, 8.75, 5, 9.75], "texture": "#0"}, - "east": {"uv": [4.5, 7.75, 5.5, 8.25], "texture": "#0"}, - "south": {"uv": [5, 8.75, 5.5, 9.75], "texture": "#0"}, - "west": {"uv": [4.5, 8.25, 5.5, 8.75], "texture": "#0"}, - "up": {"uv": [5.5, 7.75, 5.75, 8.75], "texture": "#0"}, - "down": {"uv": [5.75, 7.75, 6, 8.75], "texture": "#0"} - } - }, - { - "name": "flipperRight", - "from": [8.5, 2, 14], - "to": [9, 3.25, 16], - "rotation": {"angle": -45, "axis": "z", "origin": [9, 2, 2]}, - "faces": { - "north": {"uv": [7.75, 7.75, 7.5, 8.75], "texture": "#0"}, - "east": {"uv": [7.25, 8.25, 6.25, 8.75], "texture": "#0"}, - "south": {"uv": [7.5, 7.75, 7.25, 8.75], "texture": "#0"}, - "west": {"uv": [7.25, 7.75, 6.25, 8.25], "texture": "#0"}, - "up": {"uv": [6.75, 8.75, 6.25, 9.75], "texture": "#0"}, - "down": {"uv": [7.25, 8.75, 6.75, 9.75], "texture": "#0"} - } - }, - { - "name": "nose", - "from": [7, 2.5, 1.5], - "to": [9, 3, 2], - "rotation": {"angle": 0, "axis": "y", "origin": [7, 3, 2]}, - "faces": { - "north": {"uv": [7.25, 6.25, 8.25, 6.5], "texture": "#0"}, - "east": {"uv": [7.25, 6.75, 7.5, 7], "texture": "#0"}, - "south": {"uv": [7.25, 6.5, 8.25, 6.75], "texture": "#0"}, - "west": {"uv": [7.5, 6.75, 7.75, 7], "texture": "#0"}, - "up": {"uv": [7.25, 5.75, 8.25, 6], "texture": "#0"}, - "down": {"uv": [7.25, 6, 8.25, 6.25], "texture": "#0"} - } - }, - { - "name": "leftFlipper", - "from": [1, 0, 4.25], - "to": [4, 0.5, 6.25], - "rotation": {"angle": 22.5, "axis": "z", "origin": [1, 0, 4]}, - "faces": { - "north": {"uv": [0, 12, 1.5, 12.25], "texture": "#0"}, - "east": {"uv": [0, 11.75, 1, 12], "texture": "#0"}, - "south": {"uv": [0, 12.25, 1.5, 12.5], "texture": "#0"}, - "west": {"uv": [1, 11.75, 2, 12], "texture": "#0"}, - "up": {"uv": [0, 9.75, 1.5, 10.75], "texture": "#0"}, - "down": {"uv": [0, 10.75, 1.5, 11.75], "texture": "#0"} - } - }, - { - "name": "rightFlipper", - "from": [12, 0, 4.25], - "to": [15, 0.5, 6.25], - "rotation": {"angle": -22.5, "axis": "z", "origin": [15, 0, 4]}, - "faces": { - "north": {"uv": [3.75, 12, 2.25, 12.25], "texture": "#0"}, - "east": {"uv": [3.25, 11.75, 2.25, 12], "texture": "#0"}, - "south": {"uv": [3.75, 12.25, 2.25, 12.5], "texture": "#0"}, - "west": {"uv": [4.25, 11.75, 3.25, 12], "texture": "#0"}, - "up": {"uv": [3.75, 9.75, 2.25, 10.75], "texture": "#0"}, - "down": {"uv": [3.75, 10.75, 2.25, 11.75], "texture": "#0"} - } - } - ], - "display": { - "thirdperson_righthand": { - "rotation": [90, -45, 100], - "translation": [-8.25, 2.75, 1] - }, - "firstperson_righthand": { - "rotation": [-55, -145, -20], - "translation": [-12, 5.5, -4.75], - "scale": [1.25, 1.25, 1.25] - }, - "ground": { - "translation": [0, 0.5, 0], - "scale": [0.5, 0.5, 0.5] - }, - "gui": { - "rotation": [180, 56, -150], - "translation": [1.25, 3, 0] - }, - "head": { - "translation": [0, 14, 0] - }, - "fixed": { - "rotation": [-90, 90, 0], - "translation": [0, 0, -8] - } - }, - "groups": [ - 0, - { - "name": "poofs", - "origin": [8, 8, 8], - "color": 0, - "children": [1, 2, 3, 4] - }, - { - "name": "tail", - "origin": [8, 8, 8], - "color": 0, - "children": [5, 6, 7] - }, - { - "name": "face", - "origin": [8, 8, 8], - "color": 0, - "children": [8] - }, - { - "name": "flippers", - "origin": [8, 8, 8], - "color": 0, - "children": [9, 10] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/blahaj/models/block/trans_shark.json b/src/main/resources/assets/blahaj/models/block/trans_shark.json deleted file mode 100644 index 60c9f95..0000000 --- a/src/main/resources/assets/blahaj/models/block/trans_shark.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "blahaj:item/blue_shark", - "textures": { - "0": "blahaj:item/beyou_shork" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/blahaj/textures/model/blahaj_backpack.png b/src/main/resources/assets/blahaj/textures/model/blahaj_backpack.png deleted file mode 100644 index 6fd51e3efd5713eaa3f002f340757cc64e03c8be..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3402 zcmV-Q4Yl%#P)EX>4Tx04R}tkv&MmKpe$iQ>7v;4t6Lan4#)oK~%(1 zt5Adrp;l;tBaGOiK+|nAm57U(?5Y@eMG!*>VH6RWS;m|sCE+=~?&0I>U5saWpZjx! z)SSftpGZ8*4AUmwAfDc|4bJ<-VOEq?;&b9LlP*a7$aTf#H_nA73p_Jyrc?98VPdh+ z!Ab|SqNx#25l2-`r+gvfvdVdjvsSLM);;+PgE@U=nd>wMk-#FBAVGwJDoQBBMvPXS z6bmWZk9+tBntq8~3b{&PR%~add-6hL^sZ^DbkuM`&ym;}h5>;g_UU>7}ni^rnD^pf* zs$@nu=af7sLBXROz5R{rp4|X4ZpZCLGOF=p83=#^RI8&GKm;scCw5Ak!$<~v<;J<~ z9>gl4KPlhO~K?rx&PA#_{g{CIdk#^0F@7{ zJslJVZK_J;S0{h_olE@gvj>>A!s#k-)+vAPc@~_~GQ!?e*q<7@LHY0bl3$;#F4p)T zH%w4C@WCI_adC12gH<*n2*mF-d%k}U;CR<@%}s|$MM!|AflT1Ch9Pw;oH}!qlV!kb zr2nibyNy%)`;bv~z&7GSFPAaEu_6O~Q3fbfQH4|>5#bMC ze%nTa9B1%bdfaRz0T){=#!+me`u@Fp7X{{G6Wk<5F&YS-~>h-iHx*N@ls|6aO?3wsdl&7ceMAfQOeHt!4r` zyxG?3NmFb6Rx{z@CC6f=2ymnqn6*mBDIVx_J7}or78PPMdLg>ir*c1PESphy7fm@D zuZq)nT%9fgo!+XI7TsSV6#0-1npX}`I=zb1MIaHuDR@;H0uH5Z0NX&lLp4P6Sp*A| zJ8F6i!zhuR0VM!OkF5-;VXaCO#RQM3N&rGoKsb7Ag-}1+r=vhn*xfLwZ6J*{lD0t- z1gJD_l}Uk#lZQra+WzTScU7KLI(r9Yv@$b!3iU* z$*xmEHUqW+B8aiIORd-m3Z@Jg&20fF9mv5~6w`1+Dy z+WTn`J3J+eQKlVsz=n|Y-K|EwC=DYRAWf3hz^Ji+B6XO|BUlj{Mj`>CW{<9OO-En_ z$c&Io@5f1G&Td1DPP@Z9j)4-q^4*8E@5Wk*qCJoRh8^=%giIhYP=zQp|9kKa z(#@qUOC!zD7ymOieCd7_lz%<8EVHxIs49&{!rY!+ z0L<;#MWd0Rs?5$#Z^zumLeg6DXNMw zhE^*Bpw-GS#-OTXS-Q2e+5}8FrV>=342p`NNfWgVsJii(v>EY)6n_8LWvsP`n00|v z5kbUY?c@YSO{L=p1v)+&K@uFA%|V5M_@!?W{gay z09FK_v{11GlM>pOf=NLPDiD$;FTZvlX}Y??X(Ju_28QnMG|bggmML>#1~jF%nouOf z74&JFYW5kcX)+OJryDVtQtzx@Hy`>|1@9*(t(M&Lu~&_CCja$QuLWT5&G+I{i}*6` z^H2eb%@^>kz06K$c<1rnV~j9AzYM_q{4(w779l8pg0{fpwgmUT`^Q7qr*D7#Tm!eWUQ0Lo;nFG>woDNbwj^rfOioqL)_D8ioyl^$&?Jn)(4TyOt1!cYpG(_n7DE^Bs@Msw(Dk%aR zD8aL3;7k!~e2l~Zhyni8abpoZSq6ldA-W_n1H-~Ic?Fj17+?jKy;7VP9tw3Vpf!fi z(5GRDD}T-_MXhHHjOBN1C*;lVze8P69$GADSz&L}Vi3xpG!r3r%3|qB>wzaC231L_k2$auPjvoS5MZRe+m#8XsDAY^*t*vWrg2;al;atEyt5l;k6Byz3Y%B zwJoni7r14FDJ$eb`Tb`PTyV9X_nsf9083s;1@@$d|Ia;E;JGs?Ke}y#PXSw3b_p?s zm4_JlbsFpc#z7upoUvu<%#n|o=UqlP-W^YoZWq=uV1L7~R4My1OVteRa2#apA{DXB2D7>;e70%X)Pa`oHn)pqe0>sJZUO85HG86xF z5eq0LM*0De=fCqidd?}nE^?rrbpPn<=l+B0ppM`fGbwYegh!T3e*T%a%2ogN9gQ)7 z7&Og{4043K8tXHId4wgWJp8!>a>c(N(n@3A@yeFvzJu3~Y z-`R>QrVW4Tc=n`QTTo^8HsT8en65n)8w){rYSZw@;u!!&^;@W-({rTbDZ{X|KC*a* zr#7P_)OUcU?dpFF`t(M%l|ebu@ksrSt%S*a-*E|eR{-$@$c(VC(jlqKTSoPx?BJ^| zWmv5Y=_4Vqu+kwjGDy37S0DsTO>d*Nc=Up=x=?nua{ic=rAIIV#ufCcD1%ZiaaG&m z6v`@2c2vIrc-KRHiLCh(Raq4{g{#^YDVG4~RXN5L7>V>YY7-5pFY&I&R+~*p(15O- zA~6X?ZKXDSk8_pcdJAL{mv2r`iM9!xICBKl4~iN`_3NuQ^(Csq15J#8dQO}u=yS{SMvpi`8_5