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

no change

Browse Source
This commit is contained in:
Xiao-MoMi
2022-05-23 12:45:23 +08:00
parent 465b0d2560
commit 9656ff8e6b
2 changed files with 36 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/net/momirealms/customcrops/CommandHandler.java
View File

@@ -3,7 +3,6 @@ package net.momirealms.customcrops;
import net.momirealms.customcrops.DataManager.BackUp; import net.momirealms.customcrops.DataManager.BackUp;
import net.momirealms.customcrops.DataManager.CropManager; import net.momirealms.customcrops.DataManager.CropManager;
import net.momirealms.customcrops.DataManager.SprinklerManager; import net.momirealms.customcrops.DataManager.SprinklerManager;
import net.momirealms.customcrops.Integrations.KingdomsXIntegrations;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandExecutor;

56
src/main/java/net/momirealms/customcrops/listener/RightClickBlock.java
View File

@@ -54,30 +54,28 @@ public class RightClickBlock implements Listener {
if(event.getAction() != Action.RIGHT_CLICK_BLOCK) return; if(event.getAction() != Action.RIGHT_CLICK_BLOCK) return;
if(event.getBlockFace() != BlockFace.UP) return; if(event.getBlockFace() != BlockFace.UP) return;
FileConfiguration config = CustomCrops.instance.getConfig(); FileConfiguration config = CustomCrops.instance.getConfig();
Location location = event.getClickedBlock().getLocation(); Location location = event.getClickedBlock().getLocation();
//res兼容
if(config.getBoolean("config.integration.residence")){
if(ResidenceIntegrations.checkResBuild(location,player)){
return;
}
}
//wg兼容
if(config.getBoolean("config.integration.worldguard")){
if(WorldGuardIntegrations.checkWGBuild(location,player)){
return;
}
}
//kingdomsX兼容
if(config.getBoolean("config.integration.kingdomsX")){
if(KingdomsXIntegrations.checkKDBuild(location,player)){
return;
}
}
//是否过高过低
if(CustomStack.byItemStack(event.getItem()).getNamespacedID().equalsIgnoreCase(config.getString("config.sprinkler-1-item"))){ if(CustomStack.byItemStack(event.getItem()).getNamespacedID().equalsIgnoreCase(config.getString("config.sprinkler-1-item"))){
//res兼容
if(config.getBoolean("config.integration.residence")){
if(ResidenceIntegrations.checkResBuild(location,player)){
return;
}
}
//wg兼容
if(config.getBoolean("config.integration.worldguard")){
if(WorldGuardIntegrations.checkWGBuild(location,player)){
return;
}
}
//kingdomsX兼容
if(config.getBoolean("config.integration.kingdomsX")){
if(KingdomsXIntegrations.checkKDBuild(location,player)){
return;
}
}
if(event.getClickedBlock().getY() > config.getInt("config.height.max") || event.getClickedBlock().getY() < config.getInt("config.height.min")){ if(event.getClickedBlock().getY() > config.getInt("config.height.max") || event.getClickedBlock().getY() < config.getInt("config.height.min")){
MessageManager.playerMessage(config.getString("messages.prefix") + config.getString("messages.not-a-good-place"),player); MessageManager.playerMessage(config.getString("messages.prefix") + config.getString("messages.not-a-good-place"),player);
return; return;
@@ -93,6 +91,24 @@ public class RightClickBlock implements Listener {
IAFurniture.placeFurniture(config.getString("config.sprinkler-1"),location.clone().add(0,1,0)); IAFurniture.placeFurniture(config.getString("config.sprinkler-1"),location.clone().add(0,1,0));
SprinklerManager.putInstance(location.clone().add(0,1,0),"s1"); SprinklerManager.putInstance(location.clone().add(0,1,0),"s1");
}else if(CustomStack.byItemStack(event.getItem()).getNamespacedID().equalsIgnoreCase(config.getString("config.sprinkler-2-item"))){ }else if(CustomStack.byItemStack(event.getItem()).getNamespacedID().equalsIgnoreCase(config.getString("config.sprinkler-2-item"))){
//res兼容
if(config.getBoolean("config.integration.residence")){
if(ResidenceIntegrations.checkResBuild(location,player)){
return;
}
}
//wg兼容
if(config.getBoolean("config.integration.worldguard")){
if(WorldGuardIntegrations.checkWGBuild(location,player)){
return;
}
}
//kingdomsX兼容
if(config.getBoolean("config.integration.kingdomsX")){
if(KingdomsXIntegrations.checkKDBuild(location,player)){
return;
}
}
if(event.getClickedBlock().getY() > config.getInt("config.height.max") || event.getClickedBlock().getY() < config.getInt("config.height.min")){ if(event.getClickedBlock().getY() > config.getInt("config.height.max") || event.getClickedBlock().getY() < config.getInt("config.height.min")){
MessageManager.playerMessage(config.getString("messages.prefix") + config.getString("messages.not-a-good-place"),player); MessageManager.playerMessage(config.getString("messages.prefix") + config.getString("messages.not-a-good-place"),player);
return; return;