mirror of
https://github.com/songoda/EpicBuckets.git
synced 2025-02-16 19:51:29 +01:00
Update 1.2.5
This commit is contained in:
parent
8f7c6c1165
commit
02b03f10ee
4
pom.xml
4
pom.xml
@ -2,7 +2,7 @@
|
|||||||
<groupId>com.songoda</groupId>
|
<groupId>com.songoda</groupId>
|
||||||
<artifactId>EpicBuckets</artifactId>
|
<artifactId>EpicBuckets</artifactId>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<version>1.2.4</version>
|
<version>1.2.5</version>
|
||||||
<build>
|
<build>
|
||||||
<defaultGoal>clean package</defaultGoal>
|
<defaultGoal>clean package</defaultGoal>
|
||||||
<plugins>
|
<plugins>
|
||||||
@ -121,7 +121,7 @@
|
|||||||
<url>http://nexus.hc.to/content/repositories/pub_releases</url>
|
<url>http://nexus.hc.to/content/repositories/pub_releases</url>
|
||||||
</repository>
|
</repository>
|
||||||
<repository>
|
<repository>
|
||||||
<id>3_aikar</id>
|
<id>33_aikar</id>
|
||||||
<url>https://repo.aikar.co/content/groups/aikar/</url>
|
<url>https://repo.aikar.co/content/groups/aikar/</url>
|
||||||
</repository>
|
</repository>
|
||||||
<repository>
|
<repository>
|
||||||
|
@ -44,6 +44,7 @@ public class ConfigManager {
|
|||||||
private int spongeRadius;
|
private int spongeRadius;
|
||||||
private int maxGenbucketsPerPlayer;
|
private int maxGenbucketsPerPlayer;
|
||||||
private boolean unlimitedGenbuckets;
|
private boolean unlimitedGenbuckets;
|
||||||
|
private boolean infiniteUse;
|
||||||
private int maxVerticalHeight;
|
private int maxVerticalHeight;
|
||||||
private int maxHorizontalLength;
|
private int maxHorizontalLength;
|
||||||
private int delay;
|
private int delay;
|
||||||
@ -94,6 +95,7 @@ public class ConfigManager {
|
|||||||
spongeRadius = epicBuckets.getConfig().getInt("SPONGE-RADIUS");
|
spongeRadius = epicBuckets.getConfig().getInt("SPONGE-RADIUS");
|
||||||
maxGenbucketsPerPlayer = epicBuckets.getConfig().getInt("MAX-ACTIVE-GEN-PER-PLAYER");
|
maxGenbucketsPerPlayer = epicBuckets.getConfig().getInt("MAX-ACTIVE-GEN-PER-PLAYER");
|
||||||
unlimitedGenbuckets = epicBuckets.getConfig().getBoolean("PLACE-UNLIMTED-GENS");
|
unlimitedGenbuckets = epicBuckets.getConfig().getBoolean("PLACE-UNLIMTED-GENS");
|
||||||
|
infiniteUse = epicBuckets.getConfig().getBoolean("INFINITE-USE");
|
||||||
maxVerticalHeight = epicBuckets.getConfig().getInt("MAX-VERTICAL-HEIGHT");
|
maxVerticalHeight = epicBuckets.getConfig().getInt("MAX-VERTICAL-HEIGHT");
|
||||||
maxHorizontalLength = epicBuckets.getConfig().getInt("MAX-HORIZONTAL-LENGTH");
|
maxHorizontalLength = epicBuckets.getConfig().getInt("MAX-HORIZONTAL-LENGTH");
|
||||||
delay = epicBuckets.getConfig().getInt("DELAY");
|
delay = epicBuckets.getConfig().getInt("DELAY");
|
||||||
@ -272,4 +274,8 @@ public class ConfigManager {
|
|||||||
public List<BlockFace> getLogicalFacesForGenbucket(GenbucketType genbucketType) {
|
public List<BlockFace> getLogicalFacesForGenbucket(GenbucketType genbucketType) {
|
||||||
return genbucketLogicalFaces.get(genbucketType);
|
return genbucketLogicalFaces.get(genbucketType);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public boolean isInfiniteUse() {
|
||||||
|
return infiniteUse;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -72,6 +72,7 @@ public class GenbucketManager {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public boolean canRegisterNewGenbucket(Player owner) {
|
public boolean canRegisterNewGenbucket(Player owner) {
|
||||||
|
if (epicBuckets.getConfigManager().isUnlimitedGenbuckets()) return true;
|
||||||
if (!activeGens.containsKey(owner.getUniqueId())) return true;
|
if (!activeGens.containsKey(owner.getUniqueId())) return true;
|
||||||
if (activeGens.get(owner.getUniqueId()).size() <= getMaxGenbucketsForPlayer(owner)) return true;
|
if (activeGens.get(owner.getUniqueId()).size() <= getMaxGenbucketsForPlayer(owner)) return true;
|
||||||
return false;
|
return false;
|
||||||
|
@ -80,11 +80,12 @@ public class GenbucketPlaceListener implements Listener {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (e.getPlayer().getGameMode() != GameMode.CREATIVE && !EpicBuckets.getInstance().getConfigManager().isUnlimitedGenbuckets()) {
|
if (e.getPlayer().getGameMode() != GameMode.CREATIVE && !EpicBuckets.getInstance().getConfigManager().isInfiniteUse()) {
|
||||||
if (e.getItem().getAmount() > 1) {
|
if (e.getItem().getAmount() > 1) {
|
||||||
e.getItem().setAmount(e.getItem().getAmount() - 1);
|
e.getItem().setAmount(e.getItem().getAmount() - 1);
|
||||||
} else {
|
} else {
|
||||||
e.getItem().setAmount(0);
|
System.out.println("hi");
|
||||||
|
e.getPlayer().getInventory().remove(e.getItem());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -32,11 +32,11 @@ public class Shop {
|
|||||||
private boolean fillInventory;
|
private boolean fillInventory;
|
||||||
private String inventoryName;
|
private String inventoryName;
|
||||||
|
|
||||||
private boolean enabled = true;
|
private boolean enabled;
|
||||||
|
|
||||||
public Shop(String menuItem, String name, String path) {
|
public Shop(String menuItem, String name, String path) {
|
||||||
this.epicBuckets = EpicBuckets.getInstance();
|
this.epicBuckets = EpicBuckets.getInstance();
|
||||||
this.shops = EpicBuckets.getInstance().getConfigManager().getConfig("shops");;
|
this.shops = EpicBuckets.getInstance().getConfigManager().getConfig("shops");
|
||||||
|
|
||||||
this.subShops = new HashMap<>();
|
this.subShops = new HashMap<>();
|
||||||
|
|
||||||
@ -45,6 +45,7 @@ public class Shop {
|
|||||||
|
|
||||||
this.path = path;
|
this.path = path;
|
||||||
this.shopPath = epicBuckets.getShopManager().getShopPath() + "." + shopName;
|
this.shopPath = epicBuckets.getShopManager().getShopPath() + "." + shopName;
|
||||||
|
this.enabled = shops.getBoolean(shopPath + ".enabled");
|
||||||
|
|
||||||
loadData();
|
loadData();
|
||||||
setupShopItem();
|
setupShopItem();
|
||||||
|
@ -4,6 +4,8 @@ shops:
|
|||||||
|
|
||||||
vertical:
|
vertical:
|
||||||
|
|
||||||
|
enabled: true
|
||||||
|
|
||||||
goBackButton: 31 # back button will display if enabled in file.yml
|
goBackButton: 31 # back button will display if enabled in file.yml
|
||||||
|
|
||||||
trait: "VERTICAL" # Which genbucket type does this shop have?
|
trait: "VERTICAL" # Which genbucket type does this shop have?
|
||||||
@ -94,6 +96,8 @@ shops:
|
|||||||
|
|
||||||
infused:
|
infused:
|
||||||
|
|
||||||
|
enabled: true
|
||||||
|
|
||||||
goBackButton: 31
|
goBackButton: 31
|
||||||
|
|
||||||
trait: "INFUSED"
|
trait: "INFUSED"
|
||||||
@ -191,6 +195,8 @@ shops:
|
|||||||
|
|
||||||
psuedo:
|
psuedo:
|
||||||
|
|
||||||
|
enabled: true
|
||||||
|
|
||||||
goBackButton: 31
|
goBackButton: 31
|
||||||
|
|
||||||
trait: "PSUEDO"
|
trait: "PSUEDO"
|
||||||
@ -281,6 +287,8 @@ shops:
|
|||||||
|
|
||||||
horizontal:
|
horizontal:
|
||||||
|
|
||||||
|
enabled: true
|
||||||
|
|
||||||
goBackButton: 31
|
goBackButton: 31
|
||||||
|
|
||||||
trait: "HORIZONTAL"
|
trait: "HORIZONTAL"
|
||||||
|
Loading…
Reference in New Issue
Block a user