Skip to content

Commit db892a2

Browse files
committed
WIP
1 parent 08650fa commit db892a2

File tree

2 files changed

+69
-3
lines changed

2 files changed

+69
-3
lines changed

pom.xml

Lines changed: 61 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
<powermock.version>2.0.9</powermock.version>
5656
<!-- More visible way how to change dependency versions -->
5757
<spigot.version>1.21.5-R0.1-SNAPSHOT</spigot.version>
58-
<bentobox.version>3.4.0</bentobox.version>
58+
<bentobox.version>3.7.4-SNAPSHOT</bentobox.version>
5959
<!-- Warps addon version -->
6060
<warps.version>1.12.0</warps.version>
6161
<!-- Visit addon version -->
@@ -163,6 +163,12 @@
163163
<id>matteodev</id>
164164
<url>https://maven.devs.beer/</url>
165165
</repository>
166+
<!-- Oraxen repo-->
167+
<repository>
168+
<id>oraxen</id>
169+
<name>Oraxen Repository</name>
170+
<url>https://repo.oraxen.com/releases</url>
171+
</repository>
166172
</repositories>
167173

168174
<dependencies>
@@ -195,8 +201,7 @@
195201
<dependency>
196202
<groupId>world.bentobox</groupId>
197203
<artifactId>bentobox</artifactId>
198-
<version>${bentobox.version}</version>
199-
<scope>provided</scope>
204+
<version>3.7.4-SNAPSHOT</version>
200205
</dependency>
201206
<dependency>
202207
<groupId>world.bentobox</groupId>
@@ -257,6 +262,59 @@
257262
<version>4.0.10</version>
258263
<scope>provided</scope>
259264
</dependency>
265+
<!-- Oraxen -->
266+
<dependency>
267+
<groupId>io.th0rgal</groupId>
268+
<artifactId>oraxen</artifactId>
269+
<version>1.193.1</version>
270+
<exclusions>
271+
<exclusion>
272+
<groupId>me.gabytm.util</groupId>
273+
<artifactId>actions-spigot</artifactId>
274+
</exclusion>
275+
<exclusion>
276+
<groupId>org.jetbrains</groupId>
277+
<artifactId>annotations</artifactId>
278+
</exclusion>
279+
<exclusion>
280+
<groupId>com.ticxo</groupId>
281+
<artifactId>PlayerAnimator</artifactId>
282+
</exclusion>
283+
<exclusion>
284+
<groupId>com.github.stefvanschie.inventoryframework</groupId>
285+
<artifactId>IF</artifactId>
286+
</exclusion>
287+
<exclusion>
288+
<groupId>io.th0rgal</groupId>
289+
<artifactId>protectionlib</artifactId>
290+
</exclusion>
291+
<exclusion>
292+
<groupId>dev.triumphteam</groupId>
293+
<artifactId>triumph-gui</artifactId>
294+
</exclusion>
295+
<exclusion>
296+
<groupId>org.bstats</groupId>
297+
<artifactId>bstats-bukkit</artifactId>
298+
</exclusion>
299+
<exclusion>
300+
<groupId>com.jeff-media</groupId>
301+
<artifactId>custom-block-data</artifactId>
302+
</exclusion>
303+
<exclusion>
304+
<groupId>com.jeff-media</groupId>
305+
<artifactId>persistent-data-serializer</artifactId>
306+
</exclusion>
307+
<exclusion>
308+
<groupId>com.jeff_media</groupId>
309+
<artifactId>MorePersistentDataTypes</artifactId>
310+
</exclusion>
311+
<exclusion>
312+
<groupId>gs.mclo</groupId>
313+
<artifactId>java</artifactId>
314+
</exclusion>
315+
</exclusions>
316+
<scope>provided</scope>
317+
</dependency>
260318
</dependencies>
261319

262320
<build>

src/main/java/world/bentobox/level/calculators/IslandLevelCalculator.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
import world.bentobox.bentobox.BentoBox;
5050
import world.bentobox.bentobox.database.objects.Island;
5151
import world.bentobox.bentobox.hooks.ItemsAdderHook;
52+
import world.bentobox.bentobox.hooks.OraxenHook;
5253
import world.bentobox.bentobox.util.Pair;
5354
import world.bentobox.bentobox.util.Util;
5455
import world.bentobox.level.Level;
@@ -492,6 +493,13 @@ private void processBlock(ChunkPair cp, int x, int y, int z, int globalX, int gl
492493
Location loc = new Location(cp.world, globalX, y, globalZ);
493494

494495
String customRegionId = addon.isItemsAdder() ? ItemsAdderHook.getInCustomRegion(loc) : null;
496+
// Try Oraxen
497+
if (customRegionId == null && BentoBox.getInstance().getHooks().getHook("ItemsAdder").isPresent()) {
498+
customRegionId = OraxenHook.getOraxenBlockID(loc);
499+
if (customRegionId != null) {
500+
BentoBox.getInstance().logDebug(customRegionId);
501+
}
502+
}
495503
if (customRegionId != null) {
496504
checkBlock(customRegionId, belowSeaLevel);
497505
return;

0 commit comments

Comments
 (0)