From 7e2153f5321bd236c8d67a891fcb8413ad99a82b Mon Sep 17 00:00:00 2001 From: Daniel Saukel Date: Sun, 12 Jan 2020 16:10:08 +0100 Subject: [PATCH] Adapter | API --- adapter/pom.xml | 26 +++++++++++++++++++ .../adapter/block/BlockAdapter.java | 6 ++--- bukkit_blockdata/pom.xml | 6 +++++ .../adapter/block/BlockAdapterBlockData.java | 6 ++--- bukkit_magicvalues/pom.xml | 6 +++++ .../block/BlockAdapterMagicValues.java | 6 ++--- core/pom.xml | 6 +++++ pom.xml | 1 + 8 files changed, 54 insertions(+), 9 deletions(-) create mode 100644 adapter/pom.xml rename {api => adapter}/src/main/java/de/erethon/dungeonsxl/adapter/block/BlockAdapter.java (87%) diff --git a/adapter/pom.xml b/adapter/pom.xml new file mode 100644 index 00000000..bf9ae6e9 --- /dev/null +++ b/adapter/pom.xml @@ -0,0 +1,26 @@ + + 4.0.0 + de.erethon.dungeonsxl + dungeonsxl-adapter + 0.18-SNAPSHOT + jar + + de.erethon.dungeonsxl + dungeonsxl-parent + 0.18-SNAPSHOT + + + + de.erethon.dungeonsxl + dungeonsxl-api + ${project.parent.version} + compile + + + org.spigotmc + spigot-api + ${spigotVersion.latest} + provided + + + diff --git a/api/src/main/java/de/erethon/dungeonsxl/adapter/block/BlockAdapter.java b/adapter/src/main/java/de/erethon/dungeonsxl/adapter/block/BlockAdapter.java similarity index 87% rename from api/src/main/java/de/erethon/dungeonsxl/adapter/block/BlockAdapter.java rename to adapter/src/main/java/de/erethon/dungeonsxl/adapter/block/BlockAdapter.java index f34d4ee1..0fa34b33 100644 --- a/api/src/main/java/de/erethon/dungeonsxl/adapter/block/BlockAdapter.java +++ b/adapter/src/main/java/de/erethon/dungeonsxl/adapter/block/BlockAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012-2019 Frank Baumann + * Copyright (C) 2012-2020 Frank Baumann * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ */ package de.erethon.dungeonsxl.adapter.block; -import de.erethon.dungeonsxl.util.DColor; +import de.erethon.dungeonsxl.api.player.PlayerGroup.Color; import org.bukkit.block.Block; import org.bukkit.block.BlockFace; @@ -29,7 +29,7 @@ public interface BlockAdapter { void openDoor(Block block); - void setBlockWoolColor(Block block, DColor color); + void setBlockWoolColor(Block block, Color color); BlockFace getFacing(Block block); diff --git a/bukkit_blockdata/pom.xml b/bukkit_blockdata/pom.xml index 4ef19813..a28f4996 100644 --- a/bukkit_blockdata/pom.xml +++ b/bukkit_blockdata/pom.xml @@ -10,6 +10,12 @@ 0.18-SNAPSHOT + + de.erethon.dungeonsxl + dungeonsxl-adapter + ${project.parent.version} + compile + de.erethon.dungeonsxl dungeonsxl-api diff --git a/bukkit_blockdata/src/main/java/de/erethon/dungeonsxl/adapter/block/BlockAdapterBlockData.java b/bukkit_blockdata/src/main/java/de/erethon/dungeonsxl/adapter/block/BlockAdapterBlockData.java index dad65ace..b07d8dc5 100644 --- a/bukkit_blockdata/src/main/java/de/erethon/dungeonsxl/adapter/block/BlockAdapterBlockData.java +++ b/bukkit_blockdata/src/main/java/de/erethon/dungeonsxl/adapter/block/BlockAdapterBlockData.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012-2019 Frank Baumann + * Copyright (C) 2012-2020 Frank Baumann * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ */ package de.erethon.dungeonsxl.adapter.block; -import de.erethon.dungeonsxl.util.DColor; +import de.erethon.dungeonsxl.api.player.PlayerGroup.Color; import org.bukkit.Axis; import org.bukkit.block.Block; import org.bukkit.block.BlockFace; @@ -51,7 +51,7 @@ public class BlockAdapterBlockData implements BlockAdapter { } @Override - public void setBlockWoolColor(Block block, DColor color) { + public void setBlockWoolColor(Block block, Color color) { block.setType(color.getWoolMaterial().getMaterial()); } diff --git a/bukkit_magicvalues/pom.xml b/bukkit_magicvalues/pom.xml index c95a7afc..f25ed180 100644 --- a/bukkit_magicvalues/pom.xml +++ b/bukkit_magicvalues/pom.xml @@ -10,6 +10,12 @@ 0.18-SNAPSHOT + + de.erethon.dungeonsxl + dungeonsxl-adapter + ${project.parent.version} + compile + de.erethon.dungeonsxl dungeonsxl-api diff --git a/bukkit_magicvalues/src/main/java/de/erethon/dungeonsxl/adapter/block/BlockAdapterMagicValues.java b/bukkit_magicvalues/src/main/java/de/erethon/dungeonsxl/adapter/block/BlockAdapterMagicValues.java index 91e55fe3..d446d8a4 100644 --- a/bukkit_magicvalues/src/main/java/de/erethon/dungeonsxl/adapter/block/BlockAdapterMagicValues.java +++ b/bukkit_magicvalues/src/main/java/de/erethon/dungeonsxl/adapter/block/BlockAdapterMagicValues.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012-2019 Frank Baumann + * Copyright (C) 2012-2020 Frank Baumann * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ */ package de.erethon.dungeonsxl.adapter.block; -import de.erethon.dungeonsxl.util.DColor; +import de.erethon.dungeonsxl.api.player.PlayerGroup.Color; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.block.BlockFace; @@ -45,7 +45,7 @@ public class BlockAdapterMagicValues implements BlockAdapter { } @Override - public void setBlockWoolColor(Block block, DColor color) { + public void setBlockWoolColor(Block block, Color color) { block.setTypeIdAndData(Material.WOOL.getId(), color.getDyeColor().getWoolData(), false); } diff --git a/core/pom.xml b/core/pom.xml index 1070f0dc..2a717c35 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -22,6 +22,12 @@ + + de.erethon.dungeonsxl + dungeonsxl-adapter + ${project.parent.version} + compile + de.erethon.dungeonsxl dungeonsxl-api diff --git a/pom.xml b/pom.xml index 6e933baf..91b2df67 100644 --- a/pom.xml +++ b/pom.xml @@ -8,6 +8,7 @@ https://dre2n.github.io Create custom dungeons and adventure maps with ease! + adapter api bukkit_blockdata bukkit_magicvalues