diff --git a/src/main/java/com/minelittlepony/unicopia/Unicopia.java b/src/main/java/com/minelittlepony/unicopia/Unicopia.java index f7ebde78..28922b79 100644 --- a/src/main/java/com/minelittlepony/unicopia/Unicopia.java +++ b/src/main/java/com/minelittlepony/unicopia/Unicopia.java @@ -19,6 +19,7 @@ import com.minelittlepony.unicopia.advancement.UCriteria; import com.minelittlepony.unicopia.block.UBlocks; import com.minelittlepony.unicopia.block.state.StateMapLoader; import com.minelittlepony.unicopia.command.Commands; +import com.minelittlepony.unicopia.compat.trinkets.TrinketsDelegate; import com.minelittlepony.unicopia.container.SpellbookChapterLoader; import com.minelittlepony.unicopia.container.UScreenHandlers; import com.minelittlepony.unicopia.entity.damage.UDamageTypes; @@ -35,7 +36,6 @@ import com.minelittlepony.unicopia.server.world.UGameRules; import com.minelittlepony.unicopia.server.world.UWorldGen; import com.minelittlepony.unicopia.server.world.WeatherConditions; import com.minelittlepony.unicopia.server.world.ZapAppleStageStore; -import com.minelittlepony.unicopia.trinkets.TrinketsDelegate; public class Unicopia implements ModInitializer { public static final String DEFAULT_NAMESPACE = "unicopia"; diff --git a/src/main/java/com/minelittlepony/unicopia/block/FruitBearingBlock.java b/src/main/java/com/minelittlepony/unicopia/block/FruitBearingBlock.java index aed621ae..0a1dda76 100644 --- a/src/main/java/com/minelittlepony/unicopia/block/FruitBearingBlock.java +++ b/src/main/java/com/minelittlepony/unicopia/block/FruitBearingBlock.java @@ -7,7 +7,7 @@ import org.jetbrains.annotations.Nullable; import com.minelittlepony.unicopia.USounds; import com.minelittlepony.unicopia.ability.EarthPonyKickAbility.Buckable; -import com.minelittlepony.unicopia.seasons.FertilizableUtil; +import com.minelittlepony.unicopia.compat.seasons.FertilizableUtil; import net.fabricmc.fabric.api.registry.FlammableBlockRegistry; import net.minecraft.block.*; diff --git a/src/main/java/com/minelittlepony/unicopia/block/PineappleCropBlock.java b/src/main/java/com/minelittlepony/unicopia/block/PineappleCropBlock.java index 2e1776ba..2530a8d9 100644 --- a/src/main/java/com/minelittlepony/unicopia/block/PineappleCropBlock.java +++ b/src/main/java/com/minelittlepony/unicopia/block/PineappleCropBlock.java @@ -1,7 +1,7 @@ package com.minelittlepony.unicopia.block; +import com.minelittlepony.unicopia.compat.seasons.FertilizableUtil; import com.minelittlepony.unicopia.item.UItems; -import com.minelittlepony.unicopia.seasons.FertilizableUtil; import net.minecraft.block.Block; import net.minecraft.block.BlockState; diff --git a/src/main/java/com/minelittlepony/unicopia/block/SegmentedCropBlock.java b/src/main/java/com/minelittlepony/unicopia/block/SegmentedCropBlock.java index a20046e6..72cb168d 100644 --- a/src/main/java/com/minelittlepony/unicopia/block/SegmentedCropBlock.java +++ b/src/main/java/com/minelittlepony/unicopia/block/SegmentedCropBlock.java @@ -4,7 +4,7 @@ import java.util.function.Supplier; import org.jetbrains.annotations.Nullable; -import com.minelittlepony.unicopia.seasons.FertilizableUtil; +import com.minelittlepony.unicopia.compat.seasons.FertilizableUtil; import net.minecraft.block.*; import net.minecraft.item.ItemConvertible; diff --git a/src/main/java/com/minelittlepony/unicopia/client/gui/spellbook/SpellbookScreen.java b/src/main/java/com/minelittlepony/unicopia/client/gui/spellbook/SpellbookScreen.java index 291a5191..490d835f 100644 --- a/src/main/java/com/minelittlepony/unicopia/client/gui/spellbook/SpellbookScreen.java +++ b/src/main/java/com/minelittlepony/unicopia/client/gui/spellbook/SpellbookScreen.java @@ -17,11 +17,11 @@ import com.minelittlepony.unicopia.ability.magic.spell.effect.CustomisedSpellTyp import com.minelittlepony.unicopia.client.FlowingText; import com.minelittlepony.unicopia.client.gui.*; import com.minelittlepony.unicopia.client.gui.spellbook.SpellbookChapterList.*; +import com.minelittlepony.unicopia.compat.trinkets.TrinketSlotBackSprites; import com.minelittlepony.unicopia.container.*; import com.minelittlepony.unicopia.container.inventory.*; import com.minelittlepony.unicopia.network.Channel; import com.minelittlepony.unicopia.network.MsgSpellbookStateChanged; -import com.minelittlepony.unicopia.trinkets.TrinketSlotBackSprites; import com.mojang.blaze3d.platform.GlStateManager; import com.mojang.blaze3d.systems.RenderSystem; diff --git a/src/main/java/com/minelittlepony/unicopia/client/minelittlepony/BangleGear.java b/src/main/java/com/minelittlepony/unicopia/client/minelittlepony/BangleGear.java index 63ec760b..5346192a 100644 --- a/src/main/java/com/minelittlepony/unicopia/client/minelittlepony/BangleGear.java +++ b/src/main/java/com/minelittlepony/unicopia/client/minelittlepony/BangleGear.java @@ -9,9 +9,9 @@ import com.minelittlepony.client.model.IPonyModel; import com.minelittlepony.common.util.Color; import com.minelittlepony.unicopia.client.render.BraceletFeatureRenderer; import com.minelittlepony.unicopia.client.render.BraceletFeatureRenderer.BraceletModel; +import com.minelittlepony.unicopia.compat.trinkets.TrinketsDelegate; import com.minelittlepony.unicopia.item.FriendshipBraceletItem; import com.minelittlepony.unicopia.item.GlowableItem; -import com.minelittlepony.unicopia.trinkets.TrinketsDelegate; import net.minecraft.client.model.Dilation; import net.minecraft.client.network.ClientPlayerEntity; diff --git a/src/main/java/com/minelittlepony/unicopia/client/minelittlepony/Main.java b/src/main/java/com/minelittlepony/unicopia/client/minelittlepony/Main.java index 958debad..ca4eb3fc 100644 --- a/src/main/java/com/minelittlepony/unicopia/client/minelittlepony/Main.java +++ b/src/main/java/com/minelittlepony/unicopia/client/minelittlepony/Main.java @@ -6,8 +6,8 @@ import com.minelittlepony.api.model.gear.IGear; import com.minelittlepony.api.pony.IPony; import com.minelittlepony.unicopia.*; import com.minelittlepony.unicopia.client.render.PlayerPoser.Animation; +import com.minelittlepony.unicopia.compat.trinkets.TrinketsDelegate; import com.minelittlepony.unicopia.entity.player.Pony; -import com.minelittlepony.unicopia.trinkets.TrinketsDelegate; import com.minelittlepony.unicopia.util.AnimationUtil; import net.fabricmc.api.ClientModInitializer; diff --git a/src/main/java/com/minelittlepony/unicopia/client/render/BraceletFeatureRenderer.java b/src/main/java/com/minelittlepony/unicopia/client/render/BraceletFeatureRenderer.java index da30ee09..017e0f8c 100644 --- a/src/main/java/com/minelittlepony/unicopia/client/render/BraceletFeatureRenderer.java +++ b/src/main/java/com/minelittlepony/unicopia/client/render/BraceletFeatureRenderer.java @@ -3,8 +3,8 @@ package com.minelittlepony.unicopia.client.render; import com.minelittlepony.common.util.Color; import com.minelittlepony.unicopia.Unicopia; import com.minelittlepony.unicopia.client.minelittlepony.MineLPDelegate; +import com.minelittlepony.unicopia.compat.trinkets.TrinketsDelegate; import com.minelittlepony.unicopia.item.*; -import com.minelittlepony.unicopia.trinkets.TrinketsDelegate; import net.minecraft.client.model.Dilation; import net.minecraft.client.model.Model; diff --git a/src/main/java/com/minelittlepony/unicopia/seasons/FertilizableUtil.java b/src/main/java/com/minelittlepony/unicopia/compat/seasons/FertilizableUtil.java similarity index 95% rename from src/main/java/com/minelittlepony/unicopia/seasons/FertilizableUtil.java rename to src/main/java/com/minelittlepony/unicopia/compat/seasons/FertilizableUtil.java index b3c9600c..b3d5de4a 100644 --- a/src/main/java/com/minelittlepony/unicopia/seasons/FertilizableUtil.java +++ b/src/main/java/com/minelittlepony/unicopia/compat/seasons/FertilizableUtil.java @@ -1,4 +1,4 @@ -package com.minelittlepony.unicopia.seasons; +package com.minelittlepony.unicopia.compat.seasons; import com.minelittlepony.unicopia.mixin.seasons.MixinFertilizableUtil; diff --git a/src/main/java/com/minelittlepony/unicopia/trinkets/SpellbookTrinketSlot.java b/src/main/java/com/minelittlepony/unicopia/compat/trinkets/SpellbookTrinketSlot.java similarity index 97% rename from src/main/java/com/minelittlepony/unicopia/trinkets/SpellbookTrinketSlot.java rename to src/main/java/com/minelittlepony/unicopia/compat/trinkets/SpellbookTrinketSlot.java index 0b6332e1..55ed21a6 100644 --- a/src/main/java/com/minelittlepony/unicopia/trinkets/SpellbookTrinketSlot.java +++ b/src/main/java/com/minelittlepony/unicopia/compat/trinkets/SpellbookTrinketSlot.java @@ -1,4 +1,4 @@ -package com.minelittlepony.unicopia.trinkets; +package com.minelittlepony.unicopia.compat.trinkets; import com.minelittlepony.unicopia.container.SpellbookScreenHandler; import com.minelittlepony.unicopia.container.inventory.InventorySlot; diff --git a/src/main/java/com/minelittlepony/unicopia/trinkets/TrinketSlotBackSprites.java b/src/main/java/com/minelittlepony/unicopia/compat/trinkets/TrinketSlotBackSprites.java similarity index 97% rename from src/main/java/com/minelittlepony/unicopia/trinkets/TrinketSlotBackSprites.java rename to src/main/java/com/minelittlepony/unicopia/compat/trinkets/TrinketSlotBackSprites.java index f0cb90aa..c97fde11 100644 --- a/src/main/java/com/minelittlepony/unicopia/trinkets/TrinketSlotBackSprites.java +++ b/src/main/java/com/minelittlepony/unicopia/compat/trinkets/TrinketSlotBackSprites.java @@ -1,4 +1,4 @@ -package com.minelittlepony.unicopia.trinkets; +package com.minelittlepony.unicopia.compat.trinkets; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/com/minelittlepony/unicopia/trinkets/TrinketsDelegate.java b/src/main/java/com/minelittlepony/unicopia/compat/trinkets/TrinketsDelegate.java similarity index 98% rename from src/main/java/com/minelittlepony/unicopia/trinkets/TrinketsDelegate.java rename to src/main/java/com/minelittlepony/unicopia/compat/trinkets/TrinketsDelegate.java index 4cfd707d..beb2e98e 100644 --- a/src/main/java/com/minelittlepony/unicopia/trinkets/TrinketsDelegate.java +++ b/src/main/java/com/minelittlepony/unicopia/compat/trinkets/TrinketsDelegate.java @@ -1,4 +1,4 @@ -package com.minelittlepony.unicopia.trinkets; +package com.minelittlepony.unicopia.compat.trinkets; import java.util.*; import java.util.stream.Collectors; diff --git a/src/main/java/com/minelittlepony/unicopia/trinkets/TrinketsDelegateImpl.java b/src/main/java/com/minelittlepony/unicopia/compat/trinkets/TrinketsDelegateImpl.java similarity index 99% rename from src/main/java/com/minelittlepony/unicopia/trinkets/TrinketsDelegateImpl.java rename to src/main/java/com/minelittlepony/unicopia/compat/trinkets/TrinketsDelegateImpl.java index 82f74dd3..9b4a600d 100644 --- a/src/main/java/com/minelittlepony/unicopia/trinkets/TrinketsDelegateImpl.java +++ b/src/main/java/com/minelittlepony/unicopia/compat/trinkets/TrinketsDelegateImpl.java @@ -1,4 +1,4 @@ -package com.minelittlepony.unicopia.trinkets; +package com.minelittlepony.unicopia.compat.trinkets; import java.util.*; import java.util.stream.Collectors; diff --git a/src/main/java/com/minelittlepony/unicopia/trinkets/UnicopiaTrinket.java b/src/main/java/com/minelittlepony/unicopia/compat/trinkets/UnicopiaTrinket.java similarity index 97% rename from src/main/java/com/minelittlepony/unicopia/trinkets/UnicopiaTrinket.java rename to src/main/java/com/minelittlepony/unicopia/compat/trinkets/UnicopiaTrinket.java index ade56cb9..5fad88d2 100644 --- a/src/main/java/com/minelittlepony/unicopia/trinkets/UnicopiaTrinket.java +++ b/src/main/java/com/minelittlepony/unicopia/compat/trinkets/UnicopiaTrinket.java @@ -1,4 +1,4 @@ -package com.minelittlepony.unicopia.trinkets; +package com.minelittlepony.unicopia.compat.trinkets; import java.util.UUID; diff --git a/src/main/java/com/minelittlepony/unicopia/container/SpellbookScreenHandler.java b/src/main/java/com/minelittlepony/unicopia/container/SpellbookScreenHandler.java index fba2dffd..0bed725f 100644 --- a/src/main/java/com/minelittlepony/unicopia/container/SpellbookScreenHandler.java +++ b/src/main/java/com/minelittlepony/unicopia/container/SpellbookScreenHandler.java @@ -6,11 +6,11 @@ import java.util.function.Predicate; import org.jetbrains.annotations.Nullable; import com.minelittlepony.unicopia.ability.magic.spell.crafting.SpellbookRecipe; +import com.minelittlepony.unicopia.compat.trinkets.TrinketsDelegate; import com.minelittlepony.unicopia.container.inventory.*; import com.minelittlepony.unicopia.entity.player.Pony; import com.minelittlepony.unicopia.item.UItems; import com.minelittlepony.unicopia.item.URecipes; -import com.minelittlepony.unicopia.trinkets.TrinketsDelegate; import com.mojang.datafixers.util.Pair; import net.minecraft.enchantment.EnchantmentHelper; diff --git a/src/main/java/com/minelittlepony/unicopia/entity/ItemTracker.java b/src/main/java/com/minelittlepony/unicopia/entity/ItemTracker.java index dbbbb0bb..5155a4cd 100644 --- a/src/main/java/com/minelittlepony/unicopia/entity/ItemTracker.java +++ b/src/main/java/com/minelittlepony/unicopia/entity/ItemTracker.java @@ -4,8 +4,8 @@ import java.util.*; import java.util.function.Predicate; import java.util.stream.Stream; +import com.minelittlepony.unicopia.compat.trinkets.TrinketsDelegate; import com.minelittlepony.unicopia.entity.player.Pony; -import com.minelittlepony.unicopia.trinkets.TrinketsDelegate; import com.minelittlepony.unicopia.util.*; import net.minecraft.entity.LivingEntity; diff --git a/src/main/java/com/minelittlepony/unicopia/entity/Living.java b/src/main/java/com/minelittlepony/unicopia/entity/Living.java index 372f06ff..3b06206c 100644 --- a/src/main/java/com/minelittlepony/unicopia/entity/Living.java +++ b/src/main/java/com/minelittlepony/unicopia/entity/Living.java @@ -17,6 +17,7 @@ import com.minelittlepony.unicopia.ability.magic.SpellPredicate; import com.minelittlepony.unicopia.ability.magic.spell.AbstractDisguiseSpell; import com.minelittlepony.unicopia.ability.magic.spell.Situation; import com.minelittlepony.unicopia.advancement.UCriteria; +import com.minelittlepony.unicopia.compat.trinkets.TrinketsDelegate; import com.minelittlepony.unicopia.entity.behaviour.EntityAppearance; import com.minelittlepony.unicopia.entity.collision.MultiBoundingBoxEntity; import com.minelittlepony.unicopia.entity.duck.LivingEntityDuck; @@ -32,7 +33,6 @@ import com.minelittlepony.unicopia.network.datasync.Transmittable; import com.minelittlepony.unicopia.particle.ParticleUtils; import com.minelittlepony.unicopia.projectile.ProjectileImpactListener; import com.minelittlepony.unicopia.server.world.DragonBreathStore; -import com.minelittlepony.unicopia.trinkets.TrinketsDelegate; import com.minelittlepony.unicopia.util.*; import it.unimi.dsi.fastutil.floats.Float2ObjectFunction; diff --git a/src/main/java/com/minelittlepony/unicopia/entity/effect/SunBlindnessStatusEffect.java b/src/main/java/com/minelittlepony/unicopia/entity/effect/SunBlindnessStatusEffect.java index fbe61222..0361d84b 100644 --- a/src/main/java/com/minelittlepony/unicopia/entity/effect/SunBlindnessStatusEffect.java +++ b/src/main/java/com/minelittlepony/unicopia/entity/effect/SunBlindnessStatusEffect.java @@ -4,10 +4,10 @@ import org.jetbrains.annotations.Nullable; import com.minelittlepony.unicopia.EquinePredicates; import com.minelittlepony.unicopia.UTags; +import com.minelittlepony.unicopia.compat.trinkets.TrinketsDelegate; import com.minelittlepony.unicopia.entity.Living; import com.minelittlepony.unicopia.entity.damage.UDamageTypes; import com.minelittlepony.unicopia.entity.player.Pony; -import com.minelittlepony.unicopia.trinkets.TrinketsDelegate; import com.minelittlepony.unicopia.util.MeteorlogicalUtil; import net.minecraft.entity.Entity; diff --git a/src/main/java/com/minelittlepony/unicopia/entity/player/Pony.java b/src/main/java/com/minelittlepony/unicopia/entity/player/Pony.java index 5cbc7617..caf75543 100644 --- a/src/main/java/com/minelittlepony/unicopia/entity/player/Pony.java +++ b/src/main/java/com/minelittlepony/unicopia/entity/player/Pony.java @@ -7,6 +7,7 @@ import org.jetbrains.annotations.Nullable; import com.minelittlepony.unicopia.client.render.PlayerPoser.Animation; import com.minelittlepony.unicopia.client.render.PlayerPoser.Animation.Recipient; +import com.minelittlepony.unicopia.compat.trinkets.TrinketsDelegate; import com.minelittlepony.unicopia.client.render.PlayerPoser.AnimationInstance; import com.minelittlepony.unicopia.*; import com.minelittlepony.unicopia.ability.*; @@ -30,7 +31,6 @@ import com.minelittlepony.unicopia.util.*; import com.minelittlepony.unicopia.network.*; import com.minelittlepony.unicopia.network.datasync.EffectSync.UpdateCallback; import com.minelittlepony.unicopia.server.world.UGameRules; -import com.minelittlepony.unicopia.trinkets.TrinketsDelegate; import com.minelittlepony.common.util.animation.LinearInterpolator; import com.google.common.collect.Streams; import com.minelittlepony.common.util.animation.Interpolator; diff --git a/src/main/java/com/minelittlepony/unicopia/item/AlicornAmuletItem.java b/src/main/java/com/minelittlepony/unicopia/item/AlicornAmuletItem.java index 247b182c..10308b35 100644 --- a/src/main/java/com/minelittlepony/unicopia/item/AlicornAmuletItem.java +++ b/src/main/java/com/minelittlepony/unicopia/item/AlicornAmuletItem.java @@ -7,6 +7,7 @@ import org.jetbrains.annotations.Nullable; import com.google.common.collect.ImmutableMultimap; import com.minelittlepony.unicopia.InteractionManager; import com.minelittlepony.unicopia.USounds; +import com.minelittlepony.unicopia.compat.trinkets.TrinketsDelegate; import com.minelittlepony.unicopia.entity.*; import com.minelittlepony.unicopia.entity.damage.UDamageTypes; import com.minelittlepony.unicopia.entity.effect.UEffects; @@ -16,7 +17,6 @@ import com.minelittlepony.unicopia.particle.FollowingParticleEffect; import com.minelittlepony.unicopia.particle.ParticleUtils; import com.minelittlepony.unicopia.particle.UParticles; import com.minelittlepony.unicopia.server.world.UnicopiaWorldProperties; -import com.minelittlepony.unicopia.trinkets.TrinketsDelegate; import com.minelittlepony.unicopia.util.VecHelper; import it.unimi.dsi.fastutil.floats.Float2ObjectFunction; diff --git a/src/main/java/com/minelittlepony/unicopia/item/AmuletItem.java b/src/main/java/com/minelittlepony/unicopia/item/AmuletItem.java index 5011e727..a8c34938 100644 --- a/src/main/java/com/minelittlepony/unicopia/item/AmuletItem.java +++ b/src/main/java/com/minelittlepony/unicopia/item/AmuletItem.java @@ -8,7 +8,7 @@ import org.jetbrains.annotations.Nullable; import com.google.common.collect.ImmutableMultimap; import com.google.common.collect.Multimap; -import com.minelittlepony.unicopia.trinkets.TrinketsDelegate; +import com.minelittlepony.unicopia.compat.trinkets.TrinketsDelegate; import net.fabricmc.fabric.api.item.v1.FabricItemSettings; import net.minecraft.client.MinecraftClient; diff --git a/src/main/java/com/minelittlepony/unicopia/item/FriendshipBraceletItem.java b/src/main/java/com/minelittlepony/unicopia/item/FriendshipBraceletItem.java index 53655425..5575d357 100644 --- a/src/main/java/com/minelittlepony/unicopia/item/FriendshipBraceletItem.java +++ b/src/main/java/com/minelittlepony/unicopia/item/FriendshipBraceletItem.java @@ -9,8 +9,8 @@ import org.jetbrains.annotations.Nullable; import com.minelittlepony.unicopia.EquinePredicates; import com.minelittlepony.unicopia.USounds; import com.minelittlepony.unicopia.ability.magic.Caster; +import com.minelittlepony.unicopia.compat.trinkets.TrinketsDelegate; import com.minelittlepony.unicopia.entity.player.Pony; -import com.minelittlepony.unicopia.trinkets.TrinketsDelegate; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; diff --git a/src/main/java/com/minelittlepony/unicopia/item/GlassesItem.java b/src/main/java/com/minelittlepony/unicopia/item/GlassesItem.java index c30302ed..f915d1bf 100644 --- a/src/main/java/com/minelittlepony/unicopia/item/GlassesItem.java +++ b/src/main/java/com/minelittlepony/unicopia/item/GlassesItem.java @@ -1,6 +1,6 @@ package com.minelittlepony.unicopia.item; -import com.minelittlepony.unicopia.trinkets.TrinketsDelegate; +import com.minelittlepony.unicopia.compat.trinkets.TrinketsDelegate; import net.fabricmc.fabric.api.item.v1.FabricItemSettings; import net.minecraft.entity.EquipmentSlot; diff --git a/src/main/java/com/minelittlepony/unicopia/item/WearableItem.java b/src/main/java/com/minelittlepony/unicopia/item/WearableItem.java index 113f0ffb..9ff3c50c 100644 --- a/src/main/java/com/minelittlepony/unicopia/item/WearableItem.java +++ b/src/main/java/com/minelittlepony/unicopia/item/WearableItem.java @@ -1,6 +1,6 @@ package com.minelittlepony.unicopia.item; -import com.minelittlepony.unicopia.trinkets.TrinketsDelegate; +import com.minelittlepony.unicopia.compat.trinkets.TrinketsDelegate; import net.fabricmc.fabric.api.item.v1.FabricItemSettings; import net.minecraft.block.DispenserBlock; diff --git a/src/main/java/com/minelittlepony/unicopia/mixin/trinkets/MixinScreenHandler.java b/src/main/java/com/minelittlepony/unicopia/mixin/trinkets/MixinScreenHandler.java index 20b7c394..f716263d 100644 --- a/src/main/java/com/minelittlepony/unicopia/mixin/trinkets/MixinScreenHandler.java +++ b/src/main/java/com/minelittlepony/unicopia/mixin/trinkets/MixinScreenHandler.java @@ -5,7 +5,7 @@ import org.spongepowered.asm.mixin.*; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Redirect; -import com.minelittlepony.unicopia.trinkets.TrinketsDelegate; +import com.minelittlepony.unicopia.compat.trinkets.TrinketsDelegate; import net.minecraft.item.ItemStack; import net.minecraft.screen.ScreenHandler; diff --git a/src/main/java/com/minelittlepony/unicopia/mixin/trinkets/MixinTrinketInventory.java b/src/main/java/com/minelittlepony/unicopia/mixin/trinkets/MixinTrinketInventory.java index c6a5f2bf..4204107d 100644 --- a/src/main/java/com/minelittlepony/unicopia/mixin/trinkets/MixinTrinketInventory.java +++ b/src/main/java/com/minelittlepony/unicopia/mixin/trinkets/MixinTrinketInventory.java @@ -2,7 +2,8 @@ package com.minelittlepony.unicopia.mixin.trinkets; import org.spongepowered.asm.mixin.*; -import com.minelittlepony.unicopia.trinkets.TrinketsDelegateImpl; +import com.minelittlepony.unicopia.compat.trinkets.TrinketsDelegateImpl; + import dev.emi.trinkets.api.*; import net.minecraft.inventory.Inventory; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/minelittlepony/unicopia/mixin/trinkets/MixinTrinketItem.java b/src/main/java/com/minelittlepony/unicopia/mixin/trinkets/MixinTrinketItem.java index 38fae733..c34f5889 100644 --- a/src/main/java/com/minelittlepony/unicopia/mixin/trinkets/MixinTrinketItem.java +++ b/src/main/java/com/minelittlepony/unicopia/mixin/trinkets/MixinTrinketItem.java @@ -2,7 +2,8 @@ package com.minelittlepony.unicopia.mixin.trinkets; import org.spongepowered.asm.mixin.*; -import com.minelittlepony.unicopia.trinkets.TrinketsDelegateImpl; +import com.minelittlepony.unicopia.compat.trinkets.TrinketsDelegateImpl; + import dev.emi.trinkets.api.*; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/minelittlepony/unicopia/mixin/trinkets/MixinTrinketSlot.java b/src/main/java/com/minelittlepony/unicopia/mixin/trinkets/MixinTrinketSlot.java index 1cc48d49..aea4850b 100644 --- a/src/main/java/com/minelittlepony/unicopia/mixin/trinkets/MixinTrinketSlot.java +++ b/src/main/java/com/minelittlepony/unicopia/mixin/trinkets/MixinTrinketSlot.java @@ -2,7 +2,8 @@ package com.minelittlepony.unicopia.mixin.trinkets; import org.spongepowered.asm.mixin.*; -import com.minelittlepony.unicopia.trinkets.TrinketsDelegateImpl; +import com.minelittlepony.unicopia.compat.trinkets.TrinketsDelegateImpl; + import dev.emi.trinkets.*; import dev.emi.trinkets.api.*; import net.minecraft.item.ItemStack;