Skip to content

Commit 6b88643

Browse files
committed
Fix bug: Unexpected return when loading behavior pack.
1 parent ddc3b2e commit 6b88643

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

src/main/kotlin/net/easecation/bedrockloader/deserializer/BedrockBehaviorDeserializer.kt

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package net.easecation.bedrockloader.deserializer
22

3+
import net.easecation.bedrockloader.BedrockLoader
34
import net.easecation.bedrockloader.bedrock.definition.BlockBehaviourDefinition
45
import net.easecation.bedrockloader.bedrock.definition.EntityBehaviourDefinition
56
import net.easecation.bedrockloader.util.GsonUtil

src/main/kotlin/net/easecation/bedrockloader/loader/BedrockBehaviorPackLoader.kt

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package net.easecation.bedrockloader.loader
22

3+
import net.easecation.bedrockloader.BedrockLoader
34
import net.easecation.bedrockloader.bedrock.block.component.ComponentMaterialInstances
45
import net.easecation.bedrockloader.block.BlockDataDriven
56
import net.easecation.bedrockloader.deserializer.BedrockPackContext
@@ -26,7 +27,7 @@ class BedrockBehaviorPackLoader(
2627
BedrockAddonsRegistry.blocks[id] = block
2728
if (env == EnvType.CLIENT) {
2829
beh.components.minecraftMaterialInstances?.let { materialInstances ->
29-
val renderMethod = materialInstances["*"]?.render_method ?: return
30+
val renderMethod = materialInstances["*"]?.render_method ?: return@let
3031
if (renderMethod == ComponentMaterialInstances.RenderMethod.alpha_test) {
3132
BlockRenderLayerMap.INSTANCE.putBlock(block, RenderLayer.getCutout())
3233
} else if (renderMethod == ComponentMaterialInstances.RenderMethod.blend) {
@@ -38,8 +39,10 @@ class BedrockBehaviorPackLoader(
3839
Registry.register(Registry.ITEM, id, item)
3940
BedrockAddonsRegistry.items[id] = item
4041
}
42+
BedrockLoader.logger.info("test")
4143
// Entity
4244
context.behavior.entities.forEach { (id, beh) ->
45+
BedrockLoader.logger.info("Registering entity $id")
4346
// entity type
4447
val entityType = BedrockAddonsRegistry.getOrRegisterEntityType(id)
4548
BedrockAddonsRegistry.entityComponents[id] = beh.components

0 commit comments

Comments
 (0)