diff --git a/dependencies.gradle b/dependencies.gradle index 9fa7bb98..1dcb2d02 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -146,7 +146,7 @@ final def mod_dependencies = [ dependencies { // Libraries - implementation 'com.cleanroommc:configanytime:2.0' + implementation 'com.cleanroommc:configanytime:3.0' implementation 'com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru:1.4.2' embed 'com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru:1.4.2' diff --git a/src/main/java/mod/acgaming/universaltweaks/UniversalTweaks.java b/src/main/java/mod/acgaming/universaltweaks/UniversalTweaks.java index bd5116e1..ed2cb2c9 100644 --- a/src/main/java/mod/acgaming/universaltweaks/UniversalTweaks.java +++ b/src/main/java/mod/acgaming/universaltweaks/UniversalTweaks.java @@ -73,7 +73,7 @@ public class UniversalTweaks public static final String MODID = Tags.MOD_ID; public static final String NAME = Tags.MOD_NAME; public static final String VERSION = Tags.VERSION; - public static final String DEPENDENCIES = "required-after:mixinbooter@[8.9,);required-after:configanytime;" + public static final String DEPENDENCIES = "required-after:mixinbooter@[9.0,);required-after:configanytime@[3.0,);" + "after:abyssalcraft;" + "after:actuallyadditions;" + "after:aoa3;" diff --git a/src/main/java/mod/acgaming/universaltweaks/bugfixes/blocks/blockoverlay/mixin/UTBlockOverlayMixin.java b/src/main/java/mod/acgaming/universaltweaks/bugfixes/blocks/blockoverlay/mixin/UTBlockOverlayMixin.java index a67f01bb..0855678c 100644 --- a/src/main/java/mod/acgaming/universaltweaks/bugfixes/blocks/blockoverlay/mixin/UTBlockOverlayMixin.java +++ b/src/main/java/mod/acgaming/universaltweaks/bugfixes/blocks/blockoverlay/mixin/UTBlockOverlayMixin.java @@ -23,7 +23,7 @@ public class UTBlockOverlayMixin { @Shadow - private WorldClient world; + public WorldClient world; @Shadow @Final diff --git a/src/main/java/mod/acgaming/universaltweaks/bugfixes/entities/elytra/render/mixin/UTRenderPlayerMixin.java b/src/main/java/mod/acgaming/universaltweaks/bugfixes/entities/elytra/render/mixin/UTRenderPlayerMixin.java index 3bca982a..d639a259 100644 --- a/src/main/java/mod/acgaming/universaltweaks/bugfixes/entities/elytra/render/mixin/UTRenderPlayerMixin.java +++ b/src/main/java/mod/acgaming/universaltweaks/bugfixes/entities/elytra/render/mixin/UTRenderPlayerMixin.java @@ -11,9 +11,9 @@ // Courtesy of WaitingIdly, TheRandomLabs (RandomPatches) @Mixin(value = RenderPlayer.class) -public abstract class UTRenderPlayerMixin +public class UTRenderPlayerMixin { - @WrapOperation(method = "applyRotations", at = @At(value = "INVOKE", target = "Ljava/lang/Math;acos(D)D")) + @WrapOperation(method = "applyRotations(Lnet/minecraft/client/entity/AbstractClientPlayer;FFF)V", at = @At(value = "INVOKE", target = "Ljava/lang/Math;acos(D)D")) private double utClampToPreventInvisiblePlayerOnElytra(double instance, Operation original) { if (!UTConfigBugfixes.ENTITIES.utFixInvisiblePlayerModelWithElytra) return original.call(instance); diff --git a/src/main/java/mod/acgaming/universaltweaks/bugfixes/misc/crafteditemstatistics/mixin/UTSlotCraftingMixin.java b/src/main/java/mod/acgaming/universaltweaks/bugfixes/misc/crafteditemstatistics/mixin/UTSlotCraftingMixin.java index 9b835da2..d8760930 100644 --- a/src/main/java/mod/acgaming/universaltweaks/bugfixes/misc/crafteditemstatistics/mixin/UTSlotCraftingMixin.java +++ b/src/main/java/mod/acgaming/universaltweaks/bugfixes/misc/crafteditemstatistics/mixin/UTSlotCraftingMixin.java @@ -20,7 +20,7 @@ public abstract class UTSlotCraftingMixin extends Slot { @Shadow - private int amountCrafted; + public int amountCrafted; public UTSlotCraftingMixin(IInventory inventoryIn, int index, int xPosition, int yPosition) { diff --git a/src/main/java/mod/acgaming/universaltweaks/bugfixes/misc/depthmask/mixin/UTParticleManagerMixin.java b/src/main/java/mod/acgaming/universaltweaks/bugfixes/misc/depthmask/mixin/UTParticleManagerMixin.java index 1e330edc..e400810c 100644 --- a/src/main/java/mod/acgaming/universaltweaks/bugfixes/misc/depthmask/mixin/UTParticleManagerMixin.java +++ b/src/main/java/mod/acgaming/universaltweaks/bugfixes/misc/depthmask/mixin/UTParticleManagerMixin.java @@ -2,7 +2,7 @@ import net.minecraft.client.particle.ParticleManager; -import com.llamalad7.mixinextras.injector.WrapWithCondition; +import com.llamalad7.mixinextras.injector.v2.WrapWithCondition; import mod.acgaming.universaltweaks.config.UTConfigBugfixes; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/src/main/java/mod/acgaming/universaltweaks/bugfixes/misc/particlespawning/mixin/UTParticleSpawningMixin.java b/src/main/java/mod/acgaming/universaltweaks/bugfixes/misc/particlespawning/mixin/UTParticleSpawningMixin.java index 9c296b4a..eecfd89e 100644 --- a/src/main/java/mod/acgaming/universaltweaks/bugfixes/misc/particlespawning/mixin/UTParticleSpawningMixin.java +++ b/src/main/java/mod/acgaming/universaltweaks/bugfixes/misc/particlespawning/mixin/UTParticleSpawningMixin.java @@ -1,15 +1,14 @@ package mod.acgaming.universaltweaks.bugfixes.misc.particlespawning.mixin; import java.util.Objects; - +import mod.acgaming.universaltweaks.config.UTConfigBugfixes; import net.minecraft.util.EnumParticleTypes; import net.minecraft.world.ServerWorldEventHandler; - -import mod.acgaming.universaltweaks.config.UTConfigBugfixes; +import net.minecraft.world.WorldServer; +import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import org.spongepowered.asm.mixin.Overwrite; +import org.spongepowered.asm.mixin.Shadow; // MC-10369, MC-93826 // https://bugs.mojang.com/browse/MC-10369 @@ -18,16 +17,22 @@ @Mixin(ServerWorldEventHandler.class) public abstract class UTParticleSpawningMixin { + @Final + @Shadow + private WorldServer world; + /** - * Fixes particles not properly being spawned on the client + * @author IcarussOne + * @reason Fixes particles not properly being spawned on the client * Based on a patch by RandomPatches * https://github.com/TheRandomLabs/RandomPatches/blob/1.12/src/main/java/com/therandomlabs/randompatches/patch/ServerWorldEventHandlerPatch.java */ - @Inject(method = "spawnParticle(IZDDDDDD[I)V", at = @At("HEAD")) - public void utSpawnParticle(int particleID, boolean ignoreRange, double xCoord, double yCoord, double zCoord, double xSpeed, double ySpeed, double zSpeed, int[] parameters, CallbackInfo ci) + @SuppressWarnings("OverwriteModifiers") + @Overwrite + public void spawnParticle(int particleID, boolean ignoreRange, double xCoord, double yCoord, double zCoord, double xSpeed, double ySpeed, double zSpeed, int... parameters) { EnumParticleTypes particle = Objects.requireNonNull(EnumParticleTypes.getParticleFromId(particleID)); if (particle == EnumParticleTypes.SPELL_MOB || particle == EnumParticleTypes.SPELL_MOB_AMBIENT || !UTConfigBugfixes.MISC.utParticleSpawningToggle) return; - if (parameters.length == particle.getArgumentCount()) ((UTServerWorldEventHandlerAccessor) this).getWorld().spawnParticle(particle, xCoord, yCoord, zCoord, 0, xSpeed, ySpeed, zSpeed, 1.0, parameters); + if (parameters.length == particle.getArgumentCount()) world.spawnParticle(particle, xCoord, yCoord, zCoord, 0, xSpeed, ySpeed, zSpeed, 1.0, parameters); } } \ No newline at end of file diff --git a/src/main/java/mod/acgaming/universaltweaks/bugfixes/misc/particlespawning/mixin/UTServerWorldEventHandlerAccessor.java b/src/main/java/mod/acgaming/universaltweaks/bugfixes/misc/particlespawning/mixin/UTServerWorldEventHandlerAccessor.java deleted file mode 100644 index 5965fc4a..00000000 --- a/src/main/java/mod/acgaming/universaltweaks/bugfixes/misc/particlespawning/mixin/UTServerWorldEventHandlerAccessor.java +++ /dev/null @@ -1,18 +0,0 @@ -package mod.acgaming.universaltweaks.bugfixes.misc.particlespawning.mixin; - -import net.minecraft.world.ServerWorldEventHandler; -import net.minecraft.world.WorldServer; - -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.gen.Accessor; - -// MC-10369, MC-93826 -// https://bugs.mojang.com/browse/MC-10369 -// https://bugs.mojang.com/browse/MC-93826 -// Courtesy of Fuzs, TheRandomLabs, fonnymunkey -@Mixin(ServerWorldEventHandler.class) -public interface UTServerWorldEventHandlerAccessor -{ - @Accessor("world") - WorldServer getWorld(); -} \ No newline at end of file diff --git a/src/main/java/mod/acgaming/universaltweaks/bugfixes/misc/smoothlighting/mixin/UTSmoothLightingMixin.java b/src/main/java/mod/acgaming/universaltweaks/bugfixes/misc/smoothlighting/mixin/UTSmoothLightingMixin.java index 790c7555..dd6f180c 100644 --- a/src/main/java/mod/acgaming/universaltweaks/bugfixes/misc/smoothlighting/mixin/UTSmoothLightingMixin.java +++ b/src/main/java/mod/acgaming/universaltweaks/bugfixes/misc/smoothlighting/mixin/UTSmoothLightingMixin.java @@ -8,6 +8,7 @@ import org.spongepowered.asm.mixin.injection.Redirect; // Courtesy of Sk1erLLC +@SuppressWarnings("UnresolvedMixinReference") @Mixin(targets = "net.minecraft.client.renderer.BlockModelRenderer$AmbientOcclusionFace") public class UTSmoothLightingMixin { diff --git a/src/main/java/mod/acgaming/universaltweaks/bugfixes/world/witchhuts/mixin/UTWitchHutMixin.java b/src/main/java/mod/acgaming/universaltweaks/bugfixes/world/witchhuts/mixin/UTWitchHutMixin.java index 6a2d14b2..ea5f570b 100644 --- a/src/main/java/mod/acgaming/universaltweaks/bugfixes/world/witchhuts/mixin/UTWitchHutMixin.java +++ b/src/main/java/mod/acgaming/universaltweaks/bugfixes/world/witchhuts/mixin/UTWitchHutMixin.java @@ -23,5 +23,5 @@ public void callUpdateBoundingBox(int chunkX, int chunkZ, CallbackInfoReturnable } @Shadow - protected abstract void updateBoundingBox(); + public abstract void updateBoundingBox(); } \ No newline at end of file diff --git a/src/main/java/mod/acgaming/universaltweaks/mods/actuallyadditions/mixin/UTBlockLaserRelayMixin.java b/src/main/java/mod/acgaming/universaltweaks/mods/actuallyadditions/mixin/UTBlockLaserRelayMixin.java index ff6122b3..d0d78344 100644 --- a/src/main/java/mod/acgaming/universaltweaks/mods/actuallyadditions/mixin/UTBlockLaserRelayMixin.java +++ b/src/main/java/mod/acgaming/universaltweaks/mods/actuallyadditions/mixin/UTBlockLaserRelayMixin.java @@ -22,7 +22,7 @@ @Mixin(value = BlockLaserRelay.class) public abstract class UTBlockLaserRelayMixin { - @Inject(method = "onBlockActivated", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/player/EntityPlayer;isCreative()Z")) + @Inject(method = "onBlockActivated", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/player/EntityPlayer;isCreative()Z"), cancellable = true) public void utOnBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing par6, float par7, float par8, float par9, CallbackInfoReturnable cir) { if (!UTConfigMods.ACTUALLY_ADDITIONS.utLaserUpgradeVoid) return; diff --git a/src/main/java/mod/acgaming/universaltweaks/mods/aoa3/mixin/UTPlayerEquipmentMixin.java b/src/main/java/mod/acgaming/universaltweaks/mods/aoa3/mixin/UTPlayerEquipmentMixin.java index 8fcfca15..059ce902 100644 --- a/src/main/java/mod/acgaming/universaltweaks/mods/aoa3/mixin/UTPlayerEquipmentMixin.java +++ b/src/main/java/mod/acgaming/universaltweaks/mods/aoa3/mixin/UTPlayerEquipmentMixin.java @@ -2,7 +2,7 @@ import net.minecraft.inventory.Container; -import com.llamalad7.mixinextras.injector.WrapWithCondition; +import com.llamalad7.mixinextras.injector.v2.WrapWithCondition; import com.llamalad7.mixinextras.sugar.Share; import com.llamalad7.mixinextras.sugar.ref.LocalBooleanRef; import net.tslat.aoa3.utils.player.PlayerDataManager.PlayerEquipment; @@ -21,7 +21,6 @@ private void utShouldUpdateInventory(CallbackInfo ci, @Share("shouldUpdate") Loc shouldUpdate.set(true); } - // TODO: Replace with v2.WrapWithCondition once we depend on MixinBooter 9.x @WrapWithCondition(method = "tickEquipment", at = @At(value = "INVOKE", target = "Lnet/minecraft/inventory/Container;detectAndSendChanges()V", remap = true)) private boolean utUpdateInventoryIfAllowed(Container instance, @Share("shouldUpdate") LocalBooleanRef shouldUpdate) { diff --git a/src/main/java/mod/acgaming/universaltweaks/mods/elenaidodge2/mixin/UTED2FeathersHelperMixin.java b/src/main/java/mod/acgaming/universaltweaks/mods/elenaidodge2/mixin/UTED2FeathersHelperMixin.java index b93a58a7..b42eef20 100644 --- a/src/main/java/mod/acgaming/universaltweaks/mods/elenaidodge2/mixin/UTED2FeathersHelperMixin.java +++ b/src/main/java/mod/acgaming/universaltweaks/mods/elenaidodge2/mixin/UTED2FeathersHelperMixin.java @@ -3,7 +3,7 @@ import net.minecraftforge.fml.relauncher.FMLLaunchHandler; import com.elenai.elenaidodge2.api.FeathersHelper; -import com.llamalad7.mixinextras.injector.WrapWithCondition; +import com.llamalad7.mixinextras.injector.v2.WrapWithCondition; import mod.acgaming.universaltweaks.config.UTConfigMods; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/src/main/java/mod/acgaming/universaltweaks/mods/epicsiegemod/mixin/UTDiggerDebugMixin.java b/src/main/java/mod/acgaming/universaltweaks/mods/epicsiegemod/mixin/UTDiggerDebugMixin.java index 70b16e79..fb48244a 100644 --- a/src/main/java/mod/acgaming/universaltweaks/mods/epicsiegemod/mixin/UTDiggerDebugMixin.java +++ b/src/main/java/mod/acgaming/universaltweaks/mods/epicsiegemod/mixin/UTDiggerDebugMixin.java @@ -2,7 +2,7 @@ import java.io.PrintStream; -import com.llamalad7.mixinextras.injector.WrapWithCondition; +import com.llamalad7.mixinextras.injector.v2.WrapWithCondition; import funwayguy.epicsiegemod.ai.additions.AdditionDigger; import mod.acgaming.universaltweaks.config.UTConfigMods; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/mod/acgaming/universaltweaks/mods/forestry/mixin/UTForestryDamageSourceMixin.java b/src/main/java/mod/acgaming/universaltweaks/mods/forestry/mixin/UTForestryDamageSourceMixin.java index f49c2e16..7c7a6fb3 100644 --- a/src/main/java/mod/acgaming/universaltweaks/mods/forestry/mixin/UTForestryDamageSourceMixin.java +++ b/src/main/java/mod/acgaming/universaltweaks/mods/forestry/mixin/UTForestryDamageSourceMixin.java @@ -1,6 +1,6 @@ package mod.acgaming.universaltweaks.mods.forestry.mixin; -import com.llamalad7.mixinextras.injector.WrapWithCondition; +import com.llamalad7.mixinextras.injector.v2.WrapWithCondition; import forestry.core.utils.DamageSourceForestry; import mod.acgaming.universaltweaks.config.UTConfigMods; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/mod/acgaming/universaltweaks/mods/ironbackpacks/mixin/UTContainerBackpackMixin.java b/src/main/java/mod/acgaming/universaltweaks/mods/ironbackpacks/mixin/UTContainerBackpackMixin.java index 633c1b0f..345e52dd 100644 --- a/src/main/java/mod/acgaming/universaltweaks/mods/ironbackpacks/mixin/UTContainerBackpackMixin.java +++ b/src/main/java/mod/acgaming/universaltweaks/mods/ironbackpacks/mixin/UTContainerBackpackMixin.java @@ -26,7 +26,7 @@ public class UTContainerBackpackMixin extends Container @ParametersAreNonnullByDefault public boolean canInteractWith(EntityPlayer playerIn) { - // Currently breaks hotkey functionality + // TODO: Currently breaks hotkey functionality return this.backpackStack.getItem() instanceof IBackpack && (playerIn.getHeldItemMainhand() == this.backpackStack || playerIn.getHeldItemOffhand() == this.backpackStack); } } \ No newline at end of file diff --git a/src/main/java/mod/acgaming/universaltweaks/mods/openblocks/mixin/UTConfigMixin.java b/src/main/java/mod/acgaming/universaltweaks/mods/openblocks/mixin/UTConfigMixin.java index 0f798d16..0b2de694 100644 --- a/src/main/java/mod/acgaming/universaltweaks/mods/openblocks/mixin/UTConfigMixin.java +++ b/src/main/java/mod/acgaming/universaltweaks/mods/openblocks/mixin/UTConfigMixin.java @@ -12,7 +12,6 @@ @Mixin(value = Config.class, remap = false) public class UTConfigMixin { - // MixinBooter 8.9 (MixinExtras 0.2.1) required! @WrapOperation(method = "register", at = @At(value = "NEW", target = "()Lopenblocks/enchantments/LastStandEnchantmentsHandler;")) private static LastStandEnchantmentsHandler utCaptureLastStandHandler(Operation original) { diff --git a/src/main/java/mod/acgaming/universaltweaks/mods/tconstruct/mixin/UTSmelteryRendererMixin.java b/src/main/java/mod/acgaming/universaltweaks/mods/tconstruct/mixin/UTSmelteryRendererMixin.java index a473942d..0eebd4ea 100644 --- a/src/main/java/mod/acgaming/universaltweaks/mods/tconstruct/mixin/UTSmelteryRendererMixin.java +++ b/src/main/java/mod/acgaming/universaltweaks/mods/tconstruct/mixin/UTSmelteryRendererMixin.java @@ -15,7 +15,7 @@ @Mixin(value = SmelteryRenderer.class, remap = false) public abstract class UTSmelteryRendererMixin extends SmelteryTankRenderer { - @Inject(method = "render", at = @At(value = "INVOKE", target = "Lslimeknights/tconstruct/smeltery/client/SmelteryRenderer;renderFluids(Lslimeknights/tconstruct/library/smeltery/SmelteryTank;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/util/math/BlockPos;DDD)V", shift = At.Shift.AFTER), cancellable = true) + @Inject(method = "render(Lslimeknights/tconstruct/smeltery/tileentity/TileSmeltery;DDDFIF)V", at = @At(value = "INVOKE", target = "Lslimeknights/tconstruct/smeltery/client/SmelteryRenderer;renderFluids(Lslimeknights/tconstruct/library/smeltery/SmelteryTank;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/util/math/BlockPos;DDD)V", shift = At.Shift.AFTER), cancellable = true) public void utSmelteryRenderer(@Nonnull TileSmeltery smeltery, double x, double y, double z, float partialTicks, int destroyStage, float alpha, CallbackInfo ci) { if (UTConfigMods.TINKERS_CONSTRUCT.utMaximumItemRendersInSmeltery < 0) return; diff --git a/src/main/java/mod/acgaming/universaltweaks/mods/thaumcraft/mixin/UTContainerRepairMixin.java b/src/main/java/mod/acgaming/universaltweaks/mods/thaumcraft/mixin/UTContainerRepairMixin.java index 00766bb1..b56e56f8 100644 --- a/src/main/java/mod/acgaming/universaltweaks/mods/thaumcraft/mixin/UTContainerRepairMixin.java +++ b/src/main/java/mod/acgaming/universaltweaks/mods/thaumcraft/mixin/UTContainerRepairMixin.java @@ -18,7 +18,7 @@ public class UTContainerRepairMixin { @Shadow @Final - private IInventory inputSlots; + public IInventory inputSlots; @Inject(method = "canInteractWith", at = @At("HEAD"), cancellable = true) private void canInteractWith(EntityPlayer player, CallbackInfoReturnable info) diff --git a/src/main/java/mod/acgaming/universaltweaks/tweaks/entities/ai/wither/mixin/UTWitherAIMixin.java b/src/main/java/mod/acgaming/universaltweaks/tweaks/entities/ai/wither/mixin/UTWitherAIMixin.java index e8b4d705..d0e29434 100644 --- a/src/main/java/mod/acgaming/universaltweaks/tweaks/entities/ai/wither/mixin/UTWitherAIMixin.java +++ b/src/main/java/mod/acgaming/universaltweaks/tweaks/entities/ai/wither/mixin/UTWitherAIMixin.java @@ -2,7 +2,7 @@ import net.minecraft.entity.boss.EntityWither; -import com.llamalad7.mixinextras.injector.WrapWithCondition; +import com.llamalad7.mixinextras.injector.v2.WrapWithCondition; import mod.acgaming.universaltweaks.config.UTConfigTweaks; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/src/main/java/mod/acgaming/universaltweaks/tweaks/entities/damage/velocity/mixin/UTDamageVelocityMixin.java b/src/main/java/mod/acgaming/universaltweaks/tweaks/entities/damage/velocity/mixin/UTDamageVelocityMixin.java index ee5996dc..a135b385 100644 --- a/src/main/java/mod/acgaming/universaltweaks/tweaks/entities/damage/velocity/mixin/UTDamageVelocityMixin.java +++ b/src/main/java/mod/acgaming/universaltweaks/tweaks/entities/damage/velocity/mixin/UTDamageVelocityMixin.java @@ -6,7 +6,7 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.util.DamageSource; -import com.llamalad7.mixinextras.injector.WrapWithCondition; +import com.llamalad7.mixinextras.injector.v2.WrapWithCondition; import mod.acgaming.universaltweaks.config.UTConfigTweaks; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/src/main/java/mod/acgaming/universaltweaks/tweaks/entities/loot/mixin/UTCreeperMusicDiscsMixin.java b/src/main/java/mod/acgaming/universaltweaks/tweaks/entities/loot/mixin/UTCreeperMusicDiscsMixin.java index 81f66314..ed161ec6 100644 --- a/src/main/java/mod/acgaming/universaltweaks/tweaks/entities/loot/mixin/UTCreeperMusicDiscsMixin.java +++ b/src/main/java/mod/acgaming/universaltweaks/tweaks/entities/loot/mixin/UTCreeperMusicDiscsMixin.java @@ -3,7 +3,7 @@ import net.minecraft.entity.monster.EntityCreeper; import net.minecraft.item.Item; -import com.llamalad7.mixinextras.injector.WrapWithCondition; +import com.llamalad7.mixinextras.injector.v2.WrapWithCondition; import mod.acgaming.universaltweaks.UniversalTweaks; import mod.acgaming.universaltweaks.config.UTConfigGeneral; import mod.acgaming.universaltweaks.config.UTConfigTweaks; diff --git a/src/main/java/mod/acgaming/universaltweaks/tweaks/entities/minecart/mixin/UTEntityMinecartMixin.java b/src/main/java/mod/acgaming/universaltweaks/tweaks/entities/minecart/mixin/UTEntityMinecartMixin.java index dbf6a429..ca778184 100644 --- a/src/main/java/mod/acgaming/universaltweaks/tweaks/entities/minecart/mixin/UTEntityMinecartMixin.java +++ b/src/main/java/mod/acgaming/universaltweaks/tweaks/entities/minecart/mixin/UTEntityMinecartMixin.java @@ -19,7 +19,7 @@ private EntityItem utDropMinecartType(EntityMinecart instance, ItemStack item, f { if (!UTConfigTweaks.ENTITIES.utMinecartDropsType || !(instance instanceof EntityMinecartFurnace || instance instanceof EntityMinecartChest || instance instanceof EntityMinecartTNT || instance instanceof EntityMinecartHopper)) { - return original.call(instance, instance, y); + return original.call(instance, item, y); } ItemStack itemstack = instance.getCartItem().copy(); if (instance.hasCustomName()) itemstack.setStackDisplayName(instance.getCustomNameTag()); diff --git a/src/main/java/mod/acgaming/universaltweaks/tweaks/items/itementities/mixin/UTEntityItemMixin.java b/src/main/java/mod/acgaming/universaltweaks/tweaks/items/itementities/mixin/UTEntityItemMixin.java index c2a95331..7e78e3fd 100644 --- a/src/main/java/mod/acgaming/universaltweaks/tweaks/items/itementities/mixin/UTEntityItemMixin.java +++ b/src/main/java/mod/acgaming/universaltweaks/tweaks/items/itementities/mixin/UTEntityItemMixin.java @@ -10,7 +10,7 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.world.World; -import com.llamalad7.mixinextras.injector.WrapWithCondition; +import com.llamalad7.mixinextras.injector.v2.WrapWithCondition; import mod.acgaming.universaltweaks.config.UTConfigTweaks; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; diff --git a/src/main/java/mod/acgaming/universaltweaks/tweaks/items/itementities/mixin/UTRenderEntityItemMixin.java b/src/main/java/mod/acgaming/universaltweaks/tweaks/items/itementities/mixin/UTRenderEntityItemMixin.java index 9929a185..c53e762d 100644 --- a/src/main/java/mod/acgaming/universaltweaks/tweaks/items/itementities/mixin/UTRenderEntityItemMixin.java +++ b/src/main/java/mod/acgaming/universaltweaks/tweaks/items/itementities/mixin/UTRenderEntityItemMixin.java @@ -4,7 +4,7 @@ import net.minecraft.client.renderer.entity.RenderEntityItem; import net.minecraft.entity.item.EntityItem; -import com.llamalad7.mixinextras.injector.WrapWithCondition; +import com.llamalad7.mixinextras.injector.v2.WrapWithCondition; import mod.acgaming.universaltweaks.config.UTConfigTweaks; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/src/main/java/mod/acgaming/universaltweaks/tweaks/misc/buttons/realms/mixin/UTRealmsButtonOptionsMixin.java b/src/main/java/mod/acgaming/universaltweaks/tweaks/misc/buttons/realms/mixin/UTRealmsButtonOptionsMixin.java index a1350f87..e645fc3b 100644 --- a/src/main/java/mod/acgaming/universaltweaks/tweaks/misc/buttons/realms/mixin/UTRealmsButtonOptionsMixin.java +++ b/src/main/java/mod/acgaming/universaltweaks/tweaks/misc/buttons/realms/mixin/UTRealmsButtonOptionsMixin.java @@ -5,7 +5,7 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiOptions; -import com.llamalad7.mixinextras.injector.WrapWithCondition; +import com.llamalad7.mixinextras.injector.v2.WrapWithCondition; import mod.acgaming.universaltweaks.UniversalTweaks; import mod.acgaming.universaltweaks.config.UTConfigGeneral; import mod.acgaming.universaltweaks.config.UTConfigTweaks; diff --git a/src/main/java/mod/acgaming/universaltweaks/tweaks/misc/buttons/snooper/mixin/UTSnooperClientButton.java b/src/main/java/mod/acgaming/universaltweaks/tweaks/misc/buttons/snooper/mixin/UTSnooperClientButton.java index 50b607d2..18ce6a57 100644 --- a/src/main/java/mod/acgaming/universaltweaks/tweaks/misc/buttons/snooper/mixin/UTSnooperClientButton.java +++ b/src/main/java/mod/acgaming/universaltweaks/tweaks/misc/buttons/snooper/mixin/UTSnooperClientButton.java @@ -5,7 +5,7 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiOptions; -import com.llamalad7.mixinextras.injector.WrapWithCondition; +import com.llamalad7.mixinextras.injector.v2.WrapWithCondition; import mod.acgaming.universaltweaks.UniversalTweaks; import mod.acgaming.universaltweaks.config.UTConfigGeneral; import mod.acgaming.universaltweaks.config.UTConfigTweaks; diff --git a/src/main/java/mod/acgaming/universaltweaks/tweaks/misc/lightning/fire/mixin/UTLightningFireMixin.java b/src/main/java/mod/acgaming/universaltweaks/tweaks/misc/lightning/fire/mixin/UTLightningFireMixin.java index fdd72e17..812706e2 100644 --- a/src/main/java/mod/acgaming/universaltweaks/tweaks/misc/lightning/fire/mixin/UTLightningFireMixin.java +++ b/src/main/java/mod/acgaming/universaltweaks/tweaks/misc/lightning/fire/mixin/UTLightningFireMixin.java @@ -5,7 +5,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import com.llamalad7.mixinextras.injector.WrapWithCondition; +import com.llamalad7.mixinextras.injector.v2.WrapWithCondition; import mod.acgaming.universaltweaks.config.UTConfigTweaks; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/src/main/java/mod/acgaming/universaltweaks/tweaks/misc/smoothscrolling/mixin/UTGuiScrollingListMixin.java b/src/main/java/mod/acgaming/universaltweaks/tweaks/misc/smoothscrolling/mixin/UTGuiScrollingListMixin.java index c852bf09..fad56843 100644 --- a/src/main/java/mod/acgaming/universaltweaks/tweaks/misc/smoothscrolling/mixin/UTGuiScrollingListMixin.java +++ b/src/main/java/mod/acgaming/universaltweaks/tweaks/misc/smoothscrolling/mixin/UTGuiScrollingListMixin.java @@ -61,8 +61,7 @@ public int utGetEventDWheel(int mouseX, int mouseY) int wheel = Mouse.getEventDWheel(); if (wheel != 0) { - if (wheel > 0) wheel = -1; - else if (wheel < 0) wheel = 1; + wheel = -Integer.signum(wheel); offset(UTSmoothScrolling.getScrollStep() * wheel, true); } return 0; @@ -83,7 +82,7 @@ public void scrollTo(float value, boolean animated) @Unique public void scrollTo(float value, boolean animated, long duration) { - target = UTSmoothScrolling.clamp(value, func_148135_f()); + target = UTSmoothScrolling.clamp(value, getMaxScroll()); if (animated) { start = System.currentTimeMillis(); @@ -95,18 +94,18 @@ public void scrollTo(float value, boolean animated, long duration) @Redirect(method = "drawScreen(IIF)V", at = @At(value = "INVOKE", target = "Lnet/minecraftforge/fml/client/GuiScrollingList;applyScrollLimits()V")) public void utBindScrollDistance(GuiScrollingList guiSlot) { - if (Mouse.isButtonDown(0)) target = scrollDistance = UTSmoothScrolling.clamp(scrollDistance, func_148135_f(), 0); + if (Mouse.isButtonDown(0)) target = scrollDistance = UTSmoothScrolling.clamp(scrollDistance, getMaxScroll(), 0); } @Inject(method = "drawScreen(IIF)V", at = @At("HEAD")) public void utRender(int int_1, int int_2, float delta, CallbackInfo callbackInfo) { float[] target = new float[] {this.target}; - this.scrollDistance = UTSmoothScrolling.handleScrollingPosition(target, this.scrollDistance, this.func_148135_f(), 20f / Minecraft.getDebugFPS(), (double) this.start, (double) this.duration); + this.scrollDistance = UTSmoothScrolling.handleScrollingPosition(target, this.scrollDistance, this.getMaxScroll(), 20f / Minecraft.getDebugFPS(), (double) this.start, (double) this.duration); this.target = target[0]; if (lastContentHeight != getContentHeight()) { - if (lastContentHeight != -1) scrollDistance = this.target = UTSmoothScrolling.clamp(this.target, func_148135_f(), 0); + if (lastContentHeight != -1) scrollDistance = this.target = UTSmoothScrolling.clamp(this.target, getMaxScroll(), 0); lastContentHeight = getContentHeight(); } } @@ -118,12 +117,12 @@ public void utRenderScrollbar(int int_1, int int_2, float float_1, CallbackInfo BufferBuilder buffer = tessellator.getBuffer(); int scrollbarPositionMaxX = this.left + this.listWidth; int scrollbarPositionMinX = scrollbarPositionMaxX - 6; - int maxScroll = this.func_148135_f(); + int maxScroll = this.getMaxScroll(); if (maxScroll > 0) { int height = (this.bottom - this.top) * (this.bottom - this.top) / this.getContentHeight(); height = MathHelper.clamp(height, 32, this.bottom - this.top - 8); - height = (int) (height - Math.min(this.scrollDistance < 0.0D ? (int) (-this.scrollDistance) : (this.scrollDistance > (double) this.func_148135_f() ? (int) this.scrollDistance - this.func_148135_f() : 0), height * 0.75D)); + height = (int) (height - Math.min(this.scrollDistance < 0.0D ? (int) (-this.scrollDistance) : (this.scrollDistance > (double) this.getMaxScroll() ? (int) this.scrollDistance - this.getMaxScroll() : 0), height * 0.75D)); int minY = Math.min(Math.max(((int) scrollDistance) * (this.bottom - this.top - height) / maxScroll + this.top, this.top), this.bottom - height); GlStateManager.disableTexture2D(); buffer.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR); @@ -161,7 +160,7 @@ public void utRenderScrollbar(int int_1, int int_2, float float_1, CallbackInfo protected abstract void drawScreen(int mouseX, int mouseY); @Unique - private int func_148135_f() + private int getMaxScroll() { int max = this.getContentHeight() - (this.bottom - this.top) + 4; if (max < 0) max /= 2; diff --git a/src/main/java/mod/acgaming/universaltweaks/tweaks/misc/toastcontrol/mixin/UTAdvancementToastMixin.java b/src/main/java/mod/acgaming/universaltweaks/tweaks/misc/toastcontrol/mixin/UTAdvancementToastMixin.java index ac6ec598..2f8f59ca 100644 --- a/src/main/java/mod/acgaming/universaltweaks/tweaks/misc/toastcontrol/mixin/UTAdvancementToastMixin.java +++ b/src/main/java/mod/acgaming/universaltweaks/tweaks/misc/toastcontrol/mixin/UTAdvancementToastMixin.java @@ -4,7 +4,7 @@ import net.minecraft.client.gui.toasts.IToast; import net.minecraft.client.multiplayer.ClientAdvancementManager; -import com.llamalad7.mixinextras.injector.WrapWithCondition; +import com.llamalad7.mixinextras.injector.v2.WrapWithCondition; import mod.acgaming.universaltweaks.config.UTConfigTweaks; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/src/main/java/mod/acgaming/universaltweaks/tweaks/performance/advancementcheck/mixin/UTAdvancementManagerMixin.java b/src/main/java/mod/acgaming/universaltweaks/tweaks/performance/advancementcheck/mixin/UTAdvancementManagerMixin.java index 7f2f747a..f207ee84 100644 --- a/src/main/java/mod/acgaming/universaltweaks/tweaks/performance/advancementcheck/mixin/UTAdvancementManagerMixin.java +++ b/src/main/java/mod/acgaming/universaltweaks/tweaks/performance/advancementcheck/mixin/UTAdvancementManagerMixin.java @@ -3,7 +3,7 @@ import org.apache.logging.log4j.Logger; import net.minecraft.advancements.AdvancementManager; -import com.llamalad7.mixinextras.injector.WrapWithCondition; +import com.llamalad7.mixinextras.injector.v2.WrapWithCondition; import mod.acgaming.universaltweaks.config.UTConfigTweaks; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/src/main/java/mod/acgaming/universaltweaks/tweaks/performance/advancementcheck/mixin/UTForgeHooksMixin.java b/src/main/java/mod/acgaming/universaltweaks/tweaks/performance/advancementcheck/mixin/UTForgeHooksMixin.java index 6ac40ac1..20a55a2f 100644 --- a/src/main/java/mod/acgaming/universaltweaks/tweaks/performance/advancementcheck/mixin/UTForgeHooksMixin.java +++ b/src/main/java/mod/acgaming/universaltweaks/tweaks/performance/advancementcheck/mixin/UTForgeHooksMixin.java @@ -3,7 +3,7 @@ import org.apache.logging.log4j.Logger; import net.minecraftforge.common.ForgeHooks; -import com.llamalad7.mixinextras.injector.WrapWithCondition; +import com.llamalad7.mixinextras.injector.v2.WrapWithCondition; import mod.acgaming.universaltweaks.config.UTConfigTweaks; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/src/main/java/mod/acgaming/universaltweaks/tweaks/performance/connectionspeed/mixin/UTGuiConnectingMixin.java b/src/main/java/mod/acgaming/universaltweaks/tweaks/performance/connectionspeed/mixin/UTGuiConnectingMixin.java index 6e0457e2..658b7cfc 100644 --- a/src/main/java/mod/acgaming/universaltweaks/tweaks/performance/connectionspeed/mixin/UTGuiConnectingMixin.java +++ b/src/main/java/mod/acgaming/universaltweaks/tweaks/performance/connectionspeed/mixin/UTGuiConnectingMixin.java @@ -12,6 +12,7 @@ import mod.acgaming.universaltweaks.tweaks.performance.connectionspeed.UTConnectionPatch; // Courtesy of WaitingIdly +@SuppressWarnings("UnresolvedMixinReference") @Mixin(targets = "net.minecraft.client.multiplayer.GuiConnecting$1") public class UTGuiConnectingMixin { diff --git a/src/main/java/mod/acgaming/universaltweaks/tweaks/performance/connectionspeed/mixin/UTRealmsConnectMixin.java b/src/main/java/mod/acgaming/universaltweaks/tweaks/performance/connectionspeed/mixin/UTRealmsConnectMixin.java index 8ad34ffa..ac0ea4f0 100644 --- a/src/main/java/mod/acgaming/universaltweaks/tweaks/performance/connectionspeed/mixin/UTRealmsConnectMixin.java +++ b/src/main/java/mod/acgaming/universaltweaks/tweaks/performance/connectionspeed/mixin/UTRealmsConnectMixin.java @@ -12,6 +12,7 @@ import mod.acgaming.universaltweaks.tweaks.performance.connectionspeed.UTConnectionPatch; // Courtesy of WaitingIdly +@SuppressWarnings("UnresolvedMixinReference") @Mixin(targets = "net.minecraft.realms.RealmsConnect$1") public class UTRealmsConnectMixin { diff --git a/src/main/java/mod/acgaming/universaltweaks/tweaks/performance/languageswitching/mixin/UTLanguageListMixin.java b/src/main/java/mod/acgaming/universaltweaks/tweaks/performance/languageswitching/mixin/UTLanguageListMixin.java index 4d562e18..85abfc5f 100644 --- a/src/main/java/mod/acgaming/universaltweaks/tweaks/performance/languageswitching/mixin/UTLanguageListMixin.java +++ b/src/main/java/mod/acgaming/universaltweaks/tweaks/performance/languageswitching/mixin/UTLanguageListMixin.java @@ -11,6 +11,7 @@ import mod.acgaming.universaltweaks.config.UTConfigTweaks; // Courtesy of WaitingIdly, TheRandomLabs (RandomPatches) +@SuppressWarnings("UnresolvedMixinReference") @Mixin(targets = "net.minecraft.client.gui.GuiLanguage$List") public abstract class UTLanguageListMixin { diff --git a/src/main/java/mod/acgaming/universaltweaks/tweaks/performance/oredictionarycheck/mixin/UTOreDictionaryCheckMixin.java b/src/main/java/mod/acgaming/universaltweaks/tweaks/performance/oredictionarycheck/mixin/UTOreDictionaryCheckMixin.java index f026f9bf..de21744e 100644 --- a/src/main/java/mod/acgaming/universaltweaks/tweaks/performance/oredictionarycheck/mixin/UTOreDictionaryCheckMixin.java +++ b/src/main/java/mod/acgaming/universaltweaks/tweaks/performance/oredictionarycheck/mixin/UTOreDictionaryCheckMixin.java @@ -2,7 +2,7 @@ import net.minecraftforge.oredict.OreDictionary; -import com.llamalad7.mixinextras.injector.WrapWithCondition; +import com.llamalad7.mixinextras.injector.v2.WrapWithCondition; import mod.acgaming.universaltweaks.config.UTConfigTweaks; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/src/main/java/mod/acgaming/universaltweaks/tweaks/performance/startup/mixin/UTFasterBackgroundStartupMixin.java b/src/main/java/mod/acgaming/universaltweaks/tweaks/performance/startup/mixin/UTFasterBackgroundStartupMixin.java index 540644b6..e21d4c2d 100644 --- a/src/main/java/mod/acgaming/universaltweaks/tweaks/performance/startup/mixin/UTFasterBackgroundStartupMixin.java +++ b/src/main/java/mod/acgaming/universaltweaks/tweaks/performance/startup/mixin/UTFasterBackgroundStartupMixin.java @@ -7,7 +7,7 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.fml.client.FMLClientHandler; -import com.llamalad7.mixinextras.injector.WrapWithCondition; +import com.llamalad7.mixinextras.injector.v2.WrapWithCondition; import mod.acgaming.universaltweaks.config.UTConfigTweaks; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/src/main/java/mod/acgaming/universaltweaks/tweaks/performance/texturemapcheck/mixin/UTTextureMapCheckMixin.java b/src/main/java/mod/acgaming/universaltweaks/tweaks/performance/texturemapcheck/mixin/UTTextureMapCheckMixin.java index a5d2250d..45c0909b 100644 --- a/src/main/java/mod/acgaming/universaltweaks/tweaks/performance/texturemapcheck/mixin/UTTextureMapCheckMixin.java +++ b/src/main/java/mod/acgaming/universaltweaks/tweaks/performance/texturemapcheck/mixin/UTTextureMapCheckMixin.java @@ -3,7 +3,7 @@ import org.apache.logging.log4j.Logger; import net.minecraft.client.renderer.texture.TextureMap; -import com.llamalad7.mixinextras.injector.WrapWithCondition; +import com.llamalad7.mixinextras.injector.v2.WrapWithCondition; import mod.acgaming.universaltweaks.config.UTConfigTweaks; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/src/main/java/mod/acgaming/universaltweaks/tweaks/world/loading/mixin/UTWorldLoadingGCMixin.java b/src/main/java/mod/acgaming/universaltweaks/tweaks/world/loading/mixin/UTWorldLoadingGCMixin.java index aaacb4fb..627e4dee 100644 --- a/src/main/java/mod/acgaming/universaltweaks/tweaks/world/loading/mixin/UTWorldLoadingGCMixin.java +++ b/src/main/java/mod/acgaming/universaltweaks/tweaks/world/loading/mixin/UTWorldLoadingGCMixin.java @@ -2,7 +2,7 @@ import net.minecraft.client.Minecraft; -import com.llamalad7.mixinextras.injector.WrapWithCondition; +import com.llamalad7.mixinextras.injector.v2.WrapWithCondition; import mod.acgaming.universaltweaks.config.UTConfigTweaks; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/src/main/resources/mixins.bugfixes.misc.particlespawning.json b/src/main/resources/mixins.bugfixes.misc.particlespawning.json index e3f4ce86..3228dd0c 100644 --- a/src/main/resources/mixins.bugfixes.misc.particlespawning.json +++ b/src/main/resources/mixins.bugfixes.misc.particlespawning.json @@ -3,5 +3,5 @@ "refmap": "universaltweaks.refmap.json", "minVersion": "0.8", "compatibilityLevel": "JAVA_8", - "mixins": ["UTParticleSpawningMixin", "UTServerWorldEventHandlerAccessor"] + "mixins": ["UTParticleSpawningMixin"] } \ No newline at end of file