Skip to content

Commit e49906e

Browse files
author
Marco (Valandur)
committed
Merge branch 'release/v5.4.1'
2 parents 6ed56f9 + e9ab45b commit e49906e

8 files changed

Lines changed: 15 additions & 7 deletions

File tree

build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ dependencies {
7575
compile group: "org.glassfish.jersey.inject", name: "jersey-hk2", version: "2.26"
7676
compile group: "org.bstats", name: "bstats-sponge", version: "1.4"
7777

78-
compileOnly group: "org.spongepowered", name: "spongeapi", version: "${project.spongeVersion}.0-SNAPSHOT"
78+
compileOnly group: "org.spongepowered", name: "spongeapi", version: "${project.spongeVersion}-SNAPSHOT"
7979

8080
compile group: 'redis.clients', name: 'jedis', version: '2.9.0'
8181
compile group: 'com.rabbitmq', name: 'amqp-client', version: '5.3.0'
@@ -85,12 +85,12 @@ dependencies {
8585
compileOnly name: "CmdScheduler-s7.1-v1.1.1"
8686
compileOnly name: "GWMLibrary 1.3.4"
8787
compileOnly name: "GWMCrates 3.1.13"
88-
compileOnly name: "MMCRestrict-1.6.2-API-7"
89-
compileOnly name: "MMCTickets-2.0.4-API-7"
90-
compileOnly name: "Nucleus-1.8.0-S7.1-api"
88+
compileOnly name: "MMCRestrict-1.7.1-API-7"
89+
compileOnly name: "MMCTickets-2.0.7-API-7"
90+
compileOnly name: "Nucleus-1.12.1-S7.1-api"
9191
compileOnly name: "RedProtect-7.5.5-b130-Universal"
9292
compileOnly name: "UniversalMarket-1.12.2-v1.3"
93-
compileOnly name: "VillagerShops-1.9.1"
93+
compileOnly name: "VillagerShops-2.0.1"
9494
compileOnly name: "WebBooks"
9595
}
9696

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
version=5.4.0
1+
version=5.4.1
22
minecraftVersion=1.12.2
3-
spongeVersion=7.1
3+
spongeVersion=7.1.0
44
jacksonVersion=2.9.4
55
jettyVersion=9.4.8.v20171121

lib/MMCRestrict-1.6.2-API-7.jar

-79.3 KB
Binary file not shown.

lib/MMCRestrict-1.7.1-API-7.jar

67.6 KB
Binary file not shown.

lib/VillagerShops-2.0.1.jar

94.5 KB
Binary file not shown.

src/main/java/valandur/webapi/integration/mmcrestrict/CachedItemData.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,12 @@ public Boolean getWorldBanned() {
7171
return worldBanned;
7272
}
7373

74+
private Boolean hidden;
75+
@ApiModelProperty(value = "True if this item shows up in the public restricted items list, false otherwise", required = true)
76+
public Boolean getHidden() {
77+
return hidden;
78+
}
79+
7480

7581
public CachedItemData() {
7682
super(null);
@@ -87,11 +93,13 @@ public CachedItemData(ItemData value) {
8793
this.dropBanned = value.getDropbanned();
8894
this.craftBanned = value.getCraftbanned();
8995
this.worldBanned = value.getWorldbanned();
96+
this.hidden = value.getHidden();
9097
}
9198

9299
@Override
93100
public Optional<ItemData> getLive() {
94101
return Optional.of(new ItemData(
102+
hidden,
95103
item.getId(),
96104
item.getName(),
97105
banReason != null ? banReason : "",

0 commit comments

Comments
 (0)