diff --git a/src/main/java/ru/betterend/entity/BlockBenchModel.java b/src/main/java/ru/betterend/entity/BlockBenchModel.java index a652c280..0c3ad64b 100644 --- a/src/main/java/ru/betterend/entity/BlockBenchModel.java +++ b/src/main/java/ru/betterend/entity/BlockBenchModel.java @@ -1,10 +1,22 @@ package ru.betterend.entity; +import java.util.function.Function; + import net.minecraft.client.model.ModelPart; +import net.minecraft.client.render.RenderLayer; import net.minecraft.client.render.entity.model.EntityModel; import net.minecraft.entity.Entity; +import net.minecraft.util.Identifier; public abstract class BlockBenchModel extends EntityModel { + public BlockBenchModel() { + super(); + } + + public BlockBenchModel(Function function) { + super(function); + } + protected void setRotationAngle(ModelPart modelRenderer, float x, float y, float z) { modelRenderer.pitch = x; modelRenderer.yaw = y; diff --git a/src/main/java/ru/betterend/entity/model/ModelEntityDragonfly.java b/src/main/java/ru/betterend/entity/model/ModelEntityDragonfly.java index 8f5e4e1f..764bb647 100644 --- a/src/main/java/ru/betterend/entity/model/ModelEntityDragonfly.java +++ b/src/main/java/ru/betterend/entity/model/ModelEntityDragonfly.java @@ -1,8 +1,7 @@ package ru.betterend.entity.model; -import com.mojang.blaze3d.systems.RenderSystem; - import net.minecraft.client.model.ModelPart; +import net.minecraft.client.render.RenderLayer; import net.minecraft.client.render.VertexConsumer; import net.minecraft.client.util.math.MatrixStack; import ru.betterend.entity.BlockBenchModel; @@ -21,6 +20,8 @@ public class ModelEntityDragonfly extends BlockBenchModel { private final ModelPart legs_2; public ModelEntityDragonfly() { + super(RenderLayer::getEntityCutout); + textureWidth = 64; textureHeight = 64; @@ -99,8 +100,6 @@ public class ModelEntityDragonfly extends BlockBenchModel { @Override public void render(MatrixStack matrices, VertexConsumer vertices, int light, int overlay, float red, float green, float blue, float alpha) { - RenderSystem.enableCull(); model.render(matrices, vertices, light, overlay); - RenderSystem.disableCull(); } } diff --git a/src/main/java/ru/betterend/entity/model/ModelEntityEndFish.java b/src/main/java/ru/betterend/entity/model/ModelEntityEndFish.java index 5bf0c21f..5e0019b2 100644 --- a/src/main/java/ru/betterend/entity/model/ModelEntityEndFish.java +++ b/src/main/java/ru/betterend/entity/model/ModelEntityEndFish.java @@ -1,8 +1,7 @@ package ru.betterend.entity.model; -import com.mojang.blaze3d.systems.RenderSystem; - import net.minecraft.client.model.ModelPart; +import net.minecraft.client.render.RenderLayer; import net.minecraft.client.render.VertexConsumer; import net.minecraft.client.util.math.MatrixStack; import ru.betterend.entity.BlockBenchModel; @@ -17,6 +16,8 @@ public class ModelEntityEndFish extends BlockBenchModel { private final ModelPart fin_left; public ModelEntityEndFish() { + super(RenderLayer::getEntityCutout); + textureWidth = 32; textureHeight = 32; @@ -69,8 +70,6 @@ public class ModelEntityEndFish extends BlockBenchModel { @Override public void render(MatrixStack matrices, VertexConsumer vertices, int light, int overlay, float red, float green, float blue, float alpha) { - RenderSystem.enableCull(); model.render(matrices, vertices, light, overlay); - RenderSystem.disableCull(); } } diff --git a/src/main/resources/assets/betterend/textures/entity/dragonfly.png b/src/main/resources/assets/betterend/textures/entity/dragonfly.png index 0d2894db..9650cddb 100644 Binary files a/src/main/resources/assets/betterend/textures/entity/dragonfly.png and b/src/main/resources/assets/betterend/textures/entity/dragonfly.png differ diff --git a/src/main/resources/assets/betterend/textures/entity/dragonfly_glow.png b/src/main/resources/assets/betterend/textures/entity/dragonfly_glow.png index 3f9b983c..98f7ab93 100644 Binary files a/src/main/resources/assets/betterend/textures/entity/dragonfly_glow.png and b/src/main/resources/assets/betterend/textures/entity/dragonfly_glow.png differ diff --git a/src/main/resources/assets/betterend/textures/entity/end_fish/end_fish_0.png b/src/main/resources/assets/betterend/textures/entity/end_fish/end_fish_0.png index 75ea4153..e4a78d4d 100644 Binary files a/src/main/resources/assets/betterend/textures/entity/end_fish/end_fish_0.png and b/src/main/resources/assets/betterend/textures/entity/end_fish/end_fish_0.png differ diff --git a/src/main/resources/assets/betterend/textures/entity/end_fish/end_fish_0_glow.png b/src/main/resources/assets/betterend/textures/entity/end_fish/end_fish_0_glow.png index 56d3ba09..4fdeaf39 100644 Binary files a/src/main/resources/assets/betterend/textures/entity/end_fish/end_fish_0_glow.png and b/src/main/resources/assets/betterend/textures/entity/end_fish/end_fish_0_glow.png differ diff --git a/src/main/resources/assets/betterend/textures/entity/end_fish/end_fish_1.png b/src/main/resources/assets/betterend/textures/entity/end_fish/end_fish_1.png index 90301523..470fcd5c 100644 Binary files a/src/main/resources/assets/betterend/textures/entity/end_fish/end_fish_1.png and b/src/main/resources/assets/betterend/textures/entity/end_fish/end_fish_1.png differ diff --git a/src/main/resources/assets/betterend/textures/entity/end_fish/end_fish_1_glow.png b/src/main/resources/assets/betterend/textures/entity/end_fish/end_fish_1_glow.png index e8a54a44..5556a47f 100644 Binary files a/src/main/resources/assets/betterend/textures/entity/end_fish/end_fish_1_glow.png and b/src/main/resources/assets/betterend/textures/entity/end_fish/end_fish_1_glow.png differ diff --git a/src/main/resources/assets/betterend/textures/entity/end_fish/end_fish_2.png b/src/main/resources/assets/betterend/textures/entity/end_fish/end_fish_2.png index 16b866b5..75cc0d2e 100644 Binary files a/src/main/resources/assets/betterend/textures/entity/end_fish/end_fish_2.png and b/src/main/resources/assets/betterend/textures/entity/end_fish/end_fish_2.png differ diff --git a/src/main/resources/assets/betterend/textures/entity/end_fish/end_fish_2_glow.png b/src/main/resources/assets/betterend/textures/entity/end_fish/end_fish_2_glow.png index 6169efb9..185806b6 100644 Binary files a/src/main/resources/assets/betterend/textures/entity/end_fish/end_fish_2_glow.png and b/src/main/resources/assets/betterend/textures/entity/end_fish/end_fish_2_glow.png differ diff --git a/src/main/resources/assets/betterend/textures/entity/end_fish/end_fish_3.png b/src/main/resources/assets/betterend/textures/entity/end_fish/end_fish_3.png index c055ee56..12f99dbd 100644 Binary files a/src/main/resources/assets/betterend/textures/entity/end_fish/end_fish_3.png and b/src/main/resources/assets/betterend/textures/entity/end_fish/end_fish_3.png differ diff --git a/src/main/resources/assets/betterend/textures/entity/end_fish/end_fish_3_glow.png b/src/main/resources/assets/betterend/textures/entity/end_fish/end_fish_3_glow.png index 8e0b15c7..461cc9c8 100644 Binary files a/src/main/resources/assets/betterend/textures/entity/end_fish/end_fish_3_glow.png and b/src/main/resources/assets/betterend/textures/entity/end_fish/end_fish_3_glow.png differ diff --git a/src/main/resources/assets/betterend/textures/entity/end_fish/end_fish_4.png b/src/main/resources/assets/betterend/textures/entity/end_fish/end_fish_4.png index 0a11f0d7..1b436dec 100644 Binary files a/src/main/resources/assets/betterend/textures/entity/end_fish/end_fish_4.png and b/src/main/resources/assets/betterend/textures/entity/end_fish/end_fish_4.png differ diff --git a/src/main/resources/assets/betterend/textures/entity/end_fish/end_fish_4_glow.png b/src/main/resources/assets/betterend/textures/entity/end_fish/end_fish_4_glow.png index 76517568..cbced0ee 100644 Binary files a/src/main/resources/assets/betterend/textures/entity/end_fish/end_fish_4_glow.png and b/src/main/resources/assets/betterend/textures/entity/end_fish/end_fish_4_glow.png differ