diff --git a/src/main/java/forestry/apiculture/PluginApiculture.java b/src/main/java/forestry/apiculture/PluginApiculture.java index 5ce93df23..a836d409c 100644 --- a/src/main/java/forestry/apiculture/PluginApiculture.java +++ b/src/main/java/forestry/apiculture/PluginApiculture.java @@ -92,6 +92,7 @@ import forestry.apiculture.multiblock.TileAlvearyStabiliser; import forestry.apiculture.multiblock.TileAlvearySwarmer; import forestry.apiculture.network.PacketRegistryApiculture; import forestry.apiculture.proxy.ProxyApiculture; +import forestry.apiculture.proxy.ProxyApicultureClient; import forestry.apiculture.tiles.TileCandle; import forestry.apiculture.tiles.TileHive; import forestry.apiculture.worldgen.HiveDecorator; @@ -127,7 +128,6 @@ public class PluginApiculture extends BlankForestryPlugin { public static ProxyApiculture proxy; private static final String CONFIG_CATEGORY = "apiculture"; public static String beekeepingMode = "NORMAL"; - public static TextureAtlasSprite beeSprite; private static float secondPrincessChance = 0; public static final int ticksPerBeeWorkCycle = 550; public static boolean fancyRenderedBees = false; @@ -848,7 +848,7 @@ public class PluginApiculture extends BlankForestryPlugin { for (int i = 0; i < ParticleSnow.sprites.length; i++) { ParticleSnow.sprites[i] = event.getMap().registerSprite(new ResourceLocation("forestry:entity/particles/snow." + (i + 1))); } - beeSprite = event.getMap().registerSprite(new ResourceLocation("forestry:entity/particles/swarm_bee")); + ProxyApicultureClient.beeSprite = event.getMap().registerSprite(new ResourceLocation("forestry:entity/particles/swarm_bee")); } private static class EndFlowerAcceptableRule implements IFlowerAcceptableRule { diff --git a/src/main/java/forestry/apiculture/entities/ParticleBeeExplore.java b/src/main/java/forestry/apiculture/entities/ParticleBeeExplore.java index f587f0291..b9ce70c46 100644 --- a/src/main/java/forestry/apiculture/entities/ParticleBeeExplore.java +++ b/src/main/java/forestry/apiculture/entities/ParticleBeeExplore.java @@ -12,20 +12,19 @@ package forestry.apiculture.entities; import net.minecraft.client.particle.Particle; import net.minecraft.client.renderer.VertexBuffer; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.Entity; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; -import forestry.apiculture.PluginApiculture; +import forestry.apiculture.proxy.ProxyApicultureClient; public class ParticleBeeExplore extends Particle { private final Vec3d origin; public ParticleBeeExplore(World world, Vec3d origin, BlockPos destination, int color) { super(world, origin.xCoord, origin.yCoord, origin.zCoord, 0.0D, 0.0D, 0.0D); - setParticleTexture(PluginApiculture.beeSprite); + setParticleTexture(ProxyApicultureClient.beeSprite); this.origin = origin; this.motionX = (destination.getX() + 0.5 - this.posX) * 0.015; diff --git a/src/main/java/forestry/apiculture/entities/ParticleBeeRoundTrip.java b/src/main/java/forestry/apiculture/entities/ParticleBeeRoundTrip.java index b7690783b..fa3b48299 100644 --- a/src/main/java/forestry/apiculture/entities/ParticleBeeRoundTrip.java +++ b/src/main/java/forestry/apiculture/entities/ParticleBeeRoundTrip.java @@ -17,7 +17,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; -import forestry.apiculture.PluginApiculture; +import forestry.apiculture.proxy.ProxyApicultureClient; public class ParticleBeeRoundTrip extends Particle { private final Vec3d origin; @@ -25,7 +25,7 @@ public class ParticleBeeRoundTrip extends Particle { public ParticleBeeRoundTrip(World world, Vec3d origin, BlockPos destination, int color) { super(world, origin.xCoord, origin.yCoord, origin.zCoord, 0.0D, 0.0D, 0.0D); - setParticleTexture(PluginApiculture.beeSprite); + setParticleTexture(ProxyApicultureClient.beeSprite); this.origin = origin; this.destination = destination; diff --git a/src/main/java/forestry/apiculture/entities/ParticleBeeTargetEntity.java b/src/main/java/forestry/apiculture/entities/ParticleBeeTargetEntity.java index 69508910b..5f585afcd 100644 --- a/src/main/java/forestry/apiculture/entities/ParticleBeeTargetEntity.java +++ b/src/main/java/forestry/apiculture/entities/ParticleBeeTargetEntity.java @@ -13,11 +13,10 @@ package forestry.apiculture.entities; import net.minecraft.client.particle.Particle; import net.minecraft.client.renderer.VertexBuffer; import net.minecraft.entity.Entity; -import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; -import forestry.apiculture.PluginApiculture; +import forestry.apiculture.proxy.ProxyApicultureClient; public class ParticleBeeTargetEntity extends Particle { private final Vec3d origin; @@ -25,7 +24,7 @@ public class ParticleBeeTargetEntity extends Particle { public ParticleBeeTargetEntity(World world, Vec3d origin, Entity entity, int color) { super(world, origin.xCoord, origin.yCoord, origin.zCoord, 0.0D, 0.0D, 0.0D); - setParticleTexture(PluginApiculture.beeSprite); + setParticleTexture(ProxyApicultureClient.beeSprite); this.origin = origin; this.entity = entity; diff --git a/src/main/java/forestry/apiculture/proxy/ProxyApicultureClient.java b/src/main/java/forestry/apiculture/proxy/ProxyApicultureClient.java index b902f7155..45e3e0c9e 100644 --- a/src/main/java/forestry/apiculture/proxy/ProxyApicultureClient.java +++ b/src/main/java/forestry/apiculture/proxy/ProxyApicultureClient.java @@ -10,8 +10,12 @@ ******************************************************************************/ package forestry.apiculture.proxy; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; + public class ProxyApicultureClient extends ProxyApiculture { + public static TextureAtlasSprite beeSprite; + @Override public void initializeRendering() { // TODO: remove unused bee entity model completely