diff --git a/build.gradle b/build.gradle index 08df21a..d79c899 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ plugins { group = 'net.momirealms' -version = '1.5.11' +version = '1.5.13' repositories { mavenCentral() diff --git a/src/main/java/net/momirealms/customcrops/datamanager/CropManager.java b/src/main/java/net/momirealms/customcrops/datamanager/CropManager.java index 30795fa..06a0801 100644 --- a/src/main/java/net/momirealms/customcrops/datamanager/CropManager.java +++ b/src/main/java/net/momirealms/customcrops/datamanager/CropManager.java @@ -18,6 +18,7 @@ package net.momirealms.customcrops.datamanager; import dev.lone.itemsadder.api.CustomBlock; +import dev.lone.itemsadder.api.CustomStack; import net.momirealms.customcrops.fertilizer.QualityCrop; import net.momirealms.customcrops.utils.AdventureManager; import net.momirealms.customcrops.ConfigReader; diff --git a/src/main/java/net/momirealms/customcrops/listener/RightClick.java b/src/main/java/net/momirealms/customcrops/listener/RightClick.java index 7ba1ed9..571cdc0 100644 --- a/src/main/java/net/momirealms/customcrops/listener/RightClick.java +++ b/src/main/java/net/momirealms/customcrops/listener/RightClick.java @@ -89,6 +89,9 @@ public class RightClick implements Listener { for (Integration integration : ConfigReader.Config.integration){ if(!integration.canPlace(location, player)) return; } + if(IAFurniture.getFromLocation(location.clone().add(0.5, 0.5, 0.5), location.getWorld())){ + return; + } CropInstance cropInstance = crop.get(); PlantingCondition plantingCondition = new PlantingCondition(player, location); if (cropInstance.getRequirements() != null){ diff --git a/src/main/resources/crops.yml b/src/main/resources/crops.yml index 50cf11c..68a3ba0 100644 --- a/src/main/resources/crops.yml +++ b/src/main/resources/crops.yml @@ -57,11 +57,29 @@ crops: - autumn corn: - amount: 1~2 + amount: 2~3 quality: 1: customcrops:corn 2: customcrops:corn_silver_star 3: customcrops:corn_golden_star season: - autumn - - summer \ No newline at end of file + - summer + + pepper: + amount: 3~6 + quality: + 1: customcrops:pepper + 2: customcrops:pepper_silver_star + 3: customcrops:pepper_golden_star + season: + - spring + - summer + return: customcrops:pepper_stage_3 + + garlic: + amount: 3~4 + quality: + 1: customcrops:garlic + 2: customcrops:garlic_silver_star + 3: customcrops:garlic_golden_star \ No newline at end of file diff --git a/src/main/resources/zh-cn/crops.yml b/src/main/resources/zh-cn/crops.yml index c51c3f7..89d59df 100644 --- a/src/main/resources/zh-cn/crops.yml +++ b/src/main/resources/zh-cn/crops.yml @@ -43,8 +43,9 @@ crops: 1: customcrops:cabbage 2: customcrops:cabbage_silver_star 3: customcrops:cabbage_golden_star - gigantic: customcrops:gigantic_cabbage - gigantic-chance: 0.01 + gigantic: + block: customcrops:gigantic_cabbage + chance: 0.01 season: - spring