OreCruncher · PaintNinja · Apr 11, 2022
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,18 @@
+> ### DynamicSurroundings-1.16.5-4.0.5.1
+**Requirements**
+* JAVA 8 w/Forge 1.16.5-36.2.26+
+* 100% client side; no server side deployment needed
+* Cloth Config API (Forge) is optional
+
+**What's New**
+* Update to 1.16.5-36.2.26+ baseline
+  * This is the minimum Forge version needed to work with Java 8u321+
+
+**Fixes**
+* Removed all usages of `@OnlyIn` to help avoid potential issues in the future.
+  * It's an internal annotation used by the Forge installer and dev environment. It has no effect in production, leading to issues where it might sometimes work as intended when testing in development but fail with the built jar in production. Therefore its usage is not recommended in order to avoid hard to reproduce issues like this.
+* Gradle build using the default Java version and possibly causing incorrect builds depending on the version
+
 > ### DynamicSurroundings-1.16.5-4.0.5.0
 **Requirements**
 * JAVA 8 w/Forge 1.16.5-36.2.0+

diff --git a/build.gradle b/build.gradle
@@ -63,8 +63,9 @@ repositories {
     mavenLocal()
 }
 
-sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
-println('Java: ' + System.getProperty('java.version') + ' JVM: ' + System.getProperty('java.vm.version') + '(' + System.getProperty('java.vendor') + ') Arch: ' + System.getProperty('os.arch'))
+// Mojang ships Java 8 to end users in 1.16.5, so your mod should target Java 8.
+java.toolchain.languageVersion = JavaLanguageVersion.of(8)
+println "Java: ${System.getProperty 'java.version'}, JVM: ${System.getProperty 'java.vm.version'} (${System.getProperty 'java.vendor'}), Arch: ${System.getProperty 'os.arch'}"
 
 minecraft {
     mappings channel: 'snapshot', version: snapshot

diff --git a/configuration.gradle b/configuration.gradle
@@ -3,7 +3,7 @@
 def mcVersion    	= '1.16.5'
 def modVersion   	= '4.0.5.0'
 def modDesignator	= ''
-def forgeVersion 	= '36.2.0'
+def forgeVersion 	= '36.2.26'
 def snapshot     	= '20201028-1.16.3'
 
 // General Mod version stuff

diff --git a/gradle.properties b/gradle.properties
@@ -4,7 +4,7 @@ org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 # Base Forge info
 minecraft_version=1.16.5
-forge_version=36.2.0
+forge_version=36.2.26
 snapshot=20201028-1.16.3
 # Mod Properties
 mod_id=dsurround

diff --git a/src/main/java/org/orecruncher/dsurround/config/ConfigMenuBuilder.java b/src/main/java/org/orecruncher/dsurround/config/ConfigMenuBuilder.java
@@ -25,14 +25,11 @@
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.text.TextFormatting;
 import net.minecraft.util.text.TranslationTextComponent;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 import org.orecruncher.dsurround.huds.lightlevel.LightLevelHUD;
 import org.orecruncher.lib.config.ClothAPIFactory;
 
 import javax.annotation.Nonnull;
 
-@OnlyIn(Dist.CLIENT)
 public class ConfigMenuBuilder extends ClothAPIFactory {
 
     public ConfigMenuBuilder() {

diff --git a/src/main/java/org/orecruncher/environs/config/ConfigGenerator.java b/src/main/java/org/orecruncher/environs/config/ConfigGenerator.java
@@ -22,14 +22,11 @@
 import me.shedaniel.clothconfig2.forge.api.ConfigEntryBuilder;
 import me.shedaniel.clothconfig2.forge.impl.builders.*;
 import net.minecraft.util.text.TextFormatting;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 import org.orecruncher.environs.effects.particles.RippleStyle;
 import org.orecruncher.lib.config.ClothAPIFactory;
 
 import javax.annotation.Nonnull;
 
-@OnlyIn(Dist.CLIENT)
 public class ConfigGenerator {
 
     @Nonnull

diff --git a/src/main/java/org/orecruncher/environs/effects/BlockEffect.java b/src/main/java/org/orecruncher/environs/effects/BlockEffect.java
@@ -22,16 +22,13 @@
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IBlockReader;
 import net.minecraft.world.IWorldReader;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 import org.apache.commons.lang3.StringUtils;
 import org.orecruncher.environs.handlers.scripts.ConditionEvaluator;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import java.util.Random;
 
-@OnlyIn(Dist.CLIENT)
 public abstract class BlockEffect {
 
     private int chance;

diff --git a/src/main/java/org/orecruncher/environs/effects/BlockEffectType.java b/src/main/java/org/orecruncher/environs/effects/BlockEffectType.java
@@ -19,8 +19,6 @@
 package org.orecruncher.environs.effects;
 
 import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 import org.orecruncher.environs.config.Config;
 
 import javax.annotation.Nonnull;
@@ -32,7 +30,6 @@
 /**
  * Describes the various types of block effects that can be generated.
  */
-@OnlyIn(Dist.CLIENT)
 public enum BlockEffectType {
 
     UNKNOWN("UNKNOWN", ignored -> null, () -> false),

diff --git a/src/main/java/org/orecruncher/environs/effects/BubbleJetEffect.java b/src/main/java/org/orecruncher/environs/effects/BubbleJetEffect.java
@@ -22,15 +22,12 @@
 import net.minecraft.block.material.Material;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IBlockReader;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 import org.orecruncher.environs.effects.emitters.BubbleJet;
 import org.orecruncher.environs.effects.emitters.Jet;
 
 import javax.annotation.Nonnull;
 import java.util.Random;
 
-@OnlyIn(Dist.CLIENT)
 public class BubbleJetEffect extends JetEffect {
 
     public BubbleJetEffect(final int chance) {

diff --git a/src/main/java/org/orecruncher/environs/effects/DustJetEffect.java b/src/main/java/org/orecruncher/environs/effects/DustJetEffect.java
@@ -21,16 +21,13 @@
 import net.minecraft.block.BlockState;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IBlockReader;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 import org.orecruncher.environs.effects.emitters.DustJet;
 import org.orecruncher.environs.effects.emitters.Jet;
 import org.orecruncher.lib.WorldUtils;
 
 import javax.annotation.Nonnull;
 import java.util.Random;
 
-@OnlyIn(Dist.CLIENT)
 public class DustJetEffect extends JetEffect {
 
     public DustJetEffect(final int chance) {

diff --git a/src/main/java/org/orecruncher/environs/effects/FireFlyEffect.java b/src/main/java/org/orecruncher/environs/effects/FireFlyEffect.java
@@ -22,14 +22,11 @@
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IBlockReader;
 import net.minecraft.world.IWorldReader;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 import org.orecruncher.environs.effects.particles.Collections;
 
 import javax.annotation.Nonnull;
 import java.util.Random;
 
-@OnlyIn(Dist.CLIENT)
 public class FireFlyEffect extends BlockEffect {
 
     public FireFlyEffect(final int chance) {

diff --git a/src/main/java/org/orecruncher/environs/effects/FireJetEffect.java b/src/main/java/org/orecruncher/environs/effects/FireJetEffect.java
@@ -22,16 +22,13 @@
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.shapes.VoxelShape;
 import net.minecraft.world.IBlockReader;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 import org.orecruncher.environs.effects.emitters.FireJet;
 import org.orecruncher.environs.effects.emitters.Jet;
 import org.orecruncher.lib.WorldUtils;
 
 import javax.annotation.Nonnull;
 import java.util.Random;
 
-@OnlyIn(Dist.CLIENT)
 public class FireJetEffect extends JetEffect {
 
     public FireJetEffect(final int chance) {

diff --git a/src/main/java/org/orecruncher/environs/effects/FountainJetEffect.java b/src/main/java/org/orecruncher/environs/effects/FountainJetEffect.java
@@ -21,16 +21,13 @@
 import net.minecraft.block.BlockState;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IBlockReader;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 import org.orecruncher.environs.effects.emitters.FountainJet;
 import org.orecruncher.environs.effects.emitters.Jet;
 import org.orecruncher.lib.WorldUtils;
 
 import javax.annotation.Nonnull;
 import java.util.Random;
 
-@OnlyIn(Dist.CLIENT)
 public class FountainJetEffect extends JetEffect {
 
     public FountainJetEffect(final int chance) {

diff --git a/src/main/java/org/orecruncher/environs/effects/JetEffect.java b/src/main/java/org/orecruncher/environs/effects/JetEffect.java
@@ -24,8 +24,6 @@
 import net.minecraft.tags.FluidTags;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IBlockReader;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 import org.orecruncher.environs.effects.emitters.Jet;
 import org.orecruncher.environs.handlers.ParticleSystems;
 import org.orecruncher.environs.handlers.scripts.ConditionEvaluator;
@@ -35,7 +33,6 @@
 import java.util.Random;
 import java.util.function.Predicate;
 
-@OnlyIn(Dist.CLIENT)
 public abstract class JetEffect extends BlockEffect {
 
     public static final int MAX_STRENGTH = 10;

diff --git a/src/main/java/org/orecruncher/environs/effects/SteamJetEffect.java b/src/main/java/org/orecruncher/environs/effects/SteamJetEffect.java
@@ -22,16 +22,13 @@
 import net.minecraft.fluid.FluidState;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IBlockReader;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 import org.orecruncher.environs.effects.emitters.Jet;
 import org.orecruncher.environs.effects.emitters.SteamJet;
 import org.orecruncher.lib.WorldUtils;
 
 import javax.annotation.Nonnull;
 import java.util.Random;
 
-@OnlyIn(Dist.CLIENT)
 public class SteamJetEffect extends JetEffect {
 
     public SteamJetEffect(final int chance) {

diff --git a/src/main/java/org/orecruncher/environs/effects/WaterfallSplashEffect.java b/src/main/java/org/orecruncher/environs/effects/WaterfallSplashEffect.java
@@ -26,8 +26,6 @@
 import net.minecraft.fluid.FlowingFluid;
 import net.minecraft.fluid.FluidState;
 import net.minecraft.world.IBlockReader;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 import org.orecruncher.environs.effects.emitters.Jet;
 import org.orecruncher.environs.effects.emitters.WaterSplashJet;
 import org.orecruncher.lib.WorldUtils;
@@ -36,7 +34,6 @@
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.vector.Vector3i;
 
-@OnlyIn(Dist.CLIENT)
 public class WaterfallSplashEffect extends JetEffect {
 
 	private final static Vector3i[] cardinal_offsets = {

diff --git a/src/main/java/org/orecruncher/environs/effects/emitters/BubbleJet.java b/src/main/java/org/orecruncher/environs/effects/emitters/BubbleJet.java
@@ -20,11 +20,8 @@
 
 import net.minecraft.particles.ParticleTypes;
 import net.minecraft.world.IBlockReader;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 import org.orecruncher.lib.GameUtils;
 
-@OnlyIn(Dist.CLIENT)
 public class BubbleJet extends Jet {
 
 	public BubbleJet(final int strength, final IBlockReader world, final double x, final double y, final double z) {

diff --git a/src/main/java/org/orecruncher/environs/effects/emitters/DustJet.java b/src/main/java/org/orecruncher/environs/effects/emitters/DustJet.java
@@ -21,13 +21,10 @@
 
 import net.minecraft.block.BlockState;
 import net.minecraft.world.IBlockReader;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraft.client.particle.Particle;
 import org.orecruncher.environs.effects.particles.DustParticle;
 import org.orecruncher.lib.GameUtils;
 
-@OnlyIn(Dist.CLIENT)
 public class DustJet extends Jet {
 
 	protected final BlockState blockState;

diff --git a/src/main/java/org/orecruncher/environs/effects/emitters/FireJet.java b/src/main/java/org/orecruncher/environs/effects/emitters/FireJet.java
@@ -24,14 +24,11 @@
 import net.minecraft.particles.ParticleTypes;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.IBlockReader;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 
 import net.minecraft.client.particle.Particle;
 import org.orecruncher.lib.GameUtils;
 import org.orecruncher.sndctrl.api.acoustics.Library;
 
-@OnlyIn(Dist.CLIENT)
 public class FireJet extends Jet {
 
 	private static final ResourceLocation FIRE_ACOUSTIC = new ResourceLocation("block.fire.ambient");

diff --git a/src/main/java/org/orecruncher/environs/effects/emitters/FountainJet.java b/src/main/java/org/orecruncher/environs/effects/emitters/FountainJet.java
@@ -20,14 +20,11 @@
 
 import net.minecraft.block.BlockState;
 import net.minecraft.world.IBlockReader;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 
 import net.minecraft.client.particle.Particle;
 import net.minecraft.world.World;
 import org.orecruncher.environs.effects.particles.DustParticle;
 
-@OnlyIn(Dist.CLIENT)
 public class FountainJet extends Jet {
 
 	protected final BlockState state;

diff --git a/src/main/java/org/orecruncher/environs/effects/emitters/Jet.java b/src/main/java/org/orecruncher/environs/effects/emitters/Jet.java
@@ -19,15 +19,12 @@
 package org.orecruncher.environs.effects.emitters;
 
 import net.minecraft.world.IBlockReader;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 
 /*
  * Base for particle entities that are long lived and generate
  * other particles as a jet.  This entity does not render - just
  * serves as a particle factory.
  */
-@OnlyIn(Dist.CLIENT)
 public abstract class Jet extends ParticleEmitter {
 
 	protected final int jetStrength;

diff --git a/src/main/java/org/orecruncher/environs/effects/emitters/ParticleEmitter.java b/src/main/java/org/orecruncher/environs/effects/emitters/ParticleEmitter.java
@@ -24,15 +24,12 @@
 import javax.annotation.Nonnull;
 
 import net.minecraft.world.IBlockReader;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 import org.orecruncher.lib.GameUtils;
 import org.orecruncher.lib.random.XorShiftRandom;
 
 import net.minecraft.client.particle.Particle;
 import net.minecraft.util.math.BlockPos;
 
-@OnlyIn(Dist.CLIENT)
 public abstract class ParticleEmitter {
 
 	protected static final Random RANDOM = XorShiftRandom.current();

diff --git a/src/main/java/org/orecruncher/environs/effects/emitters/SteamJet.java b/src/main/java/org/orecruncher/environs/effects/emitters/SteamJet.java
@@ -21,13 +21,10 @@
 import net.minecraft.block.BlockState;
 import net.minecraft.client.particle.Particle;
 import net.minecraft.world.IBlockReader;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 import org.orecruncher.environs.effects.SteamJetEffect;
 import org.orecruncher.environs.effects.particles.SteamCloudParticle;
 import org.orecruncher.lib.GameUtils;
 
-@OnlyIn(Dist.CLIENT)
 public class SteamJet extends Jet {
 
     private final BlockState source;

diff --git a/src/main/java/org/orecruncher/environs/effects/emitters/WaterSplashJet.java b/src/main/java/org/orecruncher/environs/effects/emitters/WaterSplashJet.java
@@ -21,8 +21,6 @@
 import net.minecraft.client.settings.ParticleStatus;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.IBlockReader;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 import org.orecruncher.environs.Environs;
 import org.orecruncher.environs.config.Config;
 import org.orecruncher.environs.effects.JetEffect;
@@ -43,7 +41,6 @@
 
 import java.util.Arrays;
 
-@OnlyIn(Dist.CLIENT)
 public class WaterSplashJet extends Jet {
 
 	private static final ResourceLocation[] waterfallAcoustics = new ResourceLocation[JetEffect.MAX_STRENGTH + 1];

diff --git a/src/main/java/org/orecruncher/environs/effects/particles/DustParticle.java b/src/main/java/org/orecruncher/environs/effects/particles/DustParticle.java
@@ -21,14 +21,11 @@
 import net.minecraft.block.BlockState;
 import net.minecraft.client.particle.DiggingParticle;
 import net.minecraft.client.world.ClientWorld;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 import org.orecruncher.lib.WorldUtils;
 
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
-@OnlyIn(Dist.CLIENT)
 public class DustParticle extends DiggingParticle {
 
 	private final BlockPos.Mutable pos = new BlockPos.Mutable();

diff --git a/src/main/java/org/orecruncher/environs/effects/particles/MoteFireFly.java b/src/main/java/org/orecruncher/environs/effects/particles/MoteFireFly.java
@@ -23,15 +23,12 @@
 import net.minecraft.client.renderer.BufferBuilder;
 import net.minecraft.particles.ParticleTypes;
 import net.minecraft.world.IBlockReader;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 import org.orecruncher.lib.GameUtils;
 import org.orecruncher.lib.gui.ColorPalette;
 import org.orecruncher.lib.particles.AnimatedMote;
 
 import javax.annotation.Nonnull;
 
-@OnlyIn(Dist.CLIENT)
 public class MoteFireFly extends AnimatedMote {
 
     private static final float XZ_MOTION_DELTA = 0.2F;