Merge pull request #560 from WaitingIdly/aa-item-laser

Disabling Actually Additions Item Laser Particles

README.md

@@ -279,6 +279,7 @@ All changes are toggleable via config files.
 * **Actually Additions**
     * **Duplication Fixes:** Fixes various duplication exploits
     * **Laser Upgrade Voiding:** Fixes Laser Upgrades voiding instead of applying if there is only one item in the stack
+    * **Item Laser Particles Graphics:** Sets what level of Graphic Setting is required to disable the Item Particles generated by Item Lasers transferring items
 * **Astral Sorcery**
   * **Missing Player Log Level:** Downgrades the message when completing a recipe without an initializing player from a warning to a debug
   * **Sooty Marble Rendering:** Fixes Sooty Marble Pillar blocking the proper rendering of adjacent fluids due to inverted logic

src/main/java/mod/acgaming/universaltweaks/config/UTConfigMods.java

@@ -293,6 +293,19 @@ public static class ActuallyAdditionsCategory
         @Config.Name("Laser Upgrade Voiding")
         @Config.Comment("Fixes Laser Upgrades voiding instead of applying if there is only one item in the stack")
         public boolean utLaserUpgradeVoid = true;
+
+        @Config.Name("Item Laser Particles Graphics")
+        @Config.Comment
+            ({
+                "Sets what level of Particles Setting is required to disable the Item Particles generated by Item Lasers transferring items",
+                "The config setting here is complex due to how Vanilla Minecraft handles the Particles setting",
+                "-1 or lower will not register the mixin",
+                "0 disables the creation of these particles entirely",
+                "1 disables the creation of these particles when the Particle setting is on Minimal only",
+                "2 disables the creation of these particles when the Particle setting is on Decreased or Minimal",
+                "3 or higher will never disable these particles"
+            })
+        public int utItemLaserParticlesGraphics = -1;
     }
 
     public static class ArcaneArchivesCategory

src/main/java/mod/acgaming/universaltweaks/core/UTMixinLoader.java

@@ -39,7 +39,8 @@ public class UTMixinLoader implements ILateMixinLoader
         {
             put("mixins.mods.abyssalcraft.json", () -> loaded("abyssalcraft"));
             put("mixins.mods.actuallyadditions.dupes.json", () -> loaded("actuallyadditions") && UTConfigMods.ACTUALLY_ADDITIONS.utDuplicationFixesToggle);
-            put("mixins.mods.actuallyadditions.json", () -> loaded("actuallyadditions"));
+            put("mixins.mods.actuallyadditions.itemparticle.json", () -> loaded("actuallyadditions") && UTConfigMods.ACTUALLY_ADDITIONS.utItemLaserParticlesGraphics > -1);
+            put("mixins.mods.actuallyadditions.relayupgrade.json", () -> loaded("actuallyadditions") && UTConfigMods.ACTUALLY_ADDITIONS.utLaserUpgradeVoid);
             put("mixins.mods.aoa3.json", () -> loaded("aoa3") && UTConfigMods.AOA.utImprovedPlayerTickToggle);
             put("mixins.mods.arcanearchives.dupes.json", () -> loaded("arcanearchives") && UTConfigMods.ARCANE_ARCHIVES.utDuplicationFixesToggle);
             put("mixins.mods.astralsorcery.json", () -> loaded("astralsorcery"));

src/main/java/mod/acgaming/universaltweaks/mods/actuallyadditions/mixin/UTTileEntityBreakerMixin.java → src/main/java/mod/acgaming/universaltweaks/mods/actuallyadditions/dupes/mixin/UTTileEntityBreakerMixin.java

@@ -1,4 +1,4 @@
-package mod.acgaming.universaltweaks.mods.actuallyadditions.mixin;
+package mod.acgaming.universaltweaks.mods.actuallyadditions.dupes.mixin;
 
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockLiquid;

src/main/java/mod/acgaming/universaltweaks/mods/actuallyadditions/mixin/UTTileEntityDirectionalBreakerMixin.java → src/main/java/mod/acgaming/universaltweaks/mods/actuallyadditions/dupes/mixin/UTTileEntityDirectionalBreakerMixin.java

@@ -1,4 +1,4 @@
-package mod.acgaming.universaltweaks.mods.actuallyadditions.mixin;
+package mod.acgaming.universaltweaks.mods.actuallyadditions.dupes.mixin;
 
 import net.minecraft.block.Block;
 import net.minecraft.block.state.IBlockState;

src/main/java/mod/acgaming/universaltweaks/mods/actuallyadditions/mixin/UTTileEntityPhantomPlacerMixin.java → src/main/java/mod/acgaming/universaltweaks/mods/actuallyadditions/dupes/mixin/UTTileEntityPhantomPlacerMixin.java

@@ -1,4 +1,4 @@
-package mod.acgaming.universaltweaks.mods.actuallyadditions.mixin;
+package mod.acgaming.universaltweaks.mods.actuallyadditions.dupes.mixin;
 
 import net.minecraft.block.Block;
 import net.minecraft.item.ItemStack;

src/main/java/mod/acgaming/universaltweaks/mods/actuallyadditions/itemparticle/mixin/UTTileEntityItemViewerMixin.java

@@ -0,0 +1,27 @@
+package mod.acgaming.universaltweaks.mods.actuallyadditions.itemparticle.mixin;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;
+
+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 mod.acgaming.universaltweaks.config.UTConfigMods;
+
+// Courtesy of WaitingIdly
+@Mixin(targets = "de.ellpeck.actuallyadditions.mod.network.PacketHandler$3", remap = false)
+public abstract class UTTileEntityItemViewerMixin
+{
+    @Inject(method = "handleData", at = @At("HEAD"), cancellable = true)
+    private void utDoItemParticle(NBTTagCompound compound, MessageContext context, CallbackInfo ci)
+    {
+        int value = UTConfigMods.ACTUALLY_ADDITIONS.utItemLaserParticlesGraphics;
+        if (value > 3 || Minecraft.getMinecraft().gameSettings.particleSetting >= value)
+        {
+            ci.cancel();
+        }
+    }
+}

src/main/java/mod/acgaming/universaltweaks/mods/actuallyadditions/mixin/UTBlockLaserRelayMixin.java → src/main/java/mod/acgaming/universaltweaks/mods/actuallyadditions/relayupgrade/mixin/UTBlockLaserRelayMixin.java

@@ -1,4 +1,4 @@
-package mod.acgaming.universaltweaks.mods.actuallyadditions.mixin;
+package mod.acgaming.universaltweaks.mods.actuallyadditions.relayupgrade.mixin;
 
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.player.EntityPlayer;

src/main/resources/mixins.mods.actuallyadditions.dupes.json

@@ -1,5 +1,5 @@
 {
-  "package": "mod.acgaming.universaltweaks.mods.actuallyadditions.mixin",
+  "package": "mod.acgaming.universaltweaks.mods.actuallyadditions.dupes.mixin",
   "refmap": "universaltweaks.refmap.json",
   "minVersion": "0.8",
   "compatibilityLevel": "JAVA_8",

src/main/resources/mixins.mods.actuallyadditions.itemparticle.json

@@ -0,0 +1,7 @@
+{
+  "package": "mod.acgaming.universaltweaks.mods.actuallyadditions.itemparticle.mixin",
+  "refmap": "universaltweaks.refmap.json",
+  "minVersion": "0.8",
+  "compatibilityLevel": "JAVA_8",
+  "mixins": ["UTTileEntityItemViewerMixin"]
+}

src/main/resources/mixins.mods.actuallyadditions.json → src/main/resources/mixins.mods.actuallyadditions.relayupgrade.json

@@ -1,5 +1,5 @@
 {
-  "package": "mod.acgaming.universaltweaks.mods.actuallyadditions.mixin",
+  "package": "mod.acgaming.universaltweaks.mods.actuallyadditions.relayupgrade.mixin",
   "refmap": "universaltweaks.refmap.json",
   "minVersion": "0.8",
   "compatibilityLevel": "JAVA_8",