diff --git a/src/main/java/crazypants/enderio/config/Config.java b/src/main/java/crazypants/enderio/config/Config.java index a377ea0f..f7b2c464 100644 --- a/src/main/java/crazypants/enderio/config/Config.java +++ b/src/main/java/crazypants/enderio/config/Config.java @@ -361,6 +361,8 @@ public final class Config { "TwilightForest:item.steeleafHoe", "TwilightForest:item.ironwoodHoe", "IC2:itemToolBronzeHoe" }; public static List farmHoes = new ArrayList(); public static int farmSaplingReserveAmount = 8; + public static double farmParticlesMaxRange = 64; + public static int farmParticlesCount = 15; public static int magnetPowerUsePerSecondRF = 1; public static int magnetPowerCapacityRF = 100000; @@ -2060,6 +2062,18 @@ public final class Config { + "always shear all leaves.") .getInt(farmSaplingReserveAmount); + farmParticlesMaxRange = config.get( + sectionFarm.name, + "farmParticlesMaxRange", + farmParticlesMaxRange, + "The max range of the farm action particles.").getDouble(farmParticlesMaxRange); + + farmParticlesCount = config.get( + sectionFarm.name, + "farmParticlesCount", + farmParticlesCount, + "The number of particles produces by farm action.").getInt(farmParticlesCount); + combustionGeneratorUseOpaqueModel = config .get( sectionAesthetic.name, diff --git a/src/main/java/crazypants/enderio/machine/farm/PacketFarmAction.java b/src/main/java/crazypants/enderio/machine/farm/PacketFarmAction.java index 1b85a859..99facbbc 100644 --- a/src/main/java/crazypants/enderio/machine/farm/PacketFarmAction.java +++ b/src/main/java/crazypants/enderio/machine/farm/PacketFarmAction.java @@ -9,6 +9,7 @@ import com.enderio.core.common.util.BlockCoord; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import crazypants.enderio.config.Config; import crazypants.util.ClientUtil; import io.netty.buffer.ByteBuf; @@ -51,11 +52,7 @@ public class PacketFarmAction implements IMessage, IMessageHandler coords, int particlesCount) { + // 0 = All, 1 = Decreased, 2 = Minimal + int particleSetting = Minecraft.getMinecraft().gameSettings.particleSetting; + if (particleSetting >= 2 /* Minimal */) { + return; + } + + int particles = particleSetting == 0 ? particlesCount /* All */ + : (particlesCount / 2) /* Decreased */; + + World world = Minecraft.getMinecraft().theWorld; + EffectRenderer effectRenderer = Minecraft.getMinecraft().effectRenderer; + + for (BlockCoord bc : coords) { + for (int i = 0; i < particles; i++) { + double xOff = 0.5 + (rand.nextDouble() - 0.5) * 1.1; + double yOff = 0.5 + (rand.nextDouble() - 0.5) * 0.2; + double zOff = 0.5 + (rand.nextDouble() - 0.5) * 1.1; + effectRenderer.addEffect( + new EntityPortalFX( + world, + bc.x + xOff, + bc.y + yOff, + bc.z + zOff, + (rand.nextDouble() - 0.5) * 1.5, + -rand.nextDouble(), + (rand.nextDouble() - 0.5) * 1.5)); + } + } } public static void setTankNBT(PacketCombustionTank message, int x, int y, int z) {