diff --git a/src/main/java/ru/betterend/blocks/model/BaseBlockModel.java b/src/main/java/ru/betterend/blocks/model/BaseBlockModel.java index 1423614a..8e872b9c 100644 --- a/src/main/java/ru/betterend/blocks/model/BaseBlockModel.java +++ b/src/main/java/ru/betterend/blocks/model/BaseBlockModel.java @@ -8,7 +8,6 @@ import java.util.Set; import java.util.function.Function; import java.util.function.Supplier; -import com.google.common.math.Quantiles; import com.mojang.datafixers.util.Pair; import net.fabricmc.fabric.api.renderer.v1.Renderer; @@ -19,7 +18,6 @@ import net.fabricmc.fabric.api.renderer.v1.mesh.MutableQuadView; import net.fabricmc.fabric.api.renderer.v1.mesh.QuadEmitter; import net.fabricmc.fabric.api.renderer.v1.model.FabricBakedModel; import net.fabricmc.fabric.api.renderer.v1.render.RenderContext; - import net.minecraft.block.BlockState; import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.BakedQuad; @@ -38,10 +36,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.Identifier; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; -import net.minecraft.util.math.Matrix3f; -import net.minecraft.util.math.Quaternion; import net.minecraft.world.BlockRenderView; - import ru.betterend.BetterEnd; public class BaseBlockModel implements UnbakedModel, BakedModel, FabricBakedModel { diff --git a/src/main/resources/assets/betterend/textures/block/aurora_crystal.png b/src/main/resources/assets/betterend/textures/block/aurora_crystal.png index 61aceaeb..560e74b5 100644 Binary files a/src/main/resources/assets/betterend/textures/block/aurora_crystal.png and b/src/main/resources/assets/betterend/textures/block/aurora_crystal.png differ diff --git a/src/main/resources/assets/betterend/textures/block/bubble_coral.png b/src/main/resources/assets/betterend/textures/block/bubble_coral.png index e69732a5..21be4d99 100644 Binary files a/src/main/resources/assets/betterend/textures/block/bubble_coral.png and b/src/main/resources/assets/betterend/textures/block/bubble_coral.png differ diff --git a/src/main/resources/assets/betterend/textures/block/chorus_barrel_bottom.png b/src/main/resources/assets/betterend/textures/block/chorus_barrel_bottom.png new file mode 100644 index 00000000..6f80cf20 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/chorus_barrel_bottom.png differ diff --git a/src/main/resources/assets/betterend/textures/block/chorus_barrel_side.png b/src/main/resources/assets/betterend/textures/block/chorus_barrel_side.png new file mode 100644 index 00000000..28acb5ab Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/chorus_barrel_side.png differ diff --git a/src/main/resources/assets/betterend/textures/block/chorus_barrel_top.png b/src/main/resources/assets/betterend/textures/block/chorus_barrel_top.png new file mode 100644 index 00000000..dea64bc1 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/chorus_barrel_top.png differ diff --git a/src/main/resources/assets/betterend/textures/block/chorus_barrel_top_open.png b/src/main/resources/assets/betterend/textures/block/chorus_barrel_top_open.png new file mode 100644 index 00000000..eacb1d41 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/chorus_barrel_top_open.png differ diff --git a/src/main/resources/assets/betterend/textures/block/chorus_crafting_table_bottom.png b/src/main/resources/assets/betterend/textures/block/chorus_crafting_table_bottom.png new file mode 100644 index 00000000..9cb80e79 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/chorus_crafting_table_bottom.png differ diff --git a/src/main/resources/assets/betterend/textures/block/chorus_crafting_table_front.png b/src/main/resources/assets/betterend/textures/block/chorus_crafting_table_front.png new file mode 100644 index 00000000..c922003c Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/chorus_crafting_table_front.png differ diff --git a/src/main/resources/assets/betterend/textures/block/chorus_crafting_table_side.png b/src/main/resources/assets/betterend/textures/block/chorus_crafting_table_side.png new file mode 100644 index 00000000..5b006bb0 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/chorus_crafting_table_side.png differ diff --git a/src/main/resources/assets/betterend/textures/block/chorus_crafting_table_top.png b/src/main/resources/assets/betterend/textures/block/chorus_crafting_table_top.png new file mode 100644 index 00000000..6f799ca1 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/chorus_crafting_table_top.png differ diff --git a/src/main/resources/assets/betterend/textures/block/chorus_grass_01.png b/src/main/resources/assets/betterend/textures/block/chorus_grass_01.png index 5962de43..11aef5bc 100644 Binary files a/src/main/resources/assets/betterend/textures/block/chorus_grass_01.png and b/src/main/resources/assets/betterend/textures/block/chorus_grass_01.png differ diff --git a/src/main/resources/assets/betterend/textures/block/chorus_grass_02.png b/src/main/resources/assets/betterend/textures/block/chorus_grass_02.png index 4ec51920..0d4251f8 100644 Binary files a/src/main/resources/assets/betterend/textures/block/chorus_grass_02.png and b/src/main/resources/assets/betterend/textures/block/chorus_grass_02.png differ diff --git a/src/main/resources/assets/betterend/textures/block/chorus_grass_03.png b/src/main/resources/assets/betterend/textures/block/chorus_grass_03.png index 1a1118a8..3e1ed68f 100644 Binary files a/src/main/resources/assets/betterend/textures/block/chorus_grass_03.png and b/src/main/resources/assets/betterend/textures/block/chorus_grass_03.png differ diff --git a/src/main/resources/assets/betterend/textures/block/chorus_grass_04.png b/src/main/resources/assets/betterend/textures/block/chorus_grass_04.png index f60f5956..c4ed15d8 100644 Binary files a/src/main/resources/assets/betterend/textures/block/chorus_grass_04.png and b/src/main/resources/assets/betterend/textures/block/chorus_grass_04.png differ diff --git a/src/main/resources/assets/betterend/textures/block/chorus_ladder.png b/src/main/resources/assets/betterend/textures/block/chorus_ladder.png new file mode 100644 index 00000000..fd5e7a8c Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/chorus_ladder.png differ diff --git a/src/main/resources/assets/betterend/textures/block/chorus_nylium_path_top.png b/src/main/resources/assets/betterend/textures/block/chorus_nylium_path_top.png index ddf3c345..dc0ea52d 100644 Binary files a/src/main/resources/assets/betterend/textures/block/chorus_nylium_path_top.png and b/src/main/resources/assets/betterend/textures/block/chorus_nylium_path_top.png differ diff --git a/src/main/resources/assets/betterend/textures/block/chorus_nylium_side.png b/src/main/resources/assets/betterend/textures/block/chorus_nylium_side.png index b59e7cfd..5e41736f 100644 Binary files a/src/main/resources/assets/betterend/textures/block/chorus_nylium_side.png and b/src/main/resources/assets/betterend/textures/block/chorus_nylium_side.png differ diff --git a/src/main/resources/assets/betterend/textures/block/chorus_nylium_top.png b/src/main/resources/assets/betterend/textures/block/chorus_nylium_top.png index a73f0dfa..46a6bded 100644 Binary files a/src/main/resources/assets/betterend/textures/block/chorus_nylium_top.png and b/src/main/resources/assets/betterend/textures/block/chorus_nylium_top.png differ diff --git a/src/main/resources/assets/betterend/textures/block/chorus_planks.png b/src/main/resources/assets/betterend/textures/block/chorus_planks.png index 6894c31d..940cf9d4 100644 Binary files a/src/main/resources/assets/betterend/textures/block/chorus_planks.png and b/src/main/resources/assets/betterend/textures/block/chorus_planks.png differ diff --git a/src/main/resources/assets/betterend/textures/block/dense_vine.png b/src/main/resources/assets/betterend/textures/block/dense_vine.png index 0d75a103..afab6cad 100644 Binary files a/src/main/resources/assets/betterend/textures/block/dense_vine.png and b/src/main/resources/assets/betterend/textures/block/dense_vine.png differ diff --git a/src/main/resources/assets/betterend/textures/block/dense_vine_bottom.png b/src/main/resources/assets/betterend/textures/block/dense_vine_bottom.png index cb3dc25e..26e92dc2 100644 Binary files a/src/main/resources/assets/betterend/textures/block/dense_vine_bottom.png and b/src/main/resources/assets/betterend/textures/block/dense_vine_bottom.png differ diff --git a/src/main/resources/assets/betterend/textures/block/dense_vine_roots.png b/src/main/resources/assets/betterend/textures/block/dense_vine_roots.png index 43ef1c4c..26817e41 100644 Binary files a/src/main/resources/assets/betterend/textures/block/dense_vine_roots.png and b/src/main/resources/assets/betterend/textures/block/dense_vine_roots.png differ diff --git a/src/main/resources/assets/betterend/textures/block/end_lily_flower.png b/src/main/resources/assets/betterend/textures/block/end_lily_flower.png index a445cd35..90567af6 100644 Binary files a/src/main/resources/assets/betterend/textures/block/end_lily_flower.png and b/src/main/resources/assets/betterend/textures/block/end_lily_flower.png differ diff --git a/src/main/resources/assets/betterend/textures/block/end_lily_flower_small.png b/src/main/resources/assets/betterend/textures/block/end_lily_flower_small.png index 1238311e..63d47562 100644 Binary files a/src/main/resources/assets/betterend/textures/block/end_lily_flower_small.png and b/src/main/resources/assets/betterend/textures/block/end_lily_flower_small.png differ diff --git a/src/main/resources/assets/betterend/textures/block/end_lily_leaf.png b/src/main/resources/assets/betterend/textures/block/end_lily_leaf.png index 04199680..2eaf6009 100644 Binary files a/src/main/resources/assets/betterend/textures/block/end_lily_leaf.png and b/src/main/resources/assets/betterend/textures/block/end_lily_leaf.png differ diff --git a/src/main/resources/assets/betterend/textures/block/end_lily_leaf_small.png b/src/main/resources/assets/betterend/textures/block/end_lily_leaf_small.png index 62ff6714..e520864a 100644 Binary files a/src/main/resources/assets/betterend/textures/block/end_lily_leaf_small.png and b/src/main/resources/assets/betterend/textures/block/end_lily_leaf_small.png differ diff --git a/src/main/resources/assets/betterend/textures/block/end_lily_roots.png b/src/main/resources/assets/betterend/textures/block/end_lily_roots.png index 0bff2b90..3e74e71b 100644 Binary files a/src/main/resources/assets/betterend/textures/block/end_lily_roots.png and b/src/main/resources/assets/betterend/textures/block/end_lily_roots.png differ diff --git a/src/main/resources/assets/betterend/textures/block/end_lily_stem.png b/src/main/resources/assets/betterend/textures/block/end_lily_stem.png index 2a58366a..64da0c58 100644 Binary files a/src/main/resources/assets/betterend/textures/block/end_lily_stem.png and b/src/main/resources/assets/betterend/textures/block/end_lily_stem.png differ diff --git a/src/main/resources/assets/betterend/textures/block/flavolite.png b/src/main/resources/assets/betterend/textures/block/flavolite.png index bdc9ad84..07fb6d59 100644 Binary files a/src/main/resources/assets/betterend/textures/block/flavolite.png and b/src/main/resources/assets/betterend/textures/block/flavolite.png differ diff --git a/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_cap_transition.png b/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_cap_transition.png index 907022a1..20bb85bd 100644 Binary files a/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_cap_transition.png and b/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_cap_transition.png differ diff --git a/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_hymenophore_1.png b/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_hymenophore_1.png index ac8d47a8..0fdaa8bc 100644 Binary files a/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_hymenophore_1.png and b/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_hymenophore_1.png differ diff --git a/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_log_side_2.png b/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_log_side_2.png index d6dff737..dab4d306 100644 Binary files a/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_log_side_2.png and b/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_log_side_2.png differ diff --git a/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_log_side_5.png b/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_log_side_5.png index cb7c81bb..839eb6fa 100644 Binary files a/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_log_side_5.png and b/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_log_side_5.png differ diff --git a/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_stripped_log_side.png b/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_stripped_log_side.png index 8af2a9a1..f3fc5d84 100644 Binary files a/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_stripped_log_side.png and b/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_stripped_log_side.png differ diff --git a/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_stripped_log_side_2.png b/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_stripped_log_side_2.png index 13b2fd81..518cee46 100644 Binary files a/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_stripped_log_side_2.png and b/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_stripped_log_side_2.png differ diff --git a/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_stripped_log_side_5.png b/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_stripped_log_side_5.png index 441222c4..ff7b0016 100644 Binary files a/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_stripped_log_side_5.png and b/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_stripped_log_side_5.png differ diff --git a/src/main/resources/assets/betterend/textures/block/purpur_block.png b/src/main/resources/assets/betterend/textures/block/purpur_block.png index 941dfc9d..717d26c8 100644 Binary files a/src/main/resources/assets/betterend/textures/block/purpur_block.png and b/src/main/resources/assets/betterend/textures/block/purpur_block.png differ diff --git a/src/main/resources/assets/betterend/textures/entity/chest/chorus_chest.png b/src/main/resources/assets/betterend/textures/entity/chest/chorus_chest.png new file mode 100644 index 00000000..ea5565fa Binary files /dev/null and b/src/main/resources/assets/betterend/textures/entity/chest/chorus_chest.png differ diff --git a/src/main/resources/assets/betterend/textures/entity/chest/chorus_chest_left.png b/src/main/resources/assets/betterend/textures/entity/chest/chorus_chest_left.png new file mode 100644 index 00000000..ad430ec1 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/entity/chest/chorus_chest_left.png differ diff --git a/src/main/resources/assets/betterend/textures/entity/chest/chorus_chest_right.png b/src/main/resources/assets/betterend/textures/entity/chest/chorus_chest_right.png new file mode 100644 index 00000000..dc8d6fa9 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/entity/chest/chorus_chest_right.png differ diff --git a/src/main/resources/assets/betterend/textures/entity/sign/chorus_sign.png b/src/main/resources/assets/betterend/textures/entity/sign/chorus_sign.png index b62db573..e9f8d2dc 100644 Binary files a/src/main/resources/assets/betterend/textures/entity/sign/chorus_sign.png and b/src/main/resources/assets/betterend/textures/entity/sign/chorus_sign.png differ diff --git a/src/main/resources/assets/betterend/textures/item/chorus_sign.png b/src/main/resources/assets/betterend/textures/item/chorus_sign.png new file mode 100644 index 00000000..faf5a144 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/item/chorus_sign.png differ diff --git a/src/main/resources/assets/betterend/textures/item/end_lily_seed.png b/src/main/resources/assets/betterend/textures/item/end_lily_seed.png index f22d8c1e..ad8e0512 100644 Binary files a/src/main/resources/assets/betterend/textures/item/end_lily_seed.png and b/src/main/resources/assets/betterend/textures/item/end_lily_seed.png differ