Fix null wand components (#126)

Co-authored-by: thehoblit <thehoblit@gmail.com>

.github/workflows/optimize-images.yml

@@ -0,0 +1,17 @@
+name: Optimize images
+
+on:
+  pull_request:
+    branches: [ master, main, release/** ]
+    paths:
+      - "**/*.png"
+
+  push:
+    branches: [ master, main, release/** ]
+    paths:
+      - "**/*.png"
+
+jobs:
+  optimize-images:
+    uses: GTNewHorizons/GTNH-Actions-Workflows/.github/workflows/optimize-images.yml@master
+    secrets: inherit

dependencies.gradle

@@ -1,9 +1,10 @@
 // Add your dependencies here
 
 dependencies {
-    api('com.github.GTNewHorizons:Baubles-Expanded:2.2.0-GTNH:dev')
-
+    api('com.github.GTNewHorizons:Baubles-Expanded:2.2.21-GTNH:dev')
     api('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev')
 
-    compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.52.45:dev') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.52.548:dev') {transitive = false}
+
+    runtimeOnlyNonPublishable('com.github.GTNewHorizons:AspectRecipeIndex:1.1.0:dev')
 }

gradle.properties

@@ -39,9 +39,33 @@ remoteMappings = https\://raw.githubusercontent.com/MinecraftForge/FML/1.7.10/co
 # `./gradlew runClient --username=AnotherPlayer`, or configuring this command in your IDE.
 developmentEnvironmentUserName = Developer
 
-# Enables using modern Java syntax (up to version 17) via Jabel, while still targeting JVM 8.
-# See https://github.com/bsideup/jabel for details on how this works.
-enableModernJavaSyntax = true
+# Enables modern Java syntax support. Valid values:
+# - false: No modern syntax, Java 8 only
+# - jabel: Jabel syntax-only support, compiles to J8 bytecode
+# - jvmDowngrader: Full modern Java via JVM Downgrader (syntax + stdlib APIs)
+# - modern: Native modern Java bytecode, no downgrading
+enableModernJavaSyntax = jabel
+
+# If set, ignores the above setting and compiles with the given toolchain. This may cause unexpected issues,
+# and should *not* be used in most situations. -1 disables this.
+# forceToolchainVersion = -1
+
+# Target JVM version for JVM Downgrader bytecode downgrading.
+# Only used when enableModernJavaSyntax = jvmDowngrader
+# downgradeTargetVersion = 8
+
+# Comma-separated list of Java versions for multi-release jar support (JVM Downgrader only).
+# Classes will be available in META-INF/versions/N/ for each version N in this list.
+# Default: "21,25" (J25+ gets native classes, J21-24 gets partial downgrade, J8-20 gets full downgrade).
+# jvmDowngraderMultiReleaseVersions = 21,25
+
+# Specifies how JVM Downgrader API stubs are provided. Options:
+# - shade: Shade minimized stubs into the jar
+# - gtnhlib: GTNHLib provides stubs at runtime (adds version constraint)
+# - external: Another dependency provides stubs (no constraint, no warning)
+# - (empty): Warning reminding you to configure stubs
+# Note: 'shade' option requires you to verify license compliance, see: https://github.com/unimined/JvmDowngrader/blob/main/LICENSE.md
+# jvmDowngraderStubsProvider =
 
 # Enables injecting missing generics into the decompiled source code for a better coding experience.
 # Turns most publicly visible List, Map, etc. into proper List<E>, Map<K, V> types.
@@ -96,7 +120,9 @@ usesMixinDebug = false
 # Specify the location of your implementation of IMixinConfigPlugin. Leave it empty otherwise.
 mixinPlugin =
 
-# Specify the package that contains all of your Mixins. You may only place Mixins in this package or the build will fail!
+# Specify the package that contains all of your Mixins. The package must exist or
+# the build will fail. If you have a package property defined in your mixins.<modid>.json,
+# it must match with this or the build will fail.
 mixinsPackage =
 
 # Specify the core mod entry class if you use a core mod. This class must implement IFMLLoadingPlugin!
@@ -172,6 +198,12 @@ curseForgeRelations = requiredDependency\:thaumcraft
 # projects. New projects should not use this parameter.
 # customArchiveBaseName =
 
+# Optional parameter to customize the default working directory used by the runClient* tasks. Relative to the project directory.
+# runClientWorkingDirectory = run/client
+
+# Optional parameter to customize the default working directory used by the runServer* tasks. Relative to the project directory.
+# runServerWorkingDirectory = run/server
+
 # Optional parameter to have the build automatically fail if an illegal version is used.
 # This can be useful if you e.g. only want to allow versions in the form of '1.1.xxx'.
 # The check is ONLY performed if the version is a git tag.
@@ -201,3 +233,6 @@ curseForgeRelations = requiredDependency\:thaumcraft
 # This is meant to be set in $HOME/.gradle/gradle.properties.
 # ideaCheckSpotlessOnBuild = true
 
+# Non-GTNH properties
+org.gradle.configuration-cache = true
+org.gradle.parallel = true

gradle/gradle-daemon-jvm.properties

@@ -0,0 +1,12 @@
+#This file is generated by updateDaemonJvm
+toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/1630f7ebef05444cb27a2709ea0249b3/redirect
+toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/cd495626d2ee49a75447e3fdc6afb287/redirect
+toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/1630f7ebef05444cb27a2709ea0249b3/redirect
+toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/cd495626d2ee49a75447e3fdc6afb287/redirect
+toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/d4fd992c9557644e637ebe98263e0ae7/redirect
+toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/faa12903720d410b387cc69ccafb1a74/redirect
+toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/1630f7ebef05444cb27a2709ea0249b3/redirect
+toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/cd495626d2ee49a75447e3fdc6afb287/redirect
+toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/8e1d9ee5d0f13e442218f6884a306da1/redirect
+toolchainVendor=ADOPTIUM
+toolchainVersion=25

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -57,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/b631911858264c0b6e4d6603d677ff5218766cee/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -114,7 +114,6 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 
 # Determine the Java command to use to start the JVM.
@@ -172,7 +171,6 @@ fi
 # For Cygwin or MSYS, switch paths to Windows format before running java
 if "$cygwin" || "$msys" ; then
     APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
 
     JAVACMD=$( cygpath --unix "$JAVACMD" )
 
@@ -212,8 +210,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.

gradlew.bat

@@ -70,11 +70,10 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell

settings.gradle

@@ -17,7 +17,7 @@ pluginManagement {
 }
 
 plugins {
-    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.44'
+    id 'com.gtnewhorizons.gtnhsettingsconvention' version '2.0.24'
 }
 
 

src/main/java/com/kentington/thaumichorizons/client/ClientProxy.java

@@ -29,6 +29,7 @@ import net.minecraft.item.Item;
 import net.minecraft.world.World;
 import net.minecraftforge.client.MinecraftForgeClient;
 import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.event.world.WorldEvent;
 
 import com.kentington.thaumichorizons.client.audio.VortexSound;
 import com.kentington.thaumichorizons.client.fx.FXSonic;
@@ -166,6 +167,7 @@ import cpw.mods.fml.client.FMLClientHandler;
 import cpw.mods.fml.client.registry.ClientRegistry;
 import cpw.mods.fml.client.registry.RenderingRegistry;
 import cpw.mods.fml.common.FMLCommonHandler;
+import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import thaumcraft.api.wands.IWandTriggerManager;
 import thaumcraft.client.fx.ParticleEngine;
 import thaumcraft.client.fx.particles.FXBurst;
@@ -184,6 +186,7 @@ public class ClientProxy extends CommonProxy {
 
     @Override
     public void registerHandlers() {
+        MinecraftForge.EVENT_BUS.register(this);
         MinecraftForge.EVENT_BUS.register(ThaumicHorizons.instance.renderEventHandler);
         final IResourceManager resourceManager = Minecraft.getMinecraft().getResourceManager();
         if (resourceManager instanceof IReloadableResourceManager) {
@@ -198,6 +201,7 @@ public class ClientProxy extends CommonProxy {
 
     @Override
     public void registerRenderers() {
+        // spotless:off
         ClientRegistry.bindTileEntitySpecialRenderer(TileNodeMonitor.class, new TileNodeMonitorRender());
         ClientRegistry.bindTileEntitySpecialRenderer(TileSyntheticNode.class, new TileEtherealShardRender());
         ClientRegistry.bindTileEntitySpecialRenderer(TileVisDynamo.class, new TileVisDynamoRender());
@@ -209,8 +213,7 @@ public class ClientProxy extends CommonProxy {
         ClientRegistry.bindTileEntitySpecialRenderer(TileVatMatrix.class, new TileVatMatrixRender(0));
         ClientRegistry.bindTileEntitySpecialRenderer(TileBloodInfuser.class, new TileBloodInfuserRender());
         ClientRegistry.bindTileEntitySpecialRenderer(TileSoulBeacon.class, new TileSoulBeaconRender());
-        ClientRegistry
-                .bindTileEntitySpecialRenderer(TileTransductionAmplifier.class, new TileTransductionAmplifierRender());
+        ClientRegistry.bindTileEntitySpecialRenderer(TileTransductionAmplifier.class, new TileTransductionAmplifierRender());
         ClientRegistry.bindTileEntitySpecialRenderer(TileRecombinator.class, new TileRecombinatorRender());
         ClientRegistry.bindTileEntitySpecialRenderer(TileVortexStabilizer.class, new TileVortexStabilizerRender());
         ClientRegistry.bindTileEntitySpecialRenderer(TileVortex.class, new TileVortexRender());
@@ -220,61 +223,29 @@ public class ClientProxy extends CommonProxy {
         RenderingRegistry.registerEntityRenderingHandler(EntityAlchemitePrimed.class, new RenderAlchemitePrimed());
         RenderingRegistry.registerEntityRenderingHandler(EntitySyringe.class, new RenderSyringe());
         RenderingRegistry.registerEntityRenderingHandler(EntityBlastPhial.class, new BlastPhialRender());
-        RenderingRegistry
-                .registerEntityRenderingHandler(EntityChocolateCow.class, new RenderChocolateCow(new ModelCow(), 0.7f));
-        RenderingRegistry.registerEntityRenderingHandler(
-                EntityOrePig.class,
-                new RenderOreBoar(new ModelPig(), new ModelPig(0.5f), 0.7f));
-        RenderingRegistry.registerEntityRenderingHandler(
-                EntityGuardianPanther.class,
-                new RenderGuardianPanther(new ModelOcelot(), 1.0f));
-        RenderingRegistry
-                .registerEntityRenderingHandler(EntityFamiliar.class, new RenderFamiliar(new ModelFamiliar(), 0.5f));
-        RenderingRegistry.registerEntityRenderingHandler(
-                EntityGravekeeper.class,
-                new RenderGravekeeper(new ModelOcelot(), 0.5f));
-        RenderingRegistry.registerEntityRenderingHandler(
-                EntityGoldChicken.class,
-                new RenderGoldChicken(new ModelChicken(), 0.5f));
-        RenderingRegistry.registerEntityRenderingHandler(
-                EntityScholarChicken.class,
-                new RenderScholarChicken(new ModelChicken(), 0.5f));
-        RenderingRegistry.registerEntityRenderingHandler(
-                EntityTaintPig.class,
-                new RenderTaintfeeder(new ModelPig(), new ModelPig(0.5f), 0.5f));
-        RenderingRegistry.registerEntityRenderingHandler(
-                EntityNetherHound.class,
-                new RenderNetherHound(new ModelWolf(), new ModelWolf(), 0.5f));
-        RenderingRegistry.registerEntityRenderingHandler(
-                EntitySeawolf.class,
-                new RenderSeawolf(new ModelWolf(), new ModelWolf(), 0.5f));
-        RenderingRegistry.registerEntityRenderingHandler(
-                EntityLunarWolf.class,
-                new RenderLunarWolf(new ModelWolf(), new ModelWolf(), 0.5f));
-        RenderingRegistry
-                .registerEntityRenderingHandler(EntityGolemTH.class, new RenderGolemTH(new ModelGolemTH(false)));
-        RenderingRegistry
-                .registerEntityRenderingHandler(EntityEndersteed.class, new RenderEndersteed(new ModelHorse(), 0.75f));
-        RenderingRegistry
-                .registerEntityRenderingHandler(EntityNightmare.class, new RenderNightmare(new ModelHorse(), 0.75f));
+        RenderingRegistry.registerEntityRenderingHandler(EntityChocolateCow.class, new RenderChocolateCow(new ModelCow(), 0.7f));
+        RenderingRegistry.registerEntityRenderingHandler(EntityOrePig.class, new RenderOreBoar(new ModelPig(), new ModelPig(0.5f), 0.7f));
+        RenderingRegistry.registerEntityRenderingHandler(EntityGuardianPanther.class, new RenderGuardianPanther(new ModelOcelot(), 1.0f));
+        RenderingRegistry.registerEntityRenderingHandler(EntityFamiliar.class, new RenderFamiliar(new ModelFamiliar(), 0.5f));
+        RenderingRegistry.registerEntityRenderingHandler(EntityGravekeeper.class, new RenderGravekeeper(new ModelOcelot(), 0.5f));
+        RenderingRegistry.registerEntityRenderingHandler(EntityGoldChicken.class, new RenderGoldChicken(new ModelChicken(), 0.5f));
+        RenderingRegistry.registerEntityRenderingHandler(EntityScholarChicken.class, new RenderScholarChicken(new ModelChicken(), 0.5f));
+        RenderingRegistry.registerEntityRenderingHandler(EntityTaintPig.class, new RenderTaintfeeder(new ModelPig(), new ModelPig(0.5f), 0.5f));
+        RenderingRegistry.registerEntityRenderingHandler(EntityNetherHound.class, new RenderNetherHound(new ModelWolf(), new ModelWolf(), 0.5f));
+        RenderingRegistry.registerEntityRenderingHandler(EntitySeawolf.class, new RenderSeawolf(new ModelWolf(), new ModelWolf(), 0.5f));
+        RenderingRegistry.registerEntityRenderingHandler(EntityLunarWolf.class, new RenderLunarWolf(new ModelWolf(), new ModelWolf(), 0.5f));
+        RenderingRegistry.registerEntityRenderingHandler(EntityGolemTH.class, new RenderGolemTH(new ModelGolemTH(false)));
+        RenderingRegistry.registerEntityRenderingHandler(EntityEndersteed.class, new RenderEndersteed(new ModelHorse(), 0.75f));
+        RenderingRegistry.registerEntityRenderingHandler(EntityNightmare.class, new RenderNightmare(new ModelHorse(), 0.75f));
         RenderingRegistry.registerEntityRenderingHandler(EntityBoatGreatwood.class, new RenderBoatGreatwood());
         RenderingRegistry.registerEntityRenderingHandler(EntityBoatThaumium.class, new RenderBoatThaumium());
-        RenderingRegistry.registerEntityRenderingHandler(
-                EntityMeatSlime.class,
-                new RenderMeatSlime(new ModelSlime(16), new ModelSlime(0), 0.25f));
-        RenderingRegistry.registerEntityRenderingHandler(
-                EntityMercurialSlime.class,
-                new RenderMercurialSlime(new ModelSlime(16), new ModelSlime(0), 0.25f));
-        RenderingRegistry.registerEntityRenderingHandler(
-                EntityVoltSlime.class,
-                new RenderVoltSlime(new ModelSlime(16), new ModelSlime(0), 0.25f));
-        RenderingRegistry.registerEntityRenderingHandler(
-                EntityMedSlime.class,
-                new RenderMedSlime(new ModelSlime(16), new ModelSlime(0), 0.25f));
+        RenderingRegistry.registerEntityRenderingHandler(EntityMeatSlime.class, new RenderMeatSlime(new ModelSlime(16), new ModelSlime(0), 0.25f));
+        RenderingRegistry.registerEntityRenderingHandler(EntityMercurialSlime.class, new RenderMercurialSlime(new ModelSlime(16), new ModelSlime(0), 0.25f));
+        RenderingRegistry.registerEntityRenderingHandler(EntityVoltSlime.class, new RenderVoltSlime(new ModelSlime(16), new ModelSlime(0), 0.25f));
+        RenderingRegistry.registerEntityRenderingHandler(EntityMedSlime.class, new RenderMedSlime(new ModelSlime(16), new ModelSlime(0), 0.25f));
         RenderingRegistry.registerEntityRenderingHandler(EntitySheeder.class, new RenderSheeder());
         RenderingRegistry.registerEntityRenderingHandler(EntitySoul.class, new RenderSoul());
-        RenderingRegistry
-                .registerEntityRenderingHandler(EntityLightningBoltFinite.class, new RenderLightningBoltFinite());
+        RenderingRegistry.registerEntityRenderingHandler(EntityLightningBoltFinite.class, new RenderLightningBoltFinite());
         MinecraftForgeClient.registerItemRenderer(ThaumicHorizons.itemSyringeBloodSample, new ItemSyringeRender());
         MinecraftForgeClient.registerItemRenderer(ThaumicHorizons.itemSyringeHuman, new ItemSyringeRender());
         MinecraftForgeClient.registerItemRenderer(ThaumicHorizons.itemSyringeEmpty, new ItemSyringeRender());
@@ -282,6 +253,7 @@ public class ClientProxy extends CommonProxy {
         MinecraftForgeClient.registerItemRenderer(ThaumicHorizons.itemCorpseEffigy, new ItemCorpseEffigyRender());
         MinecraftForgeClient.registerItemRenderer(ThaumicHorizons.itemInjector, new ItemInjectorRender());
         MinecraftForgeClient.registerItemRenderer(ThaumicHorizons.itemWandCastingDisposable, new ItemWandRenderer());
+        // spotless:on
     }
 
     @Override
@@ -561,6 +533,14 @@ public class ClientProxy extends CommonProxy {
 
     private final Map<TileCoord, VortexSound> activeVortexSounds = new HashMap<>();
 
+    @SubscribeEvent
+    public void onWorldUnload(WorldEvent.Unload event) {
+        if (event.world.isRemote) {
+            activeVortexSounds.clear();
+            ThaumicHorizons.instance.renderEventHandler.thingsThatSparkle.clear();
+        }
+    }
+
     @Override
     public void playVortexSound(TileVortex tile) {
         if (tile == null || tile.isInvalid() || tile.getWorldObj() == null) return;

src/main/java/com/kentington/thaumichorizons/client/gui/GuiCase.java

@@ -25,8 +25,8 @@ public class GuiCase extends GuiContainer {
             final int z) {
         super(new ContainerCase(par1InventoryPlayer, world, x, y, z));
         this.blockSlot = par1InventoryPlayer.currentItem;
-        this.xSize = 175;
-        this.ySize = 232;
+        this.xSize = 176;
+        this.ySize = 233;
     }
 
     protected void drawGuiContainerForegroundLayer(final int par1, final int par2) {

src/main/java/com/kentington/thaumichorizons/client/gui/GuiInspiratron.java

@@ -22,7 +22,7 @@ public class GuiInspiratron extends GuiContainer {
     public GuiInspiratron(final InventoryPlayer player, final TileInspiratron tile) {
         super(new ContainerInspiratron(player, tile));
         this.tile = tile;
-        this.xSize = 175;
+        this.xSize = 176;
         this.ySize = 219;
     }
 

src/main/java/com/kentington/thaumichorizons/client/gui/GuiSoulExtractor.java

@@ -22,8 +22,8 @@ public class GuiSoulExtractor extends GuiContainer {
     public GuiSoulExtractor(final InventoryPlayer player, final TileSoulExtractor tile) {
         super(new ContainerSoulExtractor(player, tile));
         this.tile = tile;
-        this.xSize = 175;
-        this.ySize = 165;
+        this.xSize = 176;
+        this.ySize = 166;
     }
 
     protected void drawGuiContainerBackgroundLayer(final float p_146976_1_, final int p_146976_2_,

src/main/java/com/kentington/thaumichorizons/client/renderer/tile/TileEtherealShardRender.java

@@ -158,9 +158,7 @@ public class TileEtherealShardRender extends TileEntitySpecialRenderer {
             }
             GL11.glDisable(GL11.GL_BLEND);
             GL11.glAlphaFunc(GL11.GL_GREATER, 0.1f);
-        } catch (Exception e) {
-            System.out.println(e.getMessage());
-        } finally {
+        } catch (Exception ignored) {} finally {
             GL11.glPopMatrix();
         }
     }

src/main/java/com/kentington/thaumichorizons/client/renderer/tile/TileVortexRender.java

@@ -7,13 +7,12 @@ package com.kentington.thaumichorizons.client.renderer.tile;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.ActiveRenderInfo;
 import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.renderer.entity.RenderManager;
 import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
 import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.MathHelper;
 import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.Vec3;
 
 import org.lwjgl.opengl.GL11;
 
@@ -23,7 +22,6 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import thaumcraft.api.aspects.Aspect;
 import thaumcraft.api.aspects.AspectList;
-import thaumcraft.client.lib.QuadHelper;
 import thaumcraft.client.lib.UtilsFX;
 
 @SideOnly(Side.CLIENT)
@@ -34,25 +32,20 @@ public class TileVortexRender extends TileEntitySpecialRenderer {
 
     public void renderTileEntityAt(final TileEntity tile, final double x, final double y, final double z,
             final float partialTicks) {
-        if (!(tile instanceof final TileVortex node)) {
+        if (!(tile instanceof final TileVortex node) || !node.clientSynced) {
             return;
         }
-        final float size = 10.0f;
-        final double viewDistance = 64.0;
-        final EntityLivingBase viewer = Minecraft.getMinecraft().renderViewEntity;
-        final boolean condition = true;
-        final boolean depthIgnore = false;
         renderNode(
-                viewer,
-                viewDistance,
-                condition,
-                depthIgnore,
-                size,
+                Minecraft.getMinecraft().renderViewEntity,
+                64.0,
+                true,
+                false,
+                10.0f,
                 tile.xCoord,
                 tile.yCoord,
                 tile.zCoord,
                 partialTicks,
-                ((TileVortex) tile).aspects,
+                node.aspects,
                 node.count,
                 node.collapsing,
                 node.beams,
@@ -72,6 +65,10 @@ public class TileVortexRender extends TileEntitySpecialRenderer {
                 return;
             }
             float alpha = (float) ((viewDistance - distance) / viewDistance);
+            // Camera-relative center — avoids float precision loss at large world coords.
+            final double cx = x + 0.5 - RenderManager.renderPosX;
+            final double cy = y + 0.5 - RenderManager.renderPosY;
+            final double cz = z + 0.5 - RenderManager.renderPosZ;
             GL11.glPushMatrix();
             GL11.glAlphaFunc(GL11.GL_GREATER, 0.003921569f);
             GL11.glDepthMask(false);
@@ -79,7 +76,6 @@ public class TileVortexRender extends TileEntitySpecialRenderer {
                 GL11.glDisable(GL11.GL_DEPTH_TEST);
             }
             GL11.glDisable(GL11.GL_CULL_FACE);
-            final long time = nt / 5000000L;
             final float bscale = 0.25f;
             GL11.glPushMatrix();
             final float rad = ((float) Math.PI * 2F);
@@ -101,10 +97,10 @@ public class TileVortexRender extends TileEntitySpecialRenderer {
                 GL11.glPushMatrix();
                 GL11.glEnable(GL11.GL_BLEND);
                 GL11.glBlendFunc(GL11.GL_SRC_ALPHA, aspect.getBlend());
-                scale = MathHelper.sin(viewer.ticksExisted / (14.0f - count)) * bscale + bscale * 2.0f;
                 scale = 0.4f;
                 scale *= size;
-                angle = time % (5000 + 500 * count) / (5000.0f + 500 * count) * rad;
+                final long periodNs = (5000L + 500L * count) * 5_000_000L;
+                angle = (float) ((double) (nt % periodNs) / periodNs) * rad;
                 if (beams < 6 || timeOpen < 50) {
                     UtilsFX.renderFacingStrip(
                             x + 0.5,
@@ -153,9 +149,9 @@ public class TileVortexRender extends TileEntitySpecialRenderer {
             if (!cheat && (beams < 6 || timeOpen < 50)) {
                 UtilsFX.bindTexture(TileVortexRender.vortextex);
                 renderVortex(
-                        x + 0.5,
-                        y + 0.5,
-                        z + 0.5,
+                        cx,
+                        cy,
+                        cz,
                         angle * 20.0f * corescale / (1 + 2 * beams),
                         scale / 5.0f * corescale,
                         0.8f,
@@ -190,10 +186,10 @@ public class TileVortexRender extends TileEntitySpecialRenderer {
                     GL11.glPushMatrix();
                     GL11.glEnable(GL11.GL_BLEND);
                     GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
-                    scale = MathHelper.sin(viewer.ticksExisted / (14.0f - count)) * bscale + bscale * 2.0f;
                     scale = 0.4f;
                     scale *= size;
-                    angle = time % (5000 + 500 * count) / (5000.0f + 500 * count) * rad;
+                    final long periodNs2 = (5000L + 500L * count) * 5_000_000L;
+                    angle = (float) ((double) (nt % periodNs2) / periodNs2) * rad;
                     UtilsFX.renderFacingStrip(
                             x + 0.5,
                             y + 0.5,
@@ -233,37 +229,29 @@ public class TileVortexRender extends TileEntitySpecialRenderer {
         final float arYZ = ActiveRenderInfo.rotationYZ;
         final float arXY = ActiveRenderInfo.rotationXY;
         final float arXZ = ActiveRenderInfo.rotationXZ;
-        final EntityPlayer player = (EntityPlayer) Minecraft.getMinecraft().renderViewEntity;
-        final double iPX = player.prevPosX + (player.posX - player.prevPosX) * partialTicks;
-        final double iPY = player.prevPosY + (player.posY - player.prevPosY) * partialTicks;
-        final double iPZ = player.prevPosZ + (player.posZ - player.prevPosZ) * partialTicks;
-        GL11.glTranslated(-iPX, -iPY, -iPZ);
+
+        // Rotate screen-plane basis vectors (H = right, V = up) by angle.
+        // This avoids Rodrigues rotation around a qvec that shifts with every head movement,
+        // which caused the vortex to jerk whenever the player moved the camera.
+        final float cos = MathHelper.cos(angle);
+        final float sin = MathHelper.sin(angle);
+        final float hX = cos * arX + sin * arYZ;
+        final float hY = sin * arXZ;
+        final float hZ = cos * arZ + sin * arXY;
+        final float vX = cos * arYZ - sin * arX;
+        final float vY = cos * arXZ;
+        final float vZ = cos * arXY - sin * arZ;
+
         tessellator.startDrawingQuads();
         tessellator.setBrightness(220);
         tessellator.setColorRGBA_I(color, (int) (alpha * 255.0f));
-        final Vec3 v1 = Vec3
-                .createVectorHelper(-arX * scale - arYZ * scale, -arXZ * scale, -arZ * scale - arXY * scale);
-        final Vec3 v2 = Vec3.createVectorHelper(-arX * scale + arYZ * scale, arXZ * scale, -arZ * scale + arXY * scale);
-        final Vec3 v3 = Vec3.createVectorHelper(arX * scale + arYZ * scale, arXZ * scale, arZ * scale + arXY * scale);
-        final Vec3 v4 = Vec3.createVectorHelper(arX * scale - arYZ * scale, -arXZ * scale, arZ * scale - arXY * scale);
-        if (angle != 0.0f) {
-            final Vec3 pvec = Vec3.createVectorHelper(iPX, iPY, iPZ);
-            final Vec3 tvec = Vec3.createVectorHelper(px, py, pz);
-            final Vec3 qvec = pvec.subtract(tvec).normalize();
-            QuadHelper.setAxis(qvec, angle).rotate(v1);
-            QuadHelper.setAxis(qvec, angle).rotate(v2);
-            QuadHelper.setAxis(qvec, angle).rotate(v3);
-            QuadHelper.setAxis(qvec, angle).rotate(v4);
-        }
-        final float f2 = 0.0f;
-        final float f3 = 1.0f;
-        final float f4 = 0.0f;
-        final float f5 = 1.0f;
         tessellator.setNormal(0.0f, 0.0f, -1.0f);
-        tessellator.addVertexWithUV(px + v1.xCoord, py + v1.yCoord, pz + v1.zCoord, f2, f5);
-        tessellator.addVertexWithUV(px + v2.xCoord, py + v2.yCoord, pz + v2.zCoord, f3, f5);
-        tessellator.addVertexWithUV(px + v3.xCoord, py + v3.yCoord, pz + v3.zCoord, f3, f4);
-        tessellator.addVertexWithUV(px + v4.xCoord, py + v4.yCoord, pz + v4.zCoord, f2, f4);
+        tessellator
+                .addVertexWithUV(px + (-hX - vX) * scale, py + (-hY - vY) * scale, pz + (-hZ - vZ) * scale, 0.0, 1.0);
+        tessellator
+                .addVertexWithUV(px + (-hX + vX) * scale, py + (-hY + vY) * scale, pz + (-hZ + vZ) * scale, 1.0, 1.0);
+        tessellator.addVertexWithUV(px + (hX + vX) * scale, py + (hY + vY) * scale, pz + (hZ + vZ) * scale, 1.0, 0.0);
+        tessellator.addVertexWithUV(px + (hX - vX) * scale, py + (hY - vY) * scale, pz + (hZ - vZ) * scale, 0.0, 0.0);
         tessellator.draw();
     }
 

src/main/java/com/kentington/thaumichorizons/common/ThaumicHorizons.java

@@ -8,16 +8,24 @@ package com.kentington.thaumichorizons.common;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 
 import net.minecraft.block.Block;
+import net.minecraft.block.BlockDispenser;
 import net.minecraft.block.material.MapColor;
 import net.minecraft.block.material.Material;
 import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.dispenser.BehaviorDefaultDispenseItem;
+import net.minecraft.dispenser.BehaviorProjectileDispense;
+import net.minecraft.dispenser.IBlockSource;
+import net.minecraft.dispenser.IPosition;
+import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityList;
 import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.IProjectile;
 import net.minecraft.entity.monster.EntityBlaze;
 import net.minecraft.entity.monster.EntityEnderman;
 import net.minecraft.entity.monster.EntityGhast;
@@ -44,7 +52,9 @@ import net.minecraft.item.crafting.ShapelessRecipes;
 import net.minecraft.nbt.NBTTagByte;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.potion.Potion;
+import net.minecraft.util.EnumFacing;
 import net.minecraft.util.ResourceLocation;
+import net.minecraft.world.World;
 import net.minecraftforge.common.DimensionManager;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.common.config.Configuration;
@@ -57,6 +67,7 @@ import net.minecraftforge.oredict.ShapelessOreRecipe;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
+import com.google.common.collect.Sets;
 import com.kentington.thaumichorizons.client.lib.RenderEventHandler;
 import com.kentington.thaumichorizons.common.blocks.BlockAlchemite;
 import com.kentington.thaumichorizons.common.blocks.BlockBloodInfuser;
@@ -132,6 +143,7 @@ import com.kentington.thaumichorizons.common.entities.EntitySyringe;
 import com.kentington.thaumichorizons.common.entities.EntityTaintPig;
 import com.kentington.thaumichorizons.common.entities.EntityVoltSlime;
 import com.kentington.thaumichorizons.common.entities.ItemSpawnerEgg;
+import com.kentington.thaumichorizons.common.handlers.BehaviorDispenseBoat;
 import com.kentington.thaumichorizons.common.items.ItemAmuletMirror;
 import com.kentington.thaumichorizons.common.items.ItemBarChocolate;
 import com.kentington.thaumichorizons.common.items.ItemBoatGreatwood;
@@ -473,7 +485,7 @@ public class ThaumicHorizons {
         } catch (Exception var8) {
             log.error("Thaumic Horizons could not load its configuration file");
         } finally {
-            if (config != null) {
+            if (config != null && config.hasChanged()) {
                 config.save();
             }
         }
@@ -491,10 +503,10 @@ public class ThaumicHorizons {
         ROD_CRYSTAL = new WandRod(
                 "disposable",
                 250,
-                null,
+                new ItemStack(Blocks.bedrock),
                 99,
                 new ResourceLocation("thaumichorizons", "textures/models/crystalRod.png"));
-        CAP_CRYSTAL = new WandCap("disposable", 0.9F, null, 99);
+        CAP_CRYSTAL = new WandCap("disposable", 0.9F, new ItemStack(Blocks.bedrock), 99);
         CAP_CRYSTAL.setTexture(new ResourceLocation("thaumichorizons", "textures/models/crystalCap.png"));
         ROD_CRYSTAL.setGlowing(true);
         blockSynthNode = new BlockSyntheticNode();
@@ -752,6 +764,7 @@ public class ThaumicHorizons {
         proxy.registerHandlers();
         proxy.registerRenderers();
         FMLCommonHandler.instance().bus().register(instance);
+        initPotions();
     }
 
     @EventHandler
@@ -796,7 +809,6 @@ public class ThaumicHorizons {
         shapelessOreDictRecipe(
                 new ItemStack(ConfigItems.itemTripleMeatTreat),
                 new Object[] { Items.sugar, itemMeatNugget, ConfigItems.itemNuggetBeef, ConfigItems.itemNuggetFish });
-        initPotions();
         ResearchCategories.registerCategory(
                 "ThaumicHorizons",
                 new ResourceLocation("thaumichorizons", "textures/misc/vat.png"),
@@ -3631,6 +3643,7 @@ public class ThaumicHorizons {
                                 new ItemStack(Items.dye, 1, 0), new ItemStack(Items.dye, 1, 15) },
                         10));
         addAspectsToAllTheThings();
+        registerDispenserBehavior();
     }
 
     public static CreatureInfusionRecipe getCreatureInfusion(EntityLivingBase entityContained,
@@ -3667,7 +3680,6 @@ public class ThaumicHorizons {
     public static void initPotions() {
         byte customPotions = 5;
         int potionOffset = Potion.potionTypes.length;
-        boolean start = false;
         int var4;
         if (potionOffset < 128 - customPotions) {
             Potion[] potionTypes = new Potion[potionOffset + customPotions];
@@ -3679,40 +3691,54 @@ public class ThaumicHorizons {
             var4 = -1;
         }
 
+        int visBoostPotionId = potionVisBoostID;
         var4 = getNextPotionId(var4);
-        if (var4 >= 0) {
-            potionVisBoostID = var4;
-            PotionVisBoost.instance = new PotionVisBoost(potionVisBoostID, true, 6697847);
-            PotionVisBoost.init();
+        if (Potion.potionTypes[visBoostPotionId] != null) {
+            visBoostPotionId = getNextPotionId(visBoostPotionId);
+        }
+        potionVisBoostID = visBoostPotionId;
+        PotionVisBoost.instance = new PotionVisBoost(potionVisBoostID, true, 6697847);
+        PotionVisBoost.init();
+
+        int visRegenPotionId = potionVisRegenID;
+        var4 = getNextPotionId(var4);
+        if (Potion.potionTypes[visRegenPotionId] != null) {
+            visRegenPotionId = getNextPotionId(visRegenPotionId);
         }
 
-        var4 = getNextPotionId(var4);
-        if (var4 >= 0) {
-            potionVisRegenID = var4;
-            PotionVisRegen.instance = new PotionVisRegen(potionVisRegenID, true, 5701759);
-            PotionVisRegen.init();
+        potionVisRegenID = visRegenPotionId;
+        PotionVisRegen.instance = new PotionVisRegen(potionVisRegenID, true, 5701759);
+        PotionVisRegen.init();
+
+        int vacuumPotionId = potionVacuumID;
+
+        if (Potion.potionTypes[vacuumPotionId] != null) {
+            vacuumPotionId = getNextPotionId(vacuumPotionId);
         }
 
-        var4 = getNextPotionId(var4);
-        if (var4 >= 0) {
-            potionVacuumID = var4;
-            PotionVacuum.instance = new PotionVacuum(potionVacuumID, true, 4210752);
-            PotionVacuum.init();
+        potionVacuumID = vacuumPotionId;
+        PotionVacuum.instance = new PotionVacuum(potionVacuumID, true, 4210752);
+        PotionVacuum.init();
+
+        int shockPotionId = potionShockID;
+
+        if (Potion.potionTypes[shockPotionId] != null) {
+            shockPotionId = getNextPotionId(shockPotionId);
         }
 
-        var4 = getNextPotionId(var4);
-        if (var4 >= 0) {
-            potionShockID = var4;
-            PotionShock.instance = new PotionShock(potionShockID, true, 11513861);
-            PotionShock.init();
+        potionShockID = shockPotionId;
+        PotionShock.instance = new PotionShock(potionShockID, true, 11513861);
+        PotionShock.init();
+
+        int synthesisPotionId = potionSynthesisID;
+
+        if (Potion.potionTypes[synthesisPotionId] != null) {
+            synthesisPotionId = getNextPotionId(synthesisPotionId);
         }
 
-        var4 = getNextPotionId(var4);
-        if (var4 >= 0) {
-            potionSynthesisID = var4;
-            PotionSynthesis.instance = new PotionSynthesis(potionSynthesisID, false, 3253280);
-            PotionSynthesis.init();
-        }
+        potionSynthesisID = synthesisPotionId;
+        PotionSynthesis.instance = new PotionSynthesis(potionSynthesisID, false, 3253280);
+        PotionSynthesis.init();
     }
 
     static int getNextPotionId(int start) {
@@ -3889,6 +3915,96 @@ public class ThaumicHorizons {
                 (new AspectList()).add(Aspect.WEAPON, 3).add(Aspect.BEAST, 3));
     }
 
+    private static void registerDispenserBehavior() {
+        BlockDispenser.dispenseBehaviorRegistry
+                .putObject(Item.getItemFromBlock(blockAlchemite), new BehaviorDefaultDispenseItem() {
+
+                    @Override
+                    protected ItemStack dispenseStack(IBlockSource dispenser, ItemStack dispensedItem) {
+                        EnumFacing enumfacing = BlockDispenser.func_149937_b(dispenser.getBlockMetadata());
+                        World world = dispenser.getWorld();
+                        int x = dispenser.getXInt() + enumfacing.getFrontOffsetX();
+                        int y = dispenser.getYInt() + enumfacing.getFrontOffsetY();
+                        int z = dispenser.getZInt() + enumfacing.getFrontOffsetZ();
+
+                        EntityAlchemitePrimed primedAlchemite = new EntityAlchemitePrimed(
+                                world,
+                                x + 0.5F,
+                                y + 0.5F,
+                                z + 0.5F,
+                                null);
+                        world.spawnEntityInWorld(primedAlchemite);
+                        world.playSoundEffect(x + 0.5, y + 0.5, z + 0.5, "game.tnt.primed", 1.0F, 1.0F);
+
+                        dispensedItem.stackSize--;
+                        return dispensedItem;
+                    }
+                });
+        BlockDispenser.dispenseBehaviorRegistry.putObject(itemSyringeInjection, new BehaviorDefaultDispenseItem() {
+
+            @Override
+            public ItemStack dispenseStack(IBlockSource dispenser, ItemStack stack) {
+                if (!(stack.getItem() instanceof ItemSyringeInjection)) {
+                    return super.dispenseStack(dispenser, stack);
+                }
+
+                World world = dispenser.getWorld();
+                EnumFacing facing = BlockDispenser.func_149937_b(dispenser.getBlockMetadata());
+
+                double spawnX = dispenser.getX() + facing.getFrontOffsetX();
+                double spawnY = dispenser.getY() + facing.getFrontOffsetY();
+                double spawnZ = dispenser.getZ() + facing.getFrontOffsetZ();
+
+                IProjectile projectile = createProjectile(
+                        (ItemSyringeInjection) stack.getItem(),
+                        stack,
+                        world,
+                        spawnX,
+                        spawnY,
+                        spawnZ);
+
+                projectile.setThrowableHeading(
+                        facing.getFrontOffsetX(),
+                        facing.getFrontOffsetY() + 0.1F,
+                        facing.getFrontOffsetZ(),
+                        1.1F, // velocity
+                        6F // inaccuracy
+                );
+
+                world.spawnEntityInWorld((Entity) projectile);
+
+                stack.stackSize--;
+                return stack;
+            }
+
+            private IProjectile createProjectile(ItemSyringeInjection item, ItemStack stack, World world, double x,
+                    double y, double z) {
+                if (item.isPhial(stack.getItemDamage())) {
+                    return new EntityBlastPhial(world, x, y, z, stack);
+                } else {
+                    return new EntitySyringe(world, x, y, z, stack.stackTagCompound);
+                }
+            }
+
+            @Override
+            protected void playDispenseSound(IBlockSource source) {
+                source.getWorld().playAuxSFX(1002, source.getXInt(), source.getYInt(), source.getZInt(), 0);
+            }
+        });
+        BlockDispenser.dispenseBehaviorRegistry.putObject(itemEggIncubated, new BehaviorProjectileDispense() {
+
+            protected IProjectile getProjectileEntity(World worldIn, IPosition position) {
+                return new EntityEggIncubated(worldIn, position.getX(), position.getY(), position.getZ());
+            }
+        });
+        BlockDispenser.dispenseBehaviorRegistry.putObject(
+                itemBoatGreatwood,
+                new BehaviorDispenseBoat(Collections.singleton(Material.water), EntityBoatGreatwood::new));
+        BlockDispenser.dispenseBehaviorRegistry.putObject(
+                itemBoatThaumium,
+                new BehaviorDispenseBoat(Sets.newHashSet(Material.water, Material.lava), EntityBoatThaumium::new));
+    }
+
     static IRecipe shapelessOreDictRecipe(ItemStack res, Object[] params) {
         ShapelessOreRecipe rec = new ShapelessOreRecipe(res, params);
         CraftingManager.getInstance().getRecipeList().add(rec);
@@ -3916,6 +4032,32 @@ public class ThaumicHorizons {
         warpedTumorValueProperty.comment = "Points of warp held by warped tumor.";
         warpedTumorValueProperty.setRequiresMcRestart(true);
         warpedTumorValue = warpedTumorValueProperty.getInt();
+
+        Property visboostPotionProperty = config.get("potions", "visboostPotionID", 24);
+        visboostPotionProperty.comment = "Potion ID for the VisBoost Potion";
+        visboostPotionProperty.setRequiresMcRestart(true);
+        potionVisBoostID = visboostPotionProperty.getInt();
+
+        Property visregenPotionProperty = config.get("potions", "visregenPotionID", 25);
+        visregenPotionProperty.comment = "Potion ID for the VisRegen Potion";
+        visregenPotionProperty.setRequiresMcRestart(true);
+        potionVisRegenID = visregenPotionProperty.getInt();
+
+        Property vacuumPotionProperty = config.get("potions", "vacuumPotionID", 26);
+        vacuumPotionProperty.comment = "Potion ID for the Vacuum";
+        vacuumPotionProperty.setRequiresMcRestart(true);
+        potionVacuumID = vacuumPotionProperty.getInt();
+
+        Property shockPotionProperty = config.get("potions", "shockPotionID", 27);
+        shockPotionProperty.comment = "Potion ID for the Shock Potion";
+        shockPotionProperty.setRequiresMcRestart(true);
+        potionShockID = shockPotionProperty.getInt();
+
+        Property synthesisPotionProperty = config.get("potions", "synthesisPotionID", 28);
+        synthesisPotionProperty.comment = "Potion ID for the Sythesis Potion";
+        synthesisPotionProperty.setRequiresMcRestart(true);
+        potionSynthesisID = synthesisPotionProperty.getInt();
+
         config.save();
     }
 

src/main/java/com/kentington/thaumichorizons/common/blocks/BlockAlchemite.java

@@ -29,6 +29,7 @@ public class BlockAlchemite extends BlockTNT {
         this.setBlockName("ThaumicHorizons_alchemite");
         this.setBlockTextureName("ThaumicHorizons:alchemite");
         this.setCreativeTab(ThaumicHorizons.tabTH);
+        this.setStepSound(soundTypeGrass); // same place/break sound as TNT
     }
 
     public void onBlockDestroyedByExplosion(final World p_149723_1_, final int p_149723_2_, final int p_149723_3_,

src/main/java/com/kentington/thaumichorizons/common/blocks/BlockGatewayPortal.java

@@ -1,7 +1,3 @@
-//
-// Decompiled by Procyon v0.5.30
-//
-
 package com.kentington.thaumichorizons.common.blocks;
 
 import java.util.Random;
@@ -81,28 +77,16 @@ public class BlockGatewayPortal extends Block {
             if (world.getBlock(x + 1, y, z) == ThaumicHorizons.blockGateway) {
                 slotZ = z;
                 switch (md) {
-                    case 6 -> {
-                        slotX = x + 1;
-                    }
-                    case 7 -> {
-                        slotX = x;
-                    }
-                    case 9 -> {
-                        slotX = x - 1;
-                    }
+                    case 6 -> slotX = x + 1;
+                    case 7 -> slotX = x;
+                    case 9 -> slotX = x - 1;
                 }
             } else {
                 slotX = x;
                 switch (md) {
-                    case 6 -> {
-                        slotZ = z + 1;
-                    }
-                    case 7 -> {
-                        slotZ = z;
-                    }
-                    case 9 -> {
-                        slotZ = z - 1;
-                    }
+                    case 6 -> slotZ = z + 1;
+                    case 7 -> slotZ = z;
+                    case 9 -> slotZ = z - 1;
                 }
             }
         } else {
@@ -117,7 +101,7 @@ public class BlockGatewayPortal extends Block {
             }
         }
         final TileEntity te = world.getTileEntity(slotX, slotY, slotZ);
-        if (te instanceof TileSlot) {
+        if (te instanceof TileSlot && ((TileSlot) te).portalOpen) {
             ((TileSlot) te).destroyPortal();
         }
     }
@@ -151,313 +135,93 @@ public class BlockGatewayPortal extends Block {
                 || world.getBlock(x + 1, y, z) == ThaumicHorizons.blockPortal
                 || world.getBlock(x - 1, y, z) == ThaumicHorizons.blockGateway
                 || world.getBlock(x - 1, y, z) == ThaumicHorizons.blockPortal;
-        Label_0410: {
-            switch (world.getBlockMetadata(x, y, z)) {
-                case 0 -> {
-                    switch (side) {
-                        case 0 -> {
-                            return this.lapiz;
-                        }
-                        case 1 -> {
-                            return this.stone;
-                        }
-                        case 2 -> {
-                            if (isXAligned) {
-                                return this.CornerTR;
-                            }
-                            return this.stone;
-                        }
-                        case 3 -> {
-                            if (isXAligned) {
-                                return this.CornerTL;
-                            }
-                            return this.stone;
-                        }
-                        case 4 -> {
-                            if (isXAligned) {
-                                return this.stone;
-                            }
-                            return this.CornerTL;
-                        }
-                        case 5 -> {
-                            if (isXAligned) {
-                                return this.stone;
-                            }
-                            return this.CornerTR;
-                        }
-                        default -> {
-                            return this.leftSide(isXAligned, side);
-                        }
-                    }
-                }
-                case 1, 2, 3 -> {
-                    return this.leftSide(isXAligned, side);
-                }
-                case 4 -> {
-                    switch (side) {
-                        case 0 -> {
-                            return this.stone;
-                        }
-                        case 1 -> {
-                            return this.lapiz;
-                        }
-                        case 2 -> {
-                            if (isXAligned) {
-                                return this.CornerBR;
-                            }
-                            return this.stone;
-                        }
-                        case 3 -> {
-                            if (isXAligned) {
-                                return this.CornerBL;
-                            }
-                            return this.stone;
-                        }
-                        case 4 -> {
-                            if (isXAligned) {
-                                return this.stone;
-                            }
-                            return this.CornerBL;
-                        }
-                        case 5 -> {
-                            if (isXAligned) {
-                                return this.stone;
-                            }
-                            return this.CornerBR;
-                        }
-                        default -> {
-                            break Label_0410;
-                        }
-                    }
-                }
-                case 5 -> {
-                    switch (side) {
-                        case 0: {
-                            return this.lapiz;
-                        }
-                        case 1: {
-                            return this.stone;
-                        }
-                        case 2: {
-                            if (isXAligned) {
-                                return this.topR;
-                            }
-                        }
-                        case 3: {
-                            if (isXAligned) {
-                                return this.topL;
-                            }
-                        }
-                        case 4: {
-                            if (!isXAligned) {
-                                return this.topL;
-                            }
-                        }
-                        case 5: {
-                            if (!isXAligned) {
-                                return this.topR;
-                            }
-                            break;
-                        }
-                    }
-                    return this.lapiz;
-                }
-                case 6, 7, 9 -> {
-                    return this.bottomSide(isXAligned, side);
-                }
-                case 8 -> {
-                    switch (side) {
-                        case 0: {
-                            return this.lapiz;
-                        }
-                        case 1: {
-                            return this.stone;
-                        }
-                        case 2: {
-                            if (isXAligned) {
-                                return this.topL;
-                            }
-                        }
-                        case 3: {
-                            if (isXAligned) {
-                                return this.topR;
-                            }
-                        }
-                        case 4: {
-                            if (!isXAligned) {
-                                return this.topR;
-                            }
-                        }
-                        case 5: {
-                            if (!isXAligned) {
-                                return this.topL;
-                            }
-                            break;
-                        }
-                    }
-                    return this.lapiz;
-                }
-                case 10 -> {
-                    switch (side) {
-                        case 0 -> {
-                            return this.stone;
-                        }
-                        case 1 -> {
-                            return this.lapiz;
-                        }
-                        case 2 -> {
-                            if (isXAligned) {
-                                return this.CornerTL;
-                            }
-                            return this.stone;
-                        }
-                        case 3 -> {
-                            if (isXAligned) {
-                                return this.CornerTR;
-                            }
-                            return this.stone;
-                        }
-                        case 4 -> {
-                            if (isXAligned) {
-                                return this.stone;
-                            }
-                            return this.CornerTR;
-                        }
-                        case 5 -> {
-                            if (isXAligned) {
-                                return this.stone;
-                            }
-                            return this.CornerTL;
-                        }
-                        default -> {
-                            return this.rightSide(isXAligned, side);
-                        }
-                    }
-                }
-                case 11, 12, 13 -> {
-                    return this.rightSide(isXAligned, side);
-                }
-                case 14 -> {
-                    switch (side) {
-                        case 0 -> {
-                            return this.stone;
-                        }
-                        case 1 -> {
-                            return this.lapiz;
-                        }
-                        case 2 -> {
-                            if (isXAligned) {
-                                return this.CornerBL;
-                            }
-                            return this.stone;
-                        }
-                        case 3 -> {
-                            if (isXAligned) {
-                                return this.CornerBR;
-                            }
-                            return this.stone;
-                        }
-                        case 4 -> {
-                            if (isXAligned) {
-                                return this.stone;
-                            }
-                            return this.CornerBR;
-                        }
-                        case 5 -> {
-                            if (isXAligned) {
-                                return this.stone;
-                            }
-                            return this.CornerBL;
-                        }
-                        default -> {
-                            break Label_0410;
-                        }
-                    }
-                }
-            }
-        }
-        return this.lapiz;
+        return switch (world.getBlockMetadata(x, y, z)) {
+            case 0 -> switch (side) {
+                    case 0 -> this.lapiz;
+                    case 1 -> this.stone;
+                    case 2 -> isXAligned ? this.CornerTR : this.stone;
+                    case 3 -> isXAligned ? this.CornerTL : this.stone;
+                    case 4 -> isXAligned ? this.stone : this.CornerTL;
+                    case 5 -> isXAligned ? this.stone : this.CornerTR;
+                    default -> this.leftSide(isXAligned, side);
+                };
+            case 1, 2, 3 -> this.leftSide(isXAligned, side);
+            case 4 -> switch (side) {
+                    case 0 -> this.stone;
+                    case 1 -> this.lapiz;
+                    case 2 -> isXAligned ? this.CornerBR : this.stone;
+                    case 3 -> isXAligned ? this.CornerBL : this.stone;
+                    case 4 -> isXAligned ? this.stone : this.CornerBL;
+                    case 5 -> isXAligned ? this.stone : this.CornerBR;
+                    default -> this.lapiz;
+                };
+            case 5 -> switch (side) {
+                    case 0 -> this.lapiz;
+                    case 1 -> this.stone;
+                    case 2 -> isXAligned ? this.topR : this.stone;
+                    case 3 -> isXAligned ? this.topL : this.stone;
+                    case 4 -> isXAligned ? this.stone : this.topL;
+                    case 5 -> isXAligned ? this.stone : this.topR;
+                    default -> this.lapiz;
+                };
+            case 6, 7, 9 -> this.bottomSide(isXAligned, side);
+            case 8 -> switch (side) {
+                    case 0 -> this.lapiz;
+                    case 1 -> this.stone;
+                    case 2 -> isXAligned ? this.topL : this.stone;
+                    case 3 -> isXAligned ? this.topR : this.stone;
+                    case 4 -> isXAligned ? this.stone : this.topR;
+                    case 5 -> isXAligned ? this.stone : this.topL;
+                    default -> this.lapiz;
+                };
+            case 10 -> switch (side) {
+                    case 0 -> this.lapiz;
+                    case 1 -> this.stone;
+                    case 2 -> isXAligned ? this.CornerTL : this.stone;
+                    case 3 -> isXAligned ? this.CornerTR : this.stone;
+                    case 4 -> isXAligned ? this.stone : this.CornerTR;
+                    case 5 -> isXAligned ? this.stone : this.CornerTL;
+                    default -> this.rightSide(isXAligned, side);
+                };
+            case 11, 12, 13 -> this.rightSide(isXAligned, side);
+            case 14 -> switch (side) {
+                    case 0 -> this.stone;
+                    case 1 -> this.lapiz;
+                    case 2 -> isXAligned ? this.CornerBL : this.stone;
+                    case 3 -> isXAligned ? this.CornerBR : this.stone;
+                    case 4 -> isXAligned ? this.stone : this.CornerBR;
+                    case 5 -> isXAligned ? this.stone : this.CornerBL;
+                    default -> this.lapiz;
+                };
+            default -> this.lapiz;
+        };
     }
 
     IIcon leftSide(final boolean xAligned, final int side) {
-        if (xAligned) {
-            switch (side) {
-                case 2 -> {
-                    return this.R;
-                }
-                case 3 -> {
-                    return this.L;
-                }
-                case 4 -> {
-                    return this.stone;
-                }
-                default -> {
-                    return this.lapiz;
-                }
-            }
-        } else {
-            switch (side) {
-                case 2 -> {
-                    return this.stone;
-                }
-                case 4 -> {
-                    return this.L;
-                }
-                case 5 -> {
-                    return this.R;
-                }
-                default -> {
-                    return this.lapiz;
-                }
-            }
-        }
+        return switch (side) {
+            case 2 -> xAligned ? this.R : this.stone;
+            case 3 -> xAligned ? this.L : this.lapiz;
+            case 4 -> xAligned ? this.stone : this.L;
+            case 5 -> xAligned ? this.lapiz : this.R;
+            default -> this.lapiz;
+        };
     }
 
     IIcon rightSide(final boolean xAligned, final int side) {
-        if (xAligned) {
-            switch (side) {
-                case 2 -> {
-                    return this.L;
-                }
-                case 3 -> {
-                    return this.R;
-                }
-                case 5 -> {
-                    return this.stone;
-                }
-                default -> {
-                    return this.lapiz;
-                }
-            }
-        } else {
-            switch (side) {
-                case 3 -> {
-                    return this.stone;
-                }
-                case 4 -> {
-                    return this.R;
-                }
-                case 5 -> {
-                    return this.L;
-                }
-                default -> {
-                    return this.lapiz;
-                }
-            }
-        }
+        return switch (side) {
+            case 2 -> xAligned ? this.L : this.lapiz;
+            case 3 -> xAligned ? this.R : this.stone;
+            case 4 -> xAligned ? this.lapiz : this.R;
+            case 5 -> xAligned ? this.stone : this.L;
+            default -> this.lapiz;
+        };
     }
 
     IIcon bottomSide(final boolean xAligned, final int side) {
-        switch (side) {
-            case 0 -> {
-                return this.stone;
-            }
-            case 1 -> {
-                return this.lapiz;
-            }
-            default -> {
-                return this.B;
-            }
-        }
+        return switch (side) {
+            case 0 -> this.stone;
+            case 1 -> this.lapiz;
+            default -> this.B;
+        };
     }
 }

src/main/java/com/kentington/thaumichorizons/common/blocks/BlockPortalTH.java

@@ -14,6 +14,7 @@ import net.minecraft.server.MinecraftServer;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.AxisAlignedBB;
 import net.minecraft.world.World;
+import net.minecraft.world.WorldServer;
 
 import com.kentington.thaumichorizons.common.ThaumicHorizons;
 import com.kentington.thaumichorizons.common.lib.GatewayTeleporter;
@@ -83,12 +84,12 @@ public class BlockPortalTH extends BlockBreakable {
 
     public void onEntityCollidedWithBlock(final World world, final int x, final int y, final int z,
             final Entity player) {
-        if (player.ridingEntity == null && player.riddenByEntity == null && player instanceof EntityPlayerMP) {
-            if (player.timeUntilPortal > 0) {
-                player.timeUntilPortal = 10;
+        if (player.ridingEntity == null && player.riddenByEntity == null && player instanceof final EntityPlayerMP playerMP) {
+            if (playerMP.timeUntilPortal > 0) {
+                playerMP.timeUntilPortal = 10;
                 return;
             }
-            player.timeUntilPortal = 10;
+            playerMP.timeUntilPortal = 10;
             int targetX = 0;
             int targetY = 0;
             int targetZ = 0;
@@ -116,15 +117,21 @@ public class BlockPortalTH extends BlockBreakable {
                 if (portal.length > 3) targetDim = portal[3];
 
                 final MinecraftServer mServer = FMLCommonHandler.instance().getMinecraftServerInstance();
-                ((EntityPlayerMP) player).mcServer.getConfigurationManager().transferPlayerToDimension(
-                        (EntityPlayerMP) player,
+                final WorldServer targetWorld = mServer.worldServerForDimension(targetDim);
+                float exitYaw = playerMP.rotationYaw;
+                // face perpendicular to portal plane, away from portal into the world
+                if (targetWorld.getTileEntity(targetX, targetY + 2, targetZ) instanceof final TileSlot slotTE) {
+                    exitYaw = slotTE.xAligned ? 0.0f : 270.0f;
+                }
+                playerMP.mcServer.getConfigurationManager().transferPlayerToDimension(
+                        playerMP,
                         targetDim,
                         new GatewayTeleporter(
-                                mServer.worldServerForDimension(ThaumicHorizons.dimensionPocketId),
+                                targetWorld,
                                 targetX,
                                 targetY,
                                 targetZ,
-                                player.rotationYaw));
+                                exitYaw));
             } else {
                 int slotY = y;
                 int slotX = x;
@@ -167,8 +174,8 @@ public class BlockPortalTH extends BlockBreakable {
                         }
                     }
                     final MinecraftServer mServer2 = FMLCommonHandler.instance().getMinecraftServerInstance();
-                    ((EntityPlayerMP) player).mcServer.getConfigurationManager().transferPlayerToDimension(
-                            (EntityPlayerMP) player,
+                    playerMP.mcServer.getConfigurationManager().transferPlayerToDimension(
+                            playerMP,
                             ThaumicHorizons.dimensionPocketId,
                             new GatewayTeleporter(
                                     mServer2.worldServerForDimension(ThaumicHorizons.dimensionPocketId),

src/main/java/com/kentington/thaumichorizons/common/blocks/BlockSlot.java

@@ -32,6 +32,7 @@ public class BlockSlot extends BlockContainer {
 
     public void breakBlock(final World world, final int x, final int y, final int z, final Block block, final int md) {
         final TileSlot tco = (TileSlot) world.getTileEntity(x, y, z);
+        if (tco == null) return;
         if (tco.portalOpen) {
             tco.destroyPortal();
         }
@@ -59,15 +60,20 @@ public class BlockSlot extends BlockContainer {
                 if (tco.portalOpen) {
                     tco.destroyPortal();
                 }
+                world.markBlockForUpdate(x, y, z);
+                return true;
             } else if (!tco.portalOpen && player.getHeldItem().getItem() instanceof ItemWandCasting) {
                 tco.makePortal(player);
+                world.markBlockForUpdate(x, y, z);
+                return true;
             }
         } else if (theItem != null && theItem.getItem() == ThaumicHorizons.itemKeystone
                 && theItem.stackTagCompound != null) {
                     tco.insertKeystone(theItem.stackTagCompound.getInteger("dimension"));
                     --theItem.stackSize;
+                    world.markBlockForUpdate(x, y, z);
+                    return true;
                 }
-        world.markBlockForUpdate(x, y, z);
         return false;
     }
 

src/main/java/com/kentington/thaumichorizons/common/container/ContainerCase.java

@@ -45,10 +45,10 @@ public class ContainerCase extends Container {
                     new SlotLimitedByClass(ILens.class, this.input, a, 37 + a % 6 * 18, 51 + a / 6 * 18));
         }
         this.bindPlayerInventory(iinventory);
-        if (!par2World.isRemote) {
-            try {
-                ((InventoryCase) this.input).stackList = ((ItemLensCase) this.pouch.getItem()).getInventory(this.pouch);
-            } catch (Exception ignored) {}
+        if (!par2World.isRemote && this.pouch != null
+                && this.pouch.getItem() instanceof ItemLensCase lensCase
+                && this.input instanceof InventoryCase inv) {
+            inv.stackList = lensCase.getInventory(this.pouch);
         }
         this.onCraftMatrixChanged(this.input);
     }

src/main/java/com/kentington/thaumichorizons/common/entities/EntityBlastPhial.java

@@ -12,23 +12,27 @@ import net.minecraft.world.World;
 
 public class EntityBlastPhial extends EntityPotion {
 
-    public EntityBlastPhial(final World p_i1790_1_) {
-        super(p_i1790_1_);
+    public EntityBlastPhial(final World world) {
+        super(world);
     }
 
-    public EntityBlastPhial(final World p_i1790_1_, final EntityLivingBase p_i1790_2_, final float power,
-            final ItemStack p_i1790_3_) {
-        super(p_i1790_1_, p_i1790_2_, p_i1790_3_);
+    public EntityBlastPhial(final World world, final double x, final double y, final double z, final ItemStack stack) {
+        super(world, x, y, z, stack);
+    }
+
+    public EntityBlastPhial(final World world, final EntityLivingBase thrower, final float power,
+            final ItemStack stack) {
+        super(world, thrower, stack);
         this.setSize(0.25f, 0.25f);
         this.setSize(0.5f, 0.5f);
         this.setLocationAndAngles(
-                p_i1790_2_.posX,
-                p_i1790_2_.posY + p_i1790_2_.getEyeHeight(),
-                p_i1790_2_.posZ,
-                p_i1790_2_.rotationYaw,
-                p_i1790_2_.rotationPitch);
+                thrower.posX,
+                thrower.posY + thrower.getEyeHeight(),
+                thrower.posZ,
+                thrower.rotationYaw,
+                thrower.rotationPitch);
         this.posX -= MathHelper.cos(this.rotationYaw / 180.0f * (float) Math.PI) * 0.16f;
-        this.posY -= 0.10000000149011612;
+        this.posY -= 0.1;
         this.posZ -= MathHelper.sin(this.rotationYaw / 180.0f * (float) Math.PI) * 0.16f;
         this.setPosition(this.posX, this.posY, this.posZ);
         this.yOffset = 0.0f;

src/main/java/com/kentington/thaumichorizons/common/entities/EntityGolemTH.java

@@ -162,10 +162,8 @@ public class EntityGolemTH extends EntityGolemBase {
         this.getNavigator().setAvoidsWater(
                 this.getGolemTHType() != EnumGolemTHType.ROCK && this.getGolemTHType() != EnumGolemTHType.METAL
                         && this.getGolemTHType() != EnumGolemTHType.REDSTONE);
-        int bonus = 0;
-        try {
-            bonus = (this.getGolemDecoration().contains("H") ? 5 : 0);
-        } catch (Exception ignored) {}
+        final String decor = this.getGolemDecoration();
+        final int bonus = decor == null ? 0 : (decor.contains("H") ? 5 : 0);
         this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(this.getGolemTHType().health + bonus);
         return true;
     }
@@ -667,10 +665,8 @@ public class EntityGolemTH extends EntityGolemBase {
             this.action = 6;
         } else if (par1 == 5) {
             this.healing = 5;
-            int bonus = 0;
-            try {
-                bonus = (this.getGolemDecoration().contains("H") ? 5 : 0);
-            } catch (Exception ignored) {}
+            final String decor = this.getGolemDecoration();
+            final int bonus = decor == null ? 0 : (decor.contains("H") ? 5 : 0);
             this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(this.type.health + bonus);
         } else if (par1 == 6) {
             this.leftArm = 5;

src/main/java/com/kentington/thaumichorizons/common/entities/EntitySyringe.java

@@ -39,6 +39,7 @@ import io.netty.buffer.ByteBuf;
 public class EntitySyringe extends Entity implements IProjectile, IEntityAdditionalSpawnData {
 
     public int color;
+    public int canBePickedUp;
     public NBTTagCompound effects;
     private boolean inGround;
     private int field_145791_d;
@@ -50,7 +51,6 @@ public class EntitySyringe extends Entity implements IProjectile, IEntityAdditio
     private int ticksInAir;
     private int knockbackStrength;
     private EntityLivingBase shootingEntity;
-    private int canBePickedUp;
     private byte arrowShake;
     private double damage;
 
@@ -146,6 +146,13 @@ public class EntitySyringe extends Entity implements IProjectile, IEntityAdditio
         this.setThrowableHeading(this.motionX, this.motionY, this.motionZ, p_i1756_3_ * 1.5f, 1.0f);
     }
 
+    public EntitySyringe(World world, double x, double y, double z, NBTTagCompound effects) {
+        this(world, x, y, z);
+        this.effects = effects;
+        this.color = this.effects.getInteger("color");
+        this.canBePickedUp = 1;
+    }
+
     public void writeEntityToNBT(final NBTTagCompound p_70014_1_) {
         p_70014_1_.setTag("effects", this.effects);
         p_70014_1_.setShort("xTile", (short) this.field_145791_d);

src/main/java/com/kentington/thaumichorizons/common/handlers/BehaviorDispenseBoat.java

@@ -0,0 +1,66 @@
+package com.kentington.thaumichorizons.common.handlers;
+
+import java.util.Set;
+
+import net.minecraft.block.BlockDispenser;
+import net.minecraft.block.material.Material;
+import net.minecraft.dispenser.BehaviorDefaultDispenseItem;
+import net.minecraft.dispenser.IBlockSource;
+import net.minecraft.entity.item.EntityBoat;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.world.World;
+
+public class BehaviorDispenseBoat extends BehaviorDefaultDispenseItem {
+
+    public interface BoatFactory {
+
+        EntityBoat create(World world, double x, double y, double z);
+    }
+
+    private final Set<Material> validMaterials;
+    private final BoatFactory boatFactory;
+
+    public BehaviorDispenseBoat(Set<Material> validMaterials, BoatFactory boatFactory) {
+        this.validMaterials = validMaterials;
+        this.boatFactory = boatFactory;
+    }
+
+    @Override
+    protected ItemStack dispenseStack(IBlockSource dispenser, ItemStack stack) {
+        EnumFacing facing = BlockDispenser.func_149937_b(dispenser.getBlockMetadata());
+        World world = dispenser.getWorld();
+
+        // Calculate spawn position slightly in front of the dispenser
+        double spawnX = dispenser.getX() + (facing.getFrontOffsetX() * 1.25F);
+        double spawnY = dispenser.getY() + (facing.getFrontOffsetY() * 1.125F) - 0.5F;
+        double spawnZ = dispenser.getZ() + (facing.getFrontOffsetZ() * 1.25F);
+
+        // Block coordinates in front of the dispenser
+        int targetX = dispenser.getXInt() + facing.getFrontOffsetX();
+        int targetY = dispenser.getYInt() + facing.getFrontOffsetY();
+        int targetZ = dispenser.getZInt() + facing.getFrontOffsetZ();
+
+        Material frontMaterial = world.getBlock(targetX, targetY, targetZ).getMaterial();
+
+        if (validMaterials.contains(frontMaterial)) {
+            spawnY++;
+        } else if (!Material.air.equals(frontMaterial)) {
+            return stack;
+        }
+
+        EntityBoat boat = boatFactory.create(world, spawnX, spawnY, spawnZ);
+
+        boat.rotationYaw = switch (facing) {
+            case NORTH -> 90.0F;
+            case WEST -> 180.0F;
+            case EAST -> 0.0F;
+            default -> -90.0F; // SOUTH or other
+        };
+
+        world.spawnEntityInWorld(boat);
+
+        stack.stackSize--;
+        return stack;
+    }
+}

src/main/java/com/kentington/thaumichorizons/common/items/ItemKeystone.java

@@ -50,8 +50,11 @@ public class ItemKeystone extends Item {
 
     public void addInformation(final ItemStack par1ItemStack, final EntityPlayer par2EntityPlayer, final List par3List,
             final boolean par4) {
-        if (par1ItemStack.getTagCompound() != null && par1ItemStack.getTagCompound().getInteger("dimension") != 0) {
-            par3List.add(PocketPlaneData.planes.get(par1ItemStack.getTagCompound().getInteger("dimension")).name);
+        if (par1ItemStack.getTagCompound() != null) {
+            final int dim = par1ItemStack.getTagCompound().getInteger("dimension");
+            if (dim >= 0 && dim < PocketPlaneData.planes.size()) {
+                par3List.add(PocketPlaneData.planes.get(dim).name);
+            }
         }
         super.addInformation(par1ItemStack, par2EntityPlayer, par3List, par4);
     }
@@ -71,9 +74,13 @@ public class ItemKeystone extends Item {
             float hitX, float hitY, float hitZ) {
         if (stack.getTagCompound() == null && player.dimension == ThaumicHorizons.dimensionPocketId
                 && !world.isRemote) {
-            if (world.getTileEntity(x, y, z) instanceof TileVortex)
-                (stack.stackTagCompound = new NBTTagCompound()).setInteger("dimension", (z + 128) / 256);
-            return true;
+            if (world.getTileEntity(x, y, z) instanceof final TileVortex vortex) {
+                stack.stackTagCompound = new NBTTagCompound();
+                stack.stackTagCompound.setInteger("dimension", vortex.dimensionID);
+                player.inventory.markDirty();
+                return true;
+            }
+            return false;
         }
         return super.onItemUseFirst(stack, player, world, x, y, z, side, hitX, hitY, hitZ);
     }

src/main/java/com/kentington/thaumichorizons/common/items/lenses/ItemLensOrderEntropy.java

@@ -85,10 +85,6 @@ public class ItemLensOrderEntropy extends Item implements ILens {
                         try {
                             text = stack.getDisplayName();
                         } catch (Exception ignored) {}
-                    } else if (stack.getItem() != null) {
-                        try {
-                            text = stack.getItem().getItemStackDisplayName(stack);
-                        } catch (Exception ignored) {}
                     }
                 }
                 if (scan.type == 2) {

src/main/java/com/kentington/thaumichorizons/common/lib/EventHandlerEntity.java

@@ -171,7 +171,9 @@ public class EventHandlerEntity {
                         final PotionEffect effect = new PotionEffect(Potion.resistance.id, Integer.MAX_VALUE, 0, true);
                         effect.setCurativeItems(new ArrayList<>());
                         entity.addPotionEffect(effect);
-                        ThaumicHorizons.instance.renderEventHandler.thingsThatSparkle.add(entity);
+                        if (entity.worldObj.isRemote) {
+                            ThaumicHorizons.instance.renderEventHandler.thingsThatSparkle.add(entity);
+                        }
                     } else if (infusions[i] == 8 && !entity.getEntityData().hasKey("runicCharge")) {
                         entity.getEntityData().setInteger("runicCharge", 6);
                     } else if (infusions[i] == 7) {
@@ -955,8 +957,11 @@ public class EventHandlerEntity {
 
     @SubscribeEvent
     public void golemDies(final LivingDeathEvent event) {
-        if (event.entity instanceof EntityGolemTH) {
-            ((EntityGolemTH) event.entity).die();
+        if (event.entity.worldObj.isRemote) {
+            return;
+        }
+        if (event.entity instanceof EntityGolemTH golem) {
+            golem.die();
         }
     }
 

src/main/java/com/kentington/thaumichorizons/common/lib/ExplosionAlchemite.java

@@ -222,8 +222,16 @@ public class ExplosionAlchemite extends Explosion {
                     if (block.getMaterial() == Material.air) {
                         continue;
                     }
-                    final AspectList aspects = this
-                            .getAspects(Item.getItemFromBlock(block), this.worldObj.getBlockMetadata(i, j, k));
+                    Item item = Item.getItemFromBlock(block);
+                    int meta = worldObj.getBlockMetadata(i, j, k);
+                    if (item == null) {
+                        item = block.getItemDropped(meta, worldObj.rand, 0);
+                    }
+                    if (item == null) {
+                        continue;
+                    }
+
+                    final AspectList aspects = this.getAspects(item, meta);
                     if (aspects != null && aspects.size() > 0) {
                         for (final Aspect asp2 : aspects.getAspects()) {
                             final ItemStack stack = new ItemStack(

src/main/java/com/kentington/thaumichorizons/common/lib/PocketPlaneData.java

@@ -32,6 +32,7 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
 import net.minecraft.potion.Potion;
 import net.minecraft.server.MinecraftServer;
+import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.Vec3;
 import net.minecraft.world.World;
 import net.minecraft.world.biome.BiomeGenBase;
@@ -111,7 +112,11 @@ public class PocketPlaneData {
                 }
             }
             world.setBlock(xCenter, yCenter + 1, zCenter, ThaumicHorizons.blockVortex);
-            final TileVortex vortex = (TileVortex) world.getTileEntity(xCenter, yCenter + 1, zCenter);
+            TileEntity te = world.getTileEntity(xCenter, yCenter + 1, zCenter);
+            if (!(te instanceof TileVortex)) {
+                te = new TileVortex();
+            }
+            final TileVortex vortex = (TileVortex) te;
             vortex.cheat = true;
             vortex.returnID = returnID;
             vortex.dimensionID = PocketPlaneData.planes.size();
@@ -123,7 +128,7 @@ public class PocketPlaneData {
             data.portalD = new int[4];
             PocketPlaneData.planes.add(data);
             PocketPlaneData.positions.put(pocketPlaneMAXID, Vec3.createVectorHelper(vortexX, vortexY, vortexZ));
-            world.getChunkFromBlockCoords(vortexX, vortexZ).isModified = true;
+            world.getChunkFromBlockCoords(xCenter, zCenter).isModified = true;
             creatures = 0;
             ++pocketPlaneMAXID;
         }

src/main/java/com/kentington/thaumichorizons/common/tiles/TileSoulforge.java

@@ -30,8 +30,14 @@ public class TileSoulforge extends TileThaumcraft implements ISoulReceiver, IEss
     int progress;
     static final int PROGRESS_MAX = 9600;
     public int souls;
+    static final int MAX_SOULS = 16;
     int essentia;
     static final int ESSENTIA_MAX = 4000;
+    // Threshold for drawing more essentia (3 MIND aspects * 1000 each)
+    static final int ESSENTIA_DRAW_THRESHOLD = 3000;
+    static final int ESSENTIA_PER_ASPECT = 1000;
+    static final int SUCTION_PRESSURE = 128;
+    static final double PLAYER_REACH_SQ = 64.0;
     public float rota;
     public int forging;
 
@@ -83,8 +89,8 @@ public class TileSoulforge extends TileThaumcraft implements ISoulReceiver, IEss
     public void addSoulBits(final int bits) {
         this.progress += bits;
         this.essentia -= bits;
-        if (this.progress >= 9600) {
-            this.progress -= 9600;
+        while (this.progress >= PROGRESS_MAX) {
+            this.progress -= PROGRESS_MAX;
             ++this.souls;
         }
         this.forging = 3;
@@ -94,12 +100,12 @@ public class TileSoulforge extends TileThaumcraft implements ISoulReceiver, IEss
 
     @Override
     public boolean canAcceptSouls() {
-        return this.essentia > 0 && this.souls < 16;
+        return this.essentia > 0 && this.souls < MAX_SOULS;
     }
 
     public void updateEntity() {
         super.updateEntity();
-        if (this.essentia < 3000) {
+        if (this.essentia < ESSENTIA_DRAW_THRESHOLD) {
             this.drawEssentia();
         }
         if (this.forging > 0) {
@@ -113,7 +119,7 @@ public class TileSoulforge extends TileThaumcraft implements ISoulReceiver, IEss
 
     public boolean isUseableByPlayer(final EntityPlayer p_70300_1_) {
         return this.worldObj.getTileEntity(this.xCoord, this.yCoord, this.zCoord) == this
-                && p_70300_1_.getDistanceSq(this.xCoord + 0.5, this.yCoord + 0.5, this.zCoord + 0.5) <= 64.0;
+                && p_70300_1_.getDistanceSq(this.xCoord + 0.5, this.yCoord + 0.5, this.zCoord + 0.5) <= PLAYER_REACH_SQ;
     }
 
     void drawEssentia() {
@@ -158,12 +164,12 @@ public class TileSoulforge extends TileThaumcraft implements ISoulReceiver, IEss
         if (this.essentia <= 0) {
             return null;
         }
-        return new AspectList().add(Aspect.MIND, (int) Math.ceil(this.essentia / 1000.0f));
+        return new AspectList().add(Aspect.MIND, (int) Math.ceil(this.essentia / (float) ESSENTIA_PER_ASPECT));
     }
 
     @Override
     public void setAspects(final AspectList aspects) {
-        this.essentia = aspects.getAmount(Aspect.MIND) * 1000;
+        this.essentia = aspects.getAmount(Aspect.MIND) * ESSENTIA_PER_ASPECT;
     }
 
     @Override
@@ -188,7 +194,7 @@ public class TileSoulforge extends TileThaumcraft implements ISoulReceiver, IEss
 
     @Override
     public boolean doesContainerContainAmount(final Aspect tag, final int amount) {
-        return tag.getTag().equals(Aspect.MIND.getTag()) && this.essentia / 1000 >= amount;
+        return tag.getTag().equals(Aspect.MIND.getTag()) && this.essentia / ESSENTIA_PER_ASPECT >= amount;
     }
 
     @Override
@@ -199,7 +205,7 @@ public class TileSoulforge extends TileThaumcraft implements ISoulReceiver, IEss
     @Override
     public int containerContains(final Aspect tag) {
         if (tag.getTag().equals(Aspect.MIND.getTag())) {
-            return this.essentia / 1000;
+            return this.essentia / ESSENTIA_PER_ASPECT;
         }
         return 0;
     }
@@ -229,7 +235,7 @@ public class TileSoulforge extends TileThaumcraft implements ISoulReceiver, IEss
 
     @Override
     public int getSuctionAmount(final ForgeDirection face) {
-        return (this.essentia < 3000) ? 128 : 0;
+        return (this.essentia < ESSENTIA_DRAW_THRESHOLD) ? SUCTION_PRESSURE : 0;
     }
 
     @Override
@@ -239,8 +245,8 @@ public class TileSoulforge extends TileThaumcraft implements ISoulReceiver, IEss
 
     @Override
     public int addEssentia(final Aspect aspect, final int amount, final ForgeDirection face) {
-        if (this.essentia < 3000) {
-            this.essentia += 1000;
+        if (this.essentia < ESSENTIA_DRAW_THRESHOLD) {
+            this.essentia += ESSENTIA_PER_ASPECT;
             this.markDirty();
             this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord);
             return 1;
@@ -255,7 +261,7 @@ public class TileSoulforge extends TileThaumcraft implements ISoulReceiver, IEss
 
     @Override
     public int getEssentiaAmount(final ForgeDirection face) {
-        return this.essentia / 1000;
+        return this.essentia / ESSENTIA_PER_ASPECT;
     }
 
     @Override

src/main/java/com/kentington/thaumichorizons/common/tiles/TileSyntheticNode.java

@@ -9,7 +9,6 @@ import java.util.ArrayList;
 
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
@@ -435,16 +434,22 @@ public class TileSyntheticNode extends TileVisNode implements INode, IWandable {
     }
 
     public void addEssence(final EntityPlayer player) {
-        final Item essence = player.getHeldItem().getItem();
-        if (essence == ConfigItems.itemWispEssence
-                && ((ItemWispEssence) essence).getAspects(player.getHeldItem()) != null
-                && ((ItemWispEssence) essence).getAspects(player.getHeldItem()).getAspects().length > 0) {
-            final Aspect asp = ((ItemWispEssence) essence).getAspects(player.getHeldItem()).getAspects()[0];
-            this.aspectsMax.add(asp, 4);
+        final ItemStack heldItem = player.getHeldItem();
+        // just in case
+        if (heldItem == null) return;
+        if (heldItem.stackSize == 0) return;
+
+        if (heldItem.getItem() instanceof ItemWispEssence essence && essence == ConfigItems.itemWispEssence) {
+            if (essence.getAspects(heldItem) == null) return;
+            var aspectList = essence.getAspects(heldItem).getAspects();
+            if (aspectList == null || aspectList.length == 0) return;
+            final Aspect asp = aspectList[0];
+
+            this.aspectsMax.add(asp, 4 * heldItem.stackSize);
             this.aspects.add(asp, 0);
             this.fractionalAspects.add(asp, 0);
-            final ItemStack heldItem = player.getHeldItem();
-            --heldItem.stackSize;
+
+            heldItem.stackSize = 0;
             this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord);
             this.markDirty();
         }

src/main/java/com/kentington/thaumichorizons/common/tiles/TileVat.java

@@ -78,6 +78,45 @@ import thaumcraft.common.tiles.TilePedestal;
 
 public class TileVat extends TileThaumcraft implements IAspectContainer, IEssentiaTransport, ISidedInventory {
 
+    // Timers and progress values (in ticks)
+    private static final int CLONE_PROGRESS = 800;
+    private static final int COUNT_DELAY = 10;
+    private static final int HEAL_ASPECT_COOLDOWN = 40;
+    private static final int LIFE_ASPECT_COOLDOWN = 50;
+    private static final int EFFIGY_PROGRESS = 80;
+    private static final int BLOOD_SAMPLE_INITIAL_PROGRESS = 40;
+    private static final int INFUSER_SOUND_INTERVAL = 65;
+    private static final int CRAFTCOUNT_WIND_DOWN_MAX = 50;
+    private static final int INSTABILITY_EFFECT_CHANCE = 200;
+    private static final int INSTABILITY_CRAFT_CHANCE = 500;
+    private static final int INSTABILITY_INCREASE_CHANCE_BASE = 100;
+    private static final int MAX_INSTABILITY = 25;
+
+    // Healing amounts
+    private static final float STRONG_HEAL_AMOUNT = 8.0f;
+    private static final float WEAK_HEAL_AMOUNT = 4.0f;
+
+    // Essentia costs
+    private static final int EFFIGY_ESSENTIA_AMOUNT = 8;
+    private static final int BLOOD_SAMPLE_LIFE_COST = 4;
+    private static final int VIS_DRAIN_AMOUNT = 100;
+
+    // Instability damage divisor
+    private static final float INSTABILITY_DAMAGE_DIVISOR = 10.0f;
+
+    // Pedestal search radius
+    private static final int PEDESTAL_SEARCH_HORIZONTAL = 12;
+    private static final int PEDESTAL_SEARCH_Y_DOWN = 5;
+    private static final int PEDESTAL_SEARCH_Y_UP = 10;
+    private static final int PEDESTAL_SYMMETRY_RANGE = 8;
+
+    // Self-infusion slots
+    private static final int SELF_INFUSION_SLOTS = 12;
+    private static final float SELF_INFUSION_INITIAL_HEALTH = 20.0f;
+
+    // Particle count for infuser effects
+    private static final int INFUSER_PARTICLE_COUNT = 25;
+
     public int mode;
     AspectList myEssentia;
     AspectList essentiaDemanded;
@@ -86,7 +125,6 @@ public class TileVat extends TileThaumcraft implements IAspectContainer, IEssent
     public ItemStack nutrients;
     public int progress;
     private EntityLivingBase entityContained;
-    public final int CLONE_TIME = 800;
     public int[] selfInfusions;
     public float selfInfusionHealth;
     private final ArrayList<ChunkCoordinates> pedestals;
@@ -105,7 +143,6 @@ public class TileVat extends TileThaumcraft implements IAspectContainer, IEssent
     public int count;
     public int craftCount;
     public float startUp;
-    private final int countDelay;
     ArrayList<ItemStack> ingredients;
     public HashMap<String, SourceFX> sourceFX;
     private NBTTagCompound entityNBTObj = null;
@@ -119,8 +156,8 @@ public class TileVat extends TileThaumcraft implements IAspectContainer, IEssent
         this.sample = null;
         this.nutrients = null;
         this.entityContained = null;
-        this.selfInfusions = new int[12];
-        this.selfInfusionHealth = 20.0f;
+        this.selfInfusions = new int[SELF_INFUSION_SLOTS];
+        this.selfInfusionHealth = SELF_INFUSION_INITIAL_HEALTH;
         this.pedestals = new ArrayList<>();
         this.dangerCount = 0;
         this.checkSurroundings = true;
@@ -136,7 +173,6 @@ public class TileVat extends TileThaumcraft implements IAspectContainer, IEssent
         this.itemCount = 0;
         this.count = 0;
         this.craftCount = 0;
-        this.countDelay = 10;
         this.ingredients = new ArrayList<>();
         this.sourceFX = new HashMap<>();
     }
@@ -196,7 +232,7 @@ public class TileVat extends TileThaumcraft implements IAspectContainer, IEssent
                             this.mode = 0;
                             this.markDirty();
                             this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord);
-                            this.selfInfusions = new int[12];
+                            this.selfInfusions = new int[SELF_INFUSION_SLOTS];
                             --possibleJar.stackSize;
                         }
                     } else {
@@ -273,22 +309,22 @@ public class TileVat extends TileThaumcraft implements IAspectContainer, IEssent
                 if (this.getEntityContained().getHealth() < this.getEntityContained().getMaxHealth()) {
                     if (this.getEntityContained().getCreatureAttribute() != EnumCreatureAttribute.UNDEAD) {
                         if (this.myEssentia.getAmount(Aspect.HEAL) > 0 && this.progress <= 0) {
-                            this.getEntityContained().heal(8.0f);
+                            this.getEntityContained().heal(STRONG_HEAL_AMOUNT);
                             this.myEssentia.remove(Aspect.HEAL, 1);
                             this.markDirty();
                             this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord);
-                            this.progress += 40;
+                            this.progress += HEAL_ASPECT_COOLDOWN;
                         }
                         if (this.getEntityContained().getHealth() < this.getEntityContained().getMaxHealth()
                                 && this.essentiaDemanded.getAmount(Aspect.HEAL) < 1) {
                             this.essentiaDemanded.add(Aspect.HEAL, 1);
                         }
                         if (this.myEssentia.getAmount(Aspect.LIFE) > 0 && this.progress <= 0) {
-                            this.getEntityContained().heal(4.0f);
+                            this.getEntityContained().heal(WEAK_HEAL_AMOUNT);
                             this.myEssentia.remove(Aspect.LIFE, 1);
                             this.markDirty();
                             this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord);
-                            this.progress += 50;
+                            this.progress += LIFE_ASPECT_COOLDOWN;
                         }
                         if (this.getEntityContained().getHealth() < this.getEntityContained().getMaxHealth()
                                 && this.essentiaDemanded.getAmount(Aspect.LIFE) < 1) {
@@ -296,22 +332,22 @@ public class TileVat extends TileThaumcraft implements IAspectContainer, IEssent
                         }
                     } else {
                         if (this.myEssentia.getAmount(Aspect.UNDEAD) > 0 && this.progress <= 0) {
-                            this.getEntityContained().heal(8.0f);
+                            this.getEntityContained().heal(STRONG_HEAL_AMOUNT);
                             this.myEssentia.remove(Aspect.UNDEAD, 1);
                             this.markDirty();
                             this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord);
-                            this.progress += 40;
+                            this.progress += HEAL_ASPECT_COOLDOWN;
                         }
                         if (this.getEntityContained().getHealth() < this.getEntityContained().getMaxHealth()
                                 && this.essentiaDemanded.getAmount(Aspect.UNDEAD) < 1) {
                             this.essentiaDemanded.add(Aspect.UNDEAD, 1);
                         }
                         if (this.myEssentia.getAmount(Aspect.DEATH) > 0 && this.progress <= 0) {
-                            this.getEntityContained().heal(4.0f);
+                            this.getEntityContained().heal(WEAK_HEAL_AMOUNT);
                             this.myEssentia.remove(Aspect.DEATH, 1);
                             this.markDirty();
                             this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord);
-                            this.progress += 50;
+                            this.progress += LIFE_ASPECT_COOLDOWN;
                         }
                         if (this.getEntityContained().getHealth() < this.getEntityContained().getMaxHealth()
                                 && this.essentiaDemanded.getAmount(Aspect.DEATH) < 1) {
@@ -355,13 +391,14 @@ public class TileVat extends TileThaumcraft implements IAspectContainer, IEssent
                 }
             } else if (this.sample != null && this.sample.getItem() == ThaumicHorizons.itemCorpseEffigy) {
                 this.mode = 3;
-                this.essentiaDemanded = new AspectList().add(Aspect.LIFE, 8).add(Aspect.HEAL, 8);
-                this.progress = 80;
+                this.essentiaDemanded = new AspectList().add(Aspect.LIFE, EFFIGY_ESSENTIA_AMOUNT)
+                        .add(Aspect.HEAL, EFFIGY_ESSENTIA_AMOUNT);
+                this.progress = EFFIGY_PROGRESS;
                 this.markDirty();
                 this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord);
             } else if (this.sample != null && this.nutrients != null) {
                 this.mode = 1;
-                this.essentiaDemanded = new AspectList().add(Aspect.LIFE, 4);
+                this.essentiaDemanded = new AspectList().add(Aspect.LIFE, BLOOD_SAMPLE_LIFE_COST);
                 if (this.sample.getItem() == ThaumicHorizons.itemSyringeBloodSample && this.sample.hasTagCompound()
                         && this.sample.stackTagCompound.getCompoundTag("critter") != null
                         && this.sample.stackTagCompound.getCompoundTag("critter").getCompoundTag("ForgeData") != null) {
@@ -378,7 +415,7 @@ public class TileVat extends TileThaumcraft implements IAspectContainer, IEssent
                         }
                     }
                 }
-                this.progress = 40;
+                this.progress = BLOOD_SAMPLE_INITIAL_PROGRESS;
                 this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord);
                 this.markDirty();
             }
@@ -415,7 +452,7 @@ public class TileVat extends TileThaumcraft implements IAspectContainer, IEssent
                 if (this.nutrients.stackSize <= 0) {
                     this.nutrients = null;
                 }
-                this.progress = 800;
+                this.progress = CLONE_PROGRESS;
                 this.essentiaDemanded = new AspectList();
                 this.myEssentia = new AspectList();
                 if (this.getEntityContained() == null) {
@@ -437,7 +474,7 @@ public class TileVat extends TileThaumcraft implements IAspectContainer, IEssent
             if (this.checkSurroundings) {
                 this.checkSurroundings = false;
                 this.getSurroundings();
-            } else if (this.count % this.countDelay == 0) {
+            } else if (this.count % COUNT_DELAY == 0) {
                 this.craftCycle();
                 this.markDirty();
             }
@@ -463,7 +500,7 @@ public class TileVat extends TileThaumcraft implements IAspectContainer, IEssent
                 Thaumcraft.proxy.blockSparkle(this.worldObj, this.xCoord, this.yCoord - 2, this.zCoord, 16720418, 20);
                 Thaumcraft.proxy.blockSparkle(this.worldObj, this.xCoord, this.yCoord - 1, this.zCoord, 16720418, 20);
                 this.mode = 4;
-                this.selfInfusionHealth = 20.0f;
+                this.selfInfusionHealth = SELF_INFUSION_INITIAL_HEALTH;
                 this.sample = null;
                 this.essentiaDemanded = new AspectList();
                 this.myEssentia = new AspectList();
@@ -673,78 +710,75 @@ public class TileVat extends TileThaumcraft implements IAspectContainer, IEssent
     private void getSurroundings() {
         final ArrayList<ChunkCoordinates> stuff = new ArrayList<>();
         this.pedestals.clear();
-        try {
-            for (int xx = -12; xx <= 12; ++xx) {
-                for (int zz = -12; zz <= 12; ++zz) {
-                    boolean skip = false;
-                    for (int yy = -5; yy <= 10; ++yy) {
-                        if (xx != 0 || zz != 0) {
-                            final int x = this.xCoord + xx;
-                            final int y = this.yCoord - yy;
-                            final int z = this.zCoord + zz;
-                            final TileEntity te = this.worldObj.getTileEntity(x, y, z);
-                            if (!skip && yy > 0
-                                    && Math.abs(xx) <= 8
-                                    && Math.abs(zz) <= 8
-                                    && te instanceof TilePedestal) {
-                                this.pedestals.add(new ChunkCoordinates(x, y, z));
-                                skip = true;
-                            } else {
-                                final Block bi = this.worldObj.getBlock(x, y, z);
-                                if (bi == Blocks.skull
-                                        || (bi instanceof IInfusionStabiliser && ((IInfusionStabiliser) bi)
-                                                .canStabaliseInfusion(this.getWorldObj(), x, y, z))) {
-                                    stuff.add(new ChunkCoordinates(x, y, z));
-                                }
+        for (int xx = -PEDESTAL_SEARCH_HORIZONTAL; xx <= PEDESTAL_SEARCH_HORIZONTAL; ++xx) {
+            for (int zz = -PEDESTAL_SEARCH_HORIZONTAL; zz <= PEDESTAL_SEARCH_HORIZONTAL; ++zz) {
+                boolean skip = false;
+                for (int yy = -PEDESTAL_SEARCH_Y_DOWN; yy <= PEDESTAL_SEARCH_Y_UP; ++yy) {
+                    if (xx != 0 || zz != 0) {
+                        final int x = this.xCoord + xx;
+                        final int y = this.yCoord - yy;
+                        final int z = this.zCoord + zz;
+                        final TileEntity te = this.worldObj.getTileEntity(x, y, z);
+                        if (!skip && yy > 0
+                                && Math.abs(xx) <= PEDESTAL_SYMMETRY_RANGE
+                                && Math.abs(zz) <= PEDESTAL_SYMMETRY_RANGE
+                                && te instanceof TilePedestal) {
+                            this.pedestals.add(new ChunkCoordinates(x, y, z));
+                            skip = true;
+                        } else {
+                            final Block bi = this.worldObj.getBlock(x, y, z);
+                            if (bi == Blocks.skull || (bi instanceof IInfusionStabiliser
+                                    && ((IInfusionStabiliser) bi).canStabaliseInfusion(this.getWorldObj(), x, y, z))) {
+                                stuff.add(new ChunkCoordinates(x, y, z));
                             }
                         }
                     }
                 }
             }
-            this.symmetry = 0;
-            for (final ChunkCoordinates cc : this.pedestals) {
-                boolean items = false;
-                final int x2 = this.xCoord - cc.posX;
-                final int z2 = this.zCoord - cc.posZ;
-                TileEntity te2 = this.worldObj.getTileEntity(cc.posX, cc.posY, cc.posZ);
-                if (te2 instanceof TilePedestal) {
-                    this.symmetry += 2;
-                    if (((TilePedestal) te2).getStackInSlot(0) != null) {
-                        ++this.symmetry;
-                        items = true;
-                    }
-                }
-                final int xx2 = this.xCoord + x2;
-                final int zz2 = this.zCoord + z2;
-                te2 = this.worldObj.getTileEntity(xx2, cc.posY, zz2);
-                if (te2 instanceof TilePedestal) {
-                    this.symmetry -= 2;
-                    if (((TilePedestal) te2).getStackInSlot(0) == null || !items) {
-                        continue;
-                    }
-                    --this.symmetry;
+        }
+        this.symmetry = 0;
+        for (final ChunkCoordinates cc : this.pedestals) {
+            boolean items = false;
+            final int x2 = this.xCoord - cc.posX;
+            final int z2 = this.zCoord - cc.posZ;
+            TileEntity te2 = this.worldObj.getTileEntity(cc.posX, cc.posY, cc.posZ);
+            if (te2 instanceof TilePedestal) {
+                this.symmetry += 2;
+                if (((TilePedestal) te2).getStackInSlot(0) != null) {
+                    ++this.symmetry;
+                    items = true;
                 }
             }
-            float sym = 0.0f;
-            for (final ChunkCoordinates cc2 : stuff) {
-                final boolean items2 = false;
-                final int x = this.xCoord - cc2.posX;
-                final int z3 = this.zCoord - cc2.posZ;
-                Block bi2 = this.worldObj.getBlock(cc2.posX, cc2.posY, cc2.posZ);
-                if (bi2 == Blocks.skull || (bi2 instanceof IInfusionStabiliser && ((IInfusionStabiliser) bi2)
-                        .canStabaliseInfusion(this.getWorldObj(), cc2.posX, cc2.posY, cc2.posZ))) {
-                    sym += 0.1f;
-                }
-                final int xx3 = this.xCoord + x;
-                final int zz3 = this.zCoord + z3;
-                bi2 = this.worldObj.getBlock(xx3, cc2.posY, zz3);
-                if (bi2 == Blocks.skull || (bi2 instanceof IInfusionStabiliser && ((IInfusionStabiliser) bi2)
-                        .canStabaliseInfusion(this.getWorldObj(), cc2.posX, cc2.posY, cc2.posZ))) {
-                    sym -= 0.2f;
+            final int xx2 = this.xCoord + x2;
+            final int zz2 = this.zCoord + z2;
+            te2 = this.worldObj.getTileEntity(xx2, cc.posY, zz2);
+            if (te2 instanceof TilePedestal) {
+                this.symmetry -= 2;
+                if (((TilePedestal) te2).getStackInSlot(0) == null || !items) {
+                    continue;
                 }
+                --this.symmetry;
             }
-            this.symmetry += (int) sym;
-        } catch (Exception ignored) {}
+        }
+        float sym = 0.0f;
+        for (final ChunkCoordinates cc2 : stuff) {
+            final boolean items2 = false;
+            final int x = this.xCoord - cc2.posX;
+            final int z3 = this.zCoord - cc2.posZ;
+            Block bi2 = this.worldObj.getBlock(cc2.posX, cc2.posY, cc2.posZ);
+            if (bi2 == Blocks.skull || (bi2 instanceof IInfusionStabiliser && ((IInfusionStabiliser) bi2)
+                    .canStabaliseInfusion(this.getWorldObj(), cc2.posX, cc2.posY, cc2.posZ))) {
+                sym += 0.1f;
+            }
+            final int xx3 = this.xCoord + x;
+            final int zz3 = this.zCoord + z3;
+            bi2 = this.worldObj.getBlock(xx3, cc2.posY, zz3);
+            if (bi2 == Blocks.skull || (bi2 instanceof IInfusionStabiliser && ((IInfusionStabiliser) bi2)
+                    .canStabaliseInfusion(this.getWorldObj(), cc2.posX, cc2.posY, cc2.posZ))) {
+                sym -= 0.2f;
+            }
+        }
+        this.symmetry += (int) sym;
     }
 
     private void doEffects() {
@@ -752,7 +786,7 @@ public class TileVat extends TileThaumcraft implements IAspectContainer, IEssent
             if (this.craftCount == 0) {
                 this.worldObj
                         .playSound(this.xCoord, this.yCoord, this.zCoord, "thaumcraft:infuserstart", 0.5f, 1.0f, false);
-            } else if (this.craftCount % 65 == 0) {
+            } else if (this.craftCount % INFUSER_SOUND_INTERVAL == 0) {
                 this.worldObj.playSound(this.xCoord, this.yCoord, this.zCoord, "thaumcraft:infuser", 0.5f, 1.0f, false);
             }
             ++this.craftCount;
@@ -764,15 +798,15 @@ public class TileVat extends TileThaumcraft implements IAspectContainer, IEssent
                     0.5f + this.worldObj.rand.nextFloat() * 0.2f,
                     0.1f,
                     0.7f + this.worldObj.rand.nextFloat() * 0.3f,
-                    25,
+                    INFUSER_PARTICLE_COUNT,
                     -0.03f);
         } else if (this.craftCount > 0) {
             this.craftCount -= 2;
             if (this.craftCount < 0) {
                 this.craftCount = 0;
             }
-            if (this.craftCount > 50) {
-                this.craftCount = 50;
+            if (this.craftCount > CRAFTCOUNT_WIND_DOWN_MAX) {
+                this.craftCount = CRAFTCOUNT_WIND_DOWN_MAX;
             }
         }
         if (this.mode == 2 && this.startUp != 1.0f) {
@@ -858,7 +892,8 @@ public class TileVat extends TileThaumcraft implements IAspectContainer, IEssent
                 this.sourceFX.put(fxk, fx);
             }
         }
-        if (this.mode == 2 && this.instability > 0 && this.worldObj.rand.nextInt(200) <= this.instability) {
+        if (this.mode == 2 && this.instability > 0
+                && this.worldObj.rand.nextInt(INSTABILITY_EFFECT_CHANCE) <= this.instability) {
             Thaumcraft.proxy.nodeBolt(
                     this.worldObj,
                     this.xCoord + 0.5f,
@@ -871,7 +906,7 @@ public class TileVat extends TileThaumcraft implements IAspectContainer, IEssent
     }
 
     public void craftCycle() {
-        if (this.instability > 0 && this.worldObj.rand.nextInt(500) <= this.instability) {
+        if (this.instability > 0 && this.worldObj.rand.nextInt(INSTABILITY_CRAFT_CHANCE) <= this.instability) {
             switch (this.worldObj.rand.nextInt(21)) {
                 case 0, 2, 10, 13 -> {
                     this.inEvEjectItem(0);
@@ -920,24 +955,40 @@ public class TileVat extends TileThaumcraft implements IAspectContainer, IEssent
         if (this.instability > 0 && this.entityContained != null) {
             float visDrawn = 999.0f;
             if (!this.worldObj.isRemote) {
-                float temp = VisNetHandler
-                        .drainVis(this.worldObj, this.xCoord, this.yCoord + 1, this.zCoord, Aspect.EARTH, 100);
+                float temp = VisNetHandler.drainVis(
+                        this.worldObj,
+                        this.xCoord,
+                        this.yCoord + 1,
+                        this.zCoord,
+                        Aspect.EARTH,
+                        VIS_DRAIN_AMOUNT);
                 if (temp < visDrawn) {
                     visDrawn = temp;
                 }
-                temp = VisNetHandler
-                        .drainVis(this.worldObj, this.xCoord, this.yCoord + 1, this.zCoord, Aspect.WATER, 100);
+                temp = VisNetHandler.drainVis(
+                        this.worldObj,
+                        this.xCoord,
+                        this.yCoord + 1,
+                        this.zCoord,
+                        Aspect.WATER,
+                        VIS_DRAIN_AMOUNT);
                 if (temp < visDrawn) {
                     visDrawn = temp;
                 }
-                temp = VisNetHandler
-                        .drainVis(this.worldObj, this.xCoord, this.yCoord + 1, this.zCoord, Aspect.ORDER, 100);
+                temp = VisNetHandler.drainVis(
+                        this.worldObj,
+                        this.xCoord,
+                        this.yCoord + 1,
+                        this.zCoord,
+                        Aspect.ORDER,
+                        VIS_DRAIN_AMOUNT);
                 if (temp < visDrawn) {
                     visDrawn = temp;
                 }
             }
-            this.getEntityContained()
-                    .setHealth(this.getEntityContained().getHealth() - this.instability / 10.0f / (5.0f + visDrawn));
+            this.getEntityContained().setHealth(
+                    this.getEntityContained().getHealth()
+                            - this.instability / INSTABILITY_DAMAGE_DIVISOR / (5.0f + visDrawn));
             this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord);
             if (this.getEntityContained().getHealth() <= 0.0f) {
                 this.killSubject();
@@ -946,23 +997,38 @@ public class TileVat extends TileThaumcraft implements IAspectContainer, IEssent
         } else if (this.instability > 0) {
             float visDrawn = 999.0f;
             if (!this.worldObj.isRemote) {
-                float temp = VisNetHandler
-                        .drainVis(this.worldObj, this.xCoord, this.yCoord + 1, this.zCoord, Aspect.EARTH, 100);
+                float temp = VisNetHandler.drainVis(
+                        this.worldObj,
+                        this.xCoord,
+                        this.yCoord + 1,
+                        this.zCoord,
+                        Aspect.EARTH,
+                        VIS_DRAIN_AMOUNT);
                 if (temp < visDrawn) {
                     visDrawn = temp;
                 }
-                temp = VisNetHandler
-                        .drainVis(this.worldObj, this.xCoord, this.yCoord + 1, this.zCoord, Aspect.WATER, 100);
+                temp = VisNetHandler.drainVis(
+                        this.worldObj,
+                        this.xCoord,
+                        this.yCoord + 1,
+                        this.zCoord,
+                        Aspect.WATER,
+                        VIS_DRAIN_AMOUNT);
                 if (temp < visDrawn) {
                     visDrawn = temp;
                 }
-                temp = VisNetHandler
-                        .drainVis(this.worldObj, this.xCoord, this.yCoord + 1, this.zCoord, Aspect.ORDER, 100);
+                temp = VisNetHandler.drainVis(
+                        this.worldObj,
+                        this.xCoord,
+                        this.yCoord + 1,
+                        this.zCoord,
+                        Aspect.ORDER,
+                        VIS_DRAIN_AMOUNT);
                 if (temp < visDrawn) {
                     visDrawn = temp;
                 }
             }
-            this.selfInfusionHealth -= this.instability / 10.0f / (5.0f + visDrawn);
+            this.selfInfusionHealth -= this.instability / INSTABILITY_DAMAGE_DIVISOR / (5.0f + visDrawn);
             this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord);
             if (this.selfInfusionHealth <= 0.0f) {
                 this.killSubject();
@@ -982,11 +1048,12 @@ public class TileVat extends TileThaumcraft implements IAspectContainer, IEssent
                         this.markDirty();
                         return;
                     }
-                    if (this.worldObj.rand.nextInt(100 - this.recipeInstability * 3) == 0) {
+                    if (this.worldObj.rand.nextInt(INSTABILITY_INCREASE_CHANCE_BASE - this.recipeInstability * 3)
+                            == 0) {
                         ++this.instability;
                     }
-                    if (this.instability > 25) {
-                        this.instability = 25;
+                    if (this.instability > MAX_INSTABILITY) {
+                        this.instability = MAX_INSTABILITY;
                     }
                     this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord);
                     this.markDirty();
@@ -1354,7 +1421,7 @@ public class TileVat extends TileThaumcraft implements IAspectContainer, IEssent
         this.nutrients = ItemStack.loadItemStackFromNBT(nbttagcompound.getCompoundTag("nutrients"));
         this.selfInfusions = nbttagcompound.getIntArray("selfInfusions");
         if (this.selfInfusions.length == 0) {
-            this.selfInfusions = new int[12];
+            this.selfInfusions = new int[SELF_INFUSION_SLOTS];
         }
         this.selfInfusionHealth = nbttagcompound.getFloat("selfInfusionHealth");
     }
@@ -1515,7 +1582,7 @@ public class TileVat extends TileThaumcraft implements IAspectContainer, IEssent
                 }
             }
         }
-        this.selfInfusions = new int[12];
+        this.selfInfusions = new int[SELF_INFUSION_SLOTS];
         this.setEntityContained(null);
         this.mode = 0;
         this.currentlySucking = null;

src/main/java/com/kentington/thaumichorizons/common/tiles/TileVortex.java

@@ -18,6 +18,8 @@ import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
+import net.minecraft.network.NetworkManager;
+import net.minecraft.network.play.server.S35PacketUpdateTileEntity;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.util.AxisAlignedBB;
 import net.minecraft.util.DamageSource;
@@ -49,7 +51,7 @@ import thaumcraft.common.items.wands.ItemWandCasting;
 
 public class TileVortex extends TileThaumcraft implements IWandable, IAspectContainer {
 
-    final int MAX_COUNT = 2400;
+    private static final int MAX_COUNT = 2400;
     public int count;
     public int beams;
     public int dimensionID;
@@ -63,6 +65,9 @@ public class TileVortex extends TileThaumcraft implements IWandable, IAspectCont
     public ArrayList<ItemStack> items;
     Thread ppThread;
     private boolean soundStarted = false;
+    // true once the first S35 description packet has been received on the client
+    public boolean clientSynced = false;
+    private int lastSyncedBeams = -1;
 
     public TileVortex() {
         this.aspects = new AspectList();
@@ -78,6 +83,13 @@ public class TileVortex extends TileThaumcraft implements IWandable, IAspectCont
     public void updateEntity() {
         super.updateEntity();
 
+        // Send one packet per tick when beams changes, so same-tick re/deHungrify
+        // pairs don't produce two packets with an intermediate wrong value.
+        if (!this.worldObj.isRemote && this.beams != this.lastSyncedBeams) {
+            this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord);
+            this.lastSyncedBeams = this.beams;
+        }
+
         if (this.worldObj != null && this.worldObj.isRemote && !soundStarted) {
             ThaumicHorizons.proxy.playVortexSound(this);
             soundStarted = true;
@@ -149,7 +161,7 @@ public class TileVortex extends TileThaumcraft implements IWandable, IAspectCont
                     this.handlePocketPlaneStuff();
                 }
                 if (!this.cheat) {
-                    this.count += 6 - this.beams;
+                    this.count += Math.max(0, 6 - this.beams);
                 }
                 if (this.count > MAX_COUNT && !this.cheat
                         && this.worldObj.provider.dimensionId != ThaumicHorizons.dimensionPocketId) {
@@ -175,7 +187,7 @@ public class TileVortex extends TileThaumcraft implements IWandable, IAspectCont
                                 if (player.timeUntilPortal > 0) {
                                     player.timeUntilPortal = 10;
                                 } else if (player.dimension != ThaumicHorizons.dimensionPocketId) {
-                                    player.timeUntilPortal = 10;
+                                    player.timeUntilPortal = 200;
                                     player.mcServer.getConfigurationManager().transferPlayerToDimension(
                                             player,
                                             ThaumicHorizons.dimensionPocketId,
@@ -183,7 +195,7 @@ public class TileVortex extends TileThaumcraft implements IWandable, IAspectCont
                                                     mServer.worldServerForDimension(ThaumicHorizons.dimensionPocketId),
                                                     this.dimensionID));
                                 } else {
-                                    player.timeUntilPortal = 10;
+                                    player.timeUntilPortal = 200;
                                     player.mcServer.getConfigurationManager().transferPlayerToDimension(
                                             player,
                                             this.returnID,
@@ -238,14 +250,15 @@ public class TileVortex extends TileThaumcraft implements IWandable, IAspectCont
                 } else
             if (item.getEntityItem().getItem() == ThaumicHorizons.itemCrystalWand) {
                 final ItemStack theWand = new ItemStack(ThaumicHorizons.itemWandCastingDisposable);
-                ((ItemWandCasting) theWand.getItem()).setRod(theWand, ThaumicHorizons.ROD_CRYSTAL);
-                ((ItemWandCasting) theWand.getItem()).setCap(theWand, ThaumicHorizons.CAP_CRYSTAL);
-                ((ItemWandCasting) theWand.getItem()).storeVis(theWand, Aspect.EARTH, 25000);
-                ((ItemWandCasting) theWand.getItem()).storeVis(theWand, Aspect.AIR, 25000);
-                ((ItemWandCasting) theWand.getItem()).storeVis(theWand, Aspect.FIRE, 25000);
-                ((ItemWandCasting) theWand.getItem()).storeVis(theWand, Aspect.WATER, 25000);
-                ((ItemWandCasting) theWand.getItem()).storeVis(theWand, Aspect.ORDER, 25000);
-                ((ItemWandCasting) theWand.getItem()).storeVis(theWand, Aspect.ENTROPY, 25000);
+                final ItemWandCasting wand = (ItemWandCasting) theWand.getItem();
+                wand.setRod(theWand, ThaumicHorizons.ROD_CRYSTAL);
+                wand.setCap(theWand, ThaumicHorizons.CAP_CRYSTAL);
+                wand.storeVis(theWand, Aspect.EARTH, 25000);
+                wand.storeVis(theWand, Aspect.AIR, 25000);
+                wand.storeVis(theWand, Aspect.FIRE, 25000);
+                wand.storeVis(theWand, Aspect.WATER, 25000);
+                wand.storeVis(theWand, Aspect.ORDER, 25000);
+                wand.storeVis(theWand, Aspect.ENTROPY, 25000);
                 this.items.add(theWand);
                 item.setDead();
             } else
@@ -321,7 +334,7 @@ public class TileVortex extends TileThaumcraft implements IWandable, IAspectCont
                             this.xCoord,
                             this.yCoord,
                             this.zCoord,
-                            this.returnID))).run();
+                            this.returnID))).start();
         }
         this.markDirty();
     }
@@ -375,24 +388,25 @@ public class TileVortex extends TileThaumcraft implements IWandable, IAspectCont
                             }
                         }
                     }
-                    final double var3 = (this.xCoord + 0.5 - eo.posX) / 15.0;
-                    final double var4 = (this.yCoord + 0.5 - eo.posY) / 15.0;
-                    final double var5 = (this.zCoord + 0.5 - eo.posZ) / 15.0;
-                    final double var6 = Math.sqrt(var3 * var3 + var4 * var4 + var5 * var5);
-                    double var7 = 1.0 - var6;
+                    final double dx = (this.xCoord + 0.5 - eo.posX) / 15.0;
+                    final double dy = (this.yCoord + 0.5 - eo.posY) / 15.0;
+                    final double dz = (this.zCoord + 0.5 - eo.posZ) / 15.0;
+                    final double dist = Math.sqrt(dx * dx + dy * dy + dz * dz);
+                    double var7 = 1.0 - dist;
                     final double modifier = 2.0 - this.beams / 3.0;
                     if (var7 <= 0.0) {
                         continue;
                     }
                     var7 *= var7;
-                    eo.motionX += var3 / var6 * var7 * 0.15 * modifier;
-                    eo.motionY += var4 / var6 * var7 * 0.25 * modifier;
-                    eo.motionZ += var5 / var6 * var7 * 0.15 * modifier;
+                    eo.motionX += dx / dist * var7 * 0.15 * modifier;
+                    eo.motionY += dy / dist * var7 * 0.25 * modifier;
+                    eo.motionZ += dz / dist * var7 * 0.15 * modifier;
                 }
             }
         }
         for (int i = 0; i < 3; ++i) {
-            if (!this.worldObj.isRemote && (this.beams <= 0 || this.worldObj.rand.nextInt(this.beams) == 0)) {
+            if (!this.worldObj.isRemote
+                    && (this.beams <= 0 || this.worldObj.rand.nextInt(Math.max(1, this.beams)) == 0)) {
                 int tx2 = this.xCoord + this.worldObj.rand.nextInt(16) - this.worldObj.rand.nextInt(16);
                 int ty2 = this.yCoord + this.worldObj.rand.nextInt(16) - this.worldObj.rand.nextInt(16);
                 int tz2 = this.zCoord + this.worldObj.rand.nextInt(16) - this.worldObj.rand.nextInt(16);
@@ -579,6 +593,19 @@ public class TileVortex extends TileThaumcraft implements IWandable, IAspectCont
         return 0;
     }
 
+    @Override
+    public net.minecraft.network.Packet getDescriptionPacket() {
+        NBTTagCompound nbt = new NBTTagCompound();
+        this.writeCustomNBT(nbt);
+        return new S35PacketUpdateTileEntity(xCoord, yCoord, zCoord, 1, nbt);
+    }
+
+    @Override
+    public void onDataPacket(NetworkManager net, S35PacketUpdateTileEntity pkt) {
+        this.readCustomNBT(pkt.func_148857_g());
+        this.clientSynced = true;
+    }
+
     @Override
     public void invalidate() {
         super.invalidate();

src/main/java/com/kentington/thaumichorizons/common/tiles/TileVortexStabilizer.java

@@ -39,7 +39,7 @@ public class TileVortexStabilizer extends TileThaumcraft implements IWandable {
     public boolean redstoned;
     public ForgeDirection dir;
     public Object theBeam;
-    public Entity[] sonicFX;
+    private Entity[] sonicFX;
 
     public TileVortexStabilizer() {
         this.xTarget = Integer.MAX_VALUE;
@@ -86,20 +86,20 @@ public class TileVortexStabilizer extends TileThaumcraft implements IWandable {
                     if (this.hasTarget) {
                         this.reHungrifyTarget();
                         this.hasTarget = false;
-                    } else if (!this.hasTarget
-                            && this.worldObj.getTileEntity(mop.blockX, mop.blockY, mop.blockZ) instanceof INode) {
-                                this.hasTarget = true;
-                                this.target = this.worldObj.getTileEntity(mop.blockX, mop.blockY, mop.blockZ);
-                                this.prevType = ((INode) this.worldObj
-                                        .getTileEntity(mop.blockX, mop.blockY, mop.blockZ)).getNodeType().ordinal();
-                                this.deHungrifyTarget();
-                            } else
-                        if (!this.hasTarget && this.worldObj
-                                .getTileEntity(mop.blockX, mop.blockY, mop.blockZ) instanceof TileVortex) {
-                                    this.hasTarget = true;
-                                    this.target = this.worldObj.getTileEntity(mop.blockX, mop.blockY, mop.blockZ);
-                                    this.deHungrifyTarget();
-                                }
+                    }
+                    // Separate if (not else if) so a new valid target is acquired in the same tick,
+                    // preventing a window where beams is decremented but not yet restored.
+                    final TileEntity newTE = this.worldObj.getTileEntity(mop.blockX, mop.blockY, mop.blockZ);
+                    if (newTE instanceof INode) {
+                        this.hasTarget = true;
+                        this.target = newTE;
+                        this.prevType = ((INode) newTE).getNodeType().ordinal();
+                        this.deHungrifyTarget();
+                    } else if (newTE instanceof TileVortex) {
+                        this.hasTarget = true;
+                        this.target = newTE;
+                        this.deHungrifyTarget();
+                    }
                     this.xTarget = mop.blockX;
                     this.yTarget = mop.blockY;
                     this.zTarget = mop.blockZ;
@@ -166,25 +166,46 @@ public class TileVortexStabilizer extends TileThaumcraft implements IWandable {
 
     public void reHungrifyTarget() {
         if (this.target instanceof INode) {
-            ((INode) this.target).setNodeType(NodeType.values()[this.prevType]);
-        } else if (this.target instanceof final TileVortex tileVortex) {
-            --tileVortex.beams;
+            if (!isNodeTargetedByOtherStabilizer()) {
+                ((INode) this.target).setNodeType(NodeType.values()[this.prevType]);
+            }
+        } else if (this.target instanceof TileVortex) {
+            --((TileVortex) this.target).beams;
         }
         if (this.target != null) {
             this.target.markDirty();
-            this.worldObj.markBlockForUpdate(this.target.xCoord, this.target.yCoord, this.target.zCoord);
         }
     }
 
+    private boolean isNodeTargetedByOtherStabilizer() {
+        // A stabilizer can only reach a node from up to 10 blocks away in one of 6 directions,
+        // so check those 60 positions instead of scanning all loaded tile entities.
+        int tx = this.target.xCoord;
+        int ty = this.target.yCoord;
+        int tz = this.target.zCoord;
+        for (ForgeDirection d : ForgeDirection.VALID_DIRECTIONS) {
+            for (int dist = 1; dist <= 10; dist++) {
+                TileEntity te = this.worldObj
+                        .getTileEntity(tx - d.offsetX * dist, ty - d.offsetY * dist, tz - d.offsetZ * dist);
+                if (te instanceof TileVortexStabilizer && te != this) {
+                    TileVortexStabilizer other = (TileVortexStabilizer) te;
+                    if (other.hasTarget && other.target == this.target) {
+                        return true;
+                    }
+                }
+            }
+        }
+        return false;
+    }
+
     void deHungrifyTarget() {
         if (this.target instanceof INode) {
             ((INode) this.target).setNodeType(NodeType.NORMAL);
-        } else if (this.target instanceof final TileVortex tileVortex) {
-            ++tileVortex.beams;
+        } else if (this.target instanceof TileVortex) {
+            ++((TileVortex) this.target).beams;
         }
         if (this.target != null) {
             this.target.markDirty();
-            this.worldObj.markBlockForUpdate(this.target.xCoord, this.target.yCoord, this.target.zCoord);
         }
     }
 

src/main/resources/assets/thaumichorizons/lang/en_US.lang

@@ -296,7 +296,7 @@ healingVatContainment=     §nContainment Focus Unlocked§r<IMG>thaumichorizons:
 tc.research_name.infusionVat=Creature Infusion
 tc.research_text.infusionVat=Harder, faster, stronger
 infusionVat1=To infuse a living creature would be an unprecedented feat: thaumaturgic texts are filled with cautionary tales of grotesque deformities as the creature's body rejects the foreign magic. Your curative vats may finally allow this procedure to succeed by suspending the organism's vital functions while the infusion is applied.<BR>You must first install a modified runic matrix atop the vat. This is more difficult than it sounds, as attempting to infuse a runic matrix produces considerable magical feedback between the two matrices. The prudent thaumaturge would ensure that her altar is well-prepared.
-infusionVat2=Once the infusion vat has been set up, its operation is almost identical to the standard infusion altar, although essentia must be piped in directly.<BR>The process is somewhat riskier than infusing inanimate matter, however. In addition to the usual effects, accumulated instability will damage the subject. Worse, the process cannot be aborted; it will end in either success or death.<BR>Less hardy creatures may not survive complex infusions without outside help. Your experiments have shown that providing a combination of §3Aqua§0, §7Ordo§0, and §2Terra§0 centivis can slow the rate of injury.
+infusionVat2=Once the infusion vat has been set up, its operation is almost identical to that of the standard infusion altar, although essentia must be piped in directly.<BR>The process is somewhat riskier than infusing inanimate matter, however. In addition to the usual effects, accumulated instability will damage the subject. Worse, the process cannot be aborted; it will end in either success or death.<BR>Less hardy creatures may not survive complex infusions without outside help. Your experiments have shown that providing a combination of §3Aqua§0, §7Ordo§0, and §2Terra§0 centivis can slow the rate of injury.
 infusionVat3=The infusion vat has a few limitations. Chief among them is the fact that humans (and other sentient beings) cannot be infused, as the human soul actively interferes with the addition of magical energy. Likewise, creatures of an already magical nature such as undead and golems will not be affected.<BR>Also, while a given creature can have any number of general infusions, it may possess only one species-specific infusion.<BR>Unfortunately, infused creatures do not pass on their infusions to offspring.
 infusionVatClone=      §nIncarnation Unlocked§r<BR>Your incarnation procedure can clone infused creatures. This requires additional essentia; you will need to supply the sum of every aspect from each infusion that the creature was subjected to.<BR>Curiously, the blood sample provides such a complete pattern for the developing organism that no instability is generated and no physical objects are required, making cloning a very efficient way of propagating your creations.
 tc.research_name.generalInfusion=General Infusions
@@ -483,15 +483,15 @@ tc.research_text.chameleonSkin=Now you see me...
 chameleonSkin1=Whether sneaking into a rival's laboratory or taking notes on the life cycle of the eldritch crab, there are times when you'd like to remain unobserved. Perhaps you can come up with a more permanent solution than chugging invisibility potions?<BR>The §5Chameleon Skin§0 infusion implants magical pigments and microscopic eyes into your skin, reflexively altering its color to match objects on the opposite side. The effect is much like constant invisibility, including its inability to hide armor.<BR>This effect can be toggled using the X key.
 tc.research_name.tumorOops=Eldritch Apotheosis
 tc.research_text.tumorOops=All is the Pattern
-tumorOops1=You believed you had mastered your world and everything upon it. You fool.<BR>It is finally clear. The Eldritch are not beings in the ordinary sense, not crude things of meat and blood and bone like yourself. They are a pattern written in the stars, in the currents and eddies of magic, encoded deep in the structure of life itself.<BR>But the Pattern is fragmented, sundered and spread throughout the cosmos by some primordial catacylsm which can only be guessed at. It has sought to reassemble itself since the dawn of time, and now you have played your role in its life cycle.
-tumorOops2=All of your studies, your creations, your journeys have served the Pattern. Learning the laws of magic invited it into your mind. Crafting forbidden artifacts allowed it to replicate itself into physical matter. And once you survived the trials of the Outer Lands, the Pattern judged you to have accumulated enough of itself.<BR>Enough to craft into a greater being. The next stage of its life cycle.<BR>But you still live. Perhaps it is not too late. Perhaps you can understand more of the Pattern- perhaps you can still stop it-<BR>Or incubate more. So many more.
+tumorOops1=You believed you had mastered your world and everything upon it. You fool.<BR>It is finally clear. The Eldritch are not beings in the ordinary sense, not crude things of meat and blood and bone like yourself. They are a pattern written in the stars, in the currents and eddies of magic, encoded deep in the structure of life itself.<BR>But the Pattern is fragmented, sundered and spread throughout the cosmos by some primordial cataclysm which can only be guessed at. It has sought to reassemble itself since the dawn of time, and now you have played your role in its life cycle.
+tumorOops2=All of your studies, your creations, your journeys have served the Pattern. Learning the laws of magic invited it into your mind. Crafting forbidden artifacts allowed it to replicate itself into physical matter. And once you survived the trials of the Outer Lands, the Pattern judged you to have accumulated enough of itself.<BR>Enough to craft into a greater being. The next stage of its life cycle.<BR>But you still live. Perhaps it is not too late. Perhaps you can understand more of the Pattern - perhaps you can still stop it-<BR>Or incubate more. So many more.
 tc.research_name.construction=Arcane Construction
 tc.research_text.construction=Don't tell the golems' union
 construction1=TODO
 tc.research_name.planarTheory=Planar Theory
 tc.research_text.planarTheory=Deeper and deeper
 planarTheory1=The cosmos is vaster and more varied than you could have imagined, but certain patterns are starting to emerge. Most importantly, you finally understand what lies between the planes.<BR>It is not a void in the traditional sense, for even the emptiest places are subject to the laws of space and time. Rather, the interplanar substance could be described as frozen possibility - infinite potential with nothing to act upon. Only when it leaks through an aura node in the form of vis, into a world with established natural law, can this potential be actualized.<BR>Such is the root of all magic.
-planarTheory2=Of course, understanding this from an academic perspective is very different from being able to put it into practice. So far, all of your attempts to develop synthetic aura nodes have met with failure. Something is still missing...<BR>One offshoot of this research may warrant further study, however. By shattering an ender pearl, filling the resulting tesseract with ethereal essence, and encasing the structure in voidmetal you have created a remarkably stable device capable of manipulating rips in spacetime.<BR>Perhaps you will find some use for it.
+planarTheory2=Of course, understanding this from an academic perspective is very different from being able to put it into practice. So far, all of your attempts to develop synthetic aura nodes have met with failure. Something is still missing...<BR>One offshoot of this research may warrant further study, however. By shattering an ender pearl, filling the resulting tesseract with ethereal essence, and encasing the structure in voidmetal, you have created a remarkably stable device capable of manipulating rips in spacetime.<BR>Perhaps you will find some use for it.
 tc.research_name.transductionAmplifier=Transduction Amplifier
 tc.research_text.transductionAmplifier=Full power!
 transductionAmplifier1=Without outside interference, an aura node accumulates vis in short spurts as its dimensional breach fluctuates in size. Your node transducers can hold a node open at its largest natural diameter, but actually expanding the breach was not possible until recent advances in planar theory.<BR>You have developed a device which creates spatial turbulence, allowing microscopic rips to merge with an existing energized node. Attaching a transduction amplifier to one's side and applying a redstone signal can increase its centivis output as though the original node had ten additional vis per aspect.
@@ -515,7 +515,7 @@ planarRift2=This is unfortunate - an extremely high-vis node might have containe
 planarRift3=And what then? Passing matter into the void would immerse it in a sea of endless vis, without grinding it down to its base aspects like an ordinary hungry node. Who can imagine what staggering works of thaumaturgy could be accomplished with this resource at hand?<BR>You imagine there will be severe limitations - most materials will still not survive immersion - but you already understand the basic nature of the process. By right-clicking a rift with your wand, you can tug on ethereal currents and retrieve any surviving objects.<BR>It is now time to determine what can be crafted in this manner...
 tc.research_name.wispSpawn=Wisp Propagation
 tc.research_text.wispSpawn=Kicking the hornet's nest
-wispSpawn1=Casting a pile of salis mundus into a stabilized rift has a curious result: the salt grains absorb enough vis to resonate with one another and clump together into a quasi-living being.<BR>These artificially generated wisps are almost identical to the ones which naturally grow in magical environs. Note that the wisps' aspects will depend on which aspects were present in the parent node.<BR>The number of wisps generated is highly variable, and an incautious thamaturge can find himself quickly overwhelmed.
+wispSpawn1=Casting a pile of salis mundus into a stabilized rift has a curious result: the salt grains absorb enough vis to resonate with one another and clump together into a quasi-living being.<BR>These artificially generated wisps are almost identical to the ones which naturally grow in magical environs. Note that the wisps' aspects will depend on which aspects were present in the parent node.<BR>The number of wisps generated is highly variable, and an incautious thaumaturge can find himself quickly overwhelmed.
 tc.research_name.crystalWand=Crystalline Wand
 tc.research_text.crystalWand=Disposable magic
 crystalWand1=All advanced wands incorporate shards into their design, but only for the purpose of amplifying another material's ability to store vis. On their own, shards are wholly incapable of absorbing additional magic and so cannot drain an aura node - but what if you were to take them straight to the source?<BR>By constructing a wandlike arrangement of crystals and passing it into the void, you have created a curious device - a wand with tremendous vis capacity but no ability to ever recharge itself. Perhaps it could be used to craft objects unattainable with traditional wands.