diff --git a/gradle.properties b/gradle.properties index 3853654a..aeef8352 100644 --- a/gradle.properties +++ b/gradle.properties @@ -17,5 +17,5 @@ archives_base_name = better-end patchouli_version = 50-FABRIC fabric_version = 0.32.9+1.16 canvas_version = 1.0.+ -bclib_version = 0.1.32 +bclib_version = 0.1.33 rei_version = 5.8.10 \ No newline at end of file diff --git a/src/main/java/ru/betterend/blocks/AmaranitaHymenophoreBlock.java b/src/main/java/ru/betterend/blocks/AmaranitaHymenophoreBlock.java index c8b28396..a3f14802 100644 --- a/src/main/java/ru/betterend/blocks/AmaranitaHymenophoreBlock.java +++ b/src/main/java/ru/betterend/blocks/AmaranitaHymenophoreBlock.java @@ -5,7 +5,7 @@ import net.fabricmc.fabric.api.tool.attribute.v1.FabricToolTags; import net.minecraft.world.level.block.SoundType; import net.minecraft.world.level.material.Material; import ru.bclib.blocks.BaseBlock; -import ru.bclib.client.render.ERenderLayer; +import ru.bclib.client.render.BCLRenderLayer; import ru.bclib.interfaces.IRenderTyped; public class AmaranitaHymenophoreBlock extends BaseBlock implements IRenderTyped { @@ -14,7 +14,7 @@ public class AmaranitaHymenophoreBlock extends BaseBlock implements IRenderTyped } @Override - public ERenderLayer getRenderLayer() { - return ERenderLayer.CUTOUT; + public BCLRenderLayer getRenderLayer() { + return BCLRenderLayer.CUTOUT; } } diff --git a/src/main/java/ru/betterend/blocks/AuroraCrystalBlock.java b/src/main/java/ru/betterend/blocks/AuroraCrystalBlock.java index 872ebbb8..22473aa7 100644 --- a/src/main/java/ru/betterend/blocks/AuroraCrystalBlock.java +++ b/src/main/java/ru/betterend/blocks/AuroraCrystalBlock.java @@ -20,7 +20,7 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.material.Material; import net.minecraft.world.level.storage.loot.LootContext; import net.minecraft.world.level.storage.loot.parameters.LootContextParams; -import ru.bclib.client.render.ERenderLayer; +import ru.bclib.client.render.BCLRenderLayer; import ru.bclib.interfaces.IColorProvider; import ru.bclib.interfaces.IRenderTyped; import ru.bclib.util.ColorUtil; @@ -78,8 +78,8 @@ public class AuroraCrystalBlock extends AbstractGlassBlock implements IRenderTyp } @Override - public ERenderLayer getRenderLayer() { - return ERenderLayer.TRANSLUCENT; + public BCLRenderLayer getRenderLayer() { + return BCLRenderLayer.TRANSLUCENT; } @Override diff --git a/src/main/java/ru/betterend/blocks/BulbVineLanternBlock.java b/src/main/java/ru/betterend/blocks/BulbVineLanternBlock.java index dd20105e..0302faab 100644 --- a/src/main/java/ru/betterend/blocks/BulbVineLanternBlock.java +++ b/src/main/java/ru/betterend/blocks/BulbVineLanternBlock.java @@ -22,7 +22,7 @@ import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.VoxelShape; import ru.bclib.client.models.BlockModelProvider; import ru.bclib.client.models.ModelsHelper; -import ru.bclib.client.render.ERenderLayer; +import ru.bclib.client.render.BCLRenderLayer; import ru.bclib.interfaces.IRenderTyped; import ru.betterend.blocks.basis.EndLanternBlock; import ru.betterend.client.models.Patterns; @@ -52,8 +52,8 @@ public class BulbVineLanternBlock extends EndLanternBlock implements IRenderType } @Override - public ERenderLayer getRenderLayer() { - return ERenderLayer.CUTOUT; + public BCLRenderLayer getRenderLayer() { + return BCLRenderLayer.CUTOUT; } @Override diff --git a/src/main/java/ru/betterend/blocks/CavePumpkinBlock.java b/src/main/java/ru/betterend/blocks/CavePumpkinBlock.java index f6420a89..f61aa0cb 100644 --- a/src/main/java/ru/betterend/blocks/CavePumpkinBlock.java +++ b/src/main/java/ru/betterend/blocks/CavePumpkinBlock.java @@ -18,7 +18,7 @@ import net.minecraft.world.phys.shapes.Shapes; import net.minecraft.world.phys.shapes.VoxelShape; import ru.bclib.blocks.BaseBlockNotFull; import ru.bclib.blocks.BlockProperties; -import ru.bclib.client.render.ERenderLayer; +import ru.bclib.client.render.BCLRenderLayer; import ru.bclib.interfaces.IRenderTyped; import ru.betterend.registry.EndBlocks; @@ -38,8 +38,8 @@ public class CavePumpkinBlock extends BaseBlockNotFull implements IRenderTyped { } @Override - public ERenderLayer getRenderLayer() { - return ERenderLayer.CUTOUT; + public BCLRenderLayer getRenderLayer() { + return BCLRenderLayer.CUTOUT; } @Override diff --git a/src/main/java/ru/betterend/blocks/ChandelierBlock.java b/src/main/java/ru/betterend/blocks/ChandelierBlock.java index 3c7a5363..21a906f7 100644 --- a/src/main/java/ru/betterend/blocks/ChandelierBlock.java +++ b/src/main/java/ru/betterend/blocks/ChandelierBlock.java @@ -24,7 +24,7 @@ import net.minecraft.world.phys.shapes.VoxelShape; import ru.bclib.blocks.BaseAttachedBlock; import ru.bclib.client.models.BlockModelProvider; import ru.bclib.client.models.ModelsHelper; -import ru.bclib.client.render.ERenderLayer; +import ru.bclib.client.render.BCLRenderLayer; import ru.bclib.interfaces.IRenderTyped; import ru.betterend.client.models.Patterns; @@ -36,8 +36,8 @@ public class ChandelierBlock extends BaseAttachedBlock implements IRenderTyped, } @Override - public ERenderLayer getRenderLayer() { - return ERenderLayer.CUTOUT; + public BCLRenderLayer getRenderLayer() { + return BCLRenderLayer.CUTOUT; } @Override diff --git a/src/main/java/ru/betterend/blocks/DenseEmeraldIceBlock.java b/src/main/java/ru/betterend/blocks/DenseEmeraldIceBlock.java index 8df8d19a..ece46509 100644 --- a/src/main/java/ru/betterend/blocks/DenseEmeraldIceBlock.java +++ b/src/main/java/ru/betterend/blocks/DenseEmeraldIceBlock.java @@ -12,7 +12,7 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.storage.loot.LootContext; import net.minecraft.world.level.storage.loot.parameters.LootContextParams; import ru.bclib.blocks.BaseBlock; -import ru.bclib.client.render.ERenderLayer; +import ru.bclib.client.render.BCLRenderLayer; import ru.bclib.interfaces.IRenderTyped; public class DenseEmeraldIceBlock extends BaseBlock implements IRenderTyped { @@ -21,8 +21,8 @@ public class DenseEmeraldIceBlock extends BaseBlock implements IRenderTyped { } @Override - public ERenderLayer getRenderLayer() { - return ERenderLayer.TRANSLUCENT; + public BCLRenderLayer getRenderLayer() { + return BCLRenderLayer.TRANSLUCENT; } @Override diff --git a/src/main/java/ru/betterend/blocks/EmeraldIceBlock.java b/src/main/java/ru/betterend/blocks/EmeraldIceBlock.java index d10c664a..f8c010f1 100644 --- a/src/main/java/ru/betterend/blocks/EmeraldIceBlock.java +++ b/src/main/java/ru/betterend/blocks/EmeraldIceBlock.java @@ -25,7 +25,7 @@ import net.minecraft.world.level.material.Material; import net.minecraft.world.level.storage.loot.LootContext; import net.minecraft.world.level.storage.loot.parameters.LootContextParams; import ru.bclib.client.models.BlockModelProvider; -import ru.bclib.client.render.ERenderLayer; +import ru.bclib.client.render.BCLRenderLayer; import ru.bclib.interfaces.IRenderTyped; public class EmeraldIceBlock extends HalfTransparentBlock implements IRenderTyped, BlockModelProvider { @@ -34,8 +34,8 @@ public class EmeraldIceBlock extends HalfTransparentBlock implements IRenderType } @Override - public ERenderLayer getRenderLayer() { - return ERenderLayer.TRANSLUCENT; + public BCLRenderLayer getRenderLayer() { + return BCLRenderLayer.TRANSLUCENT; } @Override diff --git a/src/main/java/ru/betterend/blocks/EndLotusLeafBlock.java b/src/main/java/ru/betterend/blocks/EndLotusLeafBlock.java index c8923741..af3199f3 100644 --- a/src/main/java/ru/betterend/blocks/EndLotusLeafBlock.java +++ b/src/main/java/ru/betterend/blocks/EndLotusLeafBlock.java @@ -23,7 +23,7 @@ import net.minecraft.world.phys.shapes.VoxelShape; import ru.bclib.blocks.BaseBlockNotFull; import ru.bclib.blocks.BlockProperties; import ru.bclib.blocks.BlockProperties.TripleShape; -import ru.bclib.client.render.ERenderLayer; +import ru.bclib.client.render.BCLRenderLayer; import ru.bclib.interfaces.IRenderTyped; import ru.bclib.util.BlocksHelper; import ru.betterend.registry.EndBlocks; @@ -64,8 +64,8 @@ public class EndLotusLeafBlock extends BaseBlockNotFull implements IRenderTyped } @Override - public ERenderLayer getRenderLayer() { - return ERenderLayer.CUTOUT; + public BCLRenderLayer getRenderLayer() { + return BCLRenderLayer.CUTOUT; } @Override diff --git a/src/main/java/ru/betterend/blocks/EndLotusStemBlock.java b/src/main/java/ru/betterend/blocks/EndLotusStemBlock.java index f33617ca..0c27ece2 100644 --- a/src/main/java/ru/betterend/blocks/EndLotusStemBlock.java +++ b/src/main/java/ru/betterend/blocks/EndLotusStemBlock.java @@ -28,7 +28,7 @@ import net.minecraft.world.phys.shapes.VoxelShape; import ru.bclib.blocks.BaseBlock; import ru.bclib.blocks.BlockProperties; import ru.bclib.blocks.BlockProperties.TripleShape; -import ru.bclib.client.render.ERenderLayer; +import ru.bclib.client.render.BCLRenderLayer; import ru.bclib.interfaces.IRenderTyped; import ru.bclib.util.BlocksHelper; @@ -85,8 +85,8 @@ public class EndLotusStemBlock extends BaseBlock implements SimpleWaterloggedBlo } @Override - public ERenderLayer getRenderLayer() { - return ERenderLayer.CUTOUT; + public BCLRenderLayer getRenderLayer() { + return BCLRenderLayer.CUTOUT; } static { diff --git a/src/main/java/ru/betterend/blocks/EndPortalBlock.java b/src/main/java/ru/betterend/blocks/EndPortalBlock.java index 60365bf7..6d5ab346 100644 --- a/src/main/java/ru/betterend/blocks/EndPortalBlock.java +++ b/src/main/java/ru/betterend/blocks/EndPortalBlock.java @@ -32,7 +32,7 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.StateDefinition; import net.minecraft.world.level.block.state.properties.IntegerProperty; import net.minecraft.world.level.dimension.DimensionType; -import ru.bclib.client.render.ERenderLayer; +import ru.bclib.client.render.BCLRenderLayer; import ru.bclib.interfaces.IColorProvider; import ru.bclib.interfaces.IRenderTyped; import ru.betterend.interfaces.TeleportingEntity; @@ -108,8 +108,8 @@ public class EndPortalBlock extends NetherPortalBlock implements IRenderTyped, I } @Override - public ERenderLayer getRenderLayer() { - return ERenderLayer.TRANSLUCENT; + public BCLRenderLayer getRenderLayer() { + return BCLRenderLayer.TRANSLUCENT; } private BlockPos findExitPos(ServerLevel currentWorld, ServerLevel targetWorld, BlockPos currentPos, Entity entity) { diff --git a/src/main/java/ru/betterend/blocks/FilaluxWingsBlock.java b/src/main/java/ru/betterend/blocks/FilaluxWingsBlock.java index f4774291..7a3ef492 100644 --- a/src/main/java/ru/betterend/blocks/FilaluxWingsBlock.java +++ b/src/main/java/ru/betterend/blocks/FilaluxWingsBlock.java @@ -16,7 +16,7 @@ import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.Shapes; import net.minecraft.world.phys.shapes.VoxelShape; import ru.bclib.blocks.BaseAttachedBlock; -import ru.bclib.client.render.ERenderLayer; +import ru.bclib.client.render.BCLRenderLayer; import ru.bclib.interfaces.IRenderTyped; public class FilaluxWingsBlock extends BaseAttachedBlock implements IRenderTyped { @@ -27,8 +27,8 @@ public class FilaluxWingsBlock extends BaseAttachedBlock implements IRenderTyped } @Override - public ERenderLayer getRenderLayer() { - return ERenderLayer.CUTOUT; + public BCLRenderLayer getRenderLayer() { + return BCLRenderLayer.CUTOUT; } @Override diff --git a/src/main/java/ru/betterend/blocks/JellyshroomCapBlock.java b/src/main/java/ru/betterend/blocks/JellyshroomCapBlock.java index 7f014b06..caf38d89 100644 --- a/src/main/java/ru/betterend/blocks/JellyshroomCapBlock.java +++ b/src/main/java/ru/betterend/blocks/JellyshroomCapBlock.java @@ -25,7 +25,7 @@ import net.minecraft.world.level.block.state.properties.IntegerProperty; import net.minecraft.world.level.storage.loot.LootContext; import ru.bclib.client.models.BlockModelProvider; import ru.bclib.client.models.ModelsHelper; -import ru.bclib.client.render.ERenderLayer; +import ru.bclib.client.render.BCLRenderLayer; import ru.bclib.interfaces.IColorProvider; import ru.bclib.interfaces.IRenderTyped; import ru.bclib.util.ColorUtil; @@ -61,8 +61,8 @@ public class JellyshroomCapBlock extends SlimeBlock implements IRenderTyped, Blo } @Override - public ERenderLayer getRenderLayer() { - return ERenderLayer.TRANSLUCENT; + public BCLRenderLayer getRenderLayer() { + return BCLRenderLayer.TRANSLUCENT; } @Override diff --git a/src/main/java/ru/betterend/blocks/LumecornBlock.java b/src/main/java/ru/betterend/blocks/LumecornBlock.java index 97999767..e0717bea 100644 --- a/src/main/java/ru/betterend/blocks/LumecornBlock.java +++ b/src/main/java/ru/betterend/blocks/LumecornBlock.java @@ -24,7 +24,7 @@ import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.VoxelShape; import ru.bclib.api.TagAPI; import ru.bclib.blocks.BaseBlockNotFull; -import ru.bclib.client.render.ERenderLayer; +import ru.bclib.client.render.BCLRenderLayer; import ru.bclib.interfaces.IRenderTyped; import ru.bclib.util.MHelper; import ru.betterend.blocks.EndBlockProperties.LumecornShape; @@ -50,8 +50,8 @@ public class LumecornBlock extends BaseBlockNotFull implements IRenderTyped { } @Override - public ERenderLayer getRenderLayer() { - return ERenderLayer.CUTOUT; + public BCLRenderLayer getRenderLayer() { + return BCLRenderLayer.CUTOUT; } @Override diff --git a/src/main/java/ru/betterend/blocks/MengerSpongeBlock.java b/src/main/java/ru/betterend/blocks/MengerSpongeBlock.java index 28d9708c..d644fcaf 100644 --- a/src/main/java/ru/betterend/blocks/MengerSpongeBlock.java +++ b/src/main/java/ru/betterend/blocks/MengerSpongeBlock.java @@ -20,7 +20,7 @@ import net.minecraft.world.level.material.FluidState; import net.minecraft.world.level.material.Fluids; import net.minecraft.world.level.material.Material; import ru.bclib.blocks.BaseBlockNotFull; -import ru.bclib.client.render.ERenderLayer; +import ru.bclib.client.render.BCLRenderLayer; import ru.bclib.interfaces.IRenderTyped; import ru.betterend.registry.EndBlocks; @@ -93,7 +93,7 @@ public class MengerSpongeBlock extends BaseBlockNotFull implements IRenderTyped } @Override - public ERenderLayer getRenderLayer() { - return ERenderLayer.CUTOUT; + public BCLRenderLayer getRenderLayer() { + return BCLRenderLayer.CUTOUT; } } diff --git a/src/main/java/ru/betterend/blocks/MengerSpongeWetBlock.java b/src/main/java/ru/betterend/blocks/MengerSpongeWetBlock.java index b5d3554b..0908d9f3 100644 --- a/src/main/java/ru/betterend/blocks/MengerSpongeWetBlock.java +++ b/src/main/java/ru/betterend/blocks/MengerSpongeWetBlock.java @@ -20,7 +20,7 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.material.FluidState; import net.minecraft.world.level.material.Fluids; import ru.bclib.blocks.BaseBlockNotFull; -import ru.bclib.client.render.ERenderLayer; +import ru.bclib.client.render.BCLRenderLayer; import ru.bclib.interfaces.IRenderTyped; import ru.bclib.util.BlocksHelper; import ru.betterend.registry.EndBlocks; @@ -96,8 +96,8 @@ public class MengerSpongeWetBlock extends BaseBlockNotFull implements IRenderTyp } @Override - public ERenderLayer getRenderLayer() { - return ERenderLayer.CUTOUT; + public BCLRenderLayer getRenderLayer() { + return BCLRenderLayer.CUTOUT; } @Override diff --git a/src/main/java/ru/betterend/blocks/NeonCactusPlantBlock.java b/src/main/java/ru/betterend/blocks/NeonCactusPlantBlock.java index b94399b1..568ea567 100644 --- a/src/main/java/ru/betterend/blocks/NeonCactusPlantBlock.java +++ b/src/main/java/ru/betterend/blocks/NeonCactusPlantBlock.java @@ -41,7 +41,7 @@ import ru.bclib.api.TagAPI; import ru.bclib.blocks.BaseBlockNotFull; import ru.bclib.blocks.BlockProperties; import ru.bclib.blocks.BlockProperties.TripleShape; -import ru.bclib.client.render.ERenderLayer; +import ru.bclib.client.render.BCLRenderLayer; import ru.bclib.interfaces.IRenderTyped; import ru.bclib.util.BlocksHelper; import ru.bclib.util.MHelper; @@ -135,8 +135,8 @@ public class NeonCactusPlantBlock extends BaseBlockNotFull implements SimpleWate } @Override - public ERenderLayer getRenderLayer() { - return ERenderLayer.CUTOUT; + public BCLRenderLayer getRenderLayer() { + return BCLRenderLayer.CUTOUT; } @Override diff --git a/src/main/java/ru/betterend/blocks/RespawnObeliskBlock.java b/src/main/java/ru/betterend/blocks/RespawnObeliskBlock.java index b7576fd3..48b5e923 100644 --- a/src/main/java/ru/betterend/blocks/RespawnObeliskBlock.java +++ b/src/main/java/ru/betterend/blocks/RespawnObeliskBlock.java @@ -38,7 +38,7 @@ import net.minecraft.world.phys.shapes.VoxelShape; import ru.bclib.blocks.BaseBlock; import ru.bclib.blocks.BlockProperties; import ru.bclib.blocks.BlockProperties.TripleShape; -import ru.bclib.client.render.ERenderLayer; +import ru.bclib.client.render.BCLRenderLayer; import ru.bclib.interfaces.IColorProvider; import ru.bclib.interfaces.IRenderTyped; import ru.bclib.util.BlocksHelper; @@ -141,8 +141,8 @@ public class RespawnObeliskBlock extends BaseBlock implements IColorProvider, IR } @Override - public ERenderLayer getRenderLayer() { - return ERenderLayer.TRANSLUCENT; + public BCLRenderLayer getRenderLayer() { + return BCLRenderLayer.TRANSLUCENT; } @Override diff --git a/src/main/java/ru/betterend/blocks/SilkMothNestBlock.java b/src/main/java/ru/betterend/blocks/SilkMothNestBlock.java index 6956d5f5..2d13649d 100644 --- a/src/main/java/ru/betterend/blocks/SilkMothNestBlock.java +++ b/src/main/java/ru/betterend/blocks/SilkMothNestBlock.java @@ -40,7 +40,7 @@ import net.minecraft.world.phys.Vec3; import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.VoxelShape; import ru.bclib.blocks.BaseBlock; -import ru.bclib.client.render.ERenderLayer; +import ru.bclib.client.render.BCLRenderLayer; import ru.bclib.interfaces.IRenderTyped; import ru.bclib.util.BlocksHelper; import ru.bclib.util.MHelper; @@ -71,8 +71,8 @@ public class SilkMothNestBlock extends BaseBlock implements IRenderTyped { } @Override - public ERenderLayer getRenderLayer() { - return ERenderLayer.CUTOUT; + public BCLRenderLayer getRenderLayer() { + return BCLRenderLayer.CUTOUT; } @Override diff --git a/src/main/java/ru/betterend/blocks/SmallJellyshroomBlock.java b/src/main/java/ru/betterend/blocks/SmallJellyshroomBlock.java index 20e4d1b7..60aac3b5 100644 --- a/src/main/java/ru/betterend/blocks/SmallJellyshroomBlock.java +++ b/src/main/java/ru/betterend/blocks/SmallJellyshroomBlock.java @@ -31,7 +31,7 @@ import net.minecraft.world.phys.shapes.Shapes; import net.minecraft.world.phys.shapes.VoxelShape; import ru.bclib.api.TagAPI; import ru.bclib.blocks.BaseAttachedBlock; -import ru.bclib.client.render.ERenderLayer; +import ru.bclib.client.render.BCLRenderLayer; import ru.bclib.interfaces.IRenderTyped; import ru.bclib.util.BlocksHelper; import ru.betterend.registry.EndFeatures; @@ -73,8 +73,8 @@ public class SmallJellyshroomBlock extends BaseAttachedBlock implements IRenderT } @Override - public ERenderLayer getRenderLayer() { - return ERenderLayer.CUTOUT; + public BCLRenderLayer getRenderLayer() { + return BCLRenderLayer.CUTOUT; } static { diff --git a/src/main/java/ru/betterend/blocks/SmaragdantCrystalShardBlock.java b/src/main/java/ru/betterend/blocks/SmaragdantCrystalShardBlock.java index 68dc3c60..a4bb26d2 100644 --- a/src/main/java/ru/betterend/blocks/SmaragdantCrystalShardBlock.java +++ b/src/main/java/ru/betterend/blocks/SmaragdantCrystalShardBlock.java @@ -29,7 +29,7 @@ import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.Shapes; import net.minecraft.world.phys.shapes.VoxelShape; import ru.bclib.blocks.BaseAttachedBlock; -import ru.bclib.client.render.ERenderLayer; +import ru.bclib.client.render.BCLRenderLayer; import ru.bclib.interfaces.IRenderTyped; @SuppressWarnings("deprecation") @@ -54,8 +54,8 @@ public class SmaragdantCrystalShardBlock extends BaseAttachedBlock implements IR } @Override - public ERenderLayer getRenderLayer() { - return ERenderLayer.CUTOUT; + public BCLRenderLayer getRenderLayer() { + return BCLRenderLayer.CUTOUT; } @Override diff --git a/src/main/java/ru/betterend/blocks/SulphurCrystalBlock.java b/src/main/java/ru/betterend/blocks/SulphurCrystalBlock.java index b9af6190..7d6c0727 100644 --- a/src/main/java/ru/betterend/blocks/SulphurCrystalBlock.java +++ b/src/main/java/ru/betterend/blocks/SulphurCrystalBlock.java @@ -35,7 +35,7 @@ import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.Shapes; import net.minecraft.world.phys.shapes.VoxelShape; import ru.bclib.blocks.BaseAttachedBlock; -import ru.bclib.client.render.ERenderLayer; +import ru.bclib.client.render.BCLRenderLayer; import ru.bclib.interfaces.IRenderTyped; import ru.bclib.util.MHelper; import ru.betterend.registry.EndBlocks; @@ -63,8 +63,8 @@ public class SulphurCrystalBlock extends BaseAttachedBlock implements IRenderTyp } @Override - public ERenderLayer getRenderLayer() { - return ERenderLayer.CUTOUT; + public BCLRenderLayer getRenderLayer() { + return BCLRenderLayer.CUTOUT; } @Override diff --git a/src/main/java/ru/betterend/blocks/UmbrellaTreeMembraneBlock.java b/src/main/java/ru/betterend/blocks/UmbrellaTreeMembraneBlock.java index f938dd05..67ad0a06 100644 --- a/src/main/java/ru/betterend/blocks/UmbrellaTreeMembraneBlock.java +++ b/src/main/java/ru/betterend/blocks/UmbrellaTreeMembraneBlock.java @@ -23,7 +23,7 @@ import net.minecraft.world.level.block.state.StateDefinition; import net.minecraft.world.level.block.state.properties.IntegerProperty; import net.minecraft.world.level.storage.loot.LootContext; import ru.bclib.client.models.BlockModelProvider; -import ru.bclib.client.render.ERenderLayer; +import ru.bclib.client.render.BCLRenderLayer; import ru.bclib.interfaces.IRenderTyped; import ru.bclib.util.MHelper; import ru.betterend.noise.OpenSimplexNoise; @@ -51,8 +51,8 @@ public class UmbrellaTreeMembraneBlock extends SlimeBlock implements IRenderType } @Override - public ERenderLayer getRenderLayer() { - return ERenderLayer.TRANSLUCENT; + public BCLRenderLayer getRenderLayer() { + return BCLRenderLayer.TRANSLUCENT; } @Override diff --git a/src/main/java/ru/betterend/blocks/UmbrellaTreeSaplingBlock.java b/src/main/java/ru/betterend/blocks/UmbrellaTreeSaplingBlock.java index 5eec2b40..652b0b83 100644 --- a/src/main/java/ru/betterend/blocks/UmbrellaTreeSaplingBlock.java +++ b/src/main/java/ru/betterend/blocks/UmbrellaTreeSaplingBlock.java @@ -5,7 +5,7 @@ import net.minecraft.world.level.LevelReader; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.levelgen.feature.Feature; import ru.bclib.blocks.FeatureSaplingBlock; -import ru.bclib.client.render.ERenderLayer; +import ru.bclib.client.render.BCLRenderLayer; import ru.betterend.registry.EndBlocks; import ru.betterend.registry.EndFeatures; @@ -25,7 +25,7 @@ public class UmbrellaTreeSaplingBlock extends FeatureSaplingBlock { } @Override - public ERenderLayer getRenderLayer() { - return ERenderLayer.TRANSLUCENT; + public BCLRenderLayer getRenderLayer() { + return BCLRenderLayer.TRANSLUCENT; } } diff --git a/src/main/java/ru/betterend/blocks/basis/FurBlock.java b/src/main/java/ru/betterend/blocks/basis/FurBlock.java index 08f0ea94..0514f5b5 100644 --- a/src/main/java/ru/betterend/blocks/basis/FurBlock.java +++ b/src/main/java/ru/betterend/blocks/basis/FurBlock.java @@ -24,7 +24,7 @@ import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.Shapes; import net.minecraft.world.phys.shapes.VoxelShape; import ru.bclib.blocks.BaseAttachedBlock; -import ru.bclib.client.render.ERenderLayer; +import ru.bclib.client.render.BCLRenderLayer; import ru.bclib.interfaces.IRenderTyped; import ru.bclib.util.MHelper; @@ -74,8 +74,8 @@ public class FurBlock extends BaseAttachedBlock implements IRenderTyped { } @Override - public ERenderLayer getRenderLayer() { - return ERenderLayer.CUTOUT; + public BCLRenderLayer getRenderLayer() { + return BCLRenderLayer.CUTOUT; } static { diff --git a/src/main/java/ru/betterend/client/BetterEndClient.java b/src/main/java/ru/betterend/client/BetterEndClient.java index 95050080..523289b1 100644 --- a/src/main/java/ru/betterend/client/BetterEndClient.java +++ b/src/main/java/ru/betterend/client/BetterEndClient.java @@ -15,7 +15,7 @@ import ru.bclib.blocks.BaseChestBlock; import ru.bclib.blocks.BaseSignBlock; import ru.bclib.client.render.BaseChestBlockEntityRenderer; import ru.bclib.client.render.BaseSignBlockEntityRenderer; -import ru.bclib.client.render.ERenderLayer; +import ru.bclib.client.render.BCLRenderLayer; import ru.bclib.interfaces.IRenderTyped; import ru.bclib.util.TranslationHelper; import ru.betterend.BetterEnd; @@ -68,10 +68,10 @@ public class BetterEndClient implements ClientModInitializer { RenderType translucent = RenderType.translucent(); Registry.BLOCK.forEach(block -> { if (block instanceof IRenderTyped) { - ERenderLayer layer = ((IRenderTyped) block).getRenderLayer(); - if (layer == ERenderLayer.CUTOUT) + BCLRenderLayer layer = ((IRenderTyped) block).getRenderLayer(); + if (layer == BCLRenderLayer.CUTOUT) BlockRenderLayerMap.INSTANCE.putBlock(block, cutout); - else if (layer == ERenderLayer.TRANSLUCENT) + else if (layer == BCLRenderLayer.TRANSLUCENT) BlockRenderLayerMap.INSTANCE.putBlock(block, translucent); } });