PonyMirrors/Unicopia
1
0
Fork 0
mirror of https://github.com/Sollace/Unicopia.git synced 2025-02-01 11:36:43 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fixed rain not properly starting when throwing a cloud in a jar and added lightning effects to the storm in a jar

Browse source
This commit is contained in:
Sollace 2021-12-29 21:16:12 +02:00
parent 26df9fc8d3
commit 9f5d20e011
1 changed files with 34 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/main/java/com/minelittlepony/unicopia/item/JarItem.java
View file

@ -1,5 +1,6 @@
package com.minelittlepony.unicopia.item; package com.minelittlepony.unicopia.item;
import com.minelittlepony.unicopia.AwaitTickQueue;
import com.minelittlepony.unicopia.entity.IItemEntity; import com.minelittlepony.unicopia.entity.IItemEntity;
import com.minelittlepony.unicopia.entity.ItemImpl; import com.minelittlepony.unicopia.entity.ItemImpl;
import com.minelittlepony.unicopia.particle.ParticleUtils; import com.minelittlepony.unicopia.particle.ParticleUtils;
@ -26,10 +27,11 @@ import net.minecraft.util.ActionResult;
import net.minecraft.util.Hand; import net.minecraft.util.Hand;
import net.minecraft.util.TypedActionResult; import net.minecraft.util.TypedActionResult;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.ChunkSectionPos;
import net.minecraft.util.math.Vec3d; import net.minecraft.util.math.Vec3d;
import net.minecraft.world.Heightmap;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraft.world.WorldEvents; import net.minecraft.world.WorldEvents;
import net.minecraft.world.level.ServerWorldProperties;
public class JarItem extends Item implements ProjectileDelegate, ItemImpl.TickableItem { public class JarItem extends Item implements ProjectileDelegate, ItemImpl.TickableItem {
@ -127,10 +129,38 @@ public class JarItem extends Item implements ProjectileDelegate, ItemImpl.Tickab
ServerWorld world = (ServerWorld)projectile.world; ServerWorld world = (ServerWorld)projectile.world;
if (rain || thunder) { if (rain || thunder) {
ServerWorldProperties props = ((ServerWorldProperties)world.getLevelProperties()); // clear weather time = number of ticks for which the weather is clear
// rain time = ticks until rain gets toggled (reset the tick after toggling)
// thunder time = ticks until thundering gets toggled (reset the tick after toggling)
int time = Math.max(Math.max(props.getRainTime(), props.getThunderTime()), 40); // clear weather time
world.setWeather(0, time, rain, thunder); // Number of ticks weather must stay clear.
// Raining and thundering, and raining/thundering times are kept to false and 0
// when clear weather time is <= 0
// - wait for thunder time to reach zero then toggle thundering
// - wait for rain time to reach zero then toggle raining
// when thunder time is <= 0
// - randomly pick a new value for thunder time
// when rain time is <= 0
// - randomly pick a new value for rain time
world.setWeather(0, 0, rain, thunder);
if (thunder) {
for (int i = world.random.nextInt(7); i > 0; i--) {
AwaitTickQueue.scheduleTask(world, w -> {
LightningEntity bolt = EntityType.LIGHTNING_BOLT.create(world);
bolt.setCosmetic(true);
bolt.refreshPositionAfterTeleport(Vec3d.ofBottomCenter(world.getTopPosition(Heightmap.Type.MOTION_BLOCKING, world.getRandomPosInChunk(
ChunkSectionPos.getBlockCoord(ChunkSectionPos.getSectionCoord(projectile.getX())),
0,
ChunkSectionPos.getBlockCoord(ChunkSectionPos.getSectionCoord(projectile.getZ())),
15
)).up(32)));
world.spawnEntity(bolt);
}, 15 + world.random.nextInt(12));
}
}
} }
if (lightning) { if (lightning) {