mirror of
https://github.com/Xiao-MoMi/Custom-Crops.git
synced 2025-12-22 16:39:36 +00:00
Merge branch 'main' of https://github.com/Xiao-MoMi/Custom-Crops
This commit is contained in:
@@ -1 +1,3 @@
|
||||
MCBBS发布帖: https://www.mcbbs.net/thread-1342178-1-1.html
|
||||
|
||||
MineDown: https://github.com/Phoenix616/MineDown
|
||||
|
||||
2
pom.xml
2
pom.xml
@@ -93,7 +93,7 @@
|
||||
<relocations>
|
||||
<relocation>
|
||||
<pattern>de.themoep.minedown</pattern>
|
||||
<shadedPattern>net.momirealms.customcrops.libraries.minedown</shadedPattern>
|
||||
<shadedPattern>net.momirealms.customcrops.Libs.minedown</shadedPattern>
|
||||
</relocation>
|
||||
</relocations>
|
||||
</configuration>
|
||||
|
||||
@@ -54,7 +54,6 @@ public final class CustomCrops extends JavaPlugin {
|
||||
List<WrappedChatComponent> components = packet.getChatComponents().getValues();
|
||||
for (WrappedChatComponent component : components) {
|
||||
if(component.toString().contains("Ender Chest")){
|
||||
//component.setJson("{\"text\":\"收纳袋\"}");
|
||||
component.setJson("{\"translate\":\"container.enderchest\"}");
|
||||
packet.getChatComponents().write(components.indexOf(component), component);
|
||||
}
|
||||
|
||||
@@ -10,7 +10,6 @@ import java.text.SimpleDateFormat;
|
||||
import java.util.Date;
|
||||
|
||||
public class BackUp {
|
||||
|
||||
public static void backUpData(){
|
||||
|
||||
Date date = new Date();
|
||||
@@ -23,11 +22,13 @@ public class BackUp {
|
||||
|
||||
try {
|
||||
BackUp.backUp(crop_data,cropBackUp);
|
||||
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
try {
|
||||
BackUp.backUp(sprinkler_data,sprinklerBackUp);
|
||||
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
||||
@@ -3,15 +3,13 @@ package net.momirealms.customcrops.DataManager;
|
||||
import dev.lone.itemsadder.api.CustomBlock;
|
||||
import net.momirealms.customcrops.CustomCrops;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.block.Block;
|
||||
import org.bukkit.configuration.file.FileConfiguration;
|
||||
|
||||
public class MaxCropsPerChunk {
|
||||
|
||||
static FileConfiguration config = CustomCrops.instance.getConfig();
|
||||
|
||||
public static boolean maxCropsPerChunk(Location location){
|
||||
|
||||
FileConfiguration config = CustomCrops.instance.getConfig();
|
||||
if(!config.getBoolean("config.enable-limit")){
|
||||
return false;
|
||||
}
|
||||
@@ -26,10 +24,10 @@ public class MaxCropsPerChunk {
|
||||
Label_out:
|
||||
for (int i = 0; i < 16; ++i) {
|
||||
for (int j = 0; j < 16; ++j) {
|
||||
Location square = chunkLocation.clone().add(i, 0.0, j);
|
||||
final Location square = chunkLocation.clone().add((double)i, 0.0, (double)j);
|
||||
for (int k = minY; k <= maxY; ++k) {
|
||||
square.add(0.0, 1.0, 0.0);
|
||||
Block b = location.getWorld().getBlockAt(square);
|
||||
Blcok b = location.getWorld().getBlcokAt(square);
|
||||
if(CustomBlock.byAlreadyPlaced(b)!= null){
|
||||
if (CustomBlock.byAlreadyPlaced(b).getNamespacedID().contains("stage")) {
|
||||
if (n++ > maxAmount) {
|
||||
|
||||
@@ -7,11 +7,8 @@ import org.bukkit.World;
|
||||
import org.bukkit.configuration.file.FileConfiguration;
|
||||
|
||||
public class MaxSprinklersPerChunk {
|
||||
|
||||
static FileConfiguration config = CustomCrops.instance.getConfig();
|
||||
|
||||
public static boolean maxSprinklersPerChunk(Location location){
|
||||
|
||||
FileConfiguration config = CustomCrops.instance.getConfig();
|
||||
if(!config.getBoolean("config.enable-limit")){
|
||||
return false;
|
||||
}
|
||||
@@ -27,7 +24,7 @@ public class MaxSprinklersPerChunk {
|
||||
Label_out:
|
||||
for (int i = 0; i < 16; ++i) {
|
||||
for (int j = 0; j < 16; ++j) {
|
||||
Location square = chunkLocation.clone().add(i+0.5, 0.5, j+0.5);
|
||||
final Location square = chunkLocation.clone().add((double)(i+0.5), 0.5, (double)(j+0.5));
|
||||
for (int k = minY; k <= maxY; ++k) {
|
||||
square.add(0.0, 1.0, 0.0);
|
||||
if(IAFurniture.getFromLocation(square, world)){
|
||||
@@ -40,7 +37,4 @@ public class MaxSprinklersPerChunk {
|
||||
}
|
||||
return n > maxAmount;
|
||||
}
|
||||
public static boolean alreadyPlaced(Location location){
|
||||
return IAFurniture.getFromLocation(location.clone().add(0.5, 1.5, 0.5), location.getWorld());
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user