From 0d70e145bbc040a7a66002baebe511ff7386dc0e Mon Sep 17 00:00:00 2001 From: Frank Date: Mon, 18 Dec 2023 16:11:02 +0100 Subject: [PATCH] Fixed some mixins --- .../common/elytra/LivingEntityMixin.java | 1 + src/main/resources/bclib.mixins.common.json | 57 +++++++++++++++---- .../resources/together.mixins.common.json | 23 ++++++-- 3 files changed, 65 insertions(+), 16 deletions(-) diff --git a/src/main/java/org/betterx/bclib/mixin/common/elytra/LivingEntityMixin.java b/src/main/java/org/betterx/bclib/mixin/common/elytra/LivingEntityMixin.java index 5a2e5825..c28cb4ba 100644 --- a/src/main/java/org/betterx/bclib/mixin/common/elytra/LivingEntityMixin.java +++ b/src/main/java/org/betterx/bclib/mixin/common/elytra/LivingEntityMixin.java @@ -16,6 +16,7 @@ import org.spongepowered.asm.mixin.injection.Slice; @Mixin(value = LivingEntity.class, priority = 199) public abstract class LivingEntityMixin { + @Shadow public abstract ItemStack getItemBySlot(EquipmentSlot equipmentSlot); diff --git a/src/main/resources/bclib.mixins.common.json b/src/main/resources/bclib.mixins.common.json index 7ec08007..a336d65b 100644 --- a/src/main/resources/bclib.mixins.common.json +++ b/src/main/resources/bclib.mixins.common.json @@ -4,17 +4,52 @@ "package": "org.betterx.bclib.mixin.common", "compatibilityLevel": "JAVA_17", "mixins": [ - "AnvilBlockMixin", "AnvilMenuMixin", "BiomeGenerationSettingsAccessor", "BiomeMixin", "BiomeSourceMixin", - "BoneMealItemMixin", "ChunkGeneratorAccessor", "ChunkGeneratorMixin", "ChunkGeneratorsMixin", - "ComposterBlockAccessor", "CraftingMenuMixin", "DiggerItemMixin", "EnchantingTableBlockMixin", "ItemStackMixin", - "LayerLightSectionStorageMixin", "LootPoolMixin", "MissingDimensionFixMixin", "MobSpawnSettingsAccessor", - "NoiseBasedChunkGeneratorMixin", "PistonBaseBlockMixin", "PoiTypeMixin", "PortalShapeMixin", - "PotionBrewingAccessor", "RecipeManagerMixin", "RecipeMixin", "RegistryDataLoaderMixin", "ServerLevelMixin", - "ShovelItemAccessor", "SurfaceRulesContextAccessor", "TheEndBiomesMixin", "V2551Mixin", "V2832Mixin", - "WorldGenRegionMixin", "boat.BoatItemMixin", "boat.BoatMixin", "boat.ChestBoatMixin", "elytra.LivingEntityMixin", - "shears.BeehiveBlockMixin", "shears.DiggingEnchantmentMixin", "shears.ItemPredicateBuilderMixin", - "shears.MushroomCowMixin", "shears.PumpkinBlockMixin", "shears.SheepMixin", "shears.SnowGolemMixin", - "shears.TripWireBlockMixin", "signs.BlockEntityTypeMixin" + "AnvilBlockMixin", + "AnvilMenuMixin", + "BiomeGenerationSettingsAccessor", + "BiomeMixin", + "BiomeSourceMixin", + "BoneMealItemMixin", + "ChunkGeneratorAccessor", + "ChunkGeneratorMixin", + "ChunkGeneratorsMixin", + "ComposterBlockAccessor", + "CraftingMenuMixin", + "DiggerItemMixin", + "EnchantingTableBlockMixin", + "ItemStackMixin", + "LayerLightSectionStorageMixin", + "LootPoolMixin", + "MissingDimensionFixMixin", + "MobSpawnSettingsAccessor", + "NoiseBasedChunkGeneratorMixin", + "PistonBaseBlockMixin", + "PoiTypeMixin", + "PortalShapeMixin", + "PotionBrewingAccessor", + "RecipeManagerMixin", + "RecipeMixin", + "RegistryDataLoaderMixin", + "ServerLevelMixin", + "ShovelItemAccessor", + "SurfaceRulesContextAccessor", + "TheEndBiomesMixin", + "V2551Mixin", + "V2832Mixin", + "WorldGenRegionMixin", + "boat.BoatItemMixin", + "boat.BoatMixin", + "boat.ChestBoatMixin", + "elytra.LivingEntityMixin", + "shears.BeehiveBlockMixin", + "shears.DiggingEnchantmentMixin", + "shears.ItemPredicateBuilderMixin", + "shears.MushroomCowMixin", + "shears.PumpkinBlockMixin", + "shears.SheepMixin", + "shears.SnowGolemMixin", + "shears.TripWireBlockMixin", + "signs.BlockEntityTypeMixin" ], "injectors": { "defaultRequire": 1 diff --git a/src/main/resources/together.mixins.common.json b/src/main/resources/together.mixins.common.json index 454a3813..809b8cd3 100644 --- a/src/main/resources/together.mixins.common.json +++ b/src/main/resources/together.mixins.common.json @@ -4,11 +4,24 @@ "package": "org.betterx.worlds.together.mixin.common", "compatibilityLevel": "JAVA_17", "mixins": [ - "BiomeSourceMixin", "DedicatedServerPropertiesMixin", "DiggerItemAccessor", "MainDataMixin", "MainMixin", - "MinecraftServerMixin", "MinecraftServerMixinLate", "NoiseBasedChunkGeneratorMixin", - "NoiseGeneratorSettingsMixin", "RegistryDataLoaderMixin", "RegistryOpsAccessor", "TagLoaderMixin", - "VanillaRegistriesMixin", "WorldGenPropertiesMixin", "WorldLoaderMixin", "WorldPresetAccessor", - "WorldPresetMixin", "WorldStem_Mixin" + "BiomeSourceMixin", + "DedicatedServerPropertiesMixin", + "DiggerItemAccessor", + "MainDataMixin", + "MainMixin", + "MinecraftServerMixin", + "MinecraftServerMixinLate", + "NoiseBasedChunkGeneratorMixin", + "NoiseGeneratorSettingsMixin", + "RegistryDataLoaderMixin", + "RegistryOpsAccessor", + "TagLoaderMixin", + "VanillaRegistriesMixin", + "WorldGenPropertiesMixin", + "WorldLoaderMixin", + "WorldPresetAccessor", + "WorldPresetMixin", + "WorldStem_Mixin" ], "injectors": { "defaultRequire": 1