diff --git a/CHANGELOG.md b/CHANGELOG.md index 8963e0c2..dd7a7681 100644 --- 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 index 3c6781cb..265b1e2b 100644 --- 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 index 5aec9c0e..44fe48ff 100644 --- 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 index a4ff3285..6754bd1c 100644 --- 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 index de8ece19..8eed6088 100644 --- 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 index bd0fd5e7..d1be77ac 100644 --- 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 index 4dfc3460..aa77435e 100644 --- a/src/main/java/org/orecruncher/environs/effects/BlockEffect.java +++ b/src/main/java/org/orecruncher/environs/effects/BlockEffect.java @@ -22,8 +22,6 @@ 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; @@ -31,7 +29,6 @@ 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 index 0004173b..d8b6bfa7 100644 --- 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 index 435d784e..6fa3448f 100644 --- 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 index 77e58612..79e015d2 100644 --- a/src/main/java/org/orecruncher/environs/effects/DustJetEffect.java +++ b/src/main/java/org/orecruncher/environs/effects/DustJetEffect.java @@ -21,8 +21,6 @@ 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; @@ -30,7 +28,6 @@ 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 index da58772d..e1e1ff6c 100644 --- 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 index 6612784b..38f4037c 100644 --- a/src/main/java/org/orecruncher/environs/effects/FireJetEffect.java +++ b/src/main/java/org/orecruncher/environs/effects/FireJetEffect.java @@ -22,8 +22,6 @@ 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; @@ -31,7 +29,6 @@ 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 index 76639002..a931c312 100644 --- a/src/main/java/org/orecruncher/environs/effects/FountainJetEffect.java +++ b/src/main/java/org/orecruncher/environs/effects/FountainJetEffect.java @@ -21,8 +21,6 @@ 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; @@ -30,7 +28,6 @@ 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 index e7e04bce..c947b57b 100644 --- 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 index 27b67e3d..6e44d78e 100644 --- a/src/main/java/org/orecruncher/environs/effects/SteamJetEffect.java +++ b/src/main/java/org/orecruncher/environs/effects/SteamJetEffect.java @@ -22,8 +22,6 @@ 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; @@ -31,7 +29,6 @@ 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 index 344b1af2..a35630eb 100644 --- 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 index a37a4023..649a26b2 100644 --- 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 index 9f62b416..d64f1836 100644 --- 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 index 6acec42e..5dfb60de 100644 --- 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 index 70d0f5d5..fcee3e22 100644 --- 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 index f163e715..fe8ef83b 100644 --- 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 index 629fee01..368ba506 100644 --- 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 index 68075656..bd133c2d 100644 --- 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 index 3bcfcfc0..c06bbba5 100644 --- 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 index 1da54246..57609f46 100644 --- 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 index b17f9389..b598acf1 100644 --- 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; diff --git a/src/main/java/org/orecruncher/environs/effects/particles/MoteRainSplash.java b/src/main/java/org/orecruncher/environs/effects/particles/MoteRainSplash.java index f52ef23d..84098214 100644 --- a/src/main/java/org/orecruncher/environs/effects/particles/MoteRainSplash.java +++ b/src/main/java/org/orecruncher/environs/effects/particles/MoteRainSplash.java @@ -20,10 +20,7 @@ import net.minecraft.util.math.MathHelper; import net.minecraft.world.IBlockReader; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -@OnlyIn(Dist.CLIENT) public class MoteRainSplash extends MoteWaterSpray { public MoteRainSplash(final IBlockReader world, final double x, final double y, final double z) { diff --git a/src/main/java/org/orecruncher/environs/effects/particles/MoteWaterRipple.java b/src/main/java/org/orecruncher/environs/effects/particles/MoteWaterRipple.java index 66e4b92f..4b408afe 100644 --- a/src/main/java/org/orecruncher/environs/effects/particles/MoteWaterRipple.java +++ b/src/main/java/org/orecruncher/environs/effects/particles/MoteWaterRipple.java @@ -21,8 +21,6 @@ import com.mojang.blaze3d.vertex.IVertexBuilder; import net.minecraft.client.renderer.ActiveRenderInfo; import net.minecraft.world.IBlockReader; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.environs.config.Config; import org.orecruncher.lib.biomes.BiomeUtilities; @@ -31,7 +29,6 @@ import javax.annotation.Nonnull; -@OnlyIn(Dist.CLIENT) public class MoteWaterRipple extends AgeableMote { private static final float TEX_SIZE_HALF = 0.5F; diff --git a/src/main/java/org/orecruncher/environs/effects/particles/MoteWaterSpray.java b/src/main/java/org/orecruncher/environs/effects/particles/MoteWaterSpray.java index 1e965355..1328ef05 100644 --- a/src/main/java/org/orecruncher/environs/effects/particles/MoteWaterSpray.java +++ b/src/main/java/org/orecruncher/environs/effects/particles/MoteWaterSpray.java @@ -24,8 +24,6 @@ import net.minecraft.util.math.vector.Quaternion; import net.minecraft.util.math.vector.Vector3f; import net.minecraft.world.IBlockReader; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.lib.biomes.BiomeUtilities; import org.orecruncher.lib.gui.Color; @@ -37,7 +35,6 @@ import java.util.Random; // TODO: Should this be animated? Seems to overlap. -@OnlyIn(Dist.CLIENT) public class MoteWaterSpray extends MotionMote { protected static final Random RANDOM = XorShiftRandom.current(); diff --git a/src/main/java/org/orecruncher/environs/effects/particles/ParticleHooks.java b/src/main/java/org/orecruncher/environs/effects/particles/ParticleHooks.java index de2e89cc..75d13039 100644 --- a/src/main/java/org/orecruncher/environs/effects/particles/ParticleHooks.java +++ b/src/main/java/org/orecruncher/environs/effects/particles/ParticleHooks.java @@ -30,8 +30,6 @@ import net.minecraft.util.math.vector.Vector3d; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; -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; @@ -41,7 +39,6 @@ import javax.annotation.Nonnull; -@OnlyIn(Dist.CLIENT) public final class ParticleHooks { private static final ResourceLocation STEAM_HISS_ACOUSTIC = new ResourceLocation(Environs.MOD_ID, "steam.hiss"); diff --git a/src/main/java/org/orecruncher/environs/effects/particles/RippleStyle.java b/src/main/java/org/orecruncher/environs/effects/particles/RippleStyle.java index 9de3487b..0909182d 100644 --- a/src/main/java/org/orecruncher/environs/effects/particles/RippleStyle.java +++ b/src/main/java/org/orecruncher/environs/effects/particles/RippleStyle.java @@ -20,14 +20,11 @@ import javax.annotation.Nonnull; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.environs.Environs; import org.orecruncher.lib.random.XorShiftRandom; import net.minecraft.util.ResourceLocation; -@OnlyIn(Dist.CLIENT) public enum RippleStyle { CIRCLE("textures/particles/ripple.png"), diff --git a/src/main/java/org/orecruncher/environs/effects/particles/SteamCloudParticle.java b/src/main/java/org/orecruncher/environs/effects/particles/SteamCloudParticle.java index fc986c7a..40720fc7 100644 --- a/src/main/java/org/orecruncher/environs/effects/particles/SteamCloudParticle.java +++ b/src/main/java/org/orecruncher/environs/effects/particles/SteamCloudParticle.java @@ -25,15 +25,12 @@ import net.minecraft.particles.ParticleTypes; import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.lib.GameUtils; import org.orecruncher.lib.random.XorShiftRandom; import javax.annotation.Nonnull; import java.util.Random; -@OnlyIn(Dist.CLIENT) public class SteamCloudParticle extends SpriteTexturedParticle { private static final Random RANDOM = XorShiftRandom.current(); diff --git a/src/main/java/org/orecruncher/environs/fog/BedrockFogRangeCalculator.java b/src/main/java/org/orecruncher/environs/fog/BedrockFogRangeCalculator.java index 5b712ab2..e1e21ea4 100644 --- a/src/main/java/org/orecruncher/environs/fog/BedrockFogRangeCalculator.java +++ b/src/main/java/org/orecruncher/environs/fog/BedrockFogRangeCalculator.java @@ -20,8 +20,6 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.math.MathHelper; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.client.event.EntityViewRenderEvent; import org.orecruncher.environs.config.Config; import org.orecruncher.environs.handlers.CommonState; @@ -33,7 +31,6 @@ /** * Implements the void fog (the fog at bedrock) of older versions of Minecraft. */ -@OnlyIn(Dist.CLIENT) public class BedrockFogRangeCalculator extends VanillaFogRangeCalculator { protected final FogResult cached = new FogResult(); diff --git a/src/main/java/org/orecruncher/environs/fog/BiomeFogRangeCalculator.java b/src/main/java/org/orecruncher/environs/fog/BiomeFogRangeCalculator.java index b3d48edc..5682d9b7 100644 --- a/src/main/java/org/orecruncher/environs/fog/BiomeFogRangeCalculator.java +++ b/src/main/java/org/orecruncher/environs/fog/BiomeFogRangeCalculator.java @@ -23,8 +23,6 @@ import net.minecraft.util.math.vector.Vector3d; import net.minecraft.world.biome.Biome; import net.minecraft.world.biome.BiomeManager; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.client.event.EntityViewRenderEvent; import org.orecruncher.environs.config.Config; import org.orecruncher.environs.library.BiomeInfo; @@ -36,7 +34,6 @@ /** * Scans the biome area around the player to determine the fog parameters. */ -@OnlyIn(Dist.CLIENT) public class BiomeFogRangeCalculator extends VanillaFogRangeCalculator { protected final FogResult cached = new FogResult(); diff --git a/src/main/java/org/orecruncher/environs/fog/FixedFogRangeCalculator.java b/src/main/java/org/orecruncher/environs/fog/FixedFogRangeCalculator.java index bce0c415..5fc98733 100644 --- a/src/main/java/org/orecruncher/environs/fog/FixedFogRangeCalculator.java +++ b/src/main/java/org/orecruncher/environs/fog/FixedFogRangeCalculator.java @@ -18,13 +18,10 @@ package org.orecruncher.environs.fog; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.client.event.EntityViewRenderEvent; import javax.annotation.Nonnull; -@OnlyIn(Dist.CLIENT) public class FixedFogRangeCalculator extends VanillaFogRangeCalculator { protected final FogResult cached; diff --git a/src/main/java/org/orecruncher/environs/fog/FogResult.java b/src/main/java/org/orecruncher/environs/fog/FogResult.java index 43c7ae7e..5c06fca1 100644 --- a/src/main/java/org/orecruncher/environs/fog/FogResult.java +++ b/src/main/java/org/orecruncher/environs/fog/FogResult.java @@ -18,13 +18,10 @@ package org.orecruncher.environs.fog; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.client.event.EntityViewRenderEvent; import javax.annotation.Nonnull; -@OnlyIn(Dist.CLIENT) public final class FogResult { public static final float DEFAULT_PLANE_SCALE = 0.75F; diff --git a/src/main/java/org/orecruncher/environs/fog/HazeFogRangeCalculator.java b/src/main/java/org/orecruncher/environs/fog/HazeFogRangeCalculator.java index e2707a92..2b4af07f 100644 --- a/src/main/java/org/orecruncher/environs/fog/HazeFogRangeCalculator.java +++ b/src/main/java/org/orecruncher/environs/fog/HazeFogRangeCalculator.java @@ -19,8 +19,6 @@ package org.orecruncher.environs.fog; import net.minecraft.util.math.vector.Vector3d; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.client.event.EntityViewRenderEvent; import org.orecruncher.environs.config.Config; import org.orecruncher.environs.handlers.CommonState; @@ -33,7 +31,6 @@ * Calculates the fog ranges based on player elevation as compared to the * dimensions cloud height. */ -@OnlyIn(Dist.CLIENT) public class HazeFogRangeCalculator extends VanillaFogRangeCalculator { protected static final int BAND_OFFSETS = 15; diff --git a/src/main/java/org/orecruncher/environs/fog/HolisticFogRangeCalculator.java b/src/main/java/org/orecruncher/environs/fog/HolisticFogRangeCalculator.java index d9caef75..387410a4 100644 --- a/src/main/java/org/orecruncher/environs/fog/HolisticFogRangeCalculator.java +++ b/src/main/java/org/orecruncher/environs/fog/HolisticFogRangeCalculator.java @@ -18,8 +18,6 @@ package org.orecruncher.environs.fog; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.client.event.EntityViewRenderEvent; import org.orecruncher.environs.Environs; import org.orecruncher.environs.config.Config; @@ -32,7 +30,6 @@ * Consults various different fog calculators and aggregates the results into a * single set. */ -@OnlyIn(Dist.CLIENT) public class HolisticFogRangeCalculator implements IFogRangeCalculator { private static final IModLog LOGGER = Environs.LOGGER.createChild(HolisticFogRangeCalculator.class); diff --git a/src/main/java/org/orecruncher/environs/fog/IFogRangeCalculator.java b/src/main/java/org/orecruncher/environs/fog/IFogRangeCalculator.java index 6c2aec9e..3d27270b 100644 --- a/src/main/java/org/orecruncher/environs/fog/IFogRangeCalculator.java +++ b/src/main/java/org/orecruncher/environs/fog/IFogRangeCalculator.java @@ -18,13 +18,10 @@ package org.orecruncher.environs.fog; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.client.event.EntityViewRenderEvent; import javax.annotation.Nonnull; -@OnlyIn(Dist.CLIENT) public interface IFogRangeCalculator { /** diff --git a/src/main/java/org/orecruncher/environs/fog/MorningFogRangeCalculator.java b/src/main/java/org/orecruncher/environs/fog/MorningFogRangeCalculator.java index 26538c1f..e3e5f9eb 100644 --- a/src/main/java/org/orecruncher/environs/fog/MorningFogRangeCalculator.java +++ b/src/main/java/org/orecruncher/environs/fog/MorningFogRangeCalculator.java @@ -19,8 +19,6 @@ package org.orecruncher.environs.fog; import it.unimi.dsi.fastutil.objects.Reference2ReferenceOpenHashMap; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.client.event.EntityViewRenderEvent; import org.orecruncher.environs.config.Config; import org.orecruncher.environs.handlers.CommonState; @@ -32,7 +30,6 @@ import javax.annotation.Nonnull; import java.util.Map; -@OnlyIn(Dist.CLIENT) public class MorningFogRangeCalculator extends VanillaFogRangeCalculator { private static final float START = 0.630F; diff --git a/src/main/java/org/orecruncher/environs/fog/VanillaFogRangeCalculator.java b/src/main/java/org/orecruncher/environs/fog/VanillaFogRangeCalculator.java index ffdf565e..f5047916 100644 --- a/src/main/java/org/orecruncher/environs/fog/VanillaFogRangeCalculator.java +++ b/src/main/java/org/orecruncher/environs/fog/VanillaFogRangeCalculator.java @@ -18,8 +18,6 @@ package org.orecruncher.environs.fog; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.client.event.EntityViewRenderEvent; import javax.annotation.Nonnull; @@ -28,7 +26,6 @@ * Vanilla calculator that reflects whatever is in the event in terms of * start/end points for fog. */ -@OnlyIn(Dist.CLIENT) public class VanillaFogRangeCalculator implements IFogRangeCalculator { private final String name; diff --git a/src/main/java/org/orecruncher/environs/fog/WeatherFogRangeCalculator.java b/src/main/java/org/orecruncher/environs/fog/WeatherFogRangeCalculator.java index e1d7a0ee..a619dec5 100644 --- a/src/main/java/org/orecruncher/environs/fog/WeatherFogRangeCalculator.java +++ b/src/main/java/org/orecruncher/environs/fog/WeatherFogRangeCalculator.java @@ -18,8 +18,6 @@ package org.orecruncher.environs.fog; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.client.event.EntityViewRenderEvent; import org.orecruncher.environs.config.Config; import org.orecruncher.lib.GameUtils; @@ -31,7 +29,6 @@ * Calculates the fog ranges based on current weather. The stronger the * intensity of the storm the foggier it gets. */ -@OnlyIn(Dist.CLIENT) public class WeatherFogRangeCalculator extends VanillaFogRangeCalculator { protected static final float START_IMPACT = 0.9F; diff --git a/src/main/java/org/orecruncher/environs/handlers/AreaBlockEffects.java b/src/main/java/org/orecruncher/environs/handlers/AreaBlockEffects.java index 53a8a3e3..d57eaf56 100644 --- a/src/main/java/org/orecruncher/environs/handlers/AreaBlockEffects.java +++ b/src/main/java/org/orecruncher/environs/handlers/AreaBlockEffects.java @@ -19,8 +19,6 @@ package org.orecruncher.environs.handlers; import net.minecraft.entity.player.PlayerEntity; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.eventbus.api.SubscribeEvent; import org.orecruncher.environs.config.Config; import org.orecruncher.environs.scanner.*; @@ -30,7 +28,6 @@ import javax.annotation.Nonnull; -@OnlyIn(Dist.CLIENT) class AreaBlockEffects extends HandlerBase { protected final LoggingTimerEMA blockChange = new LoggingTimerEMA("Area Block Update"); diff --git a/src/main/java/org/orecruncher/environs/handlers/AuroraHandler.java b/src/main/java/org/orecruncher/environs/handlers/AuroraHandler.java index 67145ebf..0e9d1640 100644 --- a/src/main/java/org/orecruncher/environs/handlers/AuroraHandler.java +++ b/src/main/java/org/orecruncher/environs/handlers/AuroraHandler.java @@ -23,8 +23,6 @@ import com.mojang.blaze3d.matrix.MatrixStack; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.profiler.IProfiler; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.eventbus.api.SubscribeEvent; import org.orecruncher.environs.config.Config; import org.orecruncher.environs.Environs; @@ -38,7 +36,6 @@ import org.orecruncher.lib.math.LoggingTimerEMA; -@OnlyIn(Dist.CLIENT) public final class AuroraHandler extends HandlerBase { private static final IModLog LOGGER = Environs.LOGGER.createChild(AuroraHandler.class); diff --git a/src/main/java/org/orecruncher/environs/handlers/BackgroundAcousticEmitter.java b/src/main/java/org/orecruncher/environs/handlers/BackgroundAcousticEmitter.java index 52960686..7225dcf5 100644 --- a/src/main/java/org/orecruncher/environs/handlers/BackgroundAcousticEmitter.java +++ b/src/main/java/org/orecruncher/environs/handlers/BackgroundAcousticEmitter.java @@ -20,8 +20,6 @@ import javax.annotation.Nonnull; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.environs.Environs; import org.orecruncher.sndctrl.api.acoustics.IAcoustic; import org.orecruncher.sndctrl.api.acoustics.IAcousticFactory; @@ -35,7 +33,6 @@ * in the sound system even if the underlying sound system * cancels the sound. */ -@OnlyIn(Dist.CLIENT) public final class BackgroundAcousticEmitter { // Number of ticks to standoff requing a sound if for some reason it is replaced diff --git a/src/main/java/org/orecruncher/environs/handlers/BiomeSoundEffects.java b/src/main/java/org/orecruncher/environs/handlers/BiomeSoundEffects.java index 93c35f55..7db402f2 100644 --- a/src/main/java/org/orecruncher/environs/handlers/BiomeSoundEffects.java +++ b/src/main/java/org/orecruncher/environs/handlers/BiomeSoundEffects.java @@ -20,8 +20,6 @@ import it.unimi.dsi.fastutil.objects.*; import net.minecraft.entity.player.PlayerEntity; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.eventbus.api.EventPriority; import net.minecraftforge.eventbus.api.SubscribeEvent; import org.orecruncher.environs.config.Config; @@ -38,7 +36,6 @@ import javax.annotation.Nonnull; import java.util.Collection; -@OnlyIn(Dist.CLIENT) public class BiomeSoundEffects extends HandlerBase { public static final int SCAN_INTERVAL = 4; diff --git a/src/main/java/org/orecruncher/environs/handlers/CommonState.java b/src/main/java/org/orecruncher/environs/handlers/CommonState.java index 0aaef8b8..b7afa05e 100644 --- a/src/main/java/org/orecruncher/environs/handlers/CommonState.java +++ b/src/main/java/org/orecruncher/environs/handlers/CommonState.java @@ -21,8 +21,6 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.vector.Vector3d; 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.library.BiomeInfo; import org.orecruncher.environs.library.BiomeLibrary; @@ -30,7 +28,6 @@ import org.orecruncher.lib.*; import org.orecruncher.lib.seasons.Season; -@OnlyIn(Dist.CLIENT) public final class CommonState { private static CommonState instance = new CommonState(); diff --git a/src/main/java/org/orecruncher/environs/handlers/CommonStateHandler.java b/src/main/java/org/orecruncher/environs/handlers/CommonStateHandler.java index 956cf692..f01a1ba0 100644 --- a/src/main/java/org/orecruncher/environs/handlers/CommonStateHandler.java +++ b/src/main/java/org/orecruncher/environs/handlers/CommonStateHandler.java @@ -29,8 +29,6 @@ import net.minecraft.util.text.TextFormatting; import net.minecraft.world.LightType; import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.eventbus.api.EventPriority; import net.minecraftforge.eventbus.api.SubscribeEvent; import org.orecruncher.environs.Environs; @@ -50,7 +48,6 @@ import java.util.regex.Pattern; import java.util.stream.Collectors; -@OnlyIn(Dist.CLIENT) class CommonStateHandler extends HandlerBase { private static final double VILLAGE_RANGE = 64 * 64; diff --git a/src/main/java/org/orecruncher/environs/handlers/FogHandler.java b/src/main/java/org/orecruncher/environs/handlers/FogHandler.java index 110e0fda..0d3edc22 100644 --- a/src/main/java/org/orecruncher/environs/handlers/FogHandler.java +++ b/src/main/java/org/orecruncher/environs/handlers/FogHandler.java @@ -23,8 +23,6 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.fluid.FluidState; import net.minecraft.profiler.IProfiler; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.client.event.EntityViewRenderEvent; import net.minecraftforge.eventbus.api.EventPriority; import net.minecraftforge.eventbus.api.SubscribeEvent; @@ -36,7 +34,6 @@ import javax.annotation.Nonnull; -@OnlyIn(Dist.CLIENT) public class FogHandler extends HandlerBase { protected final LoggingTimerEMA render = new LoggingTimerEMA("Render Fog"); diff --git a/src/main/java/org/orecruncher/environs/handlers/HandlerBase.java b/src/main/java/org/orecruncher/environs/handlers/HandlerBase.java index b5c6673e..4abae957 100644 --- a/src/main/java/org/orecruncher/environs/handlers/HandlerBase.java +++ b/src/main/java/org/orecruncher/environs/handlers/HandlerBase.java @@ -20,8 +20,6 @@ import com.google.common.base.MoreObjects; import net.minecraft.entity.player.PlayerEntity; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.common.MinecraftForge; import org.orecruncher.lib.math.TimerEMA; import org.orecruncher.lib.random.XorShiftRandom; @@ -29,7 +27,6 @@ import javax.annotation.Nonnull; import java.util.Random; -@OnlyIn(Dist.CLIENT) public class HandlerBase { protected static final Random RANDOM = XorShiftRandom.current(); diff --git a/src/main/java/org/orecruncher/environs/handlers/ParticleSystems.java b/src/main/java/org/orecruncher/environs/handlers/ParticleSystems.java index fe8cd481..b54c8b0b 100644 --- a/src/main/java/org/orecruncher/environs/handlers/ParticleSystems.java +++ b/src/main/java/org/orecruncher/environs/handlers/ParticleSystems.java @@ -21,8 +21,6 @@ import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.math.BlockPos; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.environs.config.Config; import org.orecruncher.environs.effects.emitters.ParticleEmitter; import org.orecruncher.lib.BlockPosUtil; @@ -30,7 +28,6 @@ import javax.annotation.Nonnull; import java.util.function.Predicate; -@OnlyIn(Dist.CLIENT) public class ParticleSystems extends HandlerBase { private static final Predicate STANDARD = system -> { diff --git a/src/main/java/org/orecruncher/environs/handlers/scripts/ConditionEvaluator.java b/src/main/java/org/orecruncher/environs/handlers/scripts/ConditionEvaluator.java index 15584d26..e495b30e 100644 --- a/src/main/java/org/orecruncher/environs/handlers/scripts/ConditionEvaluator.java +++ b/src/main/java/org/orecruncher/environs/handlers/scripts/ConditionEvaluator.java @@ -19,15 +19,12 @@ package org.orecruncher.environs.handlers.scripts; import net.minecraft.util.StringUtils; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.lib.scripting.ExecutionContext; import org.orecruncher.lib.scripting.sets.*; import javax.annotation.Nonnull; import java.util.Optional; -@OnlyIn(Dist.CLIENT) public final class ConditionEvaluator { public static final ConditionEvaluator INSTANCE = new ConditionEvaluator(); diff --git a/src/main/java/org/orecruncher/environs/handlers/scripts/IStateVariables.java b/src/main/java/org/orecruncher/environs/handlers/scripts/IStateVariables.java index 231c65ba..53c7e6e7 100644 --- a/src/main/java/org/orecruncher/environs/handlers/scripts/IStateVariables.java +++ b/src/main/java/org/orecruncher/environs/handlers/scripts/IStateVariables.java @@ -18,10 +18,7 @@ package org.orecruncher.environs.handlers.scripts; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -@OnlyIn(Dist.CLIENT) public interface IStateVariables { boolean isInside(); diff --git a/src/main/java/org/orecruncher/environs/handlers/scripts/StateVariables.java b/src/main/java/org/orecruncher/environs/handlers/scripts/StateVariables.java index 3c646516..8d507859 100644 --- a/src/main/java/org/orecruncher/environs/handlers/scripts/StateVariables.java +++ b/src/main/java/org/orecruncher/environs/handlers/scripts/StateVariables.java @@ -18,14 +18,11 @@ package org.orecruncher.environs.handlers.scripts; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.environs.handlers.CommonState; import org.orecruncher.lib.scripting.VariableSet; import javax.annotation.Nonnull; -@OnlyIn(Dist.CLIENT) class StateVariables extends VariableSet implements IStateVariables { public StateVariables() { diff --git a/src/main/java/org/orecruncher/environs/library/AcousticEntry.java b/src/main/java/org/orecruncher/environs/library/AcousticEntry.java index 43c484d4..1342eeb0 100644 --- a/src/main/java/org/orecruncher/environs/library/AcousticEntry.java +++ b/src/main/java/org/orecruncher/environs/library/AcousticEntry.java @@ -19,8 +19,6 @@ package org.orecruncher.environs.library; import com.google.common.base.MoreObjects; -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 org.orecruncher.sndctrl.api.acoustics.IAcoustic; @@ -28,7 +26,6 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; -@OnlyIn(Dist.CLIENT) public class AcousticEntry { private final IAcoustic acoustic; diff --git a/src/main/java/org/orecruncher/environs/library/BiomeAdapter.java b/src/main/java/org/orecruncher/environs/library/BiomeAdapter.java index 2cf3df30..db7a3d24 100644 --- a/src/main/java/org/orecruncher/environs/library/BiomeAdapter.java +++ b/src/main/java/org/orecruncher/environs/library/BiomeAdapter.java @@ -22,8 +22,6 @@ import javax.annotation.Nonnull; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; @@ -31,7 +29,6 @@ import net.minecraftforge.common.BiomeDictionary.Type; import org.orecruncher.lib.biomes.BiomeUtilities; -@OnlyIn(Dist.CLIENT) public class BiomeAdapter implements IBiome { protected final Biome biome; diff --git a/src/main/java/org/orecruncher/environs/library/BiomeEvaluator.java b/src/main/java/org/orecruncher/environs/library/BiomeEvaluator.java index 9590983d..32380c97 100644 --- a/src/main/java/org/orecruncher/environs/library/BiomeEvaluator.java +++ b/src/main/java/org/orecruncher/environs/library/BiomeEvaluator.java @@ -19,8 +19,6 @@ package org.orecruncher.environs.library; import net.minecraft.util.StringUtils; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.common.BiomeDictionary; import org.orecruncher.lib.biomes.BiomeUtilities; import org.orecruncher.lib.scripting.ExecutionContext; @@ -28,7 +26,6 @@ import javax.annotation.Nonnull; import java.util.*; -@OnlyIn(Dist.CLIENT) public class BiomeEvaluator { private final ExecutionContext context = new ExecutionContext("Biomes"); diff --git a/src/main/java/org/orecruncher/environs/library/BiomeInfo.java b/src/main/java/org/orecruncher/environs/library/BiomeInfo.java index d83a5a78..1942d0ec 100644 --- a/src/main/java/org/orecruncher/environs/library/BiomeInfo.java +++ b/src/main/java/org/orecruncher/environs/library/BiomeInfo.java @@ -24,8 +24,6 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.apache.commons.lang3.StringUtils; import org.orecruncher.environs.Environs; import org.orecruncher.environs.library.config.BiomeConfig; @@ -42,7 +40,6 @@ import org.orecruncher.sndctrl.api.acoustics.IAcoustic; import org.orecruncher.sndctrl.api.acoustics.Library; -@OnlyIn(Dist.CLIENT) public final class BiomeInfo implements Comparable { private final static float DEFAULT_VISIBILITY = 1F; diff --git a/src/main/java/org/orecruncher/environs/library/BiomeLibrary.java b/src/main/java/org/orecruncher/environs/library/BiomeLibrary.java index cbc04db4..a0eec9cc 100644 --- a/src/main/java/org/orecruncher/environs/library/BiomeLibrary.java +++ b/src/main/java/org/orecruncher/environs/library/BiomeLibrary.java @@ -31,8 +31,6 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.tags.FluidTags; import net.minecraft.world.biome.BiomeRegistry; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.dsurround.DynamicSurroundings; import org.orecruncher.environs.config.Config; import org.orecruncher.environs.Environs; @@ -51,7 +49,6 @@ import org.orecruncher.lib.validation.ListValidator; import org.orecruncher.lib.validation.Validators; -@OnlyIn(Dist.CLIENT) public final class BiomeLibrary { private static final IModLog LOGGER = Environs.LOGGER.createChild(BiomeLibrary.class); diff --git a/src/main/java/org/orecruncher/environs/library/BiomeUtil.java b/src/main/java/org/orecruncher/environs/library/BiomeUtil.java index 76b16221..193323f6 100644 --- a/src/main/java/org/orecruncher/environs/library/BiomeUtil.java +++ b/src/main/java/org/orecruncher/environs/library/BiomeUtil.java @@ -19,15 +19,12 @@ package org.orecruncher.environs.library; import net.minecraft.world.biome.Biome; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.environs.misc.IMixinBiomeData; import org.orecruncher.lib.biomes.BiomeUtilities; import javax.annotation.Nonnull; import javax.annotation.Nullable; -@OnlyIn(Dist.CLIENT) public final class BiomeUtil { @Nonnull diff --git a/src/main/java/org/orecruncher/environs/library/BlockStateData.java b/src/main/java/org/orecruncher/environs/library/BlockStateData.java index 16b502d2..dd56570c 100644 --- a/src/main/java/org/orecruncher/environs/library/BlockStateData.java +++ b/src/main/java/org/orecruncher/environs/library/BlockStateData.java @@ -24,8 +24,6 @@ import javax.annotation.Nonnull; import com.google.common.base.Joiner; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.environs.effects.BlockEffect; import org.orecruncher.lib.WeightTable; import org.orecruncher.lib.collections.ObjectArray; @@ -34,7 +32,6 @@ /** * Base class for the data being assigned into the IBlockState implementation. */ -@OnlyIn(Dist.CLIENT) public class BlockStateData { public static final BlockStateData DEFAULT = new BlockStateData(); diff --git a/src/main/java/org/orecruncher/environs/library/BlockStateLibrary.java b/src/main/java/org/orecruncher/environs/library/BlockStateLibrary.java index 3609aa91..9bf77a00 100644 --- a/src/main/java/org/orecruncher/environs/library/BlockStateLibrary.java +++ b/src/main/java/org/orecruncher/environs/library/BlockStateLibrary.java @@ -25,8 +25,6 @@ import net.minecraft.block.Blocks; import net.minecraft.tags.ITag; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.apache.commons.lang3.StringUtils; import org.orecruncher.dsurround.DynamicSurroundings; import org.orecruncher.environs.Environs; @@ -52,7 +50,6 @@ import java.util.List; import java.util.stream.Collectors; -@OnlyIn(Dist.CLIENT) public final class BlockStateLibrary { private static final String TAG_SPECIFIER = "#"; diff --git a/src/main/java/org/orecruncher/environs/library/BlockStateUtil.java b/src/main/java/org/orecruncher/environs/library/BlockStateUtil.java index f7505ec1..0bae5dd2 100644 --- a/src/main/java/org/orecruncher/environs/library/BlockStateUtil.java +++ b/src/main/java/org/orecruncher/environs/library/BlockStateUtil.java @@ -19,14 +19,11 @@ package org.orecruncher.environs.library; import net.minecraft.block.BlockState; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.environs.misc.IMixinBlockData; import javax.annotation.Nonnull; import javax.annotation.Nullable; -@OnlyIn(Dist.CLIENT) public final class BlockStateUtil { private BlockStateUtil() { } diff --git a/src/main/java/org/orecruncher/environs/library/Constants.java b/src/main/java/org/orecruncher/environs/library/Constants.java index 59b31e01..b71d48db 100644 --- a/src/main/java/org/orecruncher/environs/library/Constants.java +++ b/src/main/java/org/orecruncher/environs/library/Constants.java @@ -18,13 +18,10 @@ package org.orecruncher.environs.library; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.environs.config.Config; import org.orecruncher.sndctrl.api.sound.Category; import org.orecruncher.sndctrl.api.sound.ISoundCategory; -@OnlyIn(Dist.CLIENT) public final class Constants { private Constants() { diff --git a/src/main/java/org/orecruncher/environs/library/DimensionInfo.java b/src/main/java/org/orecruncher/environs/library/DimensionInfo.java index 3367322f..f3acfded 100644 --- a/src/main/java/org/orecruncher/environs/library/DimensionInfo.java +++ b/src/main/java/org/orecruncher/environs/library/DimensionInfo.java @@ -21,8 +21,6 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.world.DimensionType; import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.environs.config.Config; import org.orecruncher.environs.Environs; import org.orecruncher.environs.library.config.DimensionConfig; @@ -31,7 +29,6 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; -@OnlyIn(Dist.CLIENT) public class DimensionInfo { private static final int SPACE_HEIGHT_OFFSET = 32; diff --git a/src/main/java/org/orecruncher/environs/library/DimensionLibrary.java b/src/main/java/org/orecruncher/environs/library/DimensionLibrary.java index 4b243577..1e7c087d 100644 --- a/src/main/java/org/orecruncher/environs/library/DimensionLibrary.java +++ b/src/main/java/org/orecruncher/environs/library/DimensionLibrary.java @@ -31,8 +31,6 @@ import net.minecraft.util.RegistryKey; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.dsurround.DynamicSurroundings; import org.orecruncher.environs.config.Config; import org.orecruncher.environs.Environs; @@ -46,7 +44,6 @@ import org.orecruncher.lib.validation.ListValidator; import org.orecruncher.lib.validation.Validators; -@OnlyIn(Dist.CLIENT) public final class DimensionLibrary { private static final IModLog LOGGER = Environs.LOGGER.createChild(DimensionLibrary.class); diff --git a/src/main/java/org/orecruncher/environs/library/FakeBiomeAdapter.java b/src/main/java/org/orecruncher/environs/library/FakeBiomeAdapter.java index ffffed95..36d2003b 100644 --- a/src/main/java/org/orecruncher/environs/library/FakeBiomeAdapter.java +++ b/src/main/java/org/orecruncher/environs/library/FakeBiomeAdapter.java @@ -22,8 +22,6 @@ import javax.annotation.Nonnull; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import com.google.common.collect.ImmutableSet; @@ -34,7 +32,6 @@ import org.orecruncher.environs.Environs; import org.orecruncher.lib.GameUtils; -@OnlyIn(Dist.CLIENT) public class FakeBiomeAdapter implements IBiome { protected final String name; diff --git a/src/main/java/org/orecruncher/environs/library/IBiome.java b/src/main/java/org/orecruncher/environs/library/IBiome.java index 14637585..a6ade6aa 100644 --- a/src/main/java/org/orecruncher/environs/library/IBiome.java +++ b/src/main/java/org/orecruncher/environs/library/IBiome.java @@ -25,11 +25,8 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.biome.Biome; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.common.BiomeDictionary.Type; -@OnlyIn(Dist.CLIENT) public interface IBiome { Biome getBiome(); diff --git a/src/main/java/org/orecruncher/environs/library/Libraries.java b/src/main/java/org/orecruncher/environs/library/Libraries.java index 0471b9f1..e884d337 100644 --- a/src/main/java/org/orecruncher/environs/library/Libraries.java +++ b/src/main/java/org/orecruncher/environs/library/Libraries.java @@ -18,10 +18,7 @@ package org.orecruncher.environs.library; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -@OnlyIn(Dist.CLIENT) public final class Libraries { private Libraries() { diff --git a/src/main/java/org/orecruncher/environs/library/WTFFakeBiomeAdapter.java b/src/main/java/org/orecruncher/environs/library/WTFFakeBiomeAdapter.java index 2ac4547c..2c12088a 100644 --- a/src/main/java/org/orecruncher/environs/library/WTFFakeBiomeAdapter.java +++ b/src/main/java/org/orecruncher/environs/library/WTFFakeBiomeAdapter.java @@ -22,10 +22,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.biome.Biome; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -@OnlyIn(Dist.CLIENT) public class WTFFakeBiomeAdapter extends FakeBiomeAdapter { public WTFFakeBiomeAdapter() { diff --git a/src/main/java/org/orecruncher/environs/library/WeightedAcousticEntry.java b/src/main/java/org/orecruncher/environs/library/WeightedAcousticEntry.java index 9a6b5a0e..3be77a0d 100644 --- a/src/main/java/org/orecruncher/environs/library/WeightedAcousticEntry.java +++ b/src/main/java/org/orecruncher/environs/library/WeightedAcousticEntry.java @@ -19,15 +19,12 @@ package org.orecruncher.environs.library; import com.google.common.base.MoreObjects; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.lib.WeightTable; import org.orecruncher.sndctrl.api.acoustics.IAcoustic; import javax.annotation.Nonnull; import javax.annotation.Nullable; -@OnlyIn(Dist.CLIENT) public class WeightedAcousticEntry extends AcousticEntry implements WeightTable.IItem { private final int weight; diff --git a/src/main/java/org/orecruncher/environs/library/config/AcousticConfig.java b/src/main/java/org/orecruncher/environs/library/config/AcousticConfig.java index 691707f4..60cdd3fa 100644 --- a/src/main/java/org/orecruncher/environs/library/config/AcousticConfig.java +++ b/src/main/java/org/orecruncher/environs/library/config/AcousticConfig.java @@ -18,8 +18,6 @@ package org.orecruncher.environs.library.config; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.apache.commons.lang3.StringUtils; import com.google.gson.annotations.SerializedName; @@ -30,7 +28,6 @@ import javax.annotation.Nonnull; -@OnlyIn(Dist.CLIENT) public class AcousticConfig implements IValidator { @SerializedName("acoustic") public String acoustic = null; diff --git a/src/main/java/org/orecruncher/environs/library/config/BiomeConfig.java b/src/main/java/org/orecruncher/environs/library/config/BiomeConfig.java index 7b12a6c4..e8cbc8d9 100644 --- a/src/main/java/org/orecruncher/environs/library/config/BiomeConfig.java +++ b/src/main/java/org/orecruncher/environs/library/config/BiomeConfig.java @@ -20,8 +20,6 @@ import com.google.common.collect.ImmutableList; import com.google.gson.annotations.SerializedName; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.apache.commons.lang3.StringUtils; import org.orecruncher.environs.Environs; import org.orecruncher.lib.validation.IValidator; @@ -31,7 +29,6 @@ import javax.annotation.Nonnull; import java.util.List; -@OnlyIn(Dist.CLIENT) public final class BiomeConfig implements IValidator { @SerializedName("conditions") public String conditions = StringUtils.EMPTY; diff --git a/src/main/java/org/orecruncher/environs/library/config/BlockConfig.java b/src/main/java/org/orecruncher/environs/library/config/BlockConfig.java index cadc17a8..a0c8034a 100644 --- a/src/main/java/org/orecruncher/environs/library/config/BlockConfig.java +++ b/src/main/java/org/orecruncher/environs/library/config/BlockConfig.java @@ -22,8 +22,6 @@ import com.google.common.collect.ImmutableList; import com.google.gson.annotations.SerializedName; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.environs.Environs; import org.orecruncher.lib.validation.IValidator; import org.orecruncher.lib.validation.ValidationException; @@ -31,7 +29,6 @@ import javax.annotation.Nonnull; -@OnlyIn(Dist.CLIENT) public class BlockConfig implements IValidator { @SerializedName("blocks") public List blocks = ImmutableList.of(); diff --git a/src/main/java/org/orecruncher/environs/library/config/DimensionConfig.java b/src/main/java/org/orecruncher/environs/library/config/DimensionConfig.java index 4c01a98c..111191da 100644 --- a/src/main/java/org/orecruncher/environs/library/config/DimensionConfig.java +++ b/src/main/java/org/orecruncher/environs/library/config/DimensionConfig.java @@ -21,14 +21,11 @@ import javax.annotation.Nonnull; import com.google.gson.annotations.SerializedName; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.environs.Environs; import org.orecruncher.lib.validation.IValidator; import org.orecruncher.lib.validation.ValidationException; import org.orecruncher.lib.validation.ValidationHelpers; -@OnlyIn(Dist.CLIENT) public class DimensionConfig implements IValidator { @SerializedName("dimId") public String dimensionId = null; diff --git a/src/main/java/org/orecruncher/environs/library/config/EffectConfig.java b/src/main/java/org/orecruncher/environs/library/config/EffectConfig.java index a9e5bb10..028c1a5a 100644 --- a/src/main/java/org/orecruncher/environs/library/config/EffectConfig.java +++ b/src/main/java/org/orecruncher/environs/library/config/EffectConfig.java @@ -18,8 +18,6 @@ package org.orecruncher.environs.library.config; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.apache.commons.lang3.StringUtils; import com.google.gson.annotations.SerializedName; @@ -31,7 +29,6 @@ import javax.annotation.Nonnull; -@OnlyIn(Dist.CLIENT) public final class EffectConfig implements IValidator { @SerializedName("effect") diff --git a/src/main/java/org/orecruncher/environs/scanner/AlwaysOnBlockEffectScanner.java b/src/main/java/org/orecruncher/environs/scanner/AlwaysOnBlockEffectScanner.java index 9640d4e6..53ca563f 100644 --- a/src/main/java/org/orecruncher/environs/scanner/AlwaysOnBlockEffectScanner.java +++ b/src/main/java/org/orecruncher/environs/scanner/AlwaysOnBlockEffectScanner.java @@ -25,8 +25,6 @@ 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.util.math.BlockPos; import org.orecruncher.environs.effects.BlockEffect; import org.orecruncher.environs.library.BlockStateUtil; @@ -39,7 +37,6 @@ * player moves. Once all the blocks are scanned in the region (cuboid) it will * stop. It will start again once the player moves location. */ -@OnlyIn(Dist.CLIENT) public class AlwaysOnBlockEffectScanner extends CuboidScanner { public AlwaysOnBlockEffectScanner(@Nonnull final ScanContext locus, final int range) { diff --git a/src/main/java/org/orecruncher/environs/scanner/BiomeScanner.java b/src/main/java/org/orecruncher/environs/scanner/BiomeScanner.java index eac34c15..42a716bb 100644 --- a/src/main/java/org/orecruncher/environs/scanner/BiomeScanner.java +++ b/src/main/java/org/orecruncher/environs/scanner/BiomeScanner.java @@ -22,8 +22,6 @@ import it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap; import net.minecraft.util.ResourceLocation; import net.minecraft.world.IWorldReader; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraft.util.math.BlockPos; import net.minecraft.world.biome.Biome; @@ -41,7 +39,6 @@ * Performs an area scan around the to calculate the relative weights of the * biomes in the local area. */ -@OnlyIn(Dist.CLIENT) public final class BiomeScanner { private static final int BIOME_SURVEY_RANGE = 18; diff --git a/src/main/java/org/orecruncher/environs/scanner/CeilingCoverage.java b/src/main/java/org/orecruncher/environs/scanner/CeilingCoverage.java index ab55107e..070f9ac7 100644 --- a/src/main/java/org/orecruncher/environs/scanner/CeilingCoverage.java +++ b/src/main/java/org/orecruncher/environs/scanner/CeilingCoverage.java @@ -26,8 +26,6 @@ import net.minecraft.block.BlockState; import net.minecraft.tags.BlockTags; import net.minecraft.tags.ITag; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.common.Tags; import org.orecruncher.environs.handlers.CommonState; import org.orecruncher.environs.library.DimensionInfo; @@ -46,7 +44,6 @@ * Performs area scanning around the player to determine area ceiling coverage. * Used to determine if the player is "inside" or "outside". */ -@OnlyIn(Dist.CLIENT) public final class CeilingCoverage { private static final int SURVEY_INTERVAL = 4; diff --git a/src/main/java/org/orecruncher/environs/scanner/ClientPlayerLocus.java b/src/main/java/org/orecruncher/environs/scanner/ClientPlayerLocus.java index eb044b99..3be6f8b6 100644 --- a/src/main/java/org/orecruncher/environs/scanner/ClientPlayerLocus.java +++ b/src/main/java/org/orecruncher/environs/scanner/ClientPlayerLocus.java @@ -18,13 +18,10 @@ package org.orecruncher.environs.scanner; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.environs.Environs; import org.orecruncher.environs.handlers.CommonState; -@OnlyIn(Dist.CLIENT) public class ClientPlayerLocus extends ScanContext { public ClientPlayerLocus() { diff --git a/src/main/java/org/orecruncher/environs/scanner/ComplementsPointIterator.java b/src/main/java/org/orecruncher/environs/scanner/ComplementsPointIterator.java index 7fac738a..847c2c07 100644 --- a/src/main/java/org/orecruncher/environs/scanner/ComplementsPointIterator.java +++ b/src/main/java/org/orecruncher/environs/scanner/ComplementsPointIterator.java @@ -22,8 +22,6 @@ import javax.annotation.Nullable; import net.minecraft.util.math.BlockPos; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; /** * For 2 Cuboid objects of equal dimensions displaced in space (c1,c2) that @@ -34,7 +32,6 @@ * * Updated to use "peeking" iterator pattern. */ -@OnlyIn(Dist.CLIENT) public class ComplementsPointIterator implements IPointIterator { protected CuboidPointIterator[] segments = new CuboidPointIterator[3]; diff --git a/src/main/java/org/orecruncher/environs/scanner/Cuboid.java b/src/main/java/org/orecruncher/environs/scanner/Cuboid.java index e01f0706..16cc7867 100644 --- a/src/main/java/org/orecruncher/environs/scanner/Cuboid.java +++ b/src/main/java/org/orecruncher/environs/scanner/Cuboid.java @@ -19,14 +19,11 @@ package org.orecruncher.environs.scanner; import net.minecraft.util.math.BlockPos; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.lib.BlockPosUtil; import javax.annotation.Nonnull; import javax.annotation.Nullable; -@OnlyIn(Dist.CLIENT) public class Cuboid { protected final BlockPos[] vertices = new BlockPos[8]; diff --git a/src/main/java/org/orecruncher/environs/scanner/CuboidPointIterator.java b/src/main/java/org/orecruncher/environs/scanner/CuboidPointIterator.java index b9fbdac9..db1fe558 100644 --- a/src/main/java/org/orecruncher/environs/scanner/CuboidPointIterator.java +++ b/src/main/java/org/orecruncher/environs/scanner/CuboidPointIterator.java @@ -23,8 +23,6 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos.Mutable; @@ -34,7 +32,6 @@ * Implements a "peeking" iterator. The iterator uses mutables for position so * they aren't safe to cache. */ -@OnlyIn(Dist.CLIENT) public class CuboidPointIterator implements IPointIterator { static final CuboidPointIterator NULL_ITERATOR = new CuboidPointIterator() { diff --git a/src/main/java/org/orecruncher/environs/scanner/CuboidScanner.java b/src/main/java/org/orecruncher/environs/scanner/CuboidScanner.java index dd08db98..1435714f 100644 --- a/src/main/java/org/orecruncher/environs/scanner/CuboidScanner.java +++ b/src/main/java/org/orecruncher/environs/scanner/CuboidScanner.java @@ -25,14 +25,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.util.math.BlockPos; /** * Scans the area around the player in a continuous pattern. */ -@OnlyIn(Dist.CLIENT) public abstract class CuboidScanner extends Scanner { // Iteration variables diff --git a/src/main/java/org/orecruncher/environs/scanner/IPointIterator.java b/src/main/java/org/orecruncher/environs/scanner/IPointIterator.java index 2ff1165e..1a04d481 100644 --- a/src/main/java/org/orecruncher/environs/scanner/IPointIterator.java +++ b/src/main/java/org/orecruncher/environs/scanner/IPointIterator.java @@ -19,13 +19,10 @@ package org.orecruncher.environs.scanner; import net.minecraft.util.math.BlockPos; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; /** * Interface for a "peeking" iterator. */ -@OnlyIn(Dist.CLIENT) public interface IPointIterator { BlockPos next(); diff --git a/src/main/java/org/orecruncher/environs/scanner/RandomBlockEffectScanner.java b/src/main/java/org/orecruncher/environs/scanner/RandomBlockEffectScanner.java index c9df2872..ea2feef2 100644 --- a/src/main/java/org/orecruncher/environs/scanner/RandomBlockEffectScanner.java +++ b/src/main/java/org/orecruncher/environs/scanner/RandomBlockEffectScanner.java @@ -26,8 +26,6 @@ import net.minecraft.block.BlockState; import net.minecraft.world.IBlockReader; import net.minecraft.world.IWorldReader; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraft.util.math.BlockPos; import org.orecruncher.environs.effects.BlockEffect; @@ -45,7 +43,6 @@ * since the iteration has been reduce to 667 (from 1000 in MC 1.7.10) it should * compensate. */ -@OnlyIn(Dist.CLIENT) public class RandomBlockEffectScanner extends RandomScanner { private static final int ITERATION_COUNT = 667; diff --git a/src/main/java/org/orecruncher/environs/scanner/RandomScanner.java b/src/main/java/org/orecruncher/environs/scanner/RandomScanner.java index 7225df30..944adf76 100644 --- a/src/main/java/org/orecruncher/environs/scanner/RandomScanner.java +++ b/src/main/java/org/orecruncher/environs/scanner/RandomScanner.java @@ -22,8 +22,6 @@ import javax.annotation.Nonnull; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.lib.random.LCGRandom; import net.minecraft.util.math.BlockPos; @@ -32,7 +30,6 @@ * Serves up random blocks in an area around the player. Concentration of block * selections are closer to the player. */ -@OnlyIn(Dist.CLIENT) public abstract class RandomScanner extends Scanner { private final LCGRandom lcg = new LCGRandom(); diff --git a/src/main/java/org/orecruncher/environs/scanner/ScanContext.java b/src/main/java/org/orecruncher/environs/scanner/ScanContext.java index 36396d32..eb8c2433 100644 --- a/src/main/java/org/orecruncher/environs/scanner/ScanContext.java +++ b/src/main/java/org/orecruncher/environs/scanner/ScanContext.java @@ -21,15 +21,12 @@ import javax.annotation.Nonnull; import net.minecraft.world.IBlockReader; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraft.util.math.BlockPos; import org.orecruncher.lib.logging.IModLog; import java.util.function.Supplier; -@OnlyIn(Dist.CLIENT) public class ScanContext { private final Supplier worldReader; diff --git a/src/main/java/org/orecruncher/environs/scanner/Scanner.java b/src/main/java/org/orecruncher/environs/scanner/Scanner.java index 17af5f67..e0186436 100644 --- a/src/main/java/org/orecruncher/environs/scanner/Scanner.java +++ b/src/main/java/org/orecruncher/environs/scanner/Scanner.java @@ -29,13 +29,10 @@ import net.minecraft.block.Blocks; import net.minecraft.block.material.Material; import net.minecraft.world.IBlockReader; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.lib.random.XorShiftRandom; import net.minecraft.util.math.BlockPos; -@OnlyIn(Dist.CLIENT) public abstract class Scanner { protected static final Set BLOCKSTATES_TO_IGNORE = new ReferenceArraySet<>(3); diff --git a/src/main/java/org/orecruncher/environs/shaders/ShaderPrograms.java b/src/main/java/org/orecruncher/environs/shaders/ShaderPrograms.java index 5b58f600..559b0087 100644 --- a/src/main/java/org/orecruncher/environs/shaders/ShaderPrograms.java +++ b/src/main/java/org/orecruncher/environs/shaders/ShaderPrograms.java @@ -20,15 +20,12 @@ import com.google.common.collect.ImmutableList; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.lib.shaders.IShaderResourceProvider; import org.orecruncher.lib.shaders.ShaderManager; import javax.annotation.Nonnull; import java.util.Collection; -@OnlyIn(Dist.CLIENT) public enum ShaderPrograms implements IShaderResourceProvider { AURORA( diff --git a/src/main/java/org/orecruncher/environs/shaders/aurora/AuroraBand.java b/src/main/java/org/orecruncher/environs/shaders/aurora/AuroraBand.java index 9decbc04..2286f71b 100644 --- a/src/main/java/org/orecruncher/environs/shaders/aurora/AuroraBand.java +++ b/src/main/java/org/orecruncher/environs/shaders/aurora/AuroraBand.java @@ -24,11 +24,8 @@ import javax.annotation.Nullable; import net.minecraft.util.math.vector.Vector3f; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.lib.math.MathStuff; -@OnlyIn(Dist.CLIENT) public class AuroraBand { protected static final float AURORA_SPEED = 0.75F; diff --git a/src/main/java/org/orecruncher/environs/shaders/aurora/AuroraBase.java b/src/main/java/org/orecruncher/environs/shaders/aurora/AuroraBase.java index 13f60f86..d07f50fd 100644 --- a/src/main/java/org/orecruncher/environs/shaders/aurora/AuroraBase.java +++ b/src/main/java/org/orecruncher/environs/shaders/aurora/AuroraBase.java @@ -25,8 +25,6 @@ import com.mojang.blaze3d.matrix.MatrixStack; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.math.MathHelper; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.environs.config.Config; import org.orecruncher.environs.handlers.CommonState; import org.orecruncher.environs.library.DimensionInfo; @@ -35,7 +33,6 @@ import org.orecruncher.lib.math.MathStuff; import org.orecruncher.lib.random.XorShiftRandom; -@OnlyIn(Dist.CLIENT) public abstract class AuroraBase implements IAurora { protected final Random random; diff --git a/src/main/java/org/orecruncher/environs/shaders/aurora/AuroraColor.java b/src/main/java/org/orecruncher/environs/shaders/aurora/AuroraColor.java index 7b81f9d6..d95fa4fc 100644 --- a/src/main/java/org/orecruncher/environs/shaders/aurora/AuroraColor.java +++ b/src/main/java/org/orecruncher/environs/shaders/aurora/AuroraColor.java @@ -18,8 +18,6 @@ package org.orecruncher.environs.shaders.aurora; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.lib.gui.Color; import org.orecruncher.lib.gui.ColorPalette; @@ -28,7 +26,6 @@ import java.util.List; import java.util.Random; -@OnlyIn(Dist.CLIENT) public final class AuroraColor { private static final List COLOR_SETS = new ArrayList<>(); diff --git a/src/main/java/org/orecruncher/environs/shaders/aurora/AuroraFactory.java b/src/main/java/org/orecruncher/environs/shaders/aurora/AuroraFactory.java index 0c474d7f..3a6b26ac 100644 --- a/src/main/java/org/orecruncher/environs/shaders/aurora/AuroraFactory.java +++ b/src/main/java/org/orecruncher/environs/shaders/aurora/AuroraFactory.java @@ -24,10 +24,7 @@ import javax.annotation.Nonnull; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -@OnlyIn(Dist.CLIENT) public final class AuroraFactory { @Nonnull diff --git a/src/main/java/org/orecruncher/environs/shaders/aurora/AuroraLifeTracker.java b/src/main/java/org/orecruncher/environs/shaders/aurora/AuroraLifeTracker.java index f4c394e3..bad7d261 100644 --- a/src/main/java/org/orecruncher/environs/shaders/aurora/AuroraLifeTracker.java +++ b/src/main/java/org/orecruncher/environs/shaders/aurora/AuroraLifeTracker.java @@ -18,11 +18,8 @@ package org.orecruncher.environs.shaders.aurora; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.lib.math.MathStuff; -@OnlyIn(Dist.CLIENT) public class AuroraLifeTracker { protected final int peakAge; diff --git a/src/main/java/org/orecruncher/environs/shaders/aurora/AuroraRenderType.java b/src/main/java/org/orecruncher/environs/shaders/aurora/AuroraRenderType.java index 0023ed35..6dfe6281 100644 --- a/src/main/java/org/orecruncher/environs/shaders/aurora/AuroraRenderType.java +++ b/src/main/java/org/orecruncher/environs/shaders/aurora/AuroraRenderType.java @@ -25,13 +25,10 @@ import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.client.renderer.vertex.VertexFormat; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.lwjgl.opengl.GL11; import org.orecruncher.environs.Environs; -@OnlyIn(Dist.CLIENT) public class AuroraRenderType extends RenderType { public AuroraRenderType(String nameIn, VertexFormat formatIn, int drawModeIn, int bufferSizeIn, boolean useDelegateIn, boolean needsSortingIn, Runnable setupTaskIn, Runnable clearTaskIn) { super(nameIn, formatIn, drawModeIn, bufferSizeIn, useDelegateIn, needsSortingIn, setupTaskIn, clearTaskIn); diff --git a/src/main/java/org/orecruncher/environs/shaders/aurora/AuroraShaderBand.java b/src/main/java/org/orecruncher/environs/shaders/aurora/AuroraShaderBand.java index a22ec27e..f936059f 100644 --- a/src/main/java/org/orecruncher/environs/shaders/aurora/AuroraShaderBand.java +++ b/src/main/java/org/orecruncher/environs/shaders/aurora/AuroraShaderBand.java @@ -25,8 +25,6 @@ import net.minecraft.util.math.vector.Matrix4f; import net.minecraft.util.math.vector.Vector3d; import net.minecraft.util.math.vector.Vector3f; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.environs.shaders.ShaderPrograms; import org.orecruncher.lib.shaders.ShaderCallContext; import org.orecruncher.lib.GameUtils; @@ -38,7 +36,6 @@ /* * Renders a shader generated aurora along a curved path. Makes it ribbon like. */ -@OnlyIn(Dist.CLIENT) public class AuroraShaderBand extends AuroraBase { private static final float V1 = 0; diff --git a/src/main/java/org/orecruncher/environs/shaders/aurora/AuroraUtils.java b/src/main/java/org/orecruncher/environs/shaders/aurora/AuroraUtils.java index 625fdcc7..972e5388 100644 --- a/src/main/java/org/orecruncher/environs/shaders/aurora/AuroraUtils.java +++ b/src/main/java/org/orecruncher/environs/shaders/aurora/AuroraUtils.java @@ -18,8 +18,6 @@ package org.orecruncher.environs.shaders.aurora; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.environs.handlers.CommonState; import org.orecruncher.lib.GameUtils; @@ -27,7 +25,6 @@ import java.time.Instant; -@OnlyIn(Dist.CLIENT) public class AuroraUtils { private AuroraUtils() { diff --git a/src/main/java/org/orecruncher/environs/shaders/aurora/IAurora.java b/src/main/java/org/orecruncher/environs/shaders/aurora/IAurora.java index c331fa5c..0cc90784 100644 --- a/src/main/java/org/orecruncher/environs/shaders/aurora/IAurora.java +++ b/src/main/java/org/orecruncher/environs/shaders/aurora/IAurora.java @@ -19,15 +19,12 @@ package org.orecruncher.environs.shaders.aurora; import com.mojang.blaze3d.matrix.MatrixStack; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import javax.annotation.Nonnull; /* * Implemented by an aurora so that it can go through it's life cycle. */ -@OnlyIn(Dist.CLIENT) public interface IAurora { /* diff --git a/src/main/java/org/orecruncher/environs/shaders/aurora/Panel.java b/src/main/java/org/orecruncher/environs/shaders/aurora/Panel.java index 00a1f353..1f27fdf3 100644 --- a/src/main/java/org/orecruncher/environs/shaders/aurora/Panel.java +++ b/src/main/java/org/orecruncher/environs/shaders/aurora/Panel.java @@ -18,11 +18,8 @@ package org.orecruncher.environs.shaders.aurora; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.lib.math.MathStuff; -@OnlyIn(Dist.CLIENT) final class Panel { private static final float COS_DEG90_FACTOR = MathStuff.cos(MathStuff.PI_F / 2.0F); diff --git a/src/main/java/org/orecruncher/lib/DayCycle.java b/src/main/java/org/orecruncher/lib/DayCycle.java index 9d3ca0a8..93eb6f70 100644 --- a/src/main/java/org/orecruncher/lib/DayCycle.java +++ b/src/main/java/org/orecruncher/lib/DayCycle.java @@ -19,8 +19,6 @@ package org.orecruncher.lib; import net.minecraft.world.IWorld; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.sndctrl.SoundControl; import javax.annotation.Nonnull; @@ -96,7 +94,6 @@ public boolean isAuroraVisible() { return this.auroraVisible; } - @OnlyIn(Dist.CLIENT) @Nonnull public String getFormattedName() { return Localization.load(this.localizeString); diff --git a/src/main/java/org/orecruncher/lib/GameUtils.java b/src/main/java/org/orecruncher/lib/GameUtils.java index a31fb623..e27b8f42 100644 --- a/src/main/java/org/orecruncher/lib/GameUtils.java +++ b/src/main/java/org/orecruncher/lib/GameUtils.java @@ -24,8 +24,6 @@ import net.minecraft.client.settings.PointOfView; import net.minecraft.client.world.ClientWorld; import net.minecraft.entity.player.PlayerEntity; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -36,52 +34,43 @@ private GameUtils() { } // Client methods - @OnlyIn(Dist.CLIENT) @Nullable public static PlayerEntity getPlayer() { return getMC().player; } - @OnlyIn(Dist.CLIENT) @Nullable public static ClientWorld getWorld() { return getMC().world; } - @OnlyIn(Dist.CLIENT) @Nonnull public static Minecraft getMC() { return Minecraft.getInstance(); } - @OnlyIn(Dist.CLIENT) @Nonnull public static GameSettings getGameSettings() { return getMC().gameSettings; } - @OnlyIn(Dist.CLIENT) public static boolean displayDebug() { return getGameSettings().showDebugInfo; } - @OnlyIn(Dist.CLIENT) @Nonnull public static SoundHandler getSoundHander() { return getMC().getSoundHandler(); } - @OnlyIn(Dist.CLIENT) public static boolean isInGame() { return getWorld() != null && getPlayer() != null; } - @OnlyIn(Dist.CLIENT) public static boolean isThirdPersonView() { return getGameSettings().getPointOfView() != PointOfView.FIRST_PERSON; } - @OnlyIn(Dist.CLIENT) public static boolean isFirstPersonView() { return getGameSettings().getPointOfView() == PointOfView.FIRST_PERSON; } diff --git a/src/main/java/org/orecruncher/lib/Localization.java b/src/main/java/org/orecruncher/lib/Localization.java index 0bd15628..a7c29e53 100644 --- a/src/main/java/org/orecruncher/lib/Localization.java +++ b/src/main/java/org/orecruncher/lib/Localization.java @@ -20,13 +20,10 @@ import net.minecraft.client.resources.I18n; import net.minecraft.util.text.LanguageMap; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import javax.annotation.Nonnull; import javax.annotation.Nullable; -@OnlyIn(Dist.CLIENT) public final class Localization { private Localization() { diff --git a/src/main/java/org/orecruncher/lib/MinecraftClock.java b/src/main/java/org/orecruncher/lib/MinecraftClock.java index 197c8fd0..c2310dbe 100644 --- a/src/main/java/org/orecruncher/lib/MinecraftClock.java +++ b/src/main/java/org/orecruncher/lib/MinecraftClock.java @@ -20,12 +20,9 @@ import javax.annotation.Nonnull; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraft.world.World; -@OnlyIn(Dist.CLIENT) public class MinecraftClock { private static final String AM = Localization.load("sndctrl.format.AM"); diff --git a/src/main/java/org/orecruncher/lib/WorldUtils.java b/src/main/java/org/orecruncher/lib/WorldUtils.java index 4b4e416e..8a1e2360 100644 --- a/src/main/java/org/orecruncher/lib/WorldUtils.java +++ b/src/main/java/org/orecruncher/lib/WorldUtils.java @@ -31,8 +31,6 @@ import net.minecraft.world.biome.Biome; import net.minecraft.world.gen.Heightmap; import net.minecraft.world.storage.IWorldInfo; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.lib.compat.ModEnvironment; import org.orecruncher.lib.reflection.BooleanField; //import sereneseasons.season.SeasonHooks; @@ -232,7 +230,6 @@ public static boolean hasVoidParticles(@Nonnull final World world) { return world.getDimensionType().hasSkyLight(); } - @OnlyIn(Dist.CLIENT) public static boolean isSuperFlat(@Nonnull final World world) { final IWorldInfo info = world.getWorldInfo(); return info instanceof ClientWorld.ClientWorldInfo && flatWorld.get((ClientWorld.ClientWorldInfo) info); diff --git a/src/main/java/org/orecruncher/lib/biomes/BiomeUtilities.java b/src/main/java/org/orecruncher/lib/biomes/BiomeUtilities.java index 5d7a695d..4f05440c 100644 --- a/src/main/java/org/orecruncher/lib/biomes/BiomeUtilities.java +++ b/src/main/java/org/orecruncher/lib/biomes/BiomeUtilities.java @@ -31,8 +31,6 @@ import net.minecraft.world.World; import net.minecraft.world.biome.Biome; import net.minecraft.world.biome.BiomeRegistry; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.common.BiomeDictionary; import net.minecraftforge.registries.ForgeRegistries; import org.orecruncher.environs.Environs; @@ -45,7 +43,6 @@ import java.util.Collection; import java.util.Set; -@OnlyIn(Dist.CLIENT) public class BiomeUtilities { private BiomeUtilities() { diff --git a/src/main/java/org/orecruncher/lib/config/ClothAPIFactory.java b/src/main/java/org/orecruncher/lib/config/ClothAPIFactory.java index 456395ff..efee2e12 100644 --- a/src/main/java/org/orecruncher/lib/config/ClothAPIFactory.java +++ b/src/main/java/org/orecruncher/lib/config/ClothAPIFactory.java @@ -28,8 +28,6 @@ import net.minecraft.client.gui.screen.Screen; import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.*; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.common.ForgeConfigSpec; import org.orecruncher.lib.GameUtils; @@ -42,7 +40,6 @@ import java.util.function.Function; import java.util.stream.Collectors; -@OnlyIn(Dist.CLIENT) public abstract class ClothAPIFactory implements BiFunction { private final ITextComponent title; diff --git a/src/main/java/org/orecruncher/lib/config/ConfigGui.java b/src/main/java/org/orecruncher/lib/config/ConfigGui.java index ea6dfa99..b381d4ce 100644 --- a/src/main/java/org/orecruncher/lib/config/ConfigGui.java +++ b/src/main/java/org/orecruncher/lib/config/ConfigGui.java @@ -26,15 +26,12 @@ import net.minecraft.client.gui.widget.button.Button; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TranslationTextComponent; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.fml.ExtensionPoint; import net.minecraftforge.fml.ModLoadingContext; import javax.annotation.Nonnull; import java.util.function.BiFunction; -@OnlyIn(Dist.CLIENT) public class ConfigGui { public static void registerConfigGui(@Nonnull final BiFunction factory) { diff --git a/src/main/java/org/orecruncher/lib/config/ConfigProperty.java b/src/main/java/org/orecruncher/lib/config/ConfigProperty.java index b6f8a825..c3eb40b4 100644 --- a/src/main/java/org/orecruncher/lib/config/ConfigProperty.java +++ b/src/main/java/org/orecruncher/lib/config/ConfigProperty.java @@ -21,8 +21,6 @@ import net.minecraft.client.gui.DialogTexts; import net.minecraft.util.StringUtils; import net.minecraft.util.text.*; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.common.ForgeConfigSpec; import org.orecruncher.lib.gui.GuiHelpers; import org.orecruncher.lib.reflection.ObjectField; @@ -32,7 +30,6 @@ import java.util.ArrayList; import java.util.List; -@OnlyIn(Dist.CLIENT) public final class ConfigProperty { public static final int TOOLTIP_WIDTH = 300; diff --git a/src/main/java/org/orecruncher/lib/config/Validators.java b/src/main/java/org/orecruncher/lib/config/Validators.java index b40ee3f2..0f1c1c37 100644 --- a/src/main/java/org/orecruncher/lib/config/Validators.java +++ b/src/main/java/org/orecruncher/lib/config/Validators.java @@ -18,12 +18,9 @@ package org.orecruncher.lib.config; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import javax.annotation.Nonnull; -@OnlyIn(Dist.CLIENT) public class Validators { private Validators() { diff --git a/src/main/java/org/orecruncher/lib/effects/EntityEffectManager.java b/src/main/java/org/orecruncher/lib/effects/EntityEffectManager.java index 00da0a73..47b191c4 100644 --- a/src/main/java/org/orecruncher/lib/effects/EntityEffectManager.java +++ b/src/main/java/org/orecruncher/lib/effects/EntityEffectManager.java @@ -28,8 +28,6 @@ import net.minecraft.client.settings.PointOfView; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.lib.GameUtils; import org.orecruncher.lib.collections.ObjectArray; @@ -42,7 +40,6 @@ * An EntityEffectManager is responsible for managing the effects that are * attached to an entity. */ -@OnlyIn(Dist.CLIENT) public class EntityEffectManager implements IEntityEffectManager { private static final List DUMMY_EFFECTS = ImmutableList.of("Dummy EffectHandler"); diff --git a/src/main/java/org/orecruncher/lib/effects/entity/CapabilityEntityFXData.java b/src/main/java/org/orecruncher/lib/effects/entity/CapabilityEntityFXData.java index a5c5254b..79875005 100644 --- a/src/main/java/org/orecruncher/lib/effects/entity/CapabilityEntityFXData.java +++ b/src/main/java/org/orecruncher/lib/effects/entity/CapabilityEntityFXData.java @@ -22,8 +22,6 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.LivingEntity; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; @@ -38,7 +36,6 @@ import org.orecruncher.lib.capability.SimpleProvider; import org.orecruncher.sndctrl.SoundControl; -@OnlyIn(Dist.CLIENT) public class CapabilityEntityFXData { @SuppressWarnings("ConstantConditions") @@ -47,12 +44,10 @@ public class CapabilityEntityFXData { public static final Capability FX_INFO = null; public static final ResourceLocation CAPABILITY_ID = new ResourceLocation(SoundControl.MOD_ID, "entityfx"); - @OnlyIn(Dist.CLIENT) public static void register() { CapabilityManager.INSTANCE.register(IEntityFX.class, new NullStorage<>(), EntityFXData::new); } - @OnlyIn(Dist.CLIENT) @Nonnull public static ICapabilityProvider createProvider(final IEntityFX data) { return new SimpleProvider<>(FX_INFO, null, data); diff --git a/src/main/java/org/orecruncher/lib/effects/entity/EntityFXData.java b/src/main/java/org/orecruncher/lib/effects/entity/EntityFXData.java index cc900ed0..91a9f917 100644 --- a/src/main/java/org/orecruncher/lib/effects/entity/EntityFXData.java +++ b/src/main/java/org/orecruncher/lib/effects/entity/EntityFXData.java @@ -20,12 +20,9 @@ import javax.annotation.Nullable; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.lib.effects.EntityEffectManager; -@OnlyIn(Dist.CLIENT) public class EntityFXData implements IEntityFX { protected EntityEffectManager handler; diff --git a/src/main/java/org/orecruncher/lib/effects/entity/IEntityFX.java b/src/main/java/org/orecruncher/lib/effects/entity/IEntityFX.java index a2a677db..7171909c 100644 --- a/src/main/java/org/orecruncher/lib/effects/entity/IEntityFX.java +++ b/src/main/java/org/orecruncher/lib/effects/entity/IEntityFX.java @@ -20,11 +20,8 @@ import javax.annotation.Nullable; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.lib.effects.EntityEffectManager; -@OnlyIn(Dist.CLIENT) public interface IEntityFX { void set(@Nullable final EntityEffectManager handler); diff --git a/src/main/java/org/orecruncher/lib/events/BlockUpdateEvent.java b/src/main/java/org/orecruncher/lib/events/BlockUpdateEvent.java index e34e1e8e..27af5b96 100644 --- a/src/main/java/org/orecruncher/lib/events/BlockUpdateEvent.java +++ b/src/main/java/org/orecruncher/lib/events/BlockUpdateEvent.java @@ -20,15 +20,12 @@ import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet; import net.minecraft.util.math.BlockPos; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.eventbus.api.Event; import javax.annotation.Nonnull; import java.util.Collection; import java.util.Set; -@OnlyIn(Dist.CLIENT) public class BlockUpdateEvent extends Event { private final Collection positions; diff --git a/src/main/java/org/orecruncher/lib/events/DiagnosticEvent.java b/src/main/java/org/orecruncher/lib/events/DiagnosticEvent.java index 24a81ee3..116c9f7a 100644 --- a/src/main/java/org/orecruncher/lib/events/DiagnosticEvent.java +++ b/src/main/java/org/orecruncher/lib/events/DiagnosticEvent.java @@ -18,8 +18,6 @@ package org.orecruncher.lib.events; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.eventbus.api.Event; import org.orecruncher.lib.math.TimerEMA; @@ -29,7 +27,6 @@ import java.util.Collection; import java.util.List; -@OnlyIn(Dist.CLIENT) public class DiagnosticEvent extends Event { private final List left = new ArrayList<>(); diff --git a/src/main/java/org/orecruncher/lib/fml/Checker.java b/src/main/java/org/orecruncher/lib/fml/Checker.java index 91a54f3e..1a1905bc 100644 --- a/src/main/java/org/orecruncher/lib/fml/Checker.java +++ b/src/main/java/org/orecruncher/lib/fml/Checker.java @@ -20,13 +20,10 @@ import net.minecraft.client.entity.player.ClientPlayerEntity; import net.minecraft.util.text.ITextComponent; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import javax.annotation.Nonnull; import javax.annotation.Nullable; -@OnlyIn(Dist.CLIENT) public abstract class Checker implements ClientLoginChecks.ICallbackHandler { protected final String modId; diff --git a/src/main/java/org/orecruncher/lib/fml/ForgeUtils.java b/src/main/java/org/orecruncher/lib/fml/ForgeUtils.java index ceb29352..12bc1d0c 100644 --- a/src/main/java/org/orecruncher/lib/fml/ForgeUtils.java +++ b/src/main/java/org/orecruncher/lib/fml/ForgeUtils.java @@ -23,8 +23,6 @@ import net.minecraft.resources.ResourcePackType; import net.minecraft.util.ResourceLocation; import net.minecraft.world.biome.Biome; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.fml.ModContainer; import net.minecraftforge.fml.ModList; import net.minecraftforge.forgespi.language.IModInfo; @@ -88,13 +86,11 @@ public static List getModIdList() { return result; } - @OnlyIn(Dist.CLIENT) @Nonnull public static Collection getEnabledResourcePacks() { return GameUtils.getMC().getResourcePackList().getEnabledPacks(); } - @OnlyIn(Dist.CLIENT) @Nonnull public static List getResourcePackIdList() { return getEnabledResourcePacks() diff --git a/src/main/java/org/orecruncher/lib/fml/UpdateChecker.java b/src/main/java/org/orecruncher/lib/fml/UpdateChecker.java index c3113bc4..55d02221 100644 --- a/src/main/java/org/orecruncher/lib/fml/UpdateChecker.java +++ b/src/main/java/org/orecruncher/lib/fml/UpdateChecker.java @@ -21,8 +21,6 @@ import net.minecraft.client.entity.player.ClientPlayerEntity; import net.minecraft.client.resources.I18n; import net.minecraft.util.text.ITextComponent; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.fml.VersionChecker; import net.minecraftforge.fml.VersionChecker.CheckResult; import net.minecraftforge.fml.VersionChecker.Status; @@ -36,7 +34,6 @@ * Simple update checker that can be registered with the ClientLoginChecks manager to provide feedback to the player * in the chat window if a newer version of a mod is available. */ -@OnlyIn(Dist.CLIENT) public class UpdateChecker extends Checker { protected final String messageId; diff --git a/src/main/java/org/orecruncher/lib/gui/Color.java b/src/main/java/org/orecruncher/lib/gui/Color.java index 385bb624..de1a488d 100644 --- a/src/main/java/org/orecruncher/lib/gui/Color.java +++ b/src/main/java/org/orecruncher/lib/gui/Color.java @@ -21,8 +21,6 @@ import com.google.common.base.Preconditions; import net.minecraft.util.math.vector.Vector3d; import net.minecraft.util.text.TextFormatting; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.lib.Utilities; import org.orecruncher.lib.math.MathStuff; @@ -32,7 +30,6 @@ * Holds an RGB triple. See: http://www.rapidtables.com/web/color/RGB_Color.htm */ @SuppressWarnings("unused") -@OnlyIn(Dist.CLIENT) public class Color { protected float red; diff --git a/src/main/java/org/orecruncher/lib/gui/ColorPalette.java b/src/main/java/org/orecruncher/lib/gui/ColorPalette.java index b1c957bb..a1072dd6 100644 --- a/src/main/java/org/orecruncher/lib/gui/ColorPalette.java +++ b/src/main/java/org/orecruncher/lib/gui/ColorPalette.java @@ -19,11 +19,8 @@ package org.orecruncher.lib.gui; import net.minecraft.util.text.TextFormatting; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; @SuppressWarnings("unused") -@OnlyIn(Dist.CLIENT) public final class ColorPalette { // Minecraft colors mapped to codes public static final Color MC_BLACK = new Color(TextFormatting.BLACK); diff --git a/src/main/java/org/orecruncher/lib/gui/GuiHelpers.java b/src/main/java/org/orecruncher/lib/gui/GuiHelpers.java index 8f141b0b..ffeae8f9 100644 --- a/src/main/java/org/orecruncher/lib/gui/GuiHelpers.java +++ b/src/main/java/org/orecruncher/lib/gui/GuiHelpers.java @@ -20,8 +20,6 @@ import net.minecraft.client.gui.FontRenderer; import net.minecraft.util.text.*; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.lib.GameUtils; import javax.annotation.Nonnull; @@ -29,7 +27,6 @@ import java.util.Collection; import java.util.stream.Collectors; -@OnlyIn(Dist.CLIENT) public class GuiHelpers { private final static String ELLIPSES = "..."; diff --git a/src/main/java/org/orecruncher/lib/particles/AgeableMote.java b/src/main/java/org/orecruncher/lib/particles/AgeableMote.java index ccbda8e1..9315c454 100644 --- a/src/main/java/org/orecruncher/lib/particles/AgeableMote.java +++ b/src/main/java/org/orecruncher/lib/particles/AgeableMote.java @@ -19,12 +19,9 @@ package org.orecruncher.lib.particles; import net.minecraft.world.IBlockReader; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import javax.annotation.Nonnull; -@OnlyIn(Dist.CLIENT) public abstract class AgeableMote extends Mote { protected int age; diff --git a/src/main/java/org/orecruncher/lib/particles/AnimatedMote.java b/src/main/java/org/orecruncher/lib/particles/AnimatedMote.java index 9d3a8e5b..b6b4e43a 100644 --- a/src/main/java/org/orecruncher/lib/particles/AnimatedMote.java +++ b/src/main/java/org/orecruncher/lib/particles/AnimatedMote.java @@ -28,14 +28,11 @@ import net.minecraft.util.math.vector.Quaternion; import net.minecraft.util.math.vector.Vector3f; import net.minecraft.world.IBlockReader; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.lib.gui.Color; import org.orecruncher.lib.random.XorShiftRandom; import java.util.Random; -@OnlyIn(Dist.CLIENT) public abstract class AnimatedMote extends MotionMote { protected static final Random RANDOM = XorShiftRandom.current(); diff --git a/src/main/java/org/orecruncher/lib/particles/BaseParticle.java b/src/main/java/org/orecruncher/lib/particles/BaseParticle.java index fdb6dcc7..6a19ca41 100644 --- a/src/main/java/org/orecruncher/lib/particles/BaseParticle.java +++ b/src/main/java/org/orecruncher/lib/particles/BaseParticle.java @@ -22,15 +22,12 @@ import net.minecraft.client.renderer.entity.EntityRendererManager; import net.minecraft.client.world.ClientWorld; import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.lib.GameUtils; import org.orecruncher.lib.random.XorShiftRandom; import javax.annotation.Nonnull; import java.util.Random; -@OnlyIn(Dist.CLIENT) public abstract class BaseParticle extends Particle { protected static final EntityRendererManager manager = GameUtils.getMC().getRenderManager(); diff --git a/src/main/java/org/orecruncher/lib/particles/FrustumHelper.java b/src/main/java/org/orecruncher/lib/particles/FrustumHelper.java index 51139d6b..1027002f 100644 --- a/src/main/java/org/orecruncher/lib/particles/FrustumHelper.java +++ b/src/main/java/org/orecruncher/lib/particles/FrustumHelper.java @@ -21,13 +21,10 @@ import net.minecraft.client.renderer.culling.ClippingHelper; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.vector.Vector3d; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import javax.annotation.Nonnull; import javax.annotation.Nullable; -@OnlyIn(Dist.CLIENT) public class FrustumHelper { private FrustumHelper() { diff --git a/src/main/java/org/orecruncher/lib/particles/IParticleCollection.java b/src/main/java/org/orecruncher/lib/particles/IParticleCollection.java index da248019..7132cb90 100644 --- a/src/main/java/org/orecruncher/lib/particles/IParticleCollection.java +++ b/src/main/java/org/orecruncher/lib/particles/IParticleCollection.java @@ -18,12 +18,9 @@ package org.orecruncher.lib.particles; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import javax.annotation.Nonnull; -@OnlyIn(Dist.CLIENT) public interface IParticleCollection { String name(); diff --git a/src/main/java/org/orecruncher/lib/particles/IParticleMote.java b/src/main/java/org/orecruncher/lib/particles/IParticleMote.java index 7435c136..496c2847 100644 --- a/src/main/java/org/orecruncher/lib/particles/IParticleMote.java +++ b/src/main/java/org/orecruncher/lib/particles/IParticleMote.java @@ -21,12 +21,9 @@ import com.mojang.blaze3d.vertex.IVertexBuilder; import net.minecraft.client.renderer.ActiveRenderInfo; import net.minecraft.util.math.vector.Vector3d; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import javax.annotation.Nonnull; -@OnlyIn(Dist.CLIENT) public interface IParticleMote { /** diff --git a/src/main/java/org/orecruncher/lib/particles/Mote.java b/src/main/java/org/orecruncher/lib/particles/Mote.java index 6d0d3b02..5d97ffbf 100644 --- a/src/main/java/org/orecruncher/lib/particles/Mote.java +++ b/src/main/java/org/orecruncher/lib/particles/Mote.java @@ -25,13 +25,10 @@ import net.minecraft.util.math.vector.Vector3d; 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.lib.GameUtils; import javax.annotation.Nonnull; -@OnlyIn(Dist.CLIENT) public abstract class Mote implements IParticleMote { protected final IBlockReader world; diff --git a/src/main/java/org/orecruncher/lib/particles/MotionMote.java b/src/main/java/org/orecruncher/lib/particles/MotionMote.java index 8fb6c6a2..11456d66 100644 --- a/src/main/java/org/orecruncher/lib/particles/MotionMote.java +++ b/src/main/java/org/orecruncher/lib/particles/MotionMote.java @@ -30,15 +30,12 @@ import net.minecraft.util.math.shapes.ISelectionContext; 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 java.util.Optional; /** * A particle that is capable of moving it's position in the world. */ -@OnlyIn(Dist.CLIENT) public abstract class MotionMote extends AgeableMote { protected double motionX; diff --git a/src/main/java/org/orecruncher/lib/particles/ParticleCollection.java b/src/main/java/org/orecruncher/lib/particles/ParticleCollection.java index 9601e4ba..acc81bd3 100644 --- a/src/main/java/org/orecruncher/lib/particles/ParticleCollection.java +++ b/src/main/java/org/orecruncher/lib/particles/ParticleCollection.java @@ -22,8 +22,6 @@ import net.minecraft.client.particle.IParticleRenderType; import net.minecraft.client.renderer.ActiveRenderInfo; import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.lib.GameUtils; import org.orecruncher.lib.TickCounter; import org.orecruncher.lib.collections.ObjectArray; @@ -33,7 +31,6 @@ import javax.annotation.Nonnull; import java.util.function.Predicate; -@OnlyIn(Dist.CLIENT) final class ParticleCollection extends BaseParticle { public static final ICollectionFactory FACTORY = ParticleCollection::new; diff --git a/src/main/java/org/orecruncher/lib/particles/ParticleCollectionHelper.java b/src/main/java/org/orecruncher/lib/particles/ParticleCollectionHelper.java index 8c0f81d6..5b649dd2 100644 --- a/src/main/java/org/orecruncher/lib/particles/ParticleCollectionHelper.java +++ b/src/main/java/org/orecruncher/lib/particles/ParticleCollectionHelper.java @@ -20,8 +20,6 @@ import net.minecraft.client.particle.IParticleRenderType; import net.minecraft.client.particle.Particle; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.lib.GameUtils; import org.orecruncher.lib.math.TimerEMA; @@ -30,7 +28,6 @@ import java.lang.ref.WeakReference; import java.util.Optional; -@OnlyIn(Dist.CLIENT) final class ParticleCollectionHelper implements IParticleCollection { protected final String name; diff --git a/src/main/java/org/orecruncher/lib/particles/ParticleCollisionResult.java b/src/main/java/org/orecruncher/lib/particles/ParticleCollisionResult.java index c7e267ec..2d386281 100644 --- a/src/main/java/org/orecruncher/lib/particles/ParticleCollisionResult.java +++ b/src/main/java/org/orecruncher/lib/particles/ParticleCollisionResult.java @@ -23,13 +23,10 @@ import net.minecraft.fluid.FluidState; import net.minecraft.util.math.vector.Vector3d; import net.minecraft.world.IBlockReader; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import javax.annotation.Nonnull; import javax.annotation.Nullable; -@OnlyIn(Dist.CLIENT) public final class ParticleCollisionResult { public final IBlockReader world; diff --git a/src/main/java/org/orecruncher/lib/particles/ParticleRenderType.java b/src/main/java/org/orecruncher/lib/particles/ParticleRenderType.java index 928ba9b7..0778a10d 100644 --- a/src/main/java/org/orecruncher/lib/particles/ParticleRenderType.java +++ b/src/main/java/org/orecruncher/lib/particles/ParticleRenderType.java @@ -26,13 +26,10 @@ import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.client.renderer.vertex.VertexFormat; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.lwjgl.opengl.GL11; import javax.annotation.Nonnull; -@OnlyIn(Dist.CLIENT) public class ParticleRenderType implements IParticleRenderType { private final ResourceLocation texture; diff --git a/src/main/java/org/orecruncher/lib/resource/IResourceAccessor.java b/src/main/java/org/orecruncher/lib/resource/IResourceAccessor.java index f1f80f9c..81534615 100644 --- a/src/main/java/org/orecruncher/lib/resource/IResourceAccessor.java +++ b/src/main/java/org/orecruncher/lib/resource/IResourceAccessor.java @@ -22,8 +22,6 @@ import com.google.gson.GsonBuilder; import net.minecraft.resources.IResourcePack; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.lib.Lib; import org.orecruncher.lib.validation.ValidationHelpers; import org.orecruncher.lib.validation.Validators; @@ -39,7 +37,6 @@ /** * A resource accessor is used to obtain the content of a resource from within the JAR or from an external disk source. */ -@OnlyIn(Dist.CLIENT) public interface IResourceAccessor { /** diff --git a/src/main/java/org/orecruncher/lib/resource/Manifest.java b/src/main/java/org/orecruncher/lib/resource/Manifest.java index 4b466046..6d5703d2 100644 --- a/src/main/java/org/orecruncher/lib/resource/Manifest.java +++ b/src/main/java/org/orecruncher/lib/resource/Manifest.java @@ -18,10 +18,7 @@ package org.orecruncher.lib.resource; import com.google.gson.annotations.SerializedName; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -@OnlyIn(Dist.CLIENT) class Manifest { @SerializedName("version") diff --git a/src/main/java/org/orecruncher/lib/resource/ResourceAccessorBase.java b/src/main/java/org/orecruncher/lib/resource/ResourceAccessorBase.java index 917d5105..90b43725 100644 --- a/src/main/java/org/orecruncher/lib/resource/ResourceAccessorBase.java +++ b/src/main/java/org/orecruncher/lib/resource/ResourceAccessorBase.java @@ -19,14 +19,11 @@ package org.orecruncher.lib.resource; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.lib.Singleton; import javax.annotation.Nonnull; import javax.annotation.Nullable; -@OnlyIn(Dist.CLIENT) abstract class ResourceAccessorBase implements IResourceAccessor { private final ResourceLocation location; diff --git a/src/main/java/org/orecruncher/lib/resource/ResourceAccessorExternal.java b/src/main/java/org/orecruncher/lib/resource/ResourceAccessorExternal.java index 26971549..e5052278 100644 --- a/src/main/java/org/orecruncher/lib/resource/ResourceAccessorExternal.java +++ b/src/main/java/org/orecruncher/lib/resource/ResourceAccessorExternal.java @@ -19,8 +19,6 @@ package org.orecruncher.lib.resource; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -29,7 +27,6 @@ import java.nio.file.Path; import java.nio.file.Paths; -@OnlyIn(Dist.CLIENT) final class ResourceAccessorExternal extends ResourceAccessorBase { final Path filePath; diff --git a/src/main/java/org/orecruncher/lib/resource/ResourceAccessorJar.java b/src/main/java/org/orecruncher/lib/resource/ResourceAccessorJar.java index fbd96f69..2ffa4363 100644 --- a/src/main/java/org/orecruncher/lib/resource/ResourceAccessorJar.java +++ b/src/main/java/org/orecruncher/lib/resource/ResourceAccessorJar.java @@ -19,14 +19,11 @@ package org.orecruncher.lib.resource; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.apache.commons.io.IOUtils; import javax.annotation.Nonnull; import java.io.InputStream; -@OnlyIn(Dist.CLIENT) final class ResourceAccessorJar extends ResourceAccessorBase { // Used to find assets within the current jar diff --git a/src/main/java/org/orecruncher/lib/resource/ResourceAccessorPack.java b/src/main/java/org/orecruncher/lib/resource/ResourceAccessorPack.java index 2478511a..f4414b6b 100644 --- a/src/main/java/org/orecruncher/lib/resource/ResourceAccessorPack.java +++ b/src/main/java/org/orecruncher/lib/resource/ResourceAccessorPack.java @@ -21,14 +21,11 @@ import net.minecraft.resources.IResourcePack; import net.minecraft.resources.ResourcePackType; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.apache.commons.io.IOUtils; import javax.annotation.Nonnull; import java.io.InputStream; -@OnlyIn(Dist.CLIENT) final class ResourceAccessorPack extends ResourceAccessorBase { private final IResourcePack pack; diff --git a/src/main/java/org/orecruncher/lib/resource/ResourceUtils.java b/src/main/java/org/orecruncher/lib/resource/ResourceUtils.java index c5c1b40c..6262a7aa 100644 --- a/src/main/java/org/orecruncher/lib/resource/ResourceUtils.java +++ b/src/main/java/org/orecruncher/lib/resource/ResourceUtils.java @@ -22,8 +22,6 @@ import net.minecraft.resources.ResourcePackInfo; import net.minecraft.resources.ResourcePackType; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.lib.Lib; import org.orecruncher.lib.fml.ForgeUtils; @@ -32,7 +30,6 @@ import java.io.File; import java.util.*; -@OnlyIn(Dist.CLIENT) public final class ResourceUtils { private ResourceUtils() { diff --git a/src/main/java/org/orecruncher/lib/scripting/sets/BiomeVariables.java b/src/main/java/org/orecruncher/lib/scripting/sets/BiomeVariables.java index 06638609..e90228b4 100644 --- a/src/main/java/org/orecruncher/lib/scripting/sets/BiomeVariables.java +++ b/src/main/java/org/orecruncher/lib/scripting/sets/BiomeVariables.java @@ -22,8 +22,6 @@ import net.minecraft.util.registry.Registry; import net.minecraft.world.biome.Biome; import net.minecraft.world.biome.BiomeRegistry; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.common.BiomeDictionary; import org.orecruncher.lib.GameUtils; import org.orecruncher.lib.biomes.BiomeUtilities; @@ -33,7 +31,6 @@ import java.util.Set; import java.util.stream.Collectors; -@OnlyIn(Dist.CLIENT) public class BiomeVariables extends VariableSet implements IBiomeVariables { private Biome biome; diff --git a/src/main/java/org/orecruncher/lib/scripting/sets/DimensionVariables.java b/src/main/java/org/orecruncher/lib/scripting/sets/DimensionVariables.java index ebbc1d32..5f1d3bae 100644 --- a/src/main/java/org/orecruncher/lib/scripting/sets/DimensionVariables.java +++ b/src/main/java/org/orecruncher/lib/scripting/sets/DimensionVariables.java @@ -20,15 +20,12 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.world.DimensionType; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.lib.GameUtils; import org.orecruncher.lib.WorldUtils; import org.orecruncher.lib.scripting.VariableSet; import javax.annotation.Nonnull; -@OnlyIn(Dist.CLIENT) public class DimensionVariables extends VariableSet implements IDimensionVariables { private String id; diff --git a/src/main/java/org/orecruncher/lib/scripting/sets/DiurnalCycleVariables.java b/src/main/java/org/orecruncher/lib/scripting/sets/DiurnalCycleVariables.java index 6a7a1036..c2181117 100644 --- a/src/main/java/org/orecruncher/lib/scripting/sets/DiurnalCycleVariables.java +++ b/src/main/java/org/orecruncher/lib/scripting/sets/DiurnalCycleVariables.java @@ -18,15 +18,12 @@ package org.orecruncher.lib.scripting.sets; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.lib.DayCycle; import org.orecruncher.lib.GameUtils; import org.orecruncher.lib.scripting.VariableSet; import javax.annotation.Nonnull; -@OnlyIn(Dist.CLIENT) public class DiurnalCycleVariables extends VariableSet implements IDiurnalCycle { private final LazyVariable moonPhaseFactor = new LazyVariable<>(() -> GameUtils.isInGame() ? DayCycle.getMoonPhaseFactor(GameUtils.getWorld()) : 0F); diff --git a/src/main/java/org/orecruncher/lib/scripting/sets/IBiomeVariables.java b/src/main/java/org/orecruncher/lib/scripting/sets/IBiomeVariables.java index 6ccec982..7e8e595b 100644 --- a/src/main/java/org/orecruncher/lib/scripting/sets/IBiomeVariables.java +++ b/src/main/java/org/orecruncher/lib/scripting/sets/IBiomeVariables.java @@ -18,12 +18,9 @@ package org.orecruncher.lib.scripting.sets; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import javax.annotation.Nonnull; -@OnlyIn(Dist.CLIENT) public interface IBiomeVariables { String getName(); diff --git a/src/main/java/org/orecruncher/lib/scripting/sets/IDimensionVariables.java b/src/main/java/org/orecruncher/lib/scripting/sets/IDimensionVariables.java index 89e0f41e..da410a8e 100644 --- a/src/main/java/org/orecruncher/lib/scripting/sets/IDimensionVariables.java +++ b/src/main/java/org/orecruncher/lib/scripting/sets/IDimensionVariables.java @@ -18,10 +18,7 @@ package org.orecruncher.lib.scripting.sets; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -@OnlyIn(Dist.CLIENT) public interface IDimensionVariables { String getId(); diff --git a/src/main/java/org/orecruncher/lib/scripting/sets/IDiurnalCycle.java b/src/main/java/org/orecruncher/lib/scripting/sets/IDiurnalCycle.java index a7292d6a..4a8a9ec9 100644 --- a/src/main/java/org/orecruncher/lib/scripting/sets/IDiurnalCycle.java +++ b/src/main/java/org/orecruncher/lib/scripting/sets/IDiurnalCycle.java @@ -18,10 +18,7 @@ package org.orecruncher.lib.scripting.sets; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -@OnlyIn(Dist.CLIENT) public interface IDiurnalCycle { boolean isDay(); diff --git a/src/main/java/org/orecruncher/lib/scripting/sets/IPlayerVariables.java b/src/main/java/org/orecruncher/lib/scripting/sets/IPlayerVariables.java index 52db3916..e5fa9b1c 100644 --- a/src/main/java/org/orecruncher/lib/scripting/sets/IPlayerVariables.java +++ b/src/main/java/org/orecruncher/lib/scripting/sets/IPlayerVariables.java @@ -18,10 +18,7 @@ package org.orecruncher.lib.scripting.sets; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -@OnlyIn(Dist.CLIENT) public interface IPlayerVariables { boolean isCreative(); diff --git a/src/main/java/org/orecruncher/lib/scripting/sets/IWeatherVariables.java b/src/main/java/org/orecruncher/lib/scripting/sets/IWeatherVariables.java index ccbb24ef..03e2e15f 100644 --- a/src/main/java/org/orecruncher/lib/scripting/sets/IWeatherVariables.java +++ b/src/main/java/org/orecruncher/lib/scripting/sets/IWeatherVariables.java @@ -18,11 +18,8 @@ package org.orecruncher.lib.scripting.sets; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.lib.WorldUtils; -@OnlyIn(Dist.CLIENT) public interface IWeatherVariables { /** diff --git a/src/main/java/org/orecruncher/lib/scripting/sets/LazyVariable.java b/src/main/java/org/orecruncher/lib/scripting/sets/LazyVariable.java index 9b830464..c04e319b 100644 --- a/src/main/java/org/orecruncher/lib/scripting/sets/LazyVariable.java +++ b/src/main/java/org/orecruncher/lib/scripting/sets/LazyVariable.java @@ -18,8 +18,6 @@ package org.orecruncher.lib.scripting.sets; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import javax.annotation.Nonnull; import java.util.function.Supplier; @@ -30,7 +28,6 @@ * * @param Type of value that is cached */ -@OnlyIn(Dist.CLIENT) public final class LazyVariable { @Nonnull diff --git a/src/main/java/org/orecruncher/lib/scripting/sets/PlayerVariables.java b/src/main/java/org/orecruncher/lib/scripting/sets/PlayerVariables.java index 7a358514..458fa771 100644 --- a/src/main/java/org/orecruncher/lib/scripting/sets/PlayerVariables.java +++ b/src/main/java/org/orecruncher/lib/scripting/sets/PlayerVariables.java @@ -21,15 +21,12 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.potion.Effects; import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.lib.GameUtils; import org.orecruncher.lib.WorldUtils; import org.orecruncher.lib.scripting.VariableSet; import javax.annotation.Nonnull; -@OnlyIn(Dist.CLIENT) public class PlayerVariables extends VariableSet implements IPlayerVariables { private final LazyVariable isSuffocating = new LazyVariable<>(() -> { diff --git a/src/main/java/org/orecruncher/lib/scripting/sets/SeasonVariables.java b/src/main/java/org/orecruncher/lib/scripting/sets/SeasonVariables.java index 6173861d..4b761515 100644 --- a/src/main/java/org/orecruncher/lib/scripting/sets/SeasonVariables.java +++ b/src/main/java/org/orecruncher/lib/scripting/sets/SeasonVariables.java @@ -18,8 +18,6 @@ package org.orecruncher.lib.scripting.sets; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.lib.GameUtils; import org.orecruncher.lib.scripting.VariableSet; import org.orecruncher.lib.seasons.Season; @@ -27,7 +25,6 @@ import javax.annotation.Nonnull; -@OnlyIn(Dist.CLIENT) public class SeasonVariables extends VariableSet implements ISeasonVariables { private final LazyVariable season = new LazyVariable<>(() -> Season.getSeason(GameUtils.getWorld())); diff --git a/src/main/java/org/orecruncher/lib/scripting/sets/WeatherVariables.java b/src/main/java/org/orecruncher/lib/scripting/sets/WeatherVariables.java index 18aaeafb..1dd50e77 100644 --- a/src/main/java/org/orecruncher/lib/scripting/sets/WeatherVariables.java +++ b/src/main/java/org/orecruncher/lib/scripting/sets/WeatherVariables.java @@ -20,15 +20,12 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.lib.GameUtils; import org.orecruncher.lib.WorldUtils; import org.orecruncher.lib.scripting.VariableSet; import javax.annotation.Nonnull; -@OnlyIn(Dist.CLIENT) public class WeatherVariables extends VariableSet implements IWeatherVariables { private final LazyVariable temperature = new LazyVariable<>(() -> { diff --git a/src/main/java/org/orecruncher/lib/seasons/SeasonSubType.java b/src/main/java/org/orecruncher/lib/seasons/SeasonSubType.java index 8e037cd0..cbe37f08 100644 --- a/src/main/java/org/orecruncher/lib/seasons/SeasonSubType.java +++ b/src/main/java/org/orecruncher/lib/seasons/SeasonSubType.java @@ -18,8 +18,6 @@ package org.orecruncher.lib.seasons; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.lib.Localization; import org.orecruncher.sndctrl.SoundControl; @@ -42,7 +40,6 @@ public String getTranslationKey() { return this.xlateKey; } - @OnlyIn(Dist.CLIENT) public String getFormattedText() { return Localization.load(this.xlateKey); } diff --git a/src/main/java/org/orecruncher/lib/seasons/SeasonType.java b/src/main/java/org/orecruncher/lib/seasons/SeasonType.java index e93dd6bc..dc189e01 100644 --- a/src/main/java/org/orecruncher/lib/seasons/SeasonType.java +++ b/src/main/java/org/orecruncher/lib/seasons/SeasonType.java @@ -18,8 +18,6 @@ package org.orecruncher.lib.seasons; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.lib.Localization; import org.orecruncher.sndctrl.SoundControl; @@ -42,7 +40,6 @@ public String getTranslationKey() { return this.xlateKey; } - @OnlyIn(Dist.CLIENT) public String getFormattedText() { return Localization.load(this.xlateKey); } diff --git a/src/main/java/org/orecruncher/lib/service/IModuleService.java b/src/main/java/org/orecruncher/lib/service/IModuleService.java index 0fd6e626..21f2e468 100644 --- a/src/main/java/org/orecruncher/lib/service/IModuleService.java +++ b/src/main/java/org/orecruncher/lib/service/IModuleService.java @@ -18,10 +18,7 @@ package org.orecruncher.lib.service; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -@OnlyIn(Dist.CLIENT) public interface IModuleService { String name(); diff --git a/src/main/java/org/orecruncher/lib/shaders/IShaderResourceProvider.java b/src/main/java/org/orecruncher/lib/shaders/IShaderResourceProvider.java index ca24b69f..8c7e3cd2 100644 --- a/src/main/java/org/orecruncher/lib/shaders/IShaderResourceProvider.java +++ b/src/main/java/org/orecruncher/lib/shaders/IShaderResourceProvider.java @@ -19,13 +19,10 @@ package org.orecruncher.lib.shaders; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import javax.annotation.Nonnull; import java.util.Collection; -@OnlyIn(Dist.CLIENT) public interface IShaderResourceProvider { @Nonnull ResourceLocation getVertex(); diff --git a/src/main/java/org/orecruncher/lib/shaders/ShaderCallContext.java b/src/main/java/org/orecruncher/lib/shaders/ShaderCallContext.java index 8e23ac21..8309252f 100644 --- a/src/main/java/org/orecruncher/lib/shaders/ShaderCallContext.java +++ b/src/main/java/org/orecruncher/lib/shaders/ShaderCallContext.java @@ -17,14 +17,11 @@ */ package org.orecruncher.lib.shaders; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.lwjgl.opengl.GL20; import org.orecruncher.lib.gui.Color; import javax.annotation.Nonnull; -@OnlyIn(Dist.CLIENT) public final class ShaderCallContext { private final ShaderProgram program; diff --git a/src/main/java/org/orecruncher/lib/shaders/ShaderManager.java b/src/main/java/org/orecruncher/lib/shaders/ShaderManager.java index e7bc7956..2bcc99c9 100644 --- a/src/main/java/org/orecruncher/lib/shaders/ShaderManager.java +++ b/src/main/java/org/orecruncher/lib/shaders/ShaderManager.java @@ -23,8 +23,6 @@ import net.minecraft.resources.IReloadableResourceManager; import net.minecraft.resources.IResourceManager; import net.minecraft.resources.IResourceManagerReloadListener; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraft.util.ResourceLocation; import org.orecruncher.lib.GameUtils; import org.orecruncher.lib.Lib; @@ -40,7 +38,6 @@ import java.util.function.Consumer; import java.util.function.Supplier; -@OnlyIn(Dist.CLIENT) public final class ShaderManager & IShaderResourceProvider> { private final Class clazz; diff --git a/src/main/java/org/orecruncher/lib/shaders/ShaderProgram.java b/src/main/java/org/orecruncher/lib/shaders/ShaderProgram.java index 1ab1f18b..8d36b991 100644 --- a/src/main/java/org/orecruncher/lib/shaders/ShaderProgram.java +++ b/src/main/java/org/orecruncher/lib/shaders/ShaderProgram.java @@ -21,14 +21,11 @@ import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap; import net.minecraft.client.shader.IShaderManager; import net.minecraft.client.shader.ShaderLoader; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.lib.Lib; import javax.annotation.Nonnull; import java.util.Collection; -@OnlyIn(Dist.CLIENT) final class ShaderProgram implements IShaderManager { private final String name; diff --git a/src/main/java/org/orecruncher/lib/tags/TagUtils.java b/src/main/java/org/orecruncher/lib/tags/TagUtils.java index 6d5b90bd..245241b2 100644 --- a/src/main/java/org/orecruncher/lib/tags/TagUtils.java +++ b/src/main/java/org/orecruncher/lib/tags/TagUtils.java @@ -22,15 +22,12 @@ import net.minecraft.block.Block; import net.minecraft.tags.*; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.util.stream.Collectors; import java.util.stream.Stream; -@OnlyIn(Dist.CLIENT) public final class TagUtils { private TagUtils() { diff --git a/src/main/java/org/orecruncher/mobeffects/config/ConfigGenerator.java b/src/main/java/org/orecruncher/mobeffects/config/ConfigGenerator.java index 92fd78d5..cac42c5b 100644 --- a/src/main/java/org/orecruncher/mobeffects/config/ConfigGenerator.java +++ b/src/main/java/org/orecruncher/mobeffects/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.lib.config.ClothAPIFactory; import org.orecruncher.mobeffects.footsteps.FootprintStyle; import javax.annotation.Nonnull; -@OnlyIn(Dist.CLIENT) public class ConfigGenerator { @Nonnull diff --git a/src/main/java/org/orecruncher/mobeffects/effects/EntityBowEffect.java b/src/main/java/org/orecruncher/mobeffects/effects/EntityBowEffect.java index 908a84aa..9a617a1e 100644 --- a/src/main/java/org/orecruncher/mobeffects/effects/EntityBowEffect.java +++ b/src/main/java/org/orecruncher/mobeffects/effects/EntityBowEffect.java @@ -21,14 +21,11 @@ import net.minecraft.entity.LivingEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.mobeffects.MobEffects; import org.orecruncher.mobeffects.library.ItemData; import org.orecruncher.mobeffects.library.ItemLibrary; import org.orecruncher.sndctrl.api.effects.AbstractEntityEffect; -@OnlyIn(Dist.CLIENT) public class EntityBowEffect extends AbstractEntityEffect { private static final ResourceLocation NAME = new ResourceLocation(MobEffects.MOD_ID, "bow"); diff --git a/src/main/java/org/orecruncher/mobeffects/effects/EntityBreathEffect.java b/src/main/java/org/orecruncher/mobeffects/effects/EntityBreathEffect.java index 79ff5abf..b50444fd 100644 --- a/src/main/java/org/orecruncher/mobeffects/effects/EntityBreathEffect.java +++ b/src/main/java/org/orecruncher/mobeffects/effects/EntityBreathEffect.java @@ -25,8 +25,6 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.lib.GameUtils; import org.orecruncher.lib.TickCounter; import org.orecruncher.lib.WorldUtils; @@ -39,7 +37,6 @@ import javax.annotation.Nonnull; -@OnlyIn(Dist.CLIENT) public class EntityBreathEffect extends AbstractEntityEffect { private static final ResourceLocation NAME = new ResourceLocation(MobEffects.MOD_ID, "breath"); diff --git a/src/main/java/org/orecruncher/mobeffects/effects/EntityFootprintEffect.java b/src/main/java/org/orecruncher/mobeffects/effects/EntityFootprintEffect.java index 53def31b..b073f52b 100644 --- a/src/main/java/org/orecruncher/mobeffects/effects/EntityFootprintEffect.java +++ b/src/main/java/org/orecruncher/mobeffects/effects/EntityFootprintEffect.java @@ -22,8 +22,6 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.mobeffects.config.Config; import org.orecruncher.mobeffects.MobEffects; @@ -33,7 +31,6 @@ import org.orecruncher.sndctrl.api.effects.AbstractEntityEffect; import org.orecruncher.sndctrl.api.effects.IEntityEffectManager; -@OnlyIn(Dist.CLIENT) public class EntityFootprintEffect extends AbstractEntityEffect { private static final ResourceLocation NAME = new ResourceLocation(MobEffects.MOD_ID, "footprint"); @@ -63,7 +60,6 @@ public String toString() { return super.toString() + ": " + this.generator.getPedometer(); } - @OnlyIn(Dist.CLIENT) private static class PlayerFootprintEffect extends EntityFootprintEffect { protected FootprintStyle lastStyle; diff --git a/src/main/java/org/orecruncher/mobeffects/effects/FactoryHandler.java b/src/main/java/org/orecruncher/mobeffects/effects/FactoryHandler.java index 7a1abc63..4c2d3fe7 100644 --- a/src/main/java/org/orecruncher/mobeffects/effects/FactoryHandler.java +++ b/src/main/java/org/orecruncher/mobeffects/effects/FactoryHandler.java @@ -20,8 +20,6 @@ import net.minecraft.entity.LivingEntity; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.mobeffects.library.EffectLibrary; import org.orecruncher.sndctrl.api.effects.AbstractEntityEffect; import org.orecruncher.sndctrl.api.effects.IEntityEffectFactoryHandler; @@ -29,7 +27,6 @@ import javax.annotation.Nonnull; import java.util.function.Function; -@OnlyIn(Dist.CLIENT) public class FactoryHandler implements IEntityEffectFactoryHandler { private final ResourceLocation name; diff --git a/src/main/java/org/orecruncher/mobeffects/effects/PlayerToolbarEffect.java b/src/main/java/org/orecruncher/mobeffects/effects/PlayerToolbarEffect.java index 5aea7359..67d72d30 100644 --- a/src/main/java/org/orecruncher/mobeffects/effects/PlayerToolbarEffect.java +++ b/src/main/java/org/orecruncher/mobeffects/effects/PlayerToolbarEffect.java @@ -23,8 +23,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.Hand; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.mobeffects.MobEffects; import org.orecruncher.mobeffects.library.ItemData; import org.orecruncher.mobeffects.library.ItemLibrary; @@ -33,7 +31,6 @@ import javax.annotation.Nonnull; -@OnlyIn(Dist.CLIENT) public class PlayerToolbarEffect extends AbstractEntityEffect { private static final ResourceLocation NAME = new ResourceLocation(MobEffects.MOD_ID, "toolbar"); diff --git a/src/main/java/org/orecruncher/mobeffects/effects/particles/BubbleBreathParticle.java b/src/main/java/org/orecruncher/mobeffects/effects/particles/BubbleBreathParticle.java index 9080f652..11ec0f28 100644 --- a/src/main/java/org/orecruncher/mobeffects/effects/particles/BubbleBreathParticle.java +++ b/src/main/java/org/orecruncher/mobeffects/effects/particles/BubbleBreathParticle.java @@ -27,13 +27,10 @@ import net.minecraft.tags.FluidTags; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.vector.Vector3d; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.lib.GameUtils; import javax.annotation.Nonnull; -@OnlyIn(Dist.CLIENT) public class BubbleBreathParticle extends SpriteTexturedParticle { public BubbleBreathParticle(@Nonnull final LivingEntity entity, final boolean isDrowning) { super((ClientWorld) entity.getEntityWorld(), 0, 0, 0); diff --git a/src/main/java/org/orecruncher/mobeffects/effects/particles/Collections.java b/src/main/java/org/orecruncher/mobeffects/effects/particles/Collections.java index edc45588..483881b4 100644 --- a/src/main/java/org/orecruncher/mobeffects/effects/particles/Collections.java +++ b/src/main/java/org/orecruncher/mobeffects/effects/particles/Collections.java @@ -25,8 +25,6 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.vector.Vector3d; import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.lib.particles.CollectionManager; import org.orecruncher.lib.particles.IParticleCollection; import org.orecruncher.lib.particles.IParticleMote; @@ -36,7 +34,6 @@ import javax.annotation.Nonnull; -@OnlyIn(Dist.CLIENT) public final class Collections { private static final ParticleRenderType FOOTPRINT_RENDER = diff --git a/src/main/java/org/orecruncher/mobeffects/effects/particles/FootprintMote.java b/src/main/java/org/orecruncher/mobeffects/effects/particles/FootprintMote.java index c117b8c1..ac6b1acd 100644 --- a/src/main/java/org/orecruncher/mobeffects/effects/particles/FootprintMote.java +++ b/src/main/java/org/orecruncher/mobeffects/effects/particles/FootprintMote.java @@ -26,8 +26,6 @@ import net.minecraft.util.math.vector.Vector2f; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.lib.WorldUtils; import org.orecruncher.lib.math.MathStuff; import org.orecruncher.lib.particles.AgeableMote; @@ -35,7 +33,6 @@ import javax.annotation.Nonnull; -@OnlyIn(Dist.CLIENT) public class FootprintMote extends AgeableMote { // Texture properties of the print diff --git a/src/main/java/org/orecruncher/mobeffects/effects/particles/FrostBreathParticle.java b/src/main/java/org/orecruncher/mobeffects/effects/particles/FrostBreathParticle.java index becc055b..b296471b 100644 --- a/src/main/java/org/orecruncher/mobeffects/effects/particles/FrostBreathParticle.java +++ b/src/main/java/org/orecruncher/mobeffects/effects/particles/FrostBreathParticle.java @@ -23,8 +23,6 @@ import net.minecraft.entity.LivingEntity; import net.minecraft.particles.ParticleTypes; import net.minecraft.util.math.vector.Vector3d; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.lib.GameUtils; import org.orecruncher.lib.math.MathStuff; import org.orecruncher.lib.random.XorShiftRandom; @@ -32,7 +30,6 @@ import javax.annotation.Nonnull; import java.util.Random; -@OnlyIn(Dist.CLIENT) public class FrostBreathParticle extends SpriteTexturedParticle { private final IAnimatedSprite field_217583_C; diff --git a/src/main/java/org/orecruncher/mobeffects/effects/particles/ParticleUtils.java b/src/main/java/org/orecruncher/mobeffects/effects/particles/ParticleUtils.java index 9676092f..50a9a6c7 100644 --- a/src/main/java/org/orecruncher/mobeffects/effects/particles/ParticleUtils.java +++ b/src/main/java/org/orecruncher/mobeffects/effects/particles/ParticleUtils.java @@ -21,14 +21,11 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.LivingEntity; import net.minecraft.util.math.vector.Vector3d; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.lib.random.XorShiftRandom; import javax.annotation.Nonnull; import java.util.Random; -@OnlyIn(Dist.CLIENT) public final class ParticleUtils { private static final Random RANDOM = XorShiftRandom.current(); diff --git a/src/main/java/org/orecruncher/mobeffects/footsteps/AcousticResolver.java b/src/main/java/org/orecruncher/mobeffects/footsteps/AcousticResolver.java index 240d1870..766a6e64 100644 --- a/src/main/java/org/orecruncher/mobeffects/footsteps/AcousticResolver.java +++ b/src/main/java/org/orecruncher/mobeffects/footsteps/AcousticResolver.java @@ -30,8 +30,6 @@ import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.vector.Vector3d; import net.minecraft.world.IWorldReader; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.lib.math.MathStuff; import net.minecraft.util.math.BlockPos; @@ -43,7 +41,6 @@ import org.orecruncher.sndctrl.audio.acoustic.AcousticCompiler; import org.orecruncher.sndctrl.library.Primitives; -@OnlyIn(Dist.CLIENT) public class AcousticResolver { private static final float PROBE_DEPTH = 1F/16F; diff --git a/src/main/java/org/orecruncher/mobeffects/footsteps/Association.java b/src/main/java/org/orecruncher/mobeffects/footsteps/Association.java index 32f2a87b..f67cda3a 100644 --- a/src/main/java/org/orecruncher/mobeffects/footsteps/Association.java +++ b/src/main/java/org/orecruncher/mobeffects/footsteps/Association.java @@ -21,8 +21,6 @@ import javax.annotation.Nonnull; import net.minecraft.entity.LivingEntity; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.vector.Vector3d; @@ -30,7 +28,6 @@ import org.orecruncher.sndctrl.api.acoustics.IAcoustic; import org.orecruncher.sndctrl.audio.acoustic.AcousticCompiler; -@OnlyIn(Dist.CLIENT) public class Association { private final FootStrikeLocation location; diff --git a/src/main/java/org/orecruncher/mobeffects/footsteps/FootStrikeLocation.java b/src/main/java/org/orecruncher/mobeffects/footsteps/FootStrikeLocation.java index 67846ce1..8aec4b51 100644 --- a/src/main/java/org/orecruncher/mobeffects/footsteps/FootStrikeLocation.java +++ b/src/main/java/org/orecruncher/mobeffects/footsteps/FootStrikeLocation.java @@ -26,8 +26,6 @@ import net.minecraft.entity.LivingEntity; import net.minecraft.util.Direction; import net.minecraft.util.math.shapes.VoxelShape; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.vector.Vector3d; @@ -35,7 +33,6 @@ import org.orecruncher.mobeffects.footsteps.facade.FacadeHelper; import org.orecruncher.mobeffects.library.FootstepLibrary; -@OnlyIn(Dist.CLIENT) public final class FootStrikeLocation { private final LivingEntity entity; diff --git a/src/main/java/org/orecruncher/mobeffects/footsteps/Footprint.java b/src/main/java/org/orecruncher/mobeffects/footsteps/Footprint.java index 9c773a38..c1b90d97 100644 --- a/src/main/java/org/orecruncher/mobeffects/footsteps/Footprint.java +++ b/src/main/java/org/orecruncher/mobeffects/footsteps/Footprint.java @@ -23,10 +23,7 @@ import net.minecraft.entity.LivingEntity; import net.minecraft.util.math.vector.Vector3d; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -@OnlyIn(Dist.CLIENT) public class Footprint { private FootprintStyle style; diff --git a/src/main/java/org/orecruncher/mobeffects/footsteps/FootprintStyle.java b/src/main/java/org/orecruncher/mobeffects/footsteps/FootprintStyle.java index c3e826fd..fa797c08 100644 --- a/src/main/java/org/orecruncher/mobeffects/footsteps/FootprintStyle.java +++ b/src/main/java/org/orecruncher/mobeffects/footsteps/FootprintStyle.java @@ -18,12 +18,9 @@ package org.orecruncher.mobeffects.footsteps; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import javax.annotation.Nonnull; -@OnlyIn(Dist.CLIENT) public enum FootprintStyle { SHOE, diff --git a/src/main/java/org/orecruncher/mobeffects/footsteps/Generator.java b/src/main/java/org/orecruncher/mobeffects/footsteps/Generator.java index 50fddddd..566bd9a7 100644 --- a/src/main/java/org/orecruncher/mobeffects/footsteps/Generator.java +++ b/src/main/java/org/orecruncher/mobeffects/footsteps/Generator.java @@ -29,8 +29,6 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.fluid.FluidState; import net.minecraft.tags.BlockTags; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.common.ForgeHooks; import org.orecruncher.lib.GameUtils; import org.orecruncher.lib.TickCounter; @@ -52,7 +50,6 @@ import org.orecruncher.sndctrl.api.acoustics.IAcoustic; import org.orecruncher.sndctrl.audio.acoustic.AcousticCompiler; -@OnlyIn(Dist.CLIENT) public class Generator { protected static final IModLog LOGGER = MobEffects.LOGGER.createChild(Generator.class); diff --git a/src/main/java/org/orecruncher/mobeffects/footsteps/GeneratorQP.java b/src/main/java/org/orecruncher/mobeffects/footsteps/GeneratorQP.java index 6a649f7f..729bef6a 100644 --- a/src/main/java/org/orecruncher/mobeffects/footsteps/GeneratorQP.java +++ b/src/main/java/org/orecruncher/mobeffects/footsteps/GeneratorQP.java @@ -21,12 +21,9 @@ import javax.annotation.Nonnull; import net.minecraft.entity.LivingEntity; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.mobeffects.library.Constants; import org.orecruncher.sndctrl.api.acoustics.AcousticEvent; -@OnlyIn(Dist.CLIENT) public class GeneratorQP extends Generator { private static final int USE_FUNCTION = 2; diff --git a/src/main/java/org/orecruncher/mobeffects/footsteps/Substrate.java b/src/main/java/org/orecruncher/mobeffects/footsteps/Substrate.java index 4c4502df..8a43cbf3 100644 --- a/src/main/java/org/orecruncher/mobeffects/footsteps/Substrate.java +++ b/src/main/java/org/orecruncher/mobeffects/footsteps/Substrate.java @@ -25,10 +25,7 @@ import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap; import net.minecraft.util.StringUtils; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -@OnlyIn(Dist.CLIENT) public enum Substrate { NORMAL("normal"), diff --git a/src/main/java/org/orecruncher/mobeffects/footsteps/Variator.java b/src/main/java/org/orecruncher/mobeffects/footsteps/Variator.java index e3b0ff94..3922ff8f 100644 --- a/src/main/java/org/orecruncher/mobeffects/footsteps/Variator.java +++ b/src/main/java/org/orecruncher/mobeffects/footsteps/Variator.java @@ -20,11 +20,8 @@ import javax.annotation.Nonnull; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.mobeffects.library.config.VariatorConfig; -@OnlyIn(Dist.CLIENT) public class Variator { public final int IMMOBILE_DURATION; diff --git a/src/main/java/org/orecruncher/mobeffects/footsteps/accents/ArmorAccents.java b/src/main/java/org/orecruncher/mobeffects/footsteps/accents/ArmorAccents.java index 0170aef6..ebafb03c 100644 --- a/src/main/java/org/orecruncher/mobeffects/footsteps/accents/ArmorAccents.java +++ b/src/main/java/org/orecruncher/mobeffects/footsteps/accents/ArmorAccents.java @@ -22,8 +22,6 @@ import net.minecraft.entity.LivingEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.lib.collections.ObjectArray; import org.orecruncher.mobeffects.config.Config; import org.orecruncher.mobeffects.library.ItemData; @@ -33,7 +31,6 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; -@OnlyIn(Dist.CLIENT) class ArmorAccents implements IFootstepAccentProvider { @Nullable diff --git a/src/main/java/org/orecruncher/mobeffects/footsteps/accents/FootstepAccents.java b/src/main/java/org/orecruncher/mobeffects/footsteps/accents/FootstepAccents.java index 26cf94a2..3fdea2fc 100644 --- a/src/main/java/org/orecruncher/mobeffects/footsteps/accents/FootstepAccents.java +++ b/src/main/java/org/orecruncher/mobeffects/footsteps/accents/FootstepAccents.java @@ -21,14 +21,11 @@ import net.minecraft.block.BlockState; import net.minecraft.entity.LivingEntity; import net.minecraft.util.math.BlockPos; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.lib.collections.ObjectArray; import org.orecruncher.sndctrl.api.acoustics.IAcoustic; import javax.annotation.Nonnull; -@OnlyIn(Dist.CLIENT) public class FootstepAccents { private FootstepAccents() { diff --git a/src/main/java/org/orecruncher/mobeffects/footsteps/accents/IFootstepAccentProvider.java b/src/main/java/org/orecruncher/mobeffects/footsteps/accents/IFootstepAccentProvider.java index 28b062dc..4f904b39 100644 --- a/src/main/java/org/orecruncher/mobeffects/footsteps/accents/IFootstepAccentProvider.java +++ b/src/main/java/org/orecruncher/mobeffects/footsteps/accents/IFootstepAccentProvider.java @@ -22,8 +22,6 @@ import net.minecraft.block.BlockState; import net.minecraft.entity.LivingEntity; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraft.util.math.BlockPos; import org.orecruncher.lib.collections.ObjectArray; @@ -33,7 +31,6 @@ * Interface for objects that provide additional accents to acoustics when * producing step sounds. */ -@OnlyIn(Dist.CLIENT) interface IFootstepAccentProvider { void provide(@Nonnull final LivingEntity entity, @Nonnull final BlockPos pos, @Nonnull final BlockState posState, @Nonnull final ObjectArray acoustics); diff --git a/src/main/java/org/orecruncher/mobeffects/footsteps/accents/RainSplashAccent.java b/src/main/java/org/orecruncher/mobeffects/footsteps/accents/RainSplashAccent.java index ae86de95..cd59edce 100644 --- a/src/main/java/org/orecruncher/mobeffects/footsteps/accents/RainSplashAccent.java +++ b/src/main/java/org/orecruncher/mobeffects/footsteps/accents/RainSplashAccent.java @@ -23,8 +23,6 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.biome.Biome; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.lib.WorldUtils; import org.orecruncher.lib.collections.ObjectArray; import org.orecruncher.mobeffects.config.Config; @@ -33,7 +31,6 @@ import javax.annotation.Nonnull; -@OnlyIn(Dist.CLIENT) class RainSplashAccent implements IFootstepAccentProvider { @Override diff --git a/src/main/java/org/orecruncher/mobeffects/footsteps/accents/WaterLoggedAccent.java b/src/main/java/org/orecruncher/mobeffects/footsteps/accents/WaterLoggedAccent.java index f167ddff..7c0caf59 100644 --- a/src/main/java/org/orecruncher/mobeffects/footsteps/accents/WaterLoggedAccent.java +++ b/src/main/java/org/orecruncher/mobeffects/footsteps/accents/WaterLoggedAccent.java @@ -23,8 +23,6 @@ import net.minecraft.entity.LivingEntity; import net.minecraft.fluid.FluidState; import net.minecraft.util.math.BlockPos; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.lib.collections.ObjectArray; import org.orecruncher.mobeffects.config.Config; import org.orecruncher.mobeffects.library.FootstepLibrary; @@ -32,7 +30,6 @@ import javax.annotation.Nonnull; -@OnlyIn(Dist.CLIENT) class WaterLoggedAccent implements IFootstepAccentProvider { @Override diff --git a/src/main/java/org/orecruncher/mobeffects/footsteps/facade/ChiselFacadeAccessor.java b/src/main/java/org/orecruncher/mobeffects/footsteps/facade/ChiselFacadeAccessor.java index 6f3b5b40..94ed117d 100644 --- a/src/main/java/org/orecruncher/mobeffects/footsteps/facade/ChiselFacadeAccessor.java +++ b/src/main/java/org/orecruncher/mobeffects/footsteps/facade/ChiselFacadeAccessor.java @@ -18,10 +18,7 @@ package org.orecruncher.mobeffects.footsteps.facade; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -@OnlyIn(Dist.CLIENT) final class ChiselFacadeAccessor extends FacadeAccessor { private static final String CLASS = "team.chisel.ctm.api.IFacade"; diff --git a/src/main/java/org/orecruncher/mobeffects/footsteps/facade/FacadeAccessor.java b/src/main/java/org/orecruncher/mobeffects/footsteps/facade/FacadeAccessor.java index 8f6676ef..9493252f 100644 --- a/src/main/java/org/orecruncher/mobeffects/footsteps/facade/FacadeAccessor.java +++ b/src/main/java/org/orecruncher/mobeffects/footsteps/facade/FacadeAccessor.java @@ -28,14 +28,11 @@ import net.minecraft.util.Direction; import net.minecraft.util.math.vector.Vector3d; import net.minecraft.world.IBlockReader; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraft.block.Block; import net.minecraft.util.math.BlockPos; import org.orecruncher.mobeffects.MobEffects; -@OnlyIn(Dist.CLIENT) class FacadeAccessor implements IFacadeAccessor { protected Class IFacadeClass; diff --git a/src/main/java/org/orecruncher/mobeffects/footsteps/facade/FacadeHelper.java b/src/main/java/org/orecruncher/mobeffects/footsteps/facade/FacadeHelper.java index 62dd0efb..57188807 100644 --- a/src/main/java/org/orecruncher/mobeffects/footsteps/facade/FacadeHelper.java +++ b/src/main/java/org/orecruncher/mobeffects/footsteps/facade/FacadeHelper.java @@ -31,8 +31,6 @@ import net.minecraft.util.Direction; import net.minecraft.util.math.vector.Vector3d; import net.minecraft.world.IWorldReader; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import it.unimi.dsi.fastutil.objects.Reference2ObjectOpenHashMap; import net.minecraft.block.Block; @@ -40,7 +38,6 @@ import org.orecruncher.lib.Lib; import org.orecruncher.mobeffects.MobEffects; -@OnlyIn(Dist.CLIENT) public final class FacadeHelper { private static final Map crackers = new Reference2ObjectOpenHashMap<>(); diff --git a/src/main/java/org/orecruncher/mobeffects/footsteps/facade/IFacadeAccessor.java b/src/main/java/org/orecruncher/mobeffects/footsteps/facade/IFacadeAccessor.java index c59b2952..9854ae85 100644 --- a/src/main/java/org/orecruncher/mobeffects/footsteps/facade/IFacadeAccessor.java +++ b/src/main/java/org/orecruncher/mobeffects/footsteps/facade/IFacadeAccessor.java @@ -27,10 +27,7 @@ import net.minecraft.util.Direction; import net.minecraft.util.math.vector.Vector3d; import net.minecraft.world.IBlockReader; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -@OnlyIn(Dist.CLIENT) interface IFacadeAccessor { /* diff --git a/src/main/java/org/orecruncher/mobeffects/library/BlockAcousticMap.java b/src/main/java/org/orecruncher/mobeffects/library/BlockAcousticMap.java index 2baf6077..ff4cf809 100644 --- a/src/main/java/org/orecruncher/mobeffects/library/BlockAcousticMap.java +++ b/src/main/java/org/orecruncher/mobeffects/library/BlockAcousticMap.java @@ -22,8 +22,6 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.apache.commons.lang3.tuple.Pair; import org.orecruncher.lib.Utilities; import org.orecruncher.lib.blockstate.BlockStateMatcher; @@ -35,7 +33,6 @@ import java.util.Map; import java.util.function.Function; -@OnlyIn(Dist.CLIENT) public final class BlockAcousticMap { protected final Map>> data = new Reference2ObjectOpenHashMap<>(); diff --git a/src/main/java/org/orecruncher/mobeffects/library/Constants.java b/src/main/java/org/orecruncher/mobeffects/library/Constants.java index aa160329..c123177a 100644 --- a/src/main/java/org/orecruncher/mobeffects/library/Constants.java +++ b/src/main/java/org/orecruncher/mobeffects/library/Constants.java @@ -20,8 +20,6 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundEvents; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.mobeffects.config.Config; import org.orecruncher.mobeffects.MobEffects; import org.orecruncher.sndctrl.api.acoustics.AcousticEvent; @@ -30,7 +28,6 @@ import org.orecruncher.sndctrl.api.sound.ISoundCategory; import org.orecruncher.sndctrl.audio.acoustic.NullAcoustic; -@OnlyIn(Dist.CLIENT) public final class Constants { private Constants() { diff --git a/src/main/java/org/orecruncher/mobeffects/library/EntityEffectInfo.java b/src/main/java/org/orecruncher/mobeffects/library/EntityEffectInfo.java index dbf58512..1c715b37 100644 --- a/src/main/java/org/orecruncher/mobeffects/library/EntityEffectInfo.java +++ b/src/main/java/org/orecruncher/mobeffects/library/EntityEffectInfo.java @@ -19,8 +19,6 @@ package org.orecruncher.mobeffects.library; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.mobeffects.MobEffects; import org.orecruncher.mobeffects.library.config.EntityConfig; import org.orecruncher.sndctrl.api.acoustics.Library; @@ -29,7 +27,6 @@ import java.util.HashSet; import java.util.Set; -@OnlyIn(Dist.CLIENT) public class EntityEffectInfo { public final Set effects = new HashSet<>(6); diff --git a/src/main/java/org/orecruncher/mobeffects/library/ItemData.java b/src/main/java/org/orecruncher/mobeffects/library/ItemData.java index c6970a46..e8915cf9 100644 --- a/src/main/java/org/orecruncher/mobeffects/library/ItemData.java +++ b/src/main/java/org/orecruncher/mobeffects/library/ItemData.java @@ -25,8 +25,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.sndctrl.api.acoustics.IAcoustic; import org.orecruncher.sndctrl.api.acoustics.IAcousticFactory; import org.orecruncher.sndctrl.api.acoustics.Library; @@ -39,7 +37,6 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; -@OnlyIn(Dist.CLIENT) public class ItemData { private static final int ACOUSTIC_TYPE_SWING = 0; diff --git a/src/main/java/org/orecruncher/mobeffects/library/ItemLibrary.java b/src/main/java/org/orecruncher/mobeffects/library/ItemLibrary.java index e2cd7828..fbb5a751 100644 --- a/src/main/java/org/orecruncher/mobeffects/library/ItemLibrary.java +++ b/src/main/java/org/orecruncher/mobeffects/library/ItemLibrary.java @@ -24,8 +24,6 @@ import it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet; import net.minecraft.item.*; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.registries.ForgeRegistries; import org.orecruncher.dsurround.DynamicSurroundings; import org.orecruncher.lib.logging.IModLog; @@ -46,7 +44,6 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -@OnlyIn(Dist.CLIENT) public final class ItemLibrary { // For things that don't make an equip sound - like AIR diff --git a/src/main/java/org/orecruncher/mobeffects/library/Libraries.java b/src/main/java/org/orecruncher/mobeffects/library/Libraries.java index d8954fec..d006c747 100644 --- a/src/main/java/org/orecruncher/mobeffects/library/Libraries.java +++ b/src/main/java/org/orecruncher/mobeffects/library/Libraries.java @@ -18,10 +18,7 @@ package org.orecruncher.mobeffects.library; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -@OnlyIn(Dist.CLIENT) public final class Libraries { private Libraries() { } diff --git a/src/main/java/org/orecruncher/mobeffects/library/config/EntityConfig.java b/src/main/java/org/orecruncher/mobeffects/library/config/EntityConfig.java index a57e8228..cd06617d 100644 --- a/src/main/java/org/orecruncher/mobeffects/library/config/EntityConfig.java +++ b/src/main/java/org/orecruncher/mobeffects/library/config/EntityConfig.java @@ -20,8 +20,6 @@ import com.google.common.collect.ImmutableList; import com.google.gson.annotations.SerializedName; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.apache.commons.lang3.StringUtils; import org.orecruncher.lib.validation.IValidator; import org.orecruncher.lib.validation.ValidationException; @@ -31,7 +29,6 @@ import javax.annotation.Nonnull; import java.util.List; -@OnlyIn(Dist.CLIENT) public class EntityConfig implements IValidator { @SerializedName("effects") diff --git a/src/main/java/org/orecruncher/mobeffects/library/config/FootstepConfig.java b/src/main/java/org/orecruncher/mobeffects/library/config/FootstepConfig.java index aacbe57d..3217af21 100644 --- a/src/main/java/org/orecruncher/mobeffects/library/config/FootstepConfig.java +++ b/src/main/java/org/orecruncher/mobeffects/library/config/FootstepConfig.java @@ -21,8 +21,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.gson.annotations.SerializedName; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.lib.validation.IValidator; import org.orecruncher.lib.validation.ValidationException; import org.orecruncher.lib.validation.ValidationHelpers; @@ -32,7 +30,6 @@ import java.util.List; import java.util.Map; -@OnlyIn(Dist.CLIENT) public class FootstepConfig implements IValidator { @SerializedName("primitives") public Map primitives = ImmutableMap.of(); diff --git a/src/main/java/org/orecruncher/mobeffects/library/config/VariatorConfig.java b/src/main/java/org/orecruncher/mobeffects/library/config/VariatorConfig.java index 1ea6d14a..6a948cfc 100644 --- a/src/main/java/org/orecruncher/mobeffects/library/config/VariatorConfig.java +++ b/src/main/java/org/orecruncher/mobeffects/library/config/VariatorConfig.java @@ -19,14 +19,11 @@ package org.orecruncher.mobeffects.library.config; import com.google.gson.annotations.SerializedName; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.lib.validation.IValidator; import org.orecruncher.lib.validation.ValidationException; import javax.annotation.Nonnull; -@OnlyIn(Dist.CLIENT) public class VariatorConfig implements IValidator { @SerializedName("immobileDuration") diff --git a/src/main/java/org/orecruncher/sndctrl/api/acoustics/AcousticEvent.java b/src/main/java/org/orecruncher/sndctrl/api/acoustics/AcousticEvent.java index 43077f4a..1be1eb83 100644 --- a/src/main/java/org/orecruncher/sndctrl/api/acoustics/AcousticEvent.java +++ b/src/main/java/org/orecruncher/sndctrl/api/acoustics/AcousticEvent.java @@ -20,8 +20,6 @@ import com.google.common.base.MoreObjects; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.sndctrl.SoundControl; import javax.annotation.Nonnull; @@ -29,7 +27,6 @@ import java.util.HashMap; import java.util.Map; -@OnlyIn(Dist.CLIENT) public final class AcousticEvent { private static final Map mapping = new HashMap<>(); diff --git a/src/main/java/org/orecruncher/sndctrl/api/acoustics/IAcoustic.java b/src/main/java/org/orecruncher/sndctrl/api/acoustics/IAcoustic.java index a7b6095f..bee4aaa0 100644 --- a/src/main/java/org/orecruncher/sndctrl/api/acoustics/IAcoustic.java +++ b/src/main/java/org/orecruncher/sndctrl/api/acoustics/IAcoustic.java @@ -22,12 +22,9 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.vector.Vector3d; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import javax.annotation.Nonnull; -@OnlyIn(Dist.CLIENT) public interface IAcoustic { /** diff --git a/src/main/java/org/orecruncher/sndctrl/api/acoustics/IAcousticFactory.java b/src/main/java/org/orecruncher/sndctrl/api/acoustics/IAcousticFactory.java index 80ffb075..a16e94e7 100644 --- a/src/main/java/org/orecruncher/sndctrl/api/acoustics/IAcousticFactory.java +++ b/src/main/java/org/orecruncher/sndctrl/api/acoustics/IAcousticFactory.java @@ -21,14 +21,11 @@ import net.minecraft.entity.Entity; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.vector.Vector3d; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.sndctrl.api.sound.IFadableSoundInstance; import org.orecruncher.sndctrl.api.sound.ISoundInstance; import javax.annotation.Nonnull; -@OnlyIn(Dist.CLIENT) public interface IAcousticFactory { /** * Creates a non-attenuated sound instance that plays on the MASTER category. diff --git a/src/main/java/org/orecruncher/sndctrl/api/acoustics/Library.java b/src/main/java/org/orecruncher/sndctrl/api/acoustics/Library.java index 3b2dbecc..0b812b6d 100644 --- a/src/main/java/org/orecruncher/sndctrl/api/acoustics/Library.java +++ b/src/main/java/org/orecruncher/sndctrl/api/acoustics/Library.java @@ -20,8 +20,6 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundEvent; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.sndctrl.library.AcousticLibrary; import org.orecruncher.sndctrl.library.SoundLibrary; @@ -33,7 +31,6 @@ /** * API Interface to the Acoustic Library that maintains a list of all acoustics. */ -@OnlyIn(Dist.CLIENT) public final class Library { private Library() { diff --git a/src/main/java/org/orecruncher/sndctrl/api/effects/AbstractEntityEffect.java b/src/main/java/org/orecruncher/sndctrl/api/effects/AbstractEntityEffect.java index dc7f8720..b9a64c1a 100644 --- a/src/main/java/org/orecruncher/sndctrl/api/effects/AbstractEntityEffect.java +++ b/src/main/java/org/orecruncher/sndctrl/api/effects/AbstractEntityEffect.java @@ -25,15 +25,12 @@ import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.sndctrl.api.acoustics.IAcoustic; import org.orecruncher.sndctrl.library.AcousticLibrary; /** * Interface for an effect. */ -@OnlyIn(Dist.CLIENT) public abstract class AbstractEntityEffect { private IEntityEffectManager manager; diff --git a/src/main/java/org/orecruncher/sndctrl/api/effects/IEntityEffectFactoryHandler.java b/src/main/java/org/orecruncher/sndctrl/api/effects/IEntityEffectFactoryHandler.java index 72735e01..93f6bb21 100644 --- a/src/main/java/org/orecruncher/sndctrl/api/effects/IEntityEffectFactoryHandler.java +++ b/src/main/java/org/orecruncher/sndctrl/api/effects/IEntityEffectFactoryHandler.java @@ -20,12 +20,9 @@ import net.minecraft.entity.LivingEntity; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import javax.annotation.Nonnull; -@OnlyIn(Dist.CLIENT) public interface IEntityEffectFactoryHandler { /** diff --git a/src/main/java/org/orecruncher/sndctrl/api/effects/IEntityEffectManager.java b/src/main/java/org/orecruncher/sndctrl/api/effects/IEntityEffectManager.java index 8bf8d6fa..1487b66b 100644 --- a/src/main/java/org/orecruncher/sndctrl/api/effects/IEntityEffectManager.java +++ b/src/main/java/org/orecruncher/sndctrl/api/effects/IEntityEffectManager.java @@ -21,12 +21,9 @@ import net.minecraft.client.particle.Particle; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import javax.annotation.Nonnull; -@OnlyIn(Dist.CLIENT) public interface IEntityEffectManager { boolean isActive(); diff --git a/src/main/java/org/orecruncher/sndctrl/api/sound/Category.java b/src/main/java/org/orecruncher/sndctrl/api/sound/Category.java index f01623f7..eb9c9687 100644 --- a/src/main/java/org/orecruncher/sndctrl/api/sound/Category.java +++ b/src/main/java/org/orecruncher/sndctrl/api/sound/Category.java @@ -23,8 +23,6 @@ import net.minecraft.util.SoundCategory; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TranslationTextComponent; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.lib.GameUtils; import org.orecruncher.sndctrl.audio.handlers.MusicFader; import org.orecruncher.sndctrl.config.Config; @@ -34,7 +32,6 @@ import java.util.function.Consumer; import java.util.function.Supplier; -@OnlyIn(Dist.CLIENT) public class Category implements ISoundCategory { // Mappings for easy searching private static final Map nameToCategory = new HashMap<>(); diff --git a/src/main/java/org/orecruncher/sndctrl/api/sound/IFadableSoundInstance.java b/src/main/java/org/orecruncher/sndctrl/api/sound/IFadableSoundInstance.java index 4002d3c0..7819b8cf 100644 --- a/src/main/java/org/orecruncher/sndctrl/api/sound/IFadableSoundInstance.java +++ b/src/main/java/org/orecruncher/sndctrl/api/sound/IFadableSoundInstance.java @@ -19,10 +19,7 @@ package org.orecruncher.sndctrl.api.sound; import net.minecraft.client.audio.ITickableSound; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -@OnlyIn(Dist.CLIENT) public interface IFadableSoundInstance extends ISoundInstance, ITickableSound { void noFade(); diff --git a/src/main/java/org/orecruncher/sndctrl/api/sound/ISoundCategory.java b/src/main/java/org/orecruncher/sndctrl/api/sound/ISoundCategory.java index beff1112..ef8e6890 100644 --- a/src/main/java/org/orecruncher/sndctrl/api/sound/ISoundCategory.java +++ b/src/main/java/org/orecruncher/sndctrl/api/sound/ISoundCategory.java @@ -20,12 +20,9 @@ import net.minecraft.util.SoundCategory; import net.minecraft.util.text.ITextComponent; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import javax.annotation.Nonnull; -@OnlyIn(Dist.CLIENT) public interface ISoundCategory { /** diff --git a/src/main/java/org/orecruncher/sndctrl/api/sound/ISoundInstance.java b/src/main/java/org/orecruncher/sndctrl/api/sound/ISoundInstance.java index 6df1561c..45776221 100644 --- a/src/main/java/org/orecruncher/sndctrl/api/sound/ISoundInstance.java +++ b/src/main/java/org/orecruncher/sndctrl/api/sound/ISoundInstance.java @@ -19,8 +19,6 @@ package org.orecruncher.sndctrl.api.sound; import net.minecraft.client.audio.ISound; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.sndctrl.audio.SoundState; import javax.annotation.Nonnull; @@ -28,7 +26,6 @@ /** * Additional state information associated with a sound instance. */ -@OnlyIn(Dist.CLIENT) public interface ISoundInstance extends ISound { /** diff --git a/src/main/java/org/orecruncher/sndctrl/api/sound/SoundBuilder.java b/src/main/java/org/orecruncher/sndctrl/api/sound/SoundBuilder.java index 12515424..bfc1ee0b 100644 --- a/src/main/java/org/orecruncher/sndctrl/api/sound/SoundBuilder.java +++ b/src/main/java/org/orecruncher/sndctrl/api/sound/SoundBuilder.java @@ -24,8 +24,6 @@ import net.minecraft.util.SoundEvent; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.vector.Vector3d; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.lib.math.MathStuff; import org.orecruncher.lib.random.XorShiftRandom; import org.orecruncher.sndctrl.audio.SoundInstance; @@ -39,7 +37,6 @@ * SoundBuilder is a factory object that produces ISoundInstances within the specified parameters. */ @SuppressWarnings("unused") -@OnlyIn(Dist.CLIENT) public class SoundBuilder { private static final Random RANDOM = XorShiftRandom.current(); diff --git a/src/main/java/org/orecruncher/sndctrl/audio/AudioEngine.java b/src/main/java/org/orecruncher/sndctrl/audio/AudioEngine.java index 03babfff..50213f65 100644 --- a/src/main/java/org/orecruncher/sndctrl/audio/AudioEngine.java +++ b/src/main/java/org/orecruncher/sndctrl/audio/AudioEngine.java @@ -25,8 +25,6 @@ import net.minecraft.client.audio.ChannelManager.Entry; import net.minecraft.util.math.vector.Vector3d; import net.minecraft.util.text.TextFormatting; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.TickEvent; import net.minecraftforge.event.TickEvent.Phase; @@ -53,7 +51,6 @@ /** * Handles the life cycle of sounds submitted to the Minecraft sound engine. */ -@OnlyIn(Dist.CLIENT) public final class AudioEngine { private static final IModLog LOGGER = SoundControl.LOGGER.createChild(AudioEngine.class); private static final String FMT_DBG_SOUND_SYSTEM = TextFormatting.AQUA + "SoundSystem: %d/%d"; diff --git a/src/main/java/org/orecruncher/sndctrl/audio/BackgroundSoundInstance.java b/src/main/java/org/orecruncher/sndctrl/audio/BackgroundSoundInstance.java index 29bf3917..1a687abe 100644 --- a/src/main/java/org/orecruncher/sndctrl/audio/BackgroundSoundInstance.java +++ b/src/main/java/org/orecruncher/sndctrl/audio/BackgroundSoundInstance.java @@ -18,8 +18,6 @@ package org.orecruncher.sndctrl.audio; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.sndctrl.api.sound.ISoundCategory; import org.orecruncher.sndctrl.api.sound.ISoundInstance; @@ -30,7 +28,6 @@ * of Minecraft. The difference here is that the volume can fade in and out. Used by Dynamic Surroundings * to scale background sound volumes based on biome distribution. */ -@OnlyIn(Dist.CLIENT) public class BackgroundSoundInstance extends FadableSoundInstance { public BackgroundSoundInstance(@Nonnull final ISoundInstance sound, @Nonnull final ISoundCategory category) { diff --git a/src/main/java/org/orecruncher/sndctrl/audio/Conversion.java b/src/main/java/org/orecruncher/sndctrl/audio/Conversion.java index a001c727..d3a3ec1b 100644 --- a/src/main/java/org/orecruncher/sndctrl/audio/Conversion.java +++ b/src/main/java/org/orecruncher/sndctrl/audio/Conversion.java @@ -20,8 +20,6 @@ import net.minecraft.client.audio.AudioStreamBuffer; import net.minecraft.client.audio.IAudioStream; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -29,7 +27,6 @@ import java.io.IOException; import java.nio.ByteBuffer; -@OnlyIn(Dist.CLIENT) public final class Conversion { /** diff --git a/src/main/java/org/orecruncher/sndctrl/audio/EntitySoundInstance.java b/src/main/java/org/orecruncher/sndctrl/audio/EntitySoundInstance.java index 071955a4..53546b58 100644 --- a/src/main/java/org/orecruncher/sndctrl/audio/EntitySoundInstance.java +++ b/src/main/java/org/orecruncher/sndctrl/audio/EntitySoundInstance.java @@ -21,8 +21,6 @@ import com.google.common.base.MoreObjects; import net.minecraft.entity.Entity; import net.minecraft.util.math.vector.Vector3d; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.sndctrl.api.sound.ISoundInstance; import javax.annotation.Nonnull; @@ -33,7 +31,6 @@ * every tick. If the sound is a global sound (like music), it will stay around as long as it is repeatable * and the entity is alive. */ -@OnlyIn(Dist.CLIENT) public class EntitySoundInstance extends WrappedSoundInstance { @Nonnull diff --git a/src/main/java/org/orecruncher/sndctrl/audio/FadableSoundInstance.java b/src/main/java/org/orecruncher/sndctrl/audio/FadableSoundInstance.java index fea9b2c9..41ae2ad1 100644 --- a/src/main/java/org/orecruncher/sndctrl/audio/FadableSoundInstance.java +++ b/src/main/java/org/orecruncher/sndctrl/audio/FadableSoundInstance.java @@ -19,8 +19,6 @@ package org.orecruncher.sndctrl.audio; import com.google.common.base.MoreObjects; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.lib.TickCounter; import org.orecruncher.lib.math.MathStuff; import org.orecruncher.sndctrl.api.sound.IFadableSoundInstance; @@ -29,7 +27,6 @@ import javax.annotation.Nonnull; -@OnlyIn(Dist.CLIENT) public class FadableSoundInstance extends WrappedSoundInstance implements IFadableSoundInstance { private static final float INITIAL_FADE = 0.00002F; diff --git a/src/main/java/org/orecruncher/sndctrl/audio/LoopingSoundInstance.java b/src/main/java/org/orecruncher/sndctrl/audio/LoopingSoundInstance.java index 3c8e7a39..c6388bcf 100644 --- a/src/main/java/org/orecruncher/sndctrl/audio/LoopingSoundInstance.java +++ b/src/main/java/org/orecruncher/sndctrl/audio/LoopingSoundInstance.java @@ -20,14 +20,11 @@ import com.google.common.base.MoreObjects; import net.minecraft.util.math.vector.Vector3d; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.sndctrl.api.sound.ISoundCategory; import org.orecruncher.sndctrl.api.sound.ISoundInstance; import javax.annotation.Nonnull; -@OnlyIn(Dist.CLIENT) public class LoopingSoundInstance extends WrappedSoundInstance { private final Vector3d position; diff --git a/src/main/java/org/orecruncher/sndctrl/audio/PlayerCenteredSoundInstance.java b/src/main/java/org/orecruncher/sndctrl/audio/PlayerCenteredSoundInstance.java index d2a9b8c7..f2dc3f7a 100644 --- a/src/main/java/org/orecruncher/sndctrl/audio/PlayerCenteredSoundInstance.java +++ b/src/main/java/org/orecruncher/sndctrl/audio/PlayerCenteredSoundInstance.java @@ -19,14 +19,11 @@ package org.orecruncher.sndctrl.audio; import com.google.common.base.MoreObjects; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.sndctrl.api.sound.ISoundCategory; import org.orecruncher.sndctrl.api.sound.ISoundInstance; import javax.annotation.Nonnull; -@OnlyIn(Dist.CLIENT) public class PlayerCenteredSoundInstance extends WrappedSoundInstance { public PlayerCenteredSoundInstance(@Nonnull final ISoundInstance sound, @Nonnull final ISoundCategory category) { super(sound, category); diff --git a/src/main/java/org/orecruncher/sndctrl/audio/SoundInstance.java b/src/main/java/org/orecruncher/sndctrl/audio/SoundInstance.java index c7f522ac..6f0d2db5 100644 --- a/src/main/java/org/orecruncher/sndctrl/audio/SoundInstance.java +++ b/src/main/java/org/orecruncher/sndctrl/audio/SoundInstance.java @@ -26,8 +26,6 @@ import net.minecraft.util.SoundEvent; import net.minecraft.util.math.vector.Vector3d; import net.minecraft.util.math.vector.Vector3i; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.lib.GameUtils; import org.orecruncher.sndctrl.api.sound.ISoundCategory; import org.orecruncher.sndctrl.api.sound.ISoundInstance; @@ -35,7 +33,6 @@ import javax.annotation.Nonnull; -@OnlyIn(Dist.CLIENT) public class SoundInstance extends LocatableSound implements ISoundInstance { private SoundState state; diff --git a/src/main/java/org/orecruncher/sndctrl/audio/SoundMetadata.java b/src/main/java/org/orecruncher/sndctrl/audio/SoundMetadata.java index bdc04005..6010fa45 100644 --- a/src/main/java/org/orecruncher/sndctrl/audio/SoundMetadata.java +++ b/src/main/java/org/orecruncher/sndctrl/audio/SoundMetadata.java @@ -22,8 +22,6 @@ import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.StringTextComponent; import net.minecraft.util.text.TranslationTextComponent; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.apache.commons.lang3.StringUtils; import org.orecruncher.sndctrl.api.sound.Category; import org.orecruncher.sndctrl.api.sound.ISoundCategory; @@ -34,7 +32,6 @@ import java.util.List; import java.util.Objects; -@OnlyIn(Dist.CLIENT) public final class SoundMetadata { private static final ITextComponent NO_STRING = StringTextComponent.EMPTY; diff --git a/src/main/java/org/orecruncher/sndctrl/audio/SoundState.java b/src/main/java/org/orecruncher/sndctrl/audio/SoundState.java index 97326b54..c89d46f5 100644 --- a/src/main/java/org/orecruncher/sndctrl/audio/SoundState.java +++ b/src/main/java/org/orecruncher/sndctrl/audio/SoundState.java @@ -18,8 +18,6 @@ package org.orecruncher.sndctrl.audio; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; /** * Used by sounds that have long term state that gets manipulated @@ -28,7 +26,6 @@ * with a sound. */ -@OnlyIn(Dist.CLIENT) public enum SoundState { /** * The sound was just created. diff --git a/src/main/java/org/orecruncher/sndctrl/audio/SoundUtils.java b/src/main/java/org/orecruncher/sndctrl/audio/SoundUtils.java index 57441a30..b5ab6696 100644 --- a/src/main/java/org/orecruncher/sndctrl/audio/SoundUtils.java +++ b/src/main/java/org/orecruncher/sndctrl/audio/SoundUtils.java @@ -23,8 +23,6 @@ import net.minecraft.client.audio.*; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.vector.Vector3d; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.lwjgl.openal.*; import org.orecruncher.lib.GameUtils; import org.orecruncher.lib.compat.ModEnvironment; @@ -43,7 +41,6 @@ * Helper class that obtains information about the current sound processing environment * from sources that are not directly obtainable. */ -@OnlyIn(Dist.CLIENT) public final class SoundUtils { private static final IModLog LOGGER = SoundControl.LOGGER.createChild(SoundUtils.class); diff --git a/src/main/java/org/orecruncher/sndctrl/audio/WrappedSoundInstance.java b/src/main/java/org/orecruncher/sndctrl/audio/WrappedSoundInstance.java index 2d5f081c..8746d0ad 100644 --- a/src/main/java/org/orecruncher/sndctrl/audio/WrappedSoundInstance.java +++ b/src/main/java/org/orecruncher/sndctrl/audio/WrappedSoundInstance.java @@ -24,8 +24,6 @@ import net.minecraft.client.audio.SoundHandler; import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundCategory; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.sndctrl.api.sound.ISoundCategory; import org.orecruncher.sndctrl.api.sound.ISoundInstance; @@ -36,7 +34,6 @@ /** * Base class for special sounds that aggregate the true sound being played. */ -@OnlyIn(Dist.CLIENT) public class WrappedSoundInstance implements ISoundInstance, ITickableSound { @Nonnull diff --git a/src/main/java/org/orecruncher/sndctrl/audio/acoustic/AcousticCompiler.java b/src/main/java/org/orecruncher/sndctrl/audio/acoustic/AcousticCompiler.java index 27aca181..7bddfb41 100644 --- a/src/main/java/org/orecruncher/sndctrl/audio/acoustic/AcousticCompiler.java +++ b/src/main/java/org/orecruncher/sndctrl/audio/acoustic/AcousticCompiler.java @@ -23,8 +23,6 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundEvent; import net.minecraft.util.StringUtils; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.lib.JsonUtils; import org.orecruncher.lib.collections.ObjectArray; import org.orecruncher.sndctrl.SoundControl; @@ -39,7 +37,6 @@ import javax.annotation.Nullable; import java.util.*; -@OnlyIn(Dist.CLIENT) public final class AcousticCompiler { // Defaults for the SoundBuilders that are created. There will be slight variation to avoid repeated sound diff --git a/src/main/java/org/orecruncher/sndctrl/audio/acoustic/AcousticException.java b/src/main/java/org/orecruncher/sndctrl/audio/acoustic/AcousticException.java index b5cd7422..ea2a1c21 100644 --- a/src/main/java/org/orecruncher/sndctrl/audio/acoustic/AcousticException.java +++ b/src/main/java/org/orecruncher/sndctrl/audio/acoustic/AcousticException.java @@ -18,13 +18,10 @@ package org.orecruncher.sndctrl.audio.acoustic; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import javax.annotation.Nonnull; import javax.annotation.Nullable; -@OnlyIn(Dist.CLIENT) public class AcousticException extends Exception { public AcousticException(@Nonnull final String msg, @Nullable final Object... params) { diff --git a/src/main/java/org/orecruncher/sndctrl/audio/acoustic/AcousticFactory.java b/src/main/java/org/orecruncher/sndctrl/audio/acoustic/AcousticFactory.java index 403b3b93..088bac19 100644 --- a/src/main/java/org/orecruncher/sndctrl/audio/acoustic/AcousticFactory.java +++ b/src/main/java/org/orecruncher/sndctrl/audio/acoustic/AcousticFactory.java @@ -22,8 +22,6 @@ import net.minecraft.util.SoundEvent; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.vector.Vector3d; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.lib.random.XorShiftRandom; import org.orecruncher.sndctrl.api.acoustics.IAcousticFactory; import org.orecruncher.sndctrl.api.sound.IFadableSoundInstance; @@ -41,7 +39,6 @@ /** * Helper that creates sound instances using a SoundBuilder, but tweaks based on the circumstances requested. */ -@OnlyIn(Dist.CLIENT) public class AcousticFactory extends SoundBuilder implements IAcousticFactory { public static final int SOUND_RANGE = 16; diff --git a/src/main/java/org/orecruncher/sndctrl/audio/acoustic/DelayedAcoustic.java b/src/main/java/org/orecruncher/sndctrl/audio/acoustic/DelayedAcoustic.java index 118898e5..1f67fef6 100644 --- a/src/main/java/org/orecruncher/sndctrl/audio/acoustic/DelayedAcoustic.java +++ b/src/main/java/org/orecruncher/sndctrl/audio/acoustic/DelayedAcoustic.java @@ -20,8 +20,6 @@ import com.google.common.base.MoreObjects; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.lib.random.XorShiftRandom; import org.orecruncher.sndctrl.api.sound.ISoundInstance; @@ -32,7 +30,6 @@ * An acoustic that will delay play for a random period of ticks. The sound instance will be held in the sound engine * until the delay threshold is hit. */ -@OnlyIn(Dist.CLIENT) public class DelayedAcoustic extends SimpleAcoustic { private static final Random RANDOM = XorShiftRandom.current(); diff --git a/src/main/java/org/orecruncher/sndctrl/audio/acoustic/EventSelectorAcoustic.java b/src/main/java/org/orecruncher/sndctrl/audio/acoustic/EventSelectorAcoustic.java index acd772bd..9fbf6b50 100644 --- a/src/main/java/org/orecruncher/sndctrl/audio/acoustic/EventSelectorAcoustic.java +++ b/src/main/java/org/orecruncher/sndctrl/audio/acoustic/EventSelectorAcoustic.java @@ -23,8 +23,6 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.vector.Vector3d; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.sndctrl.api.acoustics.AcousticEvent; import org.orecruncher.sndctrl.api.acoustics.IAcoustic; import org.orecruncher.sndctrl.api.acoustics.IAcousticFactory; @@ -39,7 +37,6 @@ * An acoustic that will play different sounds based on the AcousticEvent provided. For example, for a given * EventSelectorAcoustic, an acoustic could be selected if a mob is walking vs. running. */ -@OnlyIn(Dist.CLIENT) public class EventSelectorAcoustic implements IAcoustic { private final Map mapping = new IdentityHashMap<>(4); diff --git a/src/main/java/org/orecruncher/sndctrl/audio/acoustic/NullAcoustic.java b/src/main/java/org/orecruncher/sndctrl/audio/acoustic/NullAcoustic.java index 04d4357a..34339d33 100644 --- a/src/main/java/org/orecruncher/sndctrl/audio/acoustic/NullAcoustic.java +++ b/src/main/java/org/orecruncher/sndctrl/audio/acoustic/NullAcoustic.java @@ -23,8 +23,6 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.vector.Vector3d; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.sndctrl.SoundControl; import org.orecruncher.sndctrl.api.acoustics.AcousticEvent; import org.orecruncher.sndctrl.api.acoustics.IAcoustic; @@ -35,7 +33,6 @@ /** * Simple acoustic that has no sound. */ -@OnlyIn(Dist.CLIENT) public final class NullAcoustic implements IAcoustic { public static final IAcoustic INSTANCE = new NullAcoustic(new ResourceLocation(SoundControl.MOD_ID, "null_acoustic")); diff --git a/src/main/java/org/orecruncher/sndctrl/audio/acoustic/ProbabilityAcoustic.java b/src/main/java/org/orecruncher/sndctrl/audio/acoustic/ProbabilityAcoustic.java index c57f59c3..ba7962a1 100644 --- a/src/main/java/org/orecruncher/sndctrl/audio/acoustic/ProbabilityAcoustic.java +++ b/src/main/java/org/orecruncher/sndctrl/audio/acoustic/ProbabilityAcoustic.java @@ -23,8 +23,6 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.vector.Vector3d; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.lib.WeightTable; import org.orecruncher.sndctrl.api.acoustics.AcousticEvent; import org.orecruncher.sndctrl.api.acoustics.IAcoustic; @@ -37,7 +35,6 @@ /** * Plays a random acoustic from a weighted list of selections. */ -@OnlyIn(Dist.CLIENT) public class ProbabilityAcoustic implements IAcoustic { protected final ResourceLocation name; diff --git a/src/main/java/org/orecruncher/sndctrl/audio/acoustic/SimpleAcoustic.java b/src/main/java/org/orecruncher/sndctrl/audio/acoustic/SimpleAcoustic.java index 5de23c5f..5a145430 100644 --- a/src/main/java/org/orecruncher/sndctrl/audio/acoustic/SimpleAcoustic.java +++ b/src/main/java/org/orecruncher/sndctrl/audio/acoustic/SimpleAcoustic.java @@ -24,8 +24,6 @@ import net.minecraft.util.SoundEvent; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.vector.Vector3d; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.sndctrl.api.acoustics.AcousticEvent; import org.orecruncher.sndctrl.api.acoustics.IAcoustic; import org.orecruncher.sndctrl.api.acoustics.IAcousticFactory; @@ -39,7 +37,6 @@ /** * A simple acoustic that uses an AcousticFactory to produce sound instances for playing. */ -@OnlyIn(Dist.CLIENT) public class SimpleAcoustic implements IAcoustic { private final AcousticFactory factory; diff --git a/src/main/java/org/orecruncher/sndctrl/audio/acoustic/SimultaneousAcoustic.java b/src/main/java/org/orecruncher/sndctrl/audio/acoustic/SimultaneousAcoustic.java index 5e03a2e9..d9b8ef1b 100644 --- a/src/main/java/org/orecruncher/sndctrl/audio/acoustic/SimultaneousAcoustic.java +++ b/src/main/java/org/orecruncher/sndctrl/audio/acoustic/SimultaneousAcoustic.java @@ -23,8 +23,6 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.vector.Vector3d; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.lib.collections.ObjectArray; import org.orecruncher.sndctrl.api.acoustics.AcousticEvent; import org.orecruncher.sndctrl.api.acoustics.IAcoustic; @@ -36,7 +34,6 @@ /** * Plays a group of acoustics simultaneously creating a composite effect */ -@OnlyIn(Dist.CLIENT) public class SimultaneousAcoustic implements IAcoustic { @Nonnull diff --git a/src/main/java/org/orecruncher/sndctrl/audio/handlers/Effects.java b/src/main/java/org/orecruncher/sndctrl/audio/handlers/Effects.java index 84ba7b16..39c2b337 100644 --- a/src/main/java/org/orecruncher/sndctrl/audio/handlers/Effects.java +++ b/src/main/java/org/orecruncher/sndctrl/audio/handlers/Effects.java @@ -25,14 +25,11 @@ package org.orecruncher.sndctrl.audio.handlers; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.sndctrl.audio.handlers.effects.AuxSlot; import org.orecruncher.sndctrl.audio.handlers.effects.LowPassFilterSlot; import org.orecruncher.sndctrl.audio.handlers.effects.ReverbData; import org.orecruncher.sndctrl.audio.handlers.effects.ReverbEffectSlot; -@OnlyIn(Dist.CLIENT) public final class Effects { // General config settings that need to make their way somewhere private static final float ROLLOFF_FACTOR = 1F; diff --git a/src/main/java/org/orecruncher/sndctrl/audio/handlers/SoundFXUtils.java b/src/main/java/org/orecruncher/sndctrl/audio/handlers/SoundFXUtils.java index c12e46a1..eddb7501 100644 --- a/src/main/java/org/orecruncher/sndctrl/audio/handlers/SoundFXUtils.java +++ b/src/main/java/org/orecruncher/sndctrl/audio/handlers/SoundFXUtils.java @@ -36,8 +36,6 @@ import net.minecraft.util.math.vector.Vector3i; import net.minecraft.world.IWorldReader; import net.minecraft.world.biome.Biome; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.lib.WorldUtils; import org.orecruncher.lib.math.BlockRayTrace; import org.orecruncher.lib.math.MathStuff; @@ -53,7 +51,6 @@ import javax.annotation.Nullable; import java.util.Iterator; -@OnlyIn(Dist.CLIENT) public final class SoundFXUtils { /** diff --git a/src/main/java/org/orecruncher/sndctrl/audio/handlers/SoundVolumeEvaluator.java b/src/main/java/org/orecruncher/sndctrl/audio/handlers/SoundVolumeEvaluator.java index d79f4d43..5f1a2e5e 100644 --- a/src/main/java/org/orecruncher/sndctrl/audio/handlers/SoundVolumeEvaluator.java +++ b/src/main/java/org/orecruncher/sndctrl/audio/handlers/SoundVolumeEvaluator.java @@ -21,8 +21,6 @@ import com.google.common.base.Preconditions; import net.minecraft.client.audio.ISound; import net.minecraft.util.SoundCategory; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.lib.GameUtils; import org.orecruncher.lib.Utilities; import org.orecruncher.lib.collections.ObjectArray; @@ -39,7 +37,6 @@ * Handler that calculates an effective volume for a given sound based on * various factors, including any user configured sound scaling. */ -@OnlyIn(Dist.CLIENT) public final class SoundVolumeEvaluator { // Callbacks from other mods where volume can be scaled. Goal is to get mods to use this callback rather than diff --git a/src/main/java/org/orecruncher/sndctrl/audio/handlers/SourceContext.java b/src/main/java/org/orecruncher/sndctrl/audio/handlers/SourceContext.java index c88677f2..e43582c7 100644 --- a/src/main/java/org/orecruncher/sndctrl/audio/handlers/SourceContext.java +++ b/src/main/java/org/orecruncher/sndctrl/audio/handlers/SourceContext.java @@ -21,8 +21,6 @@ import com.google.common.base.MoreObjects; import net.minecraft.client.audio.ISound; import net.minecraft.util.math.vector.Vector3d; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.lwjgl.openal.EXTEfx; import org.orecruncher.lib.logging.IModLog; import org.orecruncher.lib.random.LCGRandom; @@ -41,7 +39,6 @@ * Used to track and apply sound effects for a given sound instance in the sound engine. It is also a task to * facilitate queuing to background processing. */ -@OnlyIn(Dist.CLIENT) public final class SourceContext implements Callable { private static final IModLog LOGGER = SoundControl.LOGGER.createChild(SourceContext.class); diff --git a/src/main/java/org/orecruncher/sndctrl/audio/handlers/WorldContext.java b/src/main/java/org/orecruncher/sndctrl/audio/handlers/WorldContext.java index cb344751..28308399 100644 --- a/src/main/java/org/orecruncher/sndctrl/audio/handlers/WorldContext.java +++ b/src/main/java/org/orecruncher/sndctrl/audio/handlers/WorldContext.java @@ -26,13 +26,10 @@ import net.minecraft.util.math.vector.Vector3d; import net.minecraft.world.IWorldReader; import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.lib.GameUtils; import org.orecruncher.lib.WorldUtils; import org.orecruncher.sndctrl.library.AudioEffectLibrary; -@OnlyIn(Dist.CLIENT) public final class WorldContext { /** diff --git a/src/main/java/org/orecruncher/sndctrl/audio/handlers/effects/AuxSlot.java b/src/main/java/org/orecruncher/sndctrl/audio/handlers/effects/AuxSlot.java index aaabba7c..8cefdb3b 100644 --- a/src/main/java/org/orecruncher/sndctrl/audio/handlers/effects/AuxSlot.java +++ b/src/main/java/org/orecruncher/sndctrl/audio/handlers/effects/AuxSlot.java @@ -18,12 +18,9 @@ package org.orecruncher.sndctrl.audio.handlers.effects; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.lwjgl.openal.AL10; import org.lwjgl.openal.EXTEfx; -@OnlyIn(Dist.CLIENT) public class AuxSlot extends Slot { public AuxSlot() { diff --git a/src/main/java/org/orecruncher/sndctrl/audio/handlers/effects/EffectData.java b/src/main/java/org/orecruncher/sndctrl/audio/handlers/effects/EffectData.java index 7c6982b0..2a1151c1 100644 --- a/src/main/java/org/orecruncher/sndctrl/audio/handlers/effects/EffectData.java +++ b/src/main/java/org/orecruncher/sndctrl/audio/handlers/effects/EffectData.java @@ -18,13 +18,10 @@ package org.orecruncher.sndctrl.audio.handlers.effects; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; /** * The state context for a given effect. */ -@OnlyIn(Dist.CLIENT) public abstract class EffectData { protected boolean process; diff --git a/src/main/java/org/orecruncher/sndctrl/audio/handlers/effects/LowPassFilterSlot.java b/src/main/java/org/orecruncher/sndctrl/audio/handlers/effects/LowPassFilterSlot.java index b31aab77..ba136511 100644 --- a/src/main/java/org/orecruncher/sndctrl/audio/handlers/effects/LowPassFilterSlot.java +++ b/src/main/java/org/orecruncher/sndctrl/audio/handlers/effects/LowPassFilterSlot.java @@ -18,14 +18,11 @@ package org.orecruncher.sndctrl.audio.handlers.effects; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.lwjgl.openal.AL11; import org.lwjgl.openal.EXTEfx; import javax.annotation.Nonnull; -@OnlyIn(Dist.CLIENT) public class LowPassFilterSlot extends Slot { public LowPassFilterSlot() { diff --git a/src/main/java/org/orecruncher/sndctrl/audio/handlers/effects/ReverbEffectSlot.java b/src/main/java/org/orecruncher/sndctrl/audio/handlers/effects/ReverbEffectSlot.java index fb7cf25f..36f79cbb 100644 --- a/src/main/java/org/orecruncher/sndctrl/audio/handlers/effects/ReverbEffectSlot.java +++ b/src/main/java/org/orecruncher/sndctrl/audio/handlers/effects/ReverbEffectSlot.java @@ -18,13 +18,10 @@ package org.orecruncher.sndctrl.audio.handlers.effects; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.lwjgl.openal.EXTEfx; import javax.annotation.Nonnull; -@OnlyIn(Dist.CLIENT) public class ReverbEffectSlot extends Slot { public ReverbEffectSlot() { diff --git a/src/main/java/org/orecruncher/sndctrl/audio/handlers/effects/Slot.java b/src/main/java/org/orecruncher/sndctrl/audio/handlers/effects/Slot.java index 1da8e1e3..6ec94717 100644 --- a/src/main/java/org/orecruncher/sndctrl/audio/handlers/effects/Slot.java +++ b/src/main/java/org/orecruncher/sndctrl/audio/handlers/effects/Slot.java @@ -18,8 +18,6 @@ package org.orecruncher.sndctrl.audio.handlers.effects; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.apache.commons.lang3.StringUtils; import org.lwjgl.openal.AL10; import org.lwjgl.openal.EXTEfx; @@ -30,7 +28,6 @@ import javax.annotation.Nullable; import java.util.function.Supplier; -@OnlyIn(Dist.CLIENT) public abstract class Slot { private final Supplier factory; diff --git a/src/main/java/org/orecruncher/sndctrl/audio/handlers/effects/SourcePropertyFloat.java b/src/main/java/org/orecruncher/sndctrl/audio/handlers/effects/SourcePropertyFloat.java index 3c9b2ead..5e2eed94 100644 --- a/src/main/java/org/orecruncher/sndctrl/audio/handlers/effects/SourcePropertyFloat.java +++ b/src/main/java/org/orecruncher/sndctrl/audio/handlers/effects/SourcePropertyFloat.java @@ -18,13 +18,10 @@ package org.orecruncher.sndctrl.audio.handlers.effects; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.lwjgl.openal.AL11; import org.orecruncher.lib.math.MathStuff; import org.orecruncher.sndctrl.audio.handlers.SoundFXProcessor; -@OnlyIn(Dist.CLIENT) public final class SourcePropertyFloat { private final int property; diff --git a/src/main/java/org/orecruncher/sndctrl/audio/handlers/effects/SourcePropertyInt.java b/src/main/java/org/orecruncher/sndctrl/audio/handlers/effects/SourcePropertyInt.java index 09ffbdcd..3f0b8a8f 100644 --- a/src/main/java/org/orecruncher/sndctrl/audio/handlers/effects/SourcePropertyInt.java +++ b/src/main/java/org/orecruncher/sndctrl/audio/handlers/effects/SourcePropertyInt.java @@ -18,14 +18,11 @@ package org.orecruncher.sndctrl.audio.handlers.effects; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.lwjgl.openal.AL11; import org.orecruncher.lib.math.MathStuff; import org.orecruncher.sndctrl.audio.handlers.SoundFXProcessor; @SuppressWarnings("unused") -@OnlyIn(Dist.CLIENT) public final class SourcePropertyInt { private final int property; diff --git a/src/main/java/org/orecruncher/sndctrl/config/ConfigGenerator.java b/src/main/java/org/orecruncher/sndctrl/config/ConfigGenerator.java index 7e822464..83baef37 100644 --- a/src/main/java/org/orecruncher/sndctrl/config/ConfigGenerator.java +++ b/src/main/java/org/orecruncher/sndctrl/config/ConfigGenerator.java @@ -23,15 +23,12 @@ import me.shedaniel.clothconfig2.forge.impl.builders.*; 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.lib.config.ClothAPIFactory; import org.orecruncher.sndctrl.library.IndividualSoundConfig; import javax.annotation.Nonnull; import java.util.Optional; -@OnlyIn(Dist.CLIENT) public class ConfigGenerator { @Nonnull diff --git a/src/main/java/org/orecruncher/sndctrl/events/AudioEvent.java b/src/main/java/org/orecruncher/sndctrl/events/AudioEvent.java index 8ce47f86..8f6271fa 100644 --- a/src/main/java/org/orecruncher/sndctrl/events/AudioEvent.java +++ b/src/main/java/org/orecruncher/sndctrl/events/AudioEvent.java @@ -18,13 +18,10 @@ package org.orecruncher.sndctrl.events; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.eventbus.api.Cancelable; import net.minecraftforge.eventbus.api.Event; @SuppressWarnings("unused") -@OnlyIn(Dist.CLIENT) public class AudioEvent extends Event { public AudioEvent() { } diff --git a/src/main/java/org/orecruncher/sndctrl/events/BlockInspectionEvent.java b/src/main/java/org/orecruncher/sndctrl/events/BlockInspectionEvent.java index cc93fba7..d254ebfa 100644 --- a/src/main/java/org/orecruncher/sndctrl/events/BlockInspectionEvent.java +++ b/src/main/java/org/orecruncher/sndctrl/events/BlockInspectionEvent.java @@ -22,15 +22,12 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.eventbus.api.Event; import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; -@OnlyIn(Dist.CLIENT) public class BlockInspectionEvent extends Event { public final List data = new ArrayList<>(); diff --git a/src/main/java/org/orecruncher/sndctrl/events/EntityInspectionEvent.java b/src/main/java/org/orecruncher/sndctrl/events/EntityInspectionEvent.java index 9a0345b5..39f5ab23 100644 --- a/src/main/java/org/orecruncher/sndctrl/events/EntityInspectionEvent.java +++ b/src/main/java/org/orecruncher/sndctrl/events/EntityInspectionEvent.java @@ -19,15 +19,12 @@ package org.orecruncher.sndctrl.events; import net.minecraft.entity.Entity; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.eventbus.api.Event; import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; -@OnlyIn(Dist.CLIENT) public class EntityInspectionEvent extends Event { public final List data = new ArrayList<>(); diff --git a/src/main/java/org/orecruncher/sndctrl/gui/IndividualSoundControlList.java b/src/main/java/org/orecruncher/sndctrl/gui/IndividualSoundControlList.java index 34e668d2..7d18eb3c 100644 --- a/src/main/java/org/orecruncher/sndctrl/gui/IndividualSoundControlList.java +++ b/src/main/java/org/orecruncher/sndctrl/gui/IndividualSoundControlList.java @@ -22,8 +22,6 @@ import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.widget.list.AbstractOptionList; import net.minecraft.util.StringUtils; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.sndctrl.library.IndividualSoundConfig; import org.orecruncher.sndctrl.library.SoundLibrary; @@ -35,7 +33,6 @@ import java.util.function.Function; import java.util.function.Supplier; -@OnlyIn(Dist.CLIENT) public class IndividualSoundControlList extends AbstractOptionList { private final Screen parent; diff --git a/src/main/java/org/orecruncher/sndctrl/gui/IndividualSoundControlListEntry.java b/src/main/java/org/orecruncher/sndctrl/gui/IndividualSoundControlListEntry.java index 5f80fbb5..889d0d3e 100644 --- a/src/main/java/org/orecruncher/sndctrl/gui/IndividualSoundControlListEntry.java +++ b/src/main/java/org/orecruncher/sndctrl/gui/IndividualSoundControlListEntry.java @@ -31,8 +31,6 @@ import net.minecraft.util.text.StringTextComponent; 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 net.minecraftforge.fml.client.gui.widget.Slider; import org.orecruncher.lib.GameUtils; import org.orecruncher.lib.fml.ForgeUtils; @@ -53,7 +51,6 @@ import java.util.List; import java.util.Optional; -@OnlyIn(Dist.CLIENT) public class IndividualSoundControlListEntry extends AbstractOptionList.Entry implements Slider.ISlider, AutoCloseable { private static final int SLIDER_WIDTH = 100; diff --git a/src/main/java/org/orecruncher/sndctrl/gui/IndividualSoundControlScreen.java b/src/main/java/org/orecruncher/sndctrl/gui/IndividualSoundControlScreen.java index d7e96253..d5425997 100644 --- a/src/main/java/org/orecruncher/sndctrl/gui/IndividualSoundControlScreen.java +++ b/src/main/java/org/orecruncher/sndctrl/gui/IndividualSoundControlScreen.java @@ -25,15 +25,12 @@ import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.StringTextComponent; import net.minecraft.util.text.TranslationTextComponent; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.lib.GameUtils; import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.util.List; -@OnlyIn(Dist.CLIENT) public class IndividualSoundControlScreen extends Screen { private static final int TOP_OFFSET = 10; diff --git a/src/main/java/org/orecruncher/sndctrl/gui/QuickVolumeScreen.java b/src/main/java/org/orecruncher/sndctrl/gui/QuickVolumeScreen.java index 8a905f09..c5a0f1c3 100644 --- a/src/main/java/org/orecruncher/sndctrl/gui/QuickVolumeScreen.java +++ b/src/main/java/org/orecruncher/sndctrl/gui/QuickVolumeScreen.java @@ -26,8 +26,6 @@ import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.StringTextComponent; import net.minecraft.util.text.TranslationTextComponent; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.common.ForgeConfigSpec; import net.minecraftforge.fml.client.gui.widget.Slider; import org.orecruncher.lib.gui.ColorPalette; @@ -40,7 +38,6 @@ import java.util.ArrayList; import java.util.List; -@OnlyIn(Dist.CLIENT) public class QuickVolumeScreen extends Screen implements Slider.ISlider { private static final int CONTROL_WIDTH = 160; diff --git a/src/main/java/org/orecruncher/sndctrl/library/AcousticLibrary.java b/src/main/java/org/orecruncher/sndctrl/library/AcousticLibrary.java index 6d236498..7b71e57d 100644 --- a/src/main/java/org/orecruncher/sndctrl/library/AcousticLibrary.java +++ b/src/main/java/org/orecruncher/sndctrl/library/AcousticLibrary.java @@ -22,8 +22,6 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundEvent; import net.minecraft.util.StringUtils; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.dsurround.DynamicSurroundings; import org.orecruncher.lib.logging.IModLog; import org.orecruncher.lib.resource.IResourceAccessor; @@ -39,7 +37,6 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -@OnlyIn(Dist.CLIENT) public final class AcousticLibrary { private static final IModLog LOGGER = SoundControl.LOGGER.createChild(AudioEffectLibrary.class); diff --git a/src/main/java/org/orecruncher/sndctrl/library/AudioEffectLibrary.java b/src/main/java/org/orecruncher/sndctrl/library/AudioEffectLibrary.java index 61efb24c..d285aa48 100644 --- a/src/main/java/org/orecruncher/sndctrl/library/AudioEffectLibrary.java +++ b/src/main/java/org/orecruncher/sndctrl/library/AudioEffectLibrary.java @@ -27,8 +27,6 @@ import net.minecraft.block.material.Material; import net.minecraft.tags.ITag; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.dsurround.DynamicSurroundings; import org.orecruncher.lib.MaterialUtils; import org.orecruncher.lib.tags.TagUtils; @@ -47,7 +45,6 @@ import java.util.Collection; import java.util.Map; -@OnlyIn(Dist.CLIENT) public final class AudioEffectLibrary { private static final String MATERIAL_PREFIX = "+"; diff --git a/src/main/java/org/orecruncher/sndctrl/library/EntityEffectLibrary.java b/src/main/java/org/orecruncher/sndctrl/library/EntityEffectLibrary.java index 90a36d11..70d70f6b 100644 --- a/src/main/java/org/orecruncher/sndctrl/library/EntityEffectLibrary.java +++ b/src/main/java/org/orecruncher/sndctrl/library/EntityEffectLibrary.java @@ -21,15 +21,12 @@ import javax.annotation.Nonnull; import net.minecraft.entity.LivingEntity; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.lib.collections.ObjectArray; import org.orecruncher.sndctrl.api.effects.AbstractEntityEffect; import org.orecruncher.sndctrl.config.Config; import org.orecruncher.sndctrl.SoundControl; import org.orecruncher.sndctrl.api.effects.IEntityEffectFactoryHandler; -@OnlyIn(Dist.CLIENT) public final class EntityEffectLibrary { private static final ObjectArray entityEffectfactoryHandlers = new ObjectArray<>(); diff --git a/src/main/java/org/orecruncher/sndctrl/library/IndividualSoundConfig.java b/src/main/java/org/orecruncher/sndctrl/library/IndividualSoundConfig.java index 1a798ab7..ffd71bbc 100644 --- a/src/main/java/org/orecruncher/sndctrl/library/IndividualSoundConfig.java +++ b/src/main/java/org/orecruncher/sndctrl/library/IndividualSoundConfig.java @@ -20,15 +20,12 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundEvent; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.lib.math.MathStuff; import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.util.Optional; -@OnlyIn(Dist.CLIENT) public final class IndividualSoundConfig { private static final String BLOCK_TOKEN = "block"; diff --git a/src/main/java/org/orecruncher/sndctrl/library/Primitives.java b/src/main/java/org/orecruncher/sndctrl/library/Primitives.java index efacab12..20aa3b29 100644 --- a/src/main/java/org/orecruncher/sndctrl/library/Primitives.java +++ b/src/main/java/org/orecruncher/sndctrl/library/Primitives.java @@ -23,8 +23,6 @@ import net.minecraft.item.IArmorMaterial; import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundEvent; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.orecruncher.lib.SoundTypeUtils; import org.orecruncher.lib.Utilities; import org.orecruncher.lib.resource.ResourceUtils; @@ -42,7 +40,6 @@ import java.util.List; import java.util.Optional; -@OnlyIn(Dist.CLIENT) public class Primitives { private static final float MINECRAFT_VOLUME_SCALE = 0.15F; diff --git a/src/main/java/org/orecruncher/sndctrl/library/SoundLibrary.java b/src/main/java/org/orecruncher/sndctrl/library/SoundLibrary.java index 90d48d0f..1833f937 100644 --- a/src/main/java/org/orecruncher/sndctrl/library/SoundLibrary.java +++ b/src/main/java/org/orecruncher/sndctrl/library/SoundLibrary.java @@ -22,8 +22,6 @@ import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap; import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundEvent; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.registries.ForgeRegistries; import org.orecruncher.lib.Utilities; import org.orecruncher.lib.logging.IModLog; @@ -50,7 +48,6 @@ * side mods that add their own sounds. Also, extended data about sounds is maintained, like ownership and * attribution, that can be used when rendering tooltips and the like in a GUI. */ -@OnlyIn(Dist.CLIENT) public final class SoundLibrary { private static final IModLog LOGGER = SoundControl.LOGGER.createChild(SoundLibrary.class); private static final ResourceLocation MISSING_RESOURCE = new ResourceLocation(SoundControl.MOD_ID, "missing_sound"); diff --git a/src/main/java/org/orecruncher/sndctrl/library/config/SoundMetadataConfig.java b/src/main/java/org/orecruncher/sndctrl/library/config/SoundMetadataConfig.java index b73bc56d..577e0d24 100644 --- a/src/main/java/org/orecruncher/sndctrl/library/config/SoundMetadataConfig.java +++ b/src/main/java/org/orecruncher/sndctrl/library/config/SoundMetadataConfig.java @@ -20,8 +20,6 @@ import com.google.common.collect.ImmutableList; import com.google.gson.annotations.SerializedName; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.apache.commons.lang3.StringUtils; import org.orecruncher.lib.validation.IValidator; import org.orecruncher.lib.validation.ValidationException; @@ -29,7 +27,6 @@ import javax.annotation.Nonnull; import java.util.List; -@OnlyIn(Dist.CLIENT) public class SoundMetadataConfig implements IValidator { @SerializedName("category")