diff --git a/src/main/java/ru/bclib/mixin/common/LayerLightSectionStorageMixin.java b/src/main/java/ru/bclib/mixin/common/LayerLightSectionStorageMixin.java index ac0dc5fa..a222afef 100644 --- a/src/main/java/ru/bclib/mixin/common/LayerLightSectionStorageMixin.java +++ b/src/main/java/ru/bclib/mixin/common/LayerLightSectionStorageMixin.java @@ -12,29 +12,24 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; @Mixin(LayerLightSectionStorage.class) public class LayerLightSectionStorageMixin { - - @Shadow - protected DataLayer getDataLayer(long sectionPos, boolean cached) { - return null; - } - - @Inject(method = "getStoredLevel", at = @At(value = "HEAD"), cancellable = true) - private void lightFix(long blockPos, CallbackInfoReturnable info) { - try { - long m = SectionPos.blockToSection(blockPos); - DataLayer dataLayer = this.getDataLayer(m, true); - info.setReturnValue( - dataLayer.get( - SectionPos.sectionRelative(BlockPos.getX(blockPos)), - SectionPos.sectionRelative(BlockPos.getY(blockPos)), - SectionPos.sectionRelative(BlockPos.getZ(blockPos)) - ) - ); - info.cancel(); - } catch (Exception e) { - info.setReturnValue(0); - info.cancel(); - } - } - + @Shadow + protected DataLayer getDataLayer(long sectionPos, boolean cached) { + return null; + } + + @Inject(method = "getStoredLevel", at = @At(value = "HEAD"), cancellable = true) + private void bclib_lightFix(long blockPos, CallbackInfoReturnable info) { + try { + long pos = SectionPos.blockToSection(blockPos); + DataLayer dataLayer = this.getDataLayer(pos, true); + info.setReturnValue(dataLayer.get( + SectionPos.sectionRelative(BlockPos.getX(blockPos)), + SectionPos.sectionRelative(BlockPos.getY(blockPos)), + SectionPos.sectionRelative(BlockPos.getZ(blockPos)) + )); + } + catch (Exception e) { + info.setReturnValue(0); + } + } } diff --git a/src/main/java/ru/bclib/mixin/common/SimpleReloadableResourceManagerMixin.java b/src/main/java/ru/bclib/mixin/common/SimpleReloadableResourceManagerMixin.java index 94f5ea2d..d2ff94df 100644 --- a/src/main/java/ru/bclib/mixin/common/SimpleReloadableResourceManagerMixin.java +++ b/src/main/java/ru/bclib/mixin/common/SimpleReloadableResourceManagerMixin.java @@ -26,7 +26,7 @@ public class SimpleReloadableResourceManagerMixin { }; @Inject(method = "hasResource", at = @At("HEAD"), cancellable = true) - private void hasResource(ResourceLocation resourceLocation, CallbackInfoReturnable info) { + private void bclib_hasResource(ResourceLocation resourceLocation, CallbackInfoReturnable info) { if (resourceLocation.getNamespace().equals("minecraft")) { for (String key: BCLIB_MISSING_RESOURCES) { if (resourceLocation.getPath().equals(key)) { diff --git a/src/main/resources/bclib.mixins.common.json b/src/main/resources/bclib.mixins.common.json index 2ecb65eb..e15cb1d5 100644 --- a/src/main/resources/bclib.mixins.common.json +++ b/src/main/resources/bclib.mixins.common.json @@ -6,6 +6,7 @@ "mixins": [ "SimpleReloadableResourceManagerMixin", "shears.DiggingEnchantmentMixin", + "LayerLightSectionStorageMixin", "shears.TripWireBlockMixin", "ChunkBiomeContainerMixin", "shears.BeehiveBlockMixin", @@ -20,7 +21,6 @@ "MinecraftServerMixin", "PistonBaseBlockMixin", "WorldGenRegionMixin", - "LayerLightSectionStorageMixin", "DimensionTypeMixin", "RecipeManagerMixin", "CraftingMenuMixin",