From bd47a39c838b6d79e28a35272d796c733bf98da9 Mon Sep 17 00:00:00 2001 From: Oleg Ivanov Date: Wed, 8 May 2024 21:48:35 +0300 Subject: [PATCH 1/2] Add config entries for Farming Station particles (#162) * Decrease number of Farming Station particles * Set default values for range & number of particles to original --- .../crazypants/enderio/config/Config.java | 14 ++++++ .../machine/farm/PacketFarmAction.java | 7 +-- .../enderio/machine/farm/TileFarmStation.java | 12 +++-- src/main/java/crazypants/util/ClientUtil.java | 45 ++++++++++++++----- 4 files changed, 58 insertions(+), 20 deletions(-) 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) { From fb4c9bde599646c08cf2dc7f87116c5b9a9b57fa Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Thu, 9 May 2024 10:02:46 +0200 Subject: [PATCH 2/2] update --- dependencies.gradle | 10 +++++----- settings.gradle | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 3c10e99f..f29e385a 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -2,17 +2,17 @@ dependencies { api('com.github.GTNewHorizons:EnderCore:0.4.6:dev') {transitive = false} - compileOnly('com.github.GTNewHorizons:ForestryMC:4.8.9:dev') - compileOnly('com.github.GTNewHorizons:NotEnoughItems:2.5.26-GTNH:dev') + compileOnly('com.github.GTNewHorizons:ForestryMC:4.9.0:dev') + compileOnly('com.github.GTNewHorizons:NotEnoughItems:2.6.0-GTNH:dev') compileOnly("com.github.GTNewHorizons:GTNHLib:0.2.11:dev") compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.39:dev') api('curse.maven:cofh-lib-220333:2388748') // https://www.curseforge.com/minecraft/mc-mods/cofh-lib/files/2388748 shadowImplementation('cglib:cglib-nodep:3.3.0') compileOnly('com.github.GTNewHorizons:waila:1.7.3:api') {transitive = false} - compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-350-GTNH:api') {transitive = false} + compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-400-GTNH:api') {transitive = false} compileOnly('com.github.GTNewHorizons:Baubles:1.0.4:dev') {transitive = false} - compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.45.159:dev') {transitive = false} + compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.46.05:dev') {transitive = false} compileOnly('com.github.GTNewHorizons:Railcraft:9.15.8:api') {transitive = false} compileOnly('com.github.GTNewHorizons:StorageDrawers:1.13.5-GTNH:api') {transitive = false} compileOnly('com.github.GTNewHorizons:Chisel:2.14.1-GTNH:dev') {transitive = false} @@ -24,5 +24,5 @@ dependencies { compileOnly(rfg.deobf('curse.maven:mekanism-268560:2475797')) // https://www.curseforge.com/minecraft/mc-mods/mekanism/files/2475797 compileOnly(rfg.deobf('maven.modrinth:immibis-microblocks:59.1.2')) // https://modrinth.com/mod/immibis-microblocks/version/59.1.2 - compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-alpha38:api') {transitive = false} + compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-alpha45:api') {transitive = false} } diff --git a/settings.gradle b/settings.gradle index 378da589..94c2daf3 100644 --- a/settings.gradle +++ b/settings.gradle @@ -17,7 +17,7 @@ pluginManagement { } plugins { - id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.21' + id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.22' }