diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator2/data/Simulator.java b/BauSystem_Main/src/de/steamwar/bausystem/features/simulator2/data/Simulator.java index becfb213..f2b0774e 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator2/data/Simulator.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/simulator2/data/Simulator.java @@ -1,8 +1,11 @@ package de.steamwar.bausystem.features.simulator2.data; +import org.bukkit.Material; + import java.util.ArrayList; import java.util.List; public class Simulator { + private Material material = Material.BARREL; private List elements = new ArrayList<>(); } diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator2/data/SimulatorElement.java b/BauSystem_Main/src/de/steamwar/bausystem/features/simulator2/data/SimulatorElement.java index 76139dee..d369b6a7 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator2/data/SimulatorElement.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/simulator2/data/SimulatorElement.java @@ -1,10 +1,13 @@ package de.steamwar.bausystem.features.simulator2.data; +import org.bukkit.Material; +import org.bukkit.util.Vector; + import java.util.ArrayList; import java.util.List; public abstract class SimulatorElement { + protected Material material; + protected Vector position; protected List settings = new ArrayList<>(); - - } diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator2/data/SimulatorGroup.java b/BauSystem_Main/src/de/steamwar/bausystem/features/simulator2/data/SimulatorGroup.java index 1ed3aa3a..c3bedb7b 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator2/data/SimulatorGroup.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/simulator2/data/SimulatorGroup.java @@ -1,8 +1,11 @@ package de.steamwar.bausystem.features.simulator2.data; +import org.bukkit.Material; + import java.util.ArrayList; import java.util.List; public class SimulatorGroup { + private Material material = Material.CHEST; private List> elements = new ArrayList<>(); } diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator2/data/SimulatorSetting.java b/BauSystem_Main/src/de/steamwar/bausystem/features/simulator2/data/SimulatorSetting.java index 0f5e36a2..393e03f2 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator2/data/SimulatorSetting.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/simulator2/data/SimulatorSetting.java @@ -19,5 +19,8 @@ package de.steamwar.bausystem.features.simulator2.data; -public interface SimulatorSetting { +public abstract class SimulatorSetting { + protected int tickOffset; + protected int lifetime = 80; + protected int order = 1; } diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator2/data/redstone/RedstoneSetting.java b/BauSystem_Main/src/de/steamwar/bausystem/features/simulator2/data/redstone/RedstoneSetting.java index 931403b6..5c3d9b55 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator2/data/redstone/RedstoneSetting.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/simulator2/data/redstone/RedstoneSetting.java @@ -2,5 +2,5 @@ package de.steamwar.bausystem.features.simulator2.data.redstone; import de.steamwar.bausystem.features.simulator2.data.SimulatorSetting; -public class RedstoneSetting implements SimulatorSetting { +public class RedstoneSetting extends SimulatorSetting { } diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator2/data/tnt/TNTSetting.java b/BauSystem_Main/src/de/steamwar/bausystem/features/simulator2/data/tnt/TNTSetting.java index 1ba71387..40561321 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator2/data/tnt/TNTSetting.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/simulator2/data/tnt/TNTSetting.java @@ -2,5 +2,10 @@ package de.steamwar.bausystem.features.simulator2.data.tnt; import de.steamwar.bausystem.features.simulator2.data.SimulatorSetting; -public class TNTSetting implements SimulatorSetting { +public class TNTSetting extends SimulatorSetting { + private int count = 1; + private boolean xJump = false; + private boolean yJump = false; + private boolean zJump = false; + }