diff --git a/src/main/kotlin/mods/betterfoliage/BetterFoliage.kt b/src/main/kotlin/mods/betterfoliage/BetterFoliage.kt index b8bc2c9..f9f9e48 100644 --- a/src/main/kotlin/mods/betterfoliage/BetterFoliage.kt +++ b/src/main/kotlin/mods/betterfoliage/BetterFoliage.kt @@ -2,7 +2,6 @@ package mods.betterfoliage import mods.betterfoliage.chunk.ChunkOverlayManager import mods.betterfoliage.config.BlockConfig -import mods.betterfoliage.config.BlockConfigOld import mods.betterfoliage.integration.OptifineCustomColors import mods.betterfoliage.integration.ShadersModIntegration import mods.betterfoliage.render.block.vanilla.RoundLogOverlayLayer @@ -16,22 +15,22 @@ import mods.betterfoliage.render.block.vanilla.StandardLeafDiscovery import mods.betterfoliage.render.block.vanilla.StandardLeafModel import mods.betterfoliage.render.block.vanilla.StandardLilypadDiscovery import mods.betterfoliage.render.block.vanilla.StandardLilypadModel -import mods.betterfoliage.render.block.vanilla.StandardRoundLogDiscovery import mods.betterfoliage.render.block.vanilla.StandardMyceliumDiscovery import mods.betterfoliage.render.block.vanilla.StandardMyceliumModel import mods.betterfoliage.render.block.vanilla.StandardNetherrackDiscovery import mods.betterfoliage.render.block.vanilla.StandardNetherrackModel +import mods.betterfoliage.render.block.vanilla.StandardRoundLogDiscovery import mods.betterfoliage.render.block.vanilla.StandardRoundLogModel import mods.betterfoliage.render.block.vanilla.StandardSandDiscovery import mods.betterfoliage.render.block.vanilla.StandardSandModel import mods.betterfoliage.render.lighting.AoSideHelper +import mods.betterfoliage.render.particle.LeafParticleRegistry import mods.betterfoliage.render.particle.LeafWindTracker +import mods.betterfoliage.render.particle.RisingSoulParticle import mods.betterfoliage.resource.discovery.BakeWrapperManager import mods.betterfoliage.resource.discovery.BlockTypeCache -import mods.betterfoliage.resource.generated.GeneratedTexturePack -import mods.betterfoliage.render.particle.LeafParticleRegistry -import mods.betterfoliage.render.particle.RisingSoulParticle import mods.betterfoliage.resource.discovery.RuleBasedDiscovery +import mods.betterfoliage.resource.generated.GeneratedTexturePack import mods.betterfoliage.util.resourceManager import net.minecraft.block.BlockState @@ -81,7 +80,6 @@ object BetterFoliage { // init singletons val singletons = listOf( AoSideHelper, - BlockConfigOld, ChunkOverlayManager, LeafWindTracker ) diff --git a/src/main/kotlin/mods/betterfoliage/BetterFoliageMod.kt b/src/main/kotlin/mods/betterfoliage/BetterFoliageMod.kt index 7656f55..7e01850 100644 --- a/src/main/kotlin/mods/betterfoliage/BetterFoliageMod.kt +++ b/src/main/kotlin/mods/betterfoliage/BetterFoliageMod.kt @@ -1,11 +1,9 @@ package mods.betterfoliage -import mods.betterfoliage.config.BlockConfig -import mods.betterfoliage.config.BlockConfigOld import mods.betterfoliage.config.MainConfig -import mods.betterfoliage.util.tryDefault import mods.betterfoliage.config.clothGuiRoot import mods.betterfoliage.config.forgeSpecRoot +import mods.betterfoliage.util.tryDefault import net.minecraft.client.Minecraft import net.minecraft.client.gui.screen.Screen import net.minecraft.util.ResourceLocation @@ -73,7 +71,6 @@ object BetterFoliageMod { } Minecraft.getInstance().resourcePackRepository.addPackFinder(BetterFoliage.generatedPack.finder) - bus.register(BlockConfigOld) BetterFoliage.init() } } \ No newline at end of file diff --git a/src/main/kotlin/mods/betterfoliage/config/Config.kt b/src/main/kotlin/mods/betterfoliage/config/Config.kt deleted file mode 100644 index 4513392..0000000 --- a/src/main/kotlin/mods/betterfoliage/config/Config.kt +++ /dev/null @@ -1,35 +0,0 @@ -package mods.betterfoliage.config - -import mods.betterfoliage.BetterFoliageMod -import mods.betterfoliage.resource.discovery.ConfigurableBlockMatcher -import mods.betterfoliage.resource.discovery.ModelTextureListConfiguration -import net.minecraft.util.ResourceLocation -import net.minecraftforge.eventbus.api.SubscribeEvent -import net.minecraftforge.fml.config.ModConfig - -object BlockConfigOld { - private val list = mutableListOf() - - val leafBlocks = blocks("leaves_blocks_default.cfg") - val leafModels = models("leaves_models_default.cfg") - val grassBlocks = blocks("grass_blocks_default.cfg") - val grassModels = models("grass_models_default.cfg") - val mycelium = blocks("mycelium_blocks_default.cfg") -// val dirt = blocks("dirt_default.cfg") - val crops = blocks("crop_default.cfg") - val logBlocks = blocks("log_blocks_default.cfg") - val logModels = models("log_models_default.cfg") - val lilypad = blocks("lilypad_default.cfg") - - init { BetterFoliageMod.bus.register(this) } - private fun blocks(cfgName: String) = ConfigurableBlockMatcher(ResourceLocation(BetterFoliageMod.MOD_ID, cfgName)).apply { list.add(this) } - private fun models(cfgName: String) = ModelTextureListConfiguration(ResourceLocation(BetterFoliageMod.MOD_ID, cfgName)).apply { list.add(this) } - - @SubscribeEvent - fun onConfig(event: ModConfig.ModConfigEvent) { - list.forEach { when(it) { - is ConfigurableBlockMatcher -> it.readDefaults() - is ModelTextureListConfiguration -> it.readDefaults() - } } - } -} diff --git a/src/main/kotlin/mods/betterfoliage/config/MiscDefaults.kt b/src/main/kotlin/mods/betterfoliage/config/MiscDefaults.kt index 93151ba..8fcfd0e 100644 --- a/src/main/kotlin/mods/betterfoliage/config/MiscDefaults.kt +++ b/src/main/kotlin/mods/betterfoliage/config/MiscDefaults.kt @@ -5,13 +5,6 @@ import net.minecraft.block.Blocks import net.minecraft.block.material.Material import net.minecraft.world.biome.Biome -val CACTUS_BLOCKS = listOf(Blocks.CACTUS) -val DIRT_BLOCKS = listOf(Blocks.DIRT, Blocks.COARSE_DIRT, Blocks.PODZOL) -val SAND_BLOCKS = listOf(Blocks.SAND, Blocks.RED_SAND) -val NETHERRACK_BLOCKS = listOf(Blocks.NETHERRACK) -val LILYPAD_BLOCKS = listOf(Blocks.LILY_PAD) -val MYCELIUM_BLOCKS = listOf(Blocks.MYCELIUM) - val SALTWATER_BIOMES = listOf(Biome.Category.BEACH, Biome.Category.OCEAN) val SNOW_MATERIALS = listOf(Material.TOP_SNOW, Material.SNOW) diff --git a/src/main/kotlin/mods/betterfoliage/render/block/vanilla/Cactus.kt b/src/main/kotlin/mods/betterfoliage/render/block/vanilla/Cactus.kt index 64bd9a6..dd05c66 100644 --- a/src/main/kotlin/mods/betterfoliage/render/block/vanilla/Cactus.kt +++ b/src/main/kotlin/mods/betterfoliage/render/block/vanilla/Cactus.kt @@ -3,12 +3,10 @@ package mods.betterfoliage.render.block.vanilla import mods.betterfoliage.BetterFoliage import mods.betterfoliage.BetterFoliageMod import mods.betterfoliage.chunk.BlockCtx -import mods.betterfoliage.config.CACTUS_BLOCKS import mods.betterfoliage.config.Config import mods.betterfoliage.model.Color import mods.betterfoliage.model.HalfBakedSpecialWrapper import mods.betterfoliage.model.HalfBakedWrapperKey -import mods.betterfoliage.model.SpecialRenderData import mods.betterfoliage.model.SpecialRenderModel import mods.betterfoliage.model.SpriteSetDelegate import mods.betterfoliage.model.buildTufts @@ -20,13 +18,10 @@ import mods.betterfoliage.model.tuftShapeSet import mods.betterfoliage.render.lighting.LightingPreferredFace import mods.betterfoliage.render.lighting.RoundLeafLighting import mods.betterfoliage.render.pipeline.RenderCtxBase -import mods.betterfoliage.resource.discovery.AbstractModelDiscovery -import mods.betterfoliage.resource.discovery.BakeWrapperManager import mods.betterfoliage.resource.discovery.ModelBakingContext import mods.betterfoliage.resource.discovery.ModelDiscoveryContext import mods.betterfoliage.resource.discovery.ParametrizedModelDiscovery import mods.betterfoliage.util.Atlas -import mods.betterfoliage.util.LazyInvalidatable import mods.betterfoliage.util.Rotation import mods.betterfoliage.util.horizontalDirections import mods.betterfoliage.util.idx @@ -34,7 +29,6 @@ import mods.betterfoliage.util.lazy import mods.betterfoliage.util.randomD import mods.betterfoliage.util.randomI import net.minecraft.client.renderer.RenderType -import net.minecraft.client.renderer.model.BlockModel import net.minecraft.util.Direction.DOWN import net.minecraft.util.ResourceLocation import java.util.Random diff --git a/src/main/kotlin/mods/betterfoliage/render/block/vanilla/Dirt.kt b/src/main/kotlin/mods/betterfoliage/render/block/vanilla/Dirt.kt index 8019201..32a70c1 100644 --- a/src/main/kotlin/mods/betterfoliage/render/block/vanilla/Dirt.kt +++ b/src/main/kotlin/mods/betterfoliage/render/block/vanilla/Dirt.kt @@ -4,7 +4,6 @@ import mods.betterfoliage.BetterFoliage import mods.betterfoliage.BetterFoliageMod import mods.betterfoliage.chunk.BlockCtx import mods.betterfoliage.config.Config -import mods.betterfoliage.config.DIRT_BLOCKS import mods.betterfoliage.config.SALTWATER_BIOMES import mods.betterfoliage.config.isSnow import mods.betterfoliage.integration.ShadersModIntegration @@ -21,26 +20,19 @@ import mods.betterfoliage.render.lighting.LightingPreferredFace import mods.betterfoliage.render.pipeline.Layers import mods.betterfoliage.render.pipeline.RenderCtxBase import mods.betterfoliage.render.pipeline.extendLayers -import mods.betterfoliage.resource.discovery.AbstractModelDiscovery -import mods.betterfoliage.resource.discovery.BakeWrapperManager import mods.betterfoliage.resource.discovery.ModelBakingContext import mods.betterfoliage.resource.discovery.ModelDiscoveryContext import mods.betterfoliage.resource.discovery.ParametrizedModelDiscovery import mods.betterfoliage.resource.generated.CenteredSprite import mods.betterfoliage.util.Atlas import mods.betterfoliage.util.Int3 -import mods.betterfoliage.util.LazyInvalidatable -import mods.betterfoliage.util.get import mods.betterfoliage.util.getBlockModel import mods.betterfoliage.util.idxOrNull import mods.betterfoliage.util.lazy import mods.betterfoliage.util.offset import mods.betterfoliage.util.randomI import net.minecraft.block.material.Material -import net.minecraft.client.Minecraft import net.minecraft.client.renderer.RenderType -import net.minecraft.client.renderer.RenderTypeLookup -import net.minecraft.client.renderer.model.BlockModel import net.minecraft.util.Direction.UP import net.minecraft.util.ResourceLocation import java.util.Random diff --git a/src/main/kotlin/mods/betterfoliage/render/block/vanilla/Grass.kt b/src/main/kotlin/mods/betterfoliage/render/block/vanilla/Grass.kt index 5427b9b..2fdf895 100644 --- a/src/main/kotlin/mods/betterfoliage/render/block/vanilla/Grass.kt +++ b/src/main/kotlin/mods/betterfoliage/render/block/vanilla/Grass.kt @@ -3,7 +3,6 @@ package mods.betterfoliage.render.block.vanilla import mods.betterfoliage.BetterFoliage import mods.betterfoliage.BetterFoliageMod import mods.betterfoliage.chunk.BlockCtx -import mods.betterfoliage.config.BlockConfigOld import mods.betterfoliage.config.Config import mods.betterfoliage.config.isSnow import mods.betterfoliage.integration.ShadersModIntegration @@ -21,16 +20,10 @@ import mods.betterfoliage.render.lighting.LightingPreferredFace import mods.betterfoliage.render.pipeline.Layers import mods.betterfoliage.render.pipeline.RenderCtxBase import mods.betterfoliage.render.pipeline.extendLayers -import mods.betterfoliage.resource.discovery.BakeWrapperManager -import mods.betterfoliage.resource.discovery.ConfigurableBlockMatcher -import mods.betterfoliage.resource.discovery.ConfigurableModelDiscovery import mods.betterfoliage.resource.discovery.ModelBakingContext import mods.betterfoliage.resource.discovery.ModelDiscoveryContext -import mods.betterfoliage.resource.discovery.ModelTextureList import mods.betterfoliage.resource.discovery.ParametrizedModelDiscovery import mods.betterfoliage.util.Atlas -import mods.betterfoliage.util.LazyInvalidatable -import mods.betterfoliage.util.LazyMapInvalidatable import mods.betterfoliage.util.averageColor import mods.betterfoliage.util.colorOverride import mods.betterfoliage.util.idxOrNull diff --git a/src/main/kotlin/mods/betterfoliage/render/block/vanilla/Leaf.kt b/src/main/kotlin/mods/betterfoliage/render/block/vanilla/Leaf.kt index 8842bbc..bc4b77f 100644 --- a/src/main/kotlin/mods/betterfoliage/render/block/vanilla/Leaf.kt +++ b/src/main/kotlin/mods/betterfoliage/render/block/vanilla/Leaf.kt @@ -2,7 +2,6 @@ package mods.betterfoliage.render.block.vanilla import mods.betterfoliage.BetterFoliage import mods.betterfoliage.BetterFoliageMod -import mods.betterfoliage.config.BlockConfigOld import mods.betterfoliage.config.Config import mods.betterfoliage.config.isSnow import mods.betterfoliage.integration.ShadersModIntegration @@ -18,11 +17,8 @@ import mods.betterfoliage.render.particle.LeafBlockModel import mods.betterfoliage.render.particle.LeafParticleKey import mods.betterfoliage.render.particle.LeafParticleRegistry import mods.betterfoliage.render.pipeline.RenderCtxBase -import mods.betterfoliage.resource.discovery.ConfigurableBlockMatcher -import mods.betterfoliage.resource.discovery.ConfigurableModelDiscovery import mods.betterfoliage.resource.discovery.ModelBakingContext import mods.betterfoliage.resource.discovery.ModelDiscoveryContext -import mods.betterfoliage.resource.discovery.ModelTextureList import mods.betterfoliage.resource.discovery.ParametrizedModelDiscovery import mods.betterfoliage.resource.generated.GeneratedLeafSprite import mods.betterfoliage.util.Atlas diff --git a/src/main/kotlin/mods/betterfoliage/render/block/vanilla/Lilypad.kt b/src/main/kotlin/mods/betterfoliage/render/block/vanilla/Lilypad.kt index 53dc5f6..2286902 100644 --- a/src/main/kotlin/mods/betterfoliage/render/block/vanilla/Lilypad.kt +++ b/src/main/kotlin/mods/betterfoliage/render/block/vanilla/Lilypad.kt @@ -4,7 +4,6 @@ import mods.betterfoliage.BetterFoliage import mods.betterfoliage.BetterFoliageMod import mods.betterfoliage.chunk.BlockCtx import mods.betterfoliage.config.Config -import mods.betterfoliage.config.LILYPAD_BLOCKS import mods.betterfoliage.integration.ShadersModIntegration import mods.betterfoliage.model.Color import mods.betterfoliage.model.HalfBakedSpecialWrapper @@ -16,23 +15,14 @@ import mods.betterfoliage.model.transform import mods.betterfoliage.model.tuftModelSet import mods.betterfoliage.model.tuftShapeSet import mods.betterfoliage.render.pipeline.RenderCtxBase -import mods.betterfoliage.resource.discovery.AbstractModelDiscovery -import mods.betterfoliage.resource.discovery.BakeWrapperManager import mods.betterfoliage.resource.discovery.ModelBakingContext -import mods.betterfoliage.resource.discovery.ModelBakingKey import mods.betterfoliage.resource.discovery.ModelDiscoveryContext import mods.betterfoliage.resource.discovery.ParametrizedModelDiscovery import mods.betterfoliage.util.Atlas -import mods.betterfoliage.util.LazyInvalidatable -import mods.betterfoliage.util.get import mods.betterfoliage.util.idx import mods.betterfoliage.util.idxOrNull import mods.betterfoliage.util.lazy -import net.minecraft.block.BlockState -import net.minecraft.block.Blocks import net.minecraft.client.renderer.RenderType -import net.minecraft.client.renderer.model.BlockModel -import net.minecraft.client.renderer.model.ModelBakery import net.minecraft.util.Direction.DOWN import net.minecraft.util.ResourceLocation import java.util.Random diff --git a/src/main/kotlin/mods/betterfoliage/render/block/vanilla/Mycelium.kt b/src/main/kotlin/mods/betterfoliage/render/block/vanilla/Mycelium.kt index a737957..d681751 100644 --- a/src/main/kotlin/mods/betterfoliage/render/block/vanilla/Mycelium.kt +++ b/src/main/kotlin/mods/betterfoliage/render/block/vanilla/Mycelium.kt @@ -4,7 +4,6 @@ import mods.betterfoliage.BetterFoliage import mods.betterfoliage.BetterFoliageMod import mods.betterfoliage.chunk.BlockCtx import mods.betterfoliage.config.Config -import mods.betterfoliage.config.MYCELIUM_BLOCKS import mods.betterfoliage.model.Color import mods.betterfoliage.model.HalfBakedSpecialWrapper import mods.betterfoliage.model.HalfBakedWrapperKey @@ -18,20 +17,14 @@ import mods.betterfoliage.render.lighting.LightingPreferredFace import mods.betterfoliage.render.pipeline.Layers import mods.betterfoliage.render.pipeline.RenderCtxBase import mods.betterfoliage.render.pipeline.extendLayers -import mods.betterfoliage.resource.discovery.AbstractModelDiscovery -import mods.betterfoliage.resource.discovery.BakeWrapperManager import mods.betterfoliage.resource.discovery.ModelBakingContext import mods.betterfoliage.resource.discovery.ModelDiscoveryContext import mods.betterfoliage.resource.discovery.ParametrizedModelDiscovery import mods.betterfoliage.util.Atlas -import mods.betterfoliage.util.LazyInvalidatable -import mods.betterfoliage.util.get import mods.betterfoliage.util.idxOrNull import mods.betterfoliage.util.lazy import mods.betterfoliage.util.randomI import net.minecraft.client.renderer.RenderType -import net.minecraft.client.renderer.RenderTypeLookup -import net.minecraft.client.renderer.model.BlockModel import net.minecraft.util.Direction import net.minecraft.util.ResourceLocation import java.util.Random diff --git a/src/main/kotlin/mods/betterfoliage/render/block/vanilla/Netherrack.kt b/src/main/kotlin/mods/betterfoliage/render/block/vanilla/Netherrack.kt index e9e2527..8659c76 100644 --- a/src/main/kotlin/mods/betterfoliage/render/block/vanilla/Netherrack.kt +++ b/src/main/kotlin/mods/betterfoliage/render/block/vanilla/Netherrack.kt @@ -1,10 +1,9 @@ package mods.betterfoliage.render.block.vanilla -import mods.betterfoliage.BetterFoliageMod import mods.betterfoliage.BetterFoliage +import mods.betterfoliage.BetterFoliageMod import mods.betterfoliage.chunk.BlockCtx import mods.betterfoliage.config.Config -import mods.betterfoliage.config.NETHERRACK_BLOCKS import mods.betterfoliage.model.Color import mods.betterfoliage.model.HalfBakedSpecialWrapper import mods.betterfoliage.model.HalfBakedWrapperKey @@ -19,23 +18,15 @@ import mods.betterfoliage.render.lighting.LightingPreferredFace import mods.betterfoliage.render.pipeline.Layers import mods.betterfoliage.render.pipeline.RenderCtxBase import mods.betterfoliage.render.pipeline.extendLayers -import mods.betterfoliage.resource.discovery.AbstractModelDiscovery -import mods.betterfoliage.resource.discovery.BakeWrapperManager import mods.betterfoliage.resource.discovery.ModelBakingContext import mods.betterfoliage.resource.discovery.ModelDiscoveryContext import mods.betterfoliage.resource.discovery.ParametrizedModelDiscovery import mods.betterfoliage.util.Atlas -import mods.betterfoliage.util.LazyInvalidatable import mods.betterfoliage.util.Rotation -import mods.betterfoliage.util.get import mods.betterfoliage.util.idxOrNull import mods.betterfoliage.util.lazy import mods.betterfoliage.util.randomI -import net.minecraft.block.Blocks import net.minecraft.client.renderer.RenderType -import net.minecraft.client.renderer.RenderTypeLookup -import net.minecraft.client.renderer.model.BlockModel -import net.minecraft.util.Direction import net.minecraft.util.Direction.DOWN import net.minecraft.util.ResourceLocation import java.util.Random diff --git a/src/main/kotlin/mods/betterfoliage/render/block/vanilla/RoundLog.kt b/src/main/kotlin/mods/betterfoliage/render/block/vanilla/RoundLog.kt index a35a1d5..b1af002 100644 --- a/src/main/kotlin/mods/betterfoliage/render/block/vanilla/RoundLog.kt +++ b/src/main/kotlin/mods/betterfoliage/render/block/vanilla/RoundLog.kt @@ -2,7 +2,6 @@ package mods.betterfoliage.render.block.vanilla import mods.betterfoliage.BetterFoliage import mods.betterfoliage.config.ACCEPTED_ROUND_LOG_MATERIALS -import mods.betterfoliage.config.BlockConfigOld import mods.betterfoliage.config.Config import mods.betterfoliage.model.HalfBakedWrapperKey import mods.betterfoliage.model.SpecialRenderModel @@ -10,16 +9,11 @@ import mods.betterfoliage.render.column.ColumnBlockKey import mods.betterfoliage.render.column.ColumnMeshSet import mods.betterfoliage.render.column.ColumnModelBase import mods.betterfoliage.render.column.ColumnRenderLayer -import mods.betterfoliage.resource.discovery.BakeWrapperManager -import mods.betterfoliage.resource.discovery.ConfigurableBlockMatcher -import mods.betterfoliage.resource.discovery.ConfigurableModelDiscovery import mods.betterfoliage.resource.discovery.ModelBakingContext import mods.betterfoliage.resource.discovery.ModelBakingKey import mods.betterfoliage.resource.discovery.ModelDiscoveryContext -import mods.betterfoliage.resource.discovery.ModelTextureList import mods.betterfoliage.resource.discovery.ParametrizedModelDiscovery import mods.betterfoliage.util.Atlas -import mods.betterfoliage.util.LazyMapInvalidatable import mods.betterfoliage.util.lazyMap import mods.betterfoliage.util.tryDefault import net.minecraft.block.BlockState @@ -27,7 +21,6 @@ import net.minecraft.block.RotatedPillarBlock import net.minecraft.util.Direction.Axis import net.minecraft.util.ResourceLocation import org.apache.logging.log4j.Level.INFO -import org.apache.logging.log4j.Level.WARN interface RoundLogKey : ColumnBlockKey, ModelBakingKey { val barkSprite: ResourceLocation diff --git a/src/main/kotlin/mods/betterfoliage/render/block/vanilla/Sand.kt b/src/main/kotlin/mods/betterfoliage/render/block/vanilla/Sand.kt index 1f0d89f..ddea6ea 100644 --- a/src/main/kotlin/mods/betterfoliage/render/block/vanilla/Sand.kt +++ b/src/main/kotlin/mods/betterfoliage/render/block/vanilla/Sand.kt @@ -5,7 +5,6 @@ import mods.betterfoliage.BetterFoliageMod import mods.betterfoliage.chunk.BlockCtx import mods.betterfoliage.config.Config import mods.betterfoliage.config.SALTWATER_BIOMES -import mods.betterfoliage.config.SAND_BLOCKS import mods.betterfoliage.model.Color import mods.betterfoliage.model.HalfBakedSpecialWrapper import mods.betterfoliage.model.HalfBakedWrapperKey @@ -22,27 +21,21 @@ import mods.betterfoliage.render.lighting.LightingPreferredFace import mods.betterfoliage.render.pipeline.Layers import mods.betterfoliage.render.pipeline.RenderCtxBase import mods.betterfoliage.render.pipeline.extendLayers -import mods.betterfoliage.resource.discovery.AbstractModelDiscovery -import mods.betterfoliage.resource.discovery.BakeWrapperManager import mods.betterfoliage.resource.discovery.ModelBakingContext import mods.betterfoliage.resource.discovery.ModelDiscoveryContext import mods.betterfoliage.resource.discovery.ParametrizedModelDiscovery import mods.betterfoliage.util.Atlas -import mods.betterfoliage.util.LazyInvalidatable import mods.betterfoliage.util.Rotation import mods.betterfoliage.util.allDirections import mods.betterfoliage.util.get import mods.betterfoliage.util.idx import mods.betterfoliage.util.lazy -import mods.betterfoliage.util.lazyMap import mods.betterfoliage.util.mapArray import mods.betterfoliage.util.randomB import mods.betterfoliage.util.randomD import mods.betterfoliage.util.randomI import net.minecraft.block.material.Material import net.minecraft.client.renderer.RenderType -import net.minecraft.client.renderer.RenderTypeLookup -import net.minecraft.client.renderer.model.BlockModel import net.minecraft.util.Direction import net.minecraft.util.Direction.UP import net.minecraft.util.ResourceLocation diff --git a/src/main/resources/assets/betterfoliage/dirt_default.cfg b/src/main/resources/assets/betterfoliage/dirt_default.cfg deleted file mode 100644 index 247dd14..0000000 --- a/src/main/resources/assets/betterfoliage/dirt_default.cfg +++ /dev/null @@ -1,2 +0,0 @@ -// Vanilla -net.minecraft.block.DirtBlock diff --git a/src/main/resources/assets/betterfoliage/grass_blocks_default.cfg b/src/main/resources/assets/betterfoliage/grass_blocks_default.cfg deleted file mode 100644 index eb0a164..0000000 --- a/src/main/resources/assets/betterfoliage/grass_blocks_default.cfg +++ /dev/null @@ -1,2 +0,0 @@ -// Vanilla -net.minecraft.block.GrassBlock diff --git a/src/main/resources/assets/betterfoliage/grass_models_default.cfg b/src/main/resources/assets/betterfoliage/grass_models_default.cfg deleted file mode 100644 index 7c7e5c6..0000000 --- a/src/main/resources/assets/betterfoliage/grass_models_default.cfg +++ /dev/null @@ -1,3 +0,0 @@ -// Vanilla -block/grass_block,top -block/cube_bottom_top,top diff --git a/src/main/resources/assets/betterfoliage/leaves_blocks_default.cfg b/src/main/resources/assets/betterfoliage/leaves_blocks_default.cfg deleted file mode 100644 index 839b864..0000000 --- a/src/main/resources/assets/betterfoliage/leaves_blocks_default.cfg +++ /dev/null @@ -1,2 +0,0 @@ -// Vanilla -net.minecraft.block.LeavesBlock diff --git a/src/main/resources/assets/betterfoliage/leaves_models_default.cfg b/src/main/resources/assets/betterfoliage/leaves_models_default.cfg deleted file mode 100644 index c6110b8..0000000 --- a/src/main/resources/assets/betterfoliage/leaves_models_default.cfg +++ /dev/null @@ -1,4 +0,0 @@ -minecraft:block/leaves,all -minecraft:block/cube_all,all - -biomesoplenty:block/leaves_overlay,leaves diff --git a/src/main/resources/assets/betterfoliage/lilypad_default.cfg b/src/main/resources/assets/betterfoliage/lilypad_default.cfg deleted file mode 100644 index 1408f60..0000000 --- a/src/main/resources/assets/betterfoliage/lilypad_default.cfg +++ /dev/null @@ -1,8 +0,0 @@ -// Vanilla -net.minecraft.block.BlockLilyPad - -// Biomes O'Plenty -biomesoplenty.common.block.BlockBOPLilypad - -// TerraFirmaCraft -com.bioxx.tfc.Blocks.Vanilla.BlockCustomLilyPad diff --git a/src/main/resources/assets/betterfoliage/log_blocks_default.cfg b/src/main/resources/assets/betterfoliage/log_blocks_default.cfg deleted file mode 100644 index e5a51cb..0000000 --- a/src/main/resources/assets/betterfoliage/log_blocks_default.cfg +++ /dev/null @@ -1,2 +0,0 @@ -// Vanilla -net.minecraft.block.RotatedPillarBlock diff --git a/src/main/resources/assets/betterfoliage/log_models_default.cfg b/src/main/resources/assets/betterfoliage/log_models_default.cfg deleted file mode 100644 index cf385b7..0000000 --- a/src/main/resources/assets/betterfoliage/log_models_default.cfg +++ /dev/null @@ -1,4 +0,0 @@ -// Vanilla -block/cube_column,side,end -block/cube_column_horizontal,side,end -block/cube_all,all,all diff --git a/src/main/resources/assets/betterfoliage/mycelium_blocks_default.cfg b/src/main/resources/assets/betterfoliage/mycelium_blocks_default.cfg deleted file mode 100644 index 73e1a43..0000000 --- a/src/main/resources/assets/betterfoliage/mycelium_blocks_default.cfg +++ /dev/null @@ -1,2 +0,0 @@ -// Vanilla -net.minecraft.block.MyceliumBlock