Skip to content

Commit 848fb5a

Browse files
AnarchickAnarchick
committed
prepare for release 1.0
1 parent 69d6494 commit 848fb5a

20 files changed

Lines changed: 84 additions & 64 deletions

‎plugin.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: Skript-Frame
22
author: Anarchick
3-
description: A skript addon for image on item frames
4-
version: 1.0-alpha1
3+
description: A skript addon for image on item frame
4+
version: 1.0
55
main: fr.anarchick.skriptframe.SkriptFrame
66
depend: [Skript]
77
softdepend: [BKCommonLib]

‎src/fr/anarchick/skriptframe/SkriptFrame.java‎

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010

1111
import org.bukkit.Bukkit;
1212
import org.bukkit.map.MapView;
13+
import org.bukkit.plugin.Plugin;
14+
import org.bukkit.plugin.PluginManager;
1315
import org.bukkit.plugin.java.JavaPlugin;
1416

1517
import ch.njol.skript.Skript;
@@ -19,22 +21,27 @@
1921

2022
public class SkriptFrame extends JavaPlugin {
2123

22-
static private SkriptFrame instance;
23-
static private SkriptAddon addon;
24+
private static SkriptFrame instance;
25+
private static SkriptAddon addon;
2426

25-
static private final String IMAGES_DIRECTORY_NAME = "images";
27+
private static final String IMAGES_DIRECTORY_NAME = "images";
2628
private static File imagesDirectory;
29+
private static boolean isBKCommonLib = false;
2730

2831
public void onEnable() {
2932
if(instance != null)
3033
throw new IllegalStateException("Plugin initialized twice.");
3134
instance = this;
3235
addon = Skript.registerAddon(this);
36+
PluginManager pluginManager = Bukkit.getPluginManager();
37+
Plugin bkc = pluginManager.getPlugin("BKCommonLib");
38+
if (bkc != null) isBKCommonLib = bkc.isEnabled();
39+
if (isBKCommonLib) Bukkit.getLogger().info("[Skript-Frame] support of BKCommonLIB syntaxes");
3340
try {
3441
addon.loadClasses("fr.anarchick.skriptframe", "elements");
3542
} catch (IOException e) {
3643
e.printStackTrace();
37-
Bukkit.getPluginManager().disablePlugin(this);
44+
pluginManager.disablePlugin(this);
3845
return;
3946
}
4047

@@ -68,19 +75,19 @@ public void onEnable() {
6875
@SuppressWarnings("deprecation")
6976
MapView view = Bukkit.getMap(id);
7077
if (view != null) {
71-
if (image.getWidth() != 128 || image.getHeight() != 128) {
78+
if ((image.getWidth() != 128) || (image.getHeight() != 128)) {
7279
image = MapsManager.resize(image, 128, 128);
7380
}
7481
FrameMapRenderer.drawImage(image, id, view);
7582
loaded++;
7683
}
7784
}
7885
}
79-
Skript.info("Amount of loaded frames: " + loaded);
86+
Skript.info("[Skript-Frame] Amount of loaded frames: " + loaded);
8087

8188
}
8289

83-
Bukkit.getLogger().info("[Skript-Frame] has been enabled!");
90+
Bukkit.getLogger().info("[Skript-Frame] is enable!");
8491

8592
/*
8693
Data data = Data.loadData("idcounts.dat");
@@ -101,4 +108,8 @@ static public File getImagesDirectory() {
101108
return imagesDirectory;
102109
}
103110

111+
static public boolean getBKCSupport() {
112+
return isBKCommonLib;
113+
}
114+
104115
}

src/fr/anarchick/skriptframe/elements/effects/EffResizeImage.java renamed to src/fr/anarchick/skriptframe/elements/effects/EffImageResize.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@
2727
})
2828
@Since("1.0")
2929

30-
public class EffResizeImage extends Effect {
30+
public class EffImageResize extends Effect {
3131

3232
static {
33-
Skript.registerEffect(EffResizeImage.class, "resize image %~bufferedimage% by %integer% and %integer%");
33+
Skript.registerEffect(EffImageResize.class, "resize image %~bufferedimage% by %integer% and %integer%");
3434
}
3535

3636
private Expression<BufferedImage> image;
@@ -56,7 +56,7 @@ protected void execute(Event e) {
5656
final BufferedImage img = image.getSingle(e);
5757
final Integer _w = w.getSingle(e);
5858
final Integer _h = h.getSingle(e);
59-
if (Utils.isAnyObjectNull(img, _w, _h) || _w <= 0 || _h <= 0) return;
59+
if (Utils.isAnyObjectNull(img, _w, _h) || (_w <= 0) || (_h <= 0)) return;
6060
final BufferedImage resized = MapsManager.resize(img, _w, _h);
6161
image.change(e, CollectionUtils.array(resized), ChangeMode.SET);
6262
}

src/fr/anarchick/skriptframe/elements/effects/EffSaveImage.java renamed to src/fr/anarchick/skriptframe/elements/effects/EffImageSave.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@
3232
})
3333
@Since("1.0")
3434

35-
public class EffSaveImage extends AsyncEffect {
35+
public class EffImageSave extends AsyncEffect {
3636

3737
static {
38-
Skript.registerEffect(EffSaveImage.class, "(save|write) image %~bufferedimage% at %string%");
38+
Skript.registerEffect(EffImageSave.class, "(save|write) image %~bufferedimage% at %string%");
3939
}
4040

4141
private Expression<BufferedImage> image;
@@ -58,7 +58,7 @@ public String toString(@Nullable Event e, boolean debug) {
5858
protected void execute(Event e) {
5959
BufferedImage img = image.getSingle(e);
6060
String p = path.getSingle(e);
61-
if (img != null || p != null) {
61+
if ((img != null) || (p != null)) {
6262
// Only PNG is supported for now
6363
String format = "png";
6464
try {

src/fr/anarchick/skriptframe/elements/effects/EffDrawMap.java renamed to src/fr/anarchick/skriptframe/elements/effects/EffMapDraw.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import ch.njol.skript.lang.Expression;
1919
import ch.njol.skript.lang.SkriptParser.ParseResult;
2020
import ch.njol.util.Kleenean;
21+
import fr.anarchick.skriptframe.SkriptFrame;
2122
//import fr.anarchick.skriptframe.map.CustomMapView;
2223
import fr.anarchick.skriptframe.map.FrameMapRenderer;
2324
import fr.anarchick.skriptframe.map.MapsManager;
@@ -32,14 +33,14 @@
3233
@RequiredPlugins({"BKCommonLib"})
3334
@Since("1.0")
3435

35-
public class EffDrawMap extends Effect {
36+
public class EffMapDraw extends Effect {
3637

37-
final private static String[] patterns = new String[] {
38+
private static final String[] patterns = new String[] {
3839
"draw image %~bufferedimage% to map %integer%",
3940
"draw image %~bufferedimage% to map %integer% for %players%"};
4041

4142
static {
42-
Skript.registerEffect(EffDrawMap.class, patterns);
43+
if (SkriptFrame.getBKCSupport()) Skript.registerEffect(EffMapDraw.class, patterns);
4344
}
4445

4546
private Expression<BufferedImage> image;
@@ -67,7 +68,7 @@ protected void execute(Event e) {
6768
BufferedImage img = image.getSingle(e);
6869
final Integer _id = id.getSingle(e);
6970
if (Utils.isAnyObjectNull(img, _id)) return;
70-
if (img.getWidth() != 128 || img.getHeight() != 128) {
71+
if ((img.getWidth() != 128) || (img.getHeight() != 128)) {
7172
img = MapsManager.resize(img, 128, 128);
7273
}
7374
// if client side

‎src/fr/anarchick/skriptframe/elements/expressions/ExprBlockPixel.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
public class ExprBlockPixel extends SimplePropertyExpression<Entity, Vector> {
2727

2828
static {
29-
register(ExprBlockPixel.class, Vector.class, "target block pixel", "entity");
30-
}
29+
register(ExprBlockPixel.class, Vector.class, "target block pixel", "entity");
30+
}
3131

3232
@Override
3333
public Class<? extends Vector> getReturnType() {
@@ -65,7 +65,7 @@ public Vector convert(Entity ent) {
6565
}
6666
x = Utils.fractional(x);
6767
y = Utils.fractional(y);
68-
if (face == BlockFace.NORTH || face == BlockFace.WEST) x = 1-x;
68+
if ((face == BlockFace.NORTH) || (face == BlockFace.WEST)) x = 1-x;
6969
vector = new Vector(Math.floor(x*128), Math.floor(y*128), 0); // Pixels are in range of 0-128 to match with the definition of a map
7070
}
7171
}

‎src/fr/anarchick/skriptframe/elements/expressions/ExprColorMC.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import ch.njol.skript.util.Color;
1717
import ch.njol.skript.util.ColorRGB;
1818
import ch.njol.util.Kleenean;
19+
import fr.anarchick.skriptframe.SkriptFrame;
1920
import fr.anarchick.skriptframe.map.MapsManager;
2021

2122
@Name("MC color")
@@ -29,8 +30,8 @@
2930
public class ExprColorMC extends SimpleExpression<Color> {
3031

3132
static {
32-
Skript.registerExpression(ExprColorMC.class, Color.class, ExpressionType.SIMPLE, "[the] (mc|mine[ ]craft) color from %color%");
33-
}
33+
if (SkriptFrame.getBKCSupport()) Skript.registerExpression(ExprColorMC.class, Color.class, ExpressionType.SIMPLE, "[the] (mc|mine[ ]craft) color from %color%");
34+
}
3435

3536
private Expression<Color> color;
3637

‎src/fr/anarchick/skriptframe/elements/expressions/ExprColorMCID.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import ch.njol.skript.lang.util.SimpleExpression;
1818
import ch.njol.skript.util.Color;
1919
import ch.njol.util.Kleenean;
20+
import fr.anarchick.skriptframe.SkriptFrame;
2021

2122
@Name("MC color ID")
2223
@Description("Convert a color to the minecraft color palette ID")
@@ -31,8 +32,8 @@
3132
public class ExprColorMCID extends SimpleExpression<Number> {
3233

3334
static {
34-
Skript.registerExpression(ExprColorMCID.class, Number.class, ExpressionType.SIMPLE, "[the] (mc|mine[ ]craft) color id from %color%");
35-
}
35+
if (SkriptFrame.getBKCSupport()) Skript.registerExpression(ExprColorMCID.class, Number.class, ExpressionType.SIMPLE, "[the] (mc|mine[ ]craft) color id from %color%");
36+
}
3637

3738
private Expression<Color> color;
3839

‎src/fr/anarchick/skriptframe/elements/expressions/ExprColorMCPalette.java‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import ch.njol.skript.util.Color;
1818
import ch.njol.skript.util.ColorRGB;
1919
import ch.njol.util.Kleenean;
20+
import fr.anarchick.skriptframe.SkriptFrame;
2021
import fr.anarchick.skriptframe.map.MapsManager;
2122

2223
@Name("MC colors palette")
@@ -28,16 +29,18 @@
2829

2930
public class ExprColorMCPalette extends SimpleExpression<Color> {
3031

31-
static private final Color[] palette;
32+
private static Color[] palette;
3233
static {
34+
if (SkriptFrame.getBKCSupport()) {
3335
Skript.registerExpression(ExprColorMCPalette.class, Color.class, ExpressionType.SIMPLE, "all (mc|mine[ ]craft) colors palette");
3436

3537
ArrayList<Color> skriptColor = new ArrayList<Color>();
3638
for (java.awt.Color color : MapsManager.getPalette()) {
3739
skriptColor.add(new ColorRGB(color.getRed(), color.getGreen(), color.getBlue()));
3840
}
3941
palette = skriptColor.toArray(new Color[0]);
40-
}
42+
}
43+
}
4144

4245
@Override
4346
public Class<? extends Color> getReturnType() {

‎src/fr/anarchick/skriptframe/elements/expressions/ExprImageDefinition.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
public class ExprImageDefinition extends SimpleExpression<Number> {
2929

3030
static {
31-
Skript.registerExpression(ExprImageDefinition.class, Number.class, ExpressionType.SIMPLE, "[the] (0¦width|1¦height) of image %~bufferedimage%");
32-
}
31+
Skript.registerExpression(ExprImageDefinition.class, Number.class, ExpressionType.SIMPLE, "[the] (0¦width|1¦height) of image %~bufferedimage%");
32+
}
3333

3434
private Expression<BufferedImage> image;
3535
private int element;

0 commit comments

Comments
 (0)