diff --git a/src/main/java/top/penowl/quidproquo/QuidProQuo.java b/src/main/java/top/penowl/quidproquo/QuidProQuo.java index c8c57ca..fad7858 100644 --- a/src/main/java/top/penowl/quidproquo/QuidProQuo.java +++ b/src/main/java/top/penowl/quidproquo/QuidProQuo.java @@ -43,7 +43,6 @@ public class QuidProQuo extends JavaPlugin { rituals.add(new FeedingRitual()); rituals.add(new FillerRitual()); rituals.add(new GetLuckyRitual()); - rituals.add(new HardPenorRitual()); rituals.add(new HealRitual()); rituals.add(new HerobrineRitual()); rituals.add(new HitRitual()); diff --git a/src/main/java/top/penowl/quidproquo/rituals/HardPenorRitual.java b/src/main/java/top/penowl/quidproquo/rituals/HardPenorRitual.java deleted file mode 100644 index 2ecb63b..0000000 --- a/src/main/java/top/penowl/quidproquo/rituals/HardPenorRitual.java +++ /dev/null @@ -1,53 +0,0 @@ -package top.penowl.quidproquo.rituals; -//TODO TEST - -import org.bukkit.Location; -import org.bukkit.Material; -import org.bukkit.block.Block; -import org.bukkit.entity.Player; - -import top.penowl.quidproquo.Ritual; - -public class HardPenorRitual extends Ritual { - - @Override - public void setup() { - addIngredient(Material.COBBLESTONE, 500); - addIngredient(Material.BONE, 10); - name = "erection"; - } - - @Override - public void execute(Player caster, Player target, Location location) { - Block shaft = caster.getLocation().getBlock(); - Block ball1 = shaft.getRelative(2, -1, 0); - Block ball2 = shaft.getRelative(-2,-1,0); - //TODO USE ELEGANT MATHEMATICS INSTEAD OF SCUFFED IF STATEMENTS - for(int d = 0; d < 8; d ++) { - int x = 0; - if(d < 3) x = 1; - if(d > 4) x = -1; - int z = 0; - if(d % 3 == 0) z = 1; - if(d % 3 == 1) z = -1; - for(int y = 0; y < 5; y++) { - Block changingBlock = shaft.getRelative(x,y,z); - if(changingBlock.getType() == Material.AIR) - changingBlock.setType(Material.COBBLESTONE); - } - } - for(int x = 0; x < 3; x ++) { - for(int y = 0; y < 3; y ++) { - for(int z = 0; z < 3; z ++) { - Block changingBlock1 = ball1.getRelative(x,y,z); - Block changingBlock2 = ball2.getRelative(x,y,z); - if(changingBlock1.getType() == Material.AIR) - changingBlock1.setType(Material.COBBLESTONE); - if(changingBlock2.getType() == Material.AIR) - changingBlock1.setType(Material.COBBLESTONE); - } - } - } - } - -} \ No newline at end of file diff --git a/src/main/java/top/penowl/quidproquo/rituals/HealRitual.java b/src/main/java/top/penowl/quidproquo/rituals/HealRitual.java index a1d44dd..522dc99 100644 --- a/src/main/java/top/penowl/quidproquo/rituals/HealRitual.java +++ b/src/main/java/top/penowl/quidproquo/rituals/HealRitual.java @@ -12,6 +12,7 @@ public class HealRitual extends Ritual { public void setup() { addIngredient(Material.REDSTONE, 1); addIngredient(Material.WHEAT, 16); + addIngredient(Material.GOLD_NUGGET, 1); name = "healing"; } diff --git a/src/main/java/top/penowl/quidproquo/rituals/SoftPenorRitual.java b/src/main/java/top/penowl/quidproquo/rituals/SoftPenorRitual.java index f7819a2..d762045 100644 --- a/src/main/java/top/penowl/quidproquo/rituals/SoftPenorRitual.java +++ b/src/main/java/top/penowl/quidproquo/rituals/SoftPenorRitual.java @@ -1,6 +1,7 @@ package top.penowl.quidproquo.rituals; //TODO TEST THE PENOR +import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.block.Block; @@ -12,20 +13,24 @@ public class SoftPenorRitual extends Ritual { @Override public void setup() { - addIngredient(Material.DIRT, 500); + /* addIngredient(Material.DIRT, 500); addIngredient(Material.BONE, 20); addIngredient(Material.REDSTONE, 15); - addIngredient(Material.WHEAT, 15); + addIngredient(Material.WHEAT, 15); */ + addIngredient(Material.MOSSY_COBBLESTONE, 1); backfire = 0.10; name = "disfunction"; } @Override public void execute(Player caster, Player target, Location location) { - Block shaft = target.getLocation().getBlock(); - Block ball1 = shaft.getRelative(2, -1, 0); - Block ball2 = shaft.getRelative(-2,-1,0); - //TODO USE ELEGANT MATHEMATICS INSTEAD OF SCUFFED IF STATEMENTS + Bukkit.getLogger().info("Heetwerutrth3w4uti34ht"); + Bukkit.getLogger().info(target.toString()); + // Block shaft = target.getLocation().getBlock(); + Location log = target.getLocation(); + Block shaft = log.getBlock(); + Block ball1 = shaft.getRelative(2, 0, -1); + Block ball2 = shaft.getRelative(-2, 0, -1); for(int d = 0; d < 8; d ++) { int x = 0; if(d < 3) x = 1; @@ -33,13 +38,13 @@ public class SoftPenorRitual extends Ritual { int z = 0; if(d % 3 == 0) z = 1; if(d % 3 == 1) z = -1; - for(int y = 0; y < 5; y++) { + for(int y = 0; y < 15; y++) { Block changingBlock = shaft.getRelative(x,y,z); if(changingBlock.getType() == Material.AIR) changingBlock.setType(Material.DIRT); } } - for(int x = 0; x < 3; x ++) { + /* for(int x = 0; x < 3; x ++) { for(int y = 0; y < 3; y ++) { for(int z = 0; z < 3; z ++) { Block changingBlock1 = ball1.getRelative(x,y,z); @@ -50,6 +55,6 @@ public class SoftPenorRitual extends Ritual { changingBlock1.setType(Material.DIRT); } } - } + } */ } }