Repo-Mirror/Custom-Crops
9
0
Fork 0
mirror of https://github.com/Xiao-MoMi/Custom-Crops.git synced 2025-12-22 08:29:35 +00:00
Code Issues Releases Activity

1.7-2

Browse Source
This commit is contained in:
Xiao-MoMi
2022-10-04 02:51:03 +08:00
parent e185bff763
commit a21ae65ea0
19 changed files with 346 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/net/momirealms/customcrops/CustomCrops.java
View File

@@ -17,6 +17,8 @@
package net.momirealms.customcrops;
import com.comphenix.protocol.ProtocolLibrary;
import com.comphenix.protocol.ProtocolManager;
import net.kyori.adventure.platform.bukkit.BukkitAudiences;
import net.momirealms.customcrops.commands.PluginCommand;
import net.momirealms.customcrops.config.ConfigUtil;
@@ -34,6 +36,7 @@ public final class CustomCrops extends JavaPlugin {
public static BukkitAudiences adventure;
public static CustomCrops plugin;
public static ProtocolManager protocolManager;
private PlaceholderManager placeholderManager;
private CropManager cropManager;
@@ -50,6 +53,7 @@ public final class CustomCrops extends JavaPlugin {
public void onEnable() {
adventure = BukkitAudiences.create(plugin);
protocolManager = ProtocolLibrary.getProtocolManager();
AdventureUtil.consoleMessage("[CustomCrops] Running on <white>" + Bukkit.getVersion());
if (Bukkit.getPluginManager().getPlugin("ItemsAdder") != null) {

2
src/main/java/net/momirealms/customcrops/commands/subcmd/SimulateCommand.java
View File

@@ -48,7 +48,7 @@ public class SimulateCommand extends AbstractSubCommand {
return true;
}
Bukkit.getScheduler().runTaskAsynchronously(CustomCrops.plugin, () -> {
CustomCrops.plugin.getCropManager().grow(world, growTime, sprinklerTime, dryTime);
CustomCrops.plugin.getCropManager().grow(world, growTime, sprinklerTime, dryTime, false);
});
AdventureUtil.sendMessage(sender, MessageConfig.prefix + MessageConfig.growSimulation);
}

6
src/main/java/net/momirealms/customcrops/config/BasicItemConfig.java
View File

@@ -26,7 +26,8 @@ public class BasicItemConfig {
public static String deadCrop;
public static String soilSurveyor;
public static String greenHouseGlass;
public static String crow;
public static String crowLand;
public static String crowFly;
public static String scarecrow;
public static String waterEffect;
@@ -37,7 +38,8 @@ public class BasicItemConfig {
greenHouseGlass = config.getString("greenhouse-glass");
soilSurveyor = config.getString("soil-surveyor");
deadCrop = config.getString("dead-crop");
crow = config.getString("crow");
crowLand = config.getString("crow-land");
crowFly = config.getString("crow-fly");
scarecrow = config.getString("scarecrow");
waterEffect = config.getString("water-effect");
}

2
src/main/java/net/momirealms/customcrops/config/MainConfig.java
View File

@@ -84,6 +84,8 @@ public class MainConfig {
public static boolean enableAnimations;
public static boolean autoGrow;
public static boolean enableCompensation;
public static boolean requireLight;
public static byte lightLevel;
public static void load() {
ConfigUtil.update("config.yml");

16
src/main/java/net/momirealms/customcrops/managers/CropManager.java
View File

@@ -48,7 +48,7 @@ import net.momirealms.customcrops.objects.fertilizer.Fertilizer;
import net.momirealms.customcrops.objects.fertilizer.QualityCrop;
import net.momirealms.customcrops.objects.fertilizer.RetainingSoil;
import net.momirealms.customcrops.objects.fertilizer.YieldIncreasing;
import net.momirealms.customcrops.utils.AdventureUtil;
import net.momirealms.customcrops.utils.ArmorStandUtil;
import org.bukkit.Bukkit;
import org.bukkit.GameMode;
import org.bukkit.Location;
@@ -71,6 +71,7 @@ public class CropManager extends Function {
private CropModeInterface cropMode;
private SeasonInterface seasonInterface;
private CustomInterface customInterface;
private ArmorStandUtil armorStandUtil;
private HandlerP handler;
public CropManager() {
@@ -84,6 +85,7 @@ public class CropManager extends Function {
this.itemSpawnListener = new ItemSpawnListener(this);
this.worldListener = new WorldListener(this);
this.armorStandUtil = new ArmorStandUtil(this);
//Custom Plugin
if (MainConfig.customPlugin.equals("itemsadder")) {
@@ -145,7 +147,7 @@ public class CropManager extends Function {
customWorlds.put(world, customWorld);
if (MainConfig.autoGrow && MainConfig.enableCompensation) {
if (world.getTime() < 24000 - MainConfig.timeToWork - MainConfig.timeToDry - 1200 && world.getTime() > 1500) {
Bukkit.getScheduler().runTaskLaterAsynchronously(CustomCrops.plugin, () -> grow(world, MainConfig.timeToGrow, MainConfig.timeToWork, MainConfig.timeToDry), 100);
Bukkit.getScheduler().runTaskLaterAsynchronously(CustomCrops.plugin, () -> grow(world, MainConfig.timeToGrow, MainConfig.timeToWork, MainConfig.timeToDry, true), 100);
}
}
}
@@ -159,11 +161,11 @@ public class CropManager extends Function {
seasonInterface.unloadWorld(world);
}
public void grow(World world, int cropTime, int sprinklerTime, int dryTime) {
public void grow(World world, int cropTime, int sprinklerTime, int dryTime, boolean compensation) {
CustomWorld customWorld = customWorlds.get(world);
if (customWorld == null) return;
if (MainConfig.cropMode) customWorld.growWire(cropTime, sprinklerTime, dryTime);
else customWorld.growFrame(cropTime, sprinklerTime, dryTime);
if (MainConfig.cropMode) customWorld.growWire(cropTime, sprinklerTime, dryTime, compensation);
else customWorld.growFrame(cropTime, sprinklerTime, dryTime, compensation);
}
public CropModeInterface getCropMode() {
@@ -309,4 +311,8 @@ public class CropManager extends Function {
}
}
}
public ArmorStandUtil getArmorStandUtil() {
return armorStandUtil;
}
}

60
src/main/java/net/momirealms/customcrops/managers/CustomWorld.java
View File

@@ -24,10 +24,7 @@ import com.google.gson.JsonParser;
import com.google.gson.stream.JsonReader;
import net.momirealms.customcrops.CustomCrops;
import net.momirealms.customcrops.api.event.CustomWorldEvent;
import net.momirealms.customcrops.config.ConfigUtil;
import net.momirealms.customcrops.config.CropConfig;
import net.momirealms.customcrops.config.FertilizerConfig;
import net.momirealms.customcrops.config.SprinklerConfig;
import net.momirealms.customcrops.config.*;
import net.momirealms.customcrops.objects.SimpleLocation;
import net.momirealms.customcrops.objects.Sprinkler;
import net.momirealms.customcrops.objects.WorldState;
@@ -39,6 +36,7 @@ import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.World;
import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.entity.Player;
import org.bukkit.scheduler.BukkitRunnable;
import org.bukkit.scheduler.BukkitScheduler;
import org.bukkit.scheduler.BukkitTask;
@@ -240,21 +238,17 @@ public class CustomWorld {
}
}
public void growWire(int cropTime, int sprinklerTime, int dryTime) {
public void growWire(int cropTime, int sprinklerTime, int dryTime, boolean compensation) {
route(sprinklerTime);
Random randomGenerator = new Random();
CropModeInterface cropMode = cropManager.getCropMode();
tempWatered.removeAll(watered);
for (SimpleLocation simpleLocation : tempWatered) {
bukkitScheduler.runTaskLater(CustomCrops.plugin, () -> {
Location dryLoc = MiscUtils.getLocation(simpleLocation);
if (dryLoc == null) return;
cropManager.potDryJudge(dryLoc);
}, sprinklerTime + randomGenerator.nextInt(dryTime));
if (!compensation) {
route(sprinklerTime);
potDryJudge(sprinklerTime + randomGenerator.nextInt(dryTime));
}
CropModeInterface cropMode = cropManager.getCropMode();
for (SimpleLocation location : cropCache.keySet()) {
BukkitTask task = bukkitScheduler.runTaskLaterAsynchronously(CustomCrops.plugin, () -> {
Location seedLoc = MiscUtils.getLocation(location);
@@ -267,21 +261,17 @@ public class CustomWorld {
}
}
public void growFrame(int cropTime, int sprinklerTime, int dryTime) {
public void growFrame(int cropTime, int sprinklerTime, int dryTime, boolean compensation) {
route(sprinklerTime);
Random randomGenerator = new Random();
CropModeInterface cropMode = cropManager.getCropMode();
tempWatered.removeAll(watered);
for (SimpleLocation simpleLocation : tempWatered) {
bukkitScheduler.runTaskLaterAsynchronously(CustomCrops.plugin, () -> {
Location dryLoc = MiscUtils.getLocation(simpleLocation);
if (dryLoc == null) return;
cropManager.potDryJudge(dryLoc);
}, sprinklerTime + randomGenerator.nextInt(dryTime));
if (!compensation) {
route(sprinklerTime);
potDryJudge(sprinklerTime + randomGenerator.nextInt(dryTime));
}
CropModeInterface cropMode = cropManager.getCropMode();
for (SimpleLocation location : cropCache.keySet()) {
long random = randomGenerator.nextInt(cropTime);
BukkitTask task1 = bukkitScheduler.runTaskLater(CustomCrops.plugin, () -> {
@@ -346,17 +336,37 @@ public class CustomWorld {
if (sprinkler.getWater() <= 0) return;
Location sprinklerLoc = MiscUtils.getLocation(location);
if (sprinklerLoc == null) return;
if (MainConfig.enableAnimations) {
Bukkit.getScheduler().runTask(CustomCrops.plugin, () -> {
for (Player player : sprinklerLoc.getNearbyPlayers(48)) {
cropManager.getArmorStandUtil().playWaterAnimation(player, sprinklerLoc.clone().add(0.5, 0.3, 0.5));
}
});
}
sprinkler.setWater(sprinkler.getWater() - 1);
int range = sprinkler.getRange();
for(int i = -range; i <= range; i++){
for (int j = -range; j <= range; j++){
Location wetLoc = sprinklerLoc.clone().add(i,-1,j);
cropManager.makePotWet(wetLoc);
watered.add(MiscUtils.getSimpleLocation(wetLoc));
setPotWet(wetLoc);
}
}
}
private void potDryJudge(int time) {
bukkitScheduler.runTaskLater(CustomCrops.plugin, () -> {
tempWatered.removeAll(watered);
for (SimpleLocation simpleLocation : tempWatered) {
Location dryLoc = MiscUtils.getLocation(simpleLocation);
if (dryLoc == null) return;
cropManager.potDryJudge(dryLoc);
}
}, time);
}
@Nullable
public Fertilizer getFertilizer(Location potLoc) {
return fertilizerCache.get(MiscUtils.getSimpleLocation(potLoc));

1
src/main/java/net/momirealms/customcrops/managers/WireCropImpl.java
View File

@@ -26,7 +26,6 @@ import net.momirealms.customcrops.integrations.customplugin.CustomInterface;
import net.momirealms.customcrops.objects.GiganticCrop;
import net.momirealms.customcrops.objects.fertilizer.Fertilizer;
import net.momirealms.customcrops.objects.fertilizer.Gigantic;
import net.momirealms.customcrops.objects.fertilizer.RetainingSoil;
import net.momirealms.customcrops.objects.fertilizer.SpeedGrow;
import org.apache.commons.lang.StringUtils;
import org.bukkit.Bukkit;

2
src/main/java/net/momirealms/customcrops/managers/timer/TimerTask.java
View File

@@ -36,7 +36,7 @@ public class TimerTask extends BukkitRunnable {
for (World world : MainConfig.getWorldsList()) {
long time = world.getTime();
if (time > 950 && time < 1051) {
cropManager.grow(world, MainConfig.timeToGrow, MainConfig.timeToWork, MainConfig.timeToDry);
cropManager.grow(world, MainConfig.timeToGrow, MainConfig.timeToWork, MainConfig.timeToDry, false);
}
}
}

35
src/main/java/net/momirealms/customcrops/objects/CrowTask.java Normal file
View File

@@ -0,0 +1,35 @@
package net.momirealms.customcrops.objects;
import org.bukkit.Location;
import org.bukkit.entity.Player;
import org.bukkit.scheduler.BukkitRunnable;
import org.bukkit.util.Vector;
public class CrowTask extends BukkitRunnable {
private int timer;
private Player player;
private Location location;
private Vector vector_1;
private Vector vector_2;
private float yaw;
public CrowTask(Player player, Vector vector_1, Vector vector_2, Location location, float yaw) {
this.player = player;
this.timer = 0;
this.vector_1 = vector_1;
this.vector_2 = vector_2;
this.location = location;
this.yaw = yaw;
}
@Override
public void run() {
while (this.timer < 40) {
timer++;
location.add(vector_1).subtract(0,0.2,0);
}
}
}

128
src/main/java/net/momirealms/customcrops/utils/ArmorStandUtil.java Normal file
View File

@@ -0,0 +1,128 @@
package net.momirealms.customcrops.utils;
import com.comphenix.protocol.PacketType;
import com.comphenix.protocol.ProtocolLibrary;
import com.comphenix.protocol.events.PacketContainer;
import com.comphenix.protocol.wrappers.EnumWrappers;
import com.comphenix.protocol.wrappers.Pair;
import com.comphenix.protocol.wrappers.WrappedDataWatcher;
import net.momirealms.customcrops.CustomCrops;
import net.momirealms.customcrops.config.BasicItemConfig;
import net.momirealms.customcrops.config.MainConfig;
import net.momirealms.customcrops.managers.CropManager;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
import org.bukkit.util.Vector;
import java.lang.reflect.InvocationTargetException;
import java.util.*;
public class ArmorStandUtil {
private final CropManager cropManager;
private static final Vector[] vectors =
{new Vector(10,10,10), new Vector(0,10,-15)
, new Vector(10,10,-10), new Vector(15,10,0)
, new Vector(-15,10,0), new Vector(-10,10,10)
, new Vector(0,10,15), new Vector(-10,10,-10)};
private static final float[] yaws = {135f, 180f, -135f, -90f, -45f, 0f, 45f, 90f};
public ArmorStandUtil(CropManager cropManager) {
this.cropManager = cropManager;
}
public void playWaterAnimation(Player player, Location location) {
int id = new Random().nextInt(1000000000);
try {
CustomCrops.protocolManager.sendServerPacket(player, getSpawnPacket(id, location));
CustomCrops.protocolManager.sendServerPacket(player, getMetaPacket(id));
CustomCrops.protocolManager.sendServerPacket(player, getEquipPacket(id, cropManager.getCustomInterface().getItemStack(BasicItemConfig.waterEffect)));
} catch (InvocationTargetException e) {
e.printStackTrace();
}
Bukkit.getScheduler().runTaskLaterAsynchronously(CustomCrops.plugin, () -> {
try {
CustomCrops.protocolManager.sendServerPacket(player, getDestroyPacket(id));
} catch (InvocationTargetException e) {
e.printStackTrace();
}
}, MainConfig.timeToWork/2);
}
public void playCrowAnimation(Player player, Location location) {
int id = new Random().nextInt(1000000000);
Location startLoc = location.clone().add(vectors[new Random().nextInt(vectors.length - 1)]);
try {
CustomCrops.protocolManager.sendServerPacket(player, getSpawnPacket(id, startLoc));
CustomCrops.protocolManager.sendServerPacket(player, getMetaPacket(id));
CustomCrops.protocolManager.sendServerPacket(player, getEquipPacket(id, cropManager.getCustomInterface().getItemStack(BasicItemConfig.crowLand)));
} catch (InvocationTargetException e) {
e.printStackTrace();
}
}
private WrappedDataWatcher createDataWatcher() {
WrappedDataWatcher wrappedDataWatcher = new WrappedDataWatcher();
WrappedDataWatcher.Serializer serializer1 = WrappedDataWatcher.Registry.get(Boolean.class);
WrappedDataWatcher.Serializer serializer2 = WrappedDataWatcher.Registry.get(Byte.class);
wrappedDataWatcher.setObject(new WrappedDataWatcher.WrappedDataWatcherObject(3, serializer1), false);
byte flag = 0x20;
wrappedDataWatcher.setObject(new WrappedDataWatcher.WrappedDataWatcherObject(0, serializer2), flag);
return wrappedDataWatcher;
}
private PacketContainer getDestroyPacket(int id) {
PacketContainer destroyPacket = new PacketContainer(PacketType.Play.Server.ENTITY_DESTROY);
destroyPacket.getIntLists().write(0, List.of(id));
return destroyPacket;
}
private PacketContainer getSpawnPacket(int id, Location location) {
PacketContainer entityPacket = new PacketContainer(PacketType.Play.Server.SPAWN_ENTITY);
entityPacket.getModifier().write(0, id);
entityPacket.getModifier().write(1, UUID.randomUUID());
entityPacket.getEntityTypeModifier().write(0, EntityType.ARMOR_STAND);
entityPacket.getDoubles().write(0, location.getX());
entityPacket.getDoubles().write(1, location.getY());
entityPacket.getDoubles().write(2, location.getZ());
return entityPacket;
}
private PacketContainer getMetaPacket(int id) {
PacketContainer metaPacket = new PacketContainer(PacketType.Play.Server.ENTITY_METADATA);
metaPacket.getIntegers().write(0, id);
metaPacket.getWatchableCollectionModifier().write(0, createDataWatcher().getWatchableObjects());
return metaPacket;
}
private PacketContainer getEquipPacket(int id, ItemStack itemStack) {
PacketContainer equipPacket = new PacketContainer(PacketType.Play.Server.ENTITY_EQUIPMENT);
equipPacket.getIntegers().write(0, id);
List<Pair<EnumWrappers.ItemSlot, ItemStack>> pairs = new ArrayList<>();
pairs.add(new Pair<>(EnumWrappers.ItemSlot.HEAD, itemStack));
equipPacket.getSlotStackPairLists().write(0, pairs);
return equipPacket;
}
private PacketContainer getTeleportPacket(int id, Location location) {
PacketContainer packet = new PacketContainer(PacketType.Play.Server.ENTITY_TELEPORT);
packet.getIntegers().write(0, id);
packet.getDoubles().write(0, location.getX());
packet.getDoubles().write(1, location.getY());
packet.getDoubles().write(2, location.getZ());
return packet;
}
private PacketContainer getRotationPacket(int id, float yaw) {
PacketContainer rotationPacket = new PacketContainer(PacketType.Play.Server.ENTITY_HEAD_ROTATION);
rotationPacket.getIntegers().write(0, id);
rotationPacket.getBytes().write(0, (byte) yaw);
return rotationPacket;
}
}

6
src/main/java/net/momirealms/customcrops/utils/HologramUtil.java
View File

@@ -67,8 +67,8 @@ public class HologramUtil {
metaPacket.getModifier().write(0,id);
metaPacket.getWatchableCollectionModifier().write(0, wrappedDataWatcher.getWatchableObjects());
try {
ProtocolLibrary.getProtocolManager().sendServerPacket(player, spawnPacket);
ProtocolLibrary.getProtocolManager().sendServerPacket(player, metaPacket);
CustomCrops.protocolManager.sendServerPacket(player, spawnPacket);
CustomCrops.protocolManager.sendServerPacket(player, metaPacket);
}
catch (Exception e) {
AdventureUtil.consoleMessage("<red>[CustomCrops] Failed to display hologram for " + player.getName() + " !</red>");
@@ -84,7 +84,7 @@ public class HologramUtil {
PacketContainer packet = new PacketContainer(PacketType.Play.Server.ENTITY_DESTROY);
packet.getIntLists().write(0, List.of(entityId));
try {
ProtocolLibrary.getProtocolManager().sendServerPacket(player, packet);
CustomCrops.protocolManager.sendServerPacket(player, packet);
}
catch (Exception e) {
AdventureUtil.consoleMessage("<red>[CustomCrops] Failed to remove hologram for " + player.getName() + " !</red>");