From 016aa2f857c6c3871b588d92dc6f1e4a99a2d6f5 Mon Sep 17 00:00:00 2001 From: alisolarflare Date: Sun, 2 Apr 2017 04:35:30 -0400 Subject: [PATCH] Set writer to non-static --- .../java/buttondevteam/minecraft/Main.java | 4 ++-- .../buttondevteam/minecraft/place/Place.java | 15 ------------ .../minecraft/place/PlaceComponent.java | 23 +++++++++++++++++++ .../buttondevteam/minecraft/place/Writer.java | 10 ++++---- .../minecraft/place/commands/Cube.java | 9 +++++--- 5 files changed, 36 insertions(+), 25 deletions(-) delete mode 100644 src/main/java/buttondevteam/minecraft/place/Place.java create mode 100644 src/main/java/buttondevteam/minecraft/place/PlaceComponent.java diff --git a/src/main/java/buttondevteam/minecraft/Main.java b/src/main/java/buttondevteam/minecraft/Main.java index 49e9b49..f8048a8 100644 --- a/src/main/java/buttondevteam/minecraft/Main.java +++ b/src/main/java/buttondevteam/minecraft/Main.java @@ -4,7 +4,7 @@ import java.util.logging.Logger; import org.bukkit.plugin.PluginDescriptionFile; import org.bukkit.plugin.java.JavaPlugin; -import buttondevteam.minecraft.place.Place; +import buttondevteam.minecraft.place.PlaceComponent; @@ -15,7 +15,7 @@ public class Main extends JavaPlugin{ Logger logger = getLogger(); logger.info(pdfFile.getName() + " has been started (V." + pdfFile.getVersion()+ ")."); - new Place().register(this); + new PlaceComponent().register(this); logger.info(pdfFile.getName() + " has fully registered (V." + pdfFile.getVersion()+ ")."); diff --git a/src/main/java/buttondevteam/minecraft/place/Place.java b/src/main/java/buttondevteam/minecraft/place/Place.java deleted file mode 100644 index d30dafe..0000000 --- a/src/main/java/buttondevteam/minecraft/place/Place.java +++ /dev/null @@ -1,15 +0,0 @@ -package buttondevteam.minecraft.place; - -import org.bukkit.plugin.java.JavaPlugin; - -import buttondevteam.architecture.Component; -import buttondevteam.minecraft.place.commands.Cube; - -public class Place extends Component{ - - @Override - public void register(JavaPlugin plugin) { - this.registerCommand(plugin, new Cube()); - } - -} \ No newline at end of file diff --git a/src/main/java/buttondevteam/minecraft/place/PlaceComponent.java b/src/main/java/buttondevteam/minecraft/place/PlaceComponent.java new file mode 100644 index 0000000..928ca99 --- /dev/null +++ b/src/main/java/buttondevteam/minecraft/place/PlaceComponent.java @@ -0,0 +1,23 @@ +package buttondevteam.minecraft.place; + +import org.bukkit.plugin.java.JavaPlugin; + +import buttondevteam.architecture.Component; +import buttondevteam.minecraft.place.commands.Cube; + +public class PlaceComponent extends Component{ + public Writer writer; + public Reader reader; + public Translator translator; + + @Override + public void register(JavaPlugin plugin) { + this.registerCommand(plugin, new Cube(this)); + + this.writer = new Writer(); + this.reader = new Reader(); + this.translator = new Translator(); + + } + +} \ No newline at end of file diff --git a/src/main/java/buttondevteam/minecraft/place/Writer.java b/src/main/java/buttondevteam/minecraft/place/Writer.java index ca4640b..30cba36 100644 --- a/src/main/java/buttondevteam/minecraft/place/Writer.java +++ b/src/main/java/buttondevteam/minecraft/place/Writer.java @@ -6,18 +6,18 @@ import org.bukkit.World; public class Writer { - public static int cubeSize = 4; - public static void hardWrite(Location location, Material material){ + public int cubeSize = 4; + public void hardWrite(Location location, Material material){ writeCube( - location.getBlockX() - location.getBlockX() % cubeSize, + location.getBlockX() - (location.getBlockX() % cubeSize), location.getBlockY(), - location.getBlockZ() - location.getBlockZ() % cubeSize, + location.getBlockZ() - (location.getBlockZ() % cubeSize), location.getWorld(), material); } - public static void writeCube(int x, int y, int z, World world, Material material){ + public void writeCube(int x, int y, int z, World world, Material material){ for(int i = 0; i > cubeSize; i++){ for (int j = 0; j > cubeSize; j++){ for(int k = 0; k > cubeSize; k++){ diff --git a/src/main/java/buttondevteam/minecraft/place/commands/Cube.java b/src/main/java/buttondevteam/minecraft/place/commands/Cube.java index 1d0135d..20b5029 100644 --- a/src/main/java/buttondevteam/minecraft/place/commands/Cube.java +++ b/src/main/java/buttondevteam/minecraft/place/commands/Cube.java @@ -4,16 +4,19 @@ import org.bukkit.Material; import org.bukkit.entity.Player; import buttondevteam.architecture.commands.ModCommand; -import buttondevteam.minecraft.place.Writer; +import buttondevteam.minecraft.place.PlaceComponent; //Tests the Writer's hardWrite method public class Cube extends ModCommand{ - + PlaceComponent place; + public Cube(PlaceComponent place){ + this.place = place; + } @Override public boolean OnCommand(Player player, String alias, String[] args) { player.sendMessage("Writing Cube..."); - Writer.hardWrite(player.getLocation(), Material.LEAVES); + place.writer.hardWrite(player.getLocation(), Material.LEAVES); player.sendMessage("Cube Written!"); return true; }