SBDevelopment/V10Lift
3
0
Fork 0
Code Issues 11 Pull requests Releases Wiki Activity Actions

Fixed slab support

Browse source
This commit is contained in:
stijnb1234 2020-02-27 19:41:26 +01:00
parent 78158f9f38
commit f6bf85c654
3 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/main/lombok/nl/SBDeveloper/V10Lift/API/Objects/LiftBlock.java
View file

@ -45,6 +45,7 @@ public class LiftBlock implements Comparable<LiftBlock> {
this.signLines = null; this.signLines = null;
this.floor = floor; this.floor = floor;
this.bisected = null; this.bisected = null;
this.slabtype = null;
} }
/** 1.12 liftblocks **/ /** 1.12 liftblocks **/
@ -61,6 +62,7 @@ public class LiftBlock implements Comparable<LiftBlock> {
this.signLines = null; this.signLines = null;
this.floor = null; this.floor = null;
this.bisected = null; this.bisected = null;
this.slabtype = null;
} }
/* 1.12 liftblock (sign) */ /* 1.12 liftblock (sign) */
@ -75,6 +77,7 @@ public class LiftBlock implements Comparable<LiftBlock> {
this.signLines = signLines; this.signLines = signLines;
this.floor = null; this.floor = null;
this.bisected = null; this.bisected = null;
this.slabtype = null;
} }
/** 1.13 liftblocks **/ /** 1.13 liftblocks **/
@ -91,6 +94,7 @@ public class LiftBlock implements Comparable<LiftBlock> {
this.signLines = null; this.signLines = null;
this.floor = null; this.floor = null;
this.bisected = null; this.bisected = null;
this.slabtype = null;
} }
/* 1.13 liftblock (Directional) */ /* 1.13 liftblock (Directional) */
@ -105,6 +109,7 @@ public class LiftBlock implements Comparable<LiftBlock> {
this.signLines = null; this.signLines = null;
this.floor = null; this.floor = null;
this.bisected = null; this.bisected = null;
this.slabtype = null;
} }
/* 1.13 liftblock (dir & bisec) */ /* 1.13 liftblock (dir & bisec) */
@ -119,6 +124,7 @@ public class LiftBlock implements Comparable<LiftBlock> {
this.signLines = null; this.signLines = null;
this.floor = null; this.floor = null;
this.bisected = bisected; this.bisected = bisected;
this.slabtype = null;
} }
/* 1.13 liftblock (sign) */ /* 1.13 liftblock (sign) */
@ -133,6 +139,7 @@ public class LiftBlock implements Comparable<LiftBlock> {
this.signLines = signLines; this.signLines = signLines;
this.floor = null; this.floor = null;
this.bisected = null; this.bisected = null;
this.slabtype = null;
} }
/* 1.13 liftblock (slab) */ /* 1.13 liftblock (slab) */
@ -146,6 +153,7 @@ public class LiftBlock implements Comparable<LiftBlock> {
this.data = 0; this.data = 0;
this.signLines = null; this.signLines = null;
this.floor = null; this.floor = null;
this.bisected = null;
this.slabtype = slabtype; this.slabtype = slabtype;
} }

6
src/main/lombok/nl/SBDeveloper/V10Lift/API/V10LiftAPI.java
View file

@ -209,7 +209,7 @@ public class V10LiftAPI {
lb = new LiftBlock(block.getWorld().getName(), block.getX(), block.getY(), block.getZ(), type, DirectionUtil.getDirection(block)); lb = new LiftBlock(block.getWorld().getName(), block.getX(), block.getY(), block.getZ(), type, DirectionUtil.getDirection(block));
} else if (block.getBlockData() instanceof org.bukkit.block.data.type.Slab) { } else if (block.getBlockData() instanceof org.bukkit.block.data.type.Slab) {
Bukkit.getLogger().info("Block instanceof Slab 1.13"); Bukkit.getLogger().info("Block instanceof Slab 1.13");
lb = new LiftBlock(block.getWorld().getName(), block.getX(), block.getY(), block.getZ(), type, DirectionUtil.getDirection(block), DirectionUtil.getSlabType(block)); lb = new LiftBlock(block.getWorld().getName(), block.getX(), block.getY(), block.getZ(), type, DirectionUtil.getSlabType(block));
} else { } else {
Bukkit.getLogger().info("Block not instanceof Dir 1.13"); Bukkit.getLogger().info("Block not instanceof Dir 1.13");
lb = new LiftBlock(block.getWorld().getName(), block.getX(), block.getY(), block.getZ(), type); lb = new LiftBlock(block.getWorld().getName(), block.getX(), block.getY(), block.getZ(), type);
@ -266,7 +266,7 @@ public class V10LiftAPI {
lb = new LiftBlock(block.getWorld().getName(), block.getX(), block.getY(), block.getZ(), type, DirectionUtil.getDirection(block)); lb = new LiftBlock(block.getWorld().getName(), block.getX(), block.getY(), block.getZ(), type, DirectionUtil.getDirection(block));
} else if (block.getBlockData() instanceof org.bukkit.block.data.type.Slab) { } else if (block.getBlockData() instanceof org.bukkit.block.data.type.Slab) {
Bukkit.getLogger().info("Block instanceof Slab 1.13"); Bukkit.getLogger().info("Block instanceof Slab 1.13");
lb = new LiftBlock(block.getWorld().getName(), block.getX(), block.getY(), block.getZ(), type, DirectionUtil.getDirection(block), DirectionUtil.getSlabType(block)); lb = new LiftBlock(block.getWorld().getName(), block.getX(), block.getY(), block.getZ(), type, DirectionUtil.getSlabType(block));
} else { } else {
Bukkit.getLogger().info("Block not instanceof Dir 1.13"); Bukkit.getLogger().info("Block not instanceof Dir 1.13");
lb = new LiftBlock(block.getWorld().getName(), block.getX(), block.getY(), block.getZ(), type); lb = new LiftBlock(block.getWorld().getName(), block.getX(), block.getY(), block.getZ(), type);
@ -323,7 +323,7 @@ public class V10LiftAPI {
lb = new LiftBlock(block.getWorld().getName(), block.getX(), block.getY(), block.getZ(), type, DirectionUtil.getDirection(block)); lb = new LiftBlock(block.getWorld().getName(), block.getX(), block.getY(), block.getZ(), type, DirectionUtil.getDirection(block));
} else if (block.getBlockData() instanceof org.bukkit.block.data.type.Slab) { } else if (block.getBlockData() instanceof org.bukkit.block.data.type.Slab) {
Bukkit.getLogger().info("Block instanceof Slab 1.13"); Bukkit.getLogger().info("Block instanceof Slab 1.13");
lb = new LiftBlock(block.getWorld().getName(), block.getX(), block.getY(), block.getZ(), type, DirectionUtil.getDirection(block), DirectionUtil.getSlabType(block)); lb = new LiftBlock(block.getWorld().getName(), block.getX(), block.getY(), block.getZ(), type, DirectionUtil.getSlabType(block));
} else { } else {
Bukkit.getLogger().info("Block not instanceof Dir 1.13"); Bukkit.getLogger().info("Block not instanceof Dir 1.13");
lb = new LiftBlock(block.getWorld().getName(), block.getX(), block.getY(), block.getZ(), type); lb = new LiftBlock(block.getWorld().getName(), block.getX(), block.getY(), block.getZ(), type);

2
src/main/lombok/nl/SBDeveloper/V10Lift/Utils/DirectionUtil.java
View file

@ -46,6 +46,7 @@ public class DirectionUtil {
try { try {
half = org.bukkit.block.data.Bisected.Half.valueOf(bisected); half = org.bukkit.block.data.Bisected.Half.valueOf(bisected);
} catch (IllegalArgumentException e) { } catch (IllegalArgumentException e) {
e.printStackTrace();
return; return;
} }
@ -74,6 +75,7 @@ public class DirectionUtil {
try { try {
type = org.bukkit.block.data.type.Slab.Type.valueOf(slabtype); type = org.bukkit.block.data.type.Slab.Type.valueOf(slabtype);
} catch (IllegalArgumentException e) { } catch (IllegalArgumentException e) {
e.printStackTrace();
return; return;
} }