From 49a941c242a4edcce5ee255a43caf075e8d0f082 Mon Sep 17 00:00:00 2001 From: DeflatedPickle Date: Sat, 17 Mar 2018 14:02:23 +0000 Subject: [PATCH] Fixed most of the errors --- src/goddrinksjava/Antioxidants.java | 7 ++ src/goddrinksjava/Attribute.java | 4 + src/goddrinksjava/Circumference.java | 7 ++ src/goddrinksjava/Dimension.java | 7 ++ src/goddrinksjava/Lovable.java | 74 ----------------- src/goddrinksjava/Memory.java | 7 ++ src/goddrinksjava/Nutrients.java | 7 ++ src/goddrinksjava/SineWave.java | 1 + src/goddrinksjava/Tangent.java | 4 + src/goddrinksjava/Thing.java | 120 +++++++++++++++++++++++---- 10 files changed, 150 insertions(+), 88 deletions(-) create mode 100644 src/goddrinksjava/Antioxidants.java create mode 100644 src/goddrinksjava/Attribute.java create mode 100644 src/goddrinksjava/Circumference.java create mode 100644 src/goddrinksjava/Dimension.java create mode 100644 src/goddrinksjava/Memory.java create mode 100644 src/goddrinksjava/Nutrients.java create mode 100644 src/goddrinksjava/Tangent.java diff --git a/src/goddrinksjava/Antioxidants.java b/src/goddrinksjava/Antioxidants.java new file mode 100644 index 0000000..790c2c2 --- /dev/null +++ b/src/goddrinksjava/Antioxidants.java @@ -0,0 +1,7 @@ +package goddrinksjava; + +public class Antioxidants { + public Attribute toAttribute() { + return new Attribute(); + } +} diff --git a/src/goddrinksjava/Attribute.java b/src/goddrinksjava/Attribute.java new file mode 100644 index 0000000..927df71 --- /dev/null +++ b/src/goddrinksjava/Attribute.java @@ -0,0 +1,4 @@ +package goddrinksjava; + +public class Attribute { +} diff --git a/src/goddrinksjava/Circumference.java b/src/goddrinksjava/Circumference.java new file mode 100644 index 0000000..e58ff4e --- /dev/null +++ b/src/goddrinksjava/Circumference.java @@ -0,0 +1,7 @@ +package goddrinksjava; + +public class Circumference { + public Attribute toAttribute() { + return new Attribute(); + } +} diff --git a/src/goddrinksjava/Dimension.java b/src/goddrinksjava/Dimension.java new file mode 100644 index 0000000..edb7de8 --- /dev/null +++ b/src/goddrinksjava/Dimension.java @@ -0,0 +1,7 @@ +package goddrinksjava; + +public class Dimension { + public Attribute toAttribute() { + return new Attribute(); + } +} diff --git a/src/goddrinksjava/Lovable.java b/src/goddrinksjava/Lovable.java index 6ad3e0f..72598fb 100644 --- a/src/goddrinksjava/Lovable.java +++ b/src/goddrinksjava/Lovable.java @@ -4,78 +4,4 @@ public class Lovable extends Thing { public Lovable(String name, Integer i, Boolean b, Integer i2, Boolean b2) { } - - public void addAction(String name, Object o) { - - } - - public void canSee(Boolean value) { - - } - - public void addFeeling(String feeling) { - - } - - public void setSatisfaction(Integer level) { - - } - - public Integer toSatisfaction() { - return 0; - } - - public Integer getFeelingIndex(String feeling) { - return 0; - } - - public void requestExecution(World world) { - - } - - public void toggleGender() { - - } - - public void toggleRoleBDSM() { - - } - - public Integer getSenseIndex(String sense) { - return 0; - } - - public void removeFeeling(String feeling) { - - } - - public void setOpinion(Object of, Boolean b) { - - } - - public Integer getOpinionIndex(String s) { - return 0; - } - - public void setExecution(Object thing) { - - } - - // Not sure what to return - public Object toExecution() { - return ""; - } - - public void learnTopic(String topic) { - - } - - public void takeExamTopic(String topic) { - - } - - // Not sure what to return - public Object getAlgebraicExpression(String s) { - return ""; - } } diff --git a/src/goddrinksjava/Memory.java b/src/goddrinksjava/Memory.java new file mode 100644 index 0000000..36fb16f --- /dev/null +++ b/src/goddrinksjava/Memory.java @@ -0,0 +1,7 @@ +package goddrinksjava; + +public class Memory { + public Boolean isErasable() { + return false; + } +} diff --git a/src/goddrinksjava/Nutrients.java b/src/goddrinksjava/Nutrients.java new file mode 100644 index 0000000..70d33b3 --- /dev/null +++ b/src/goddrinksjava/Nutrients.java @@ -0,0 +1,7 @@ +package goddrinksjava; + +public class Nutrients { + public Attribute toAttribute() { + return new Attribute(); + } +} diff --git a/src/goddrinksjava/SineWave.java b/src/goddrinksjava/SineWave.java index 19a23eb..1dfa13e 100644 --- a/src/goddrinksjava/SineWave.java +++ b/src/goddrinksjava/SineWave.java @@ -1,4 +1,5 @@ package goddrinksjava; public interface SineWave { + Tangent getTangent(Integer source); } diff --git a/src/goddrinksjava/Tangent.java b/src/goddrinksjava/Tangent.java new file mode 100644 index 0000000..4824011 --- /dev/null +++ b/src/goddrinksjava/Tangent.java @@ -0,0 +1,4 @@ +package goddrinksjava; + +public class Tangent { +} diff --git a/src/goddrinksjava/Thing.java b/src/goddrinksjava/Thing.java index 740d6d8..b4bdd00 100644 --- a/src/goddrinksjava/Thing.java +++ b/src/goddrinksjava/Thing.java @@ -1,13 +1,19 @@ package goddrinksjava; -public class Thing implements Circle, PointSet, SineWave, Sequence, Fruit { - public void addAttribute() { +public class Thing implements Circle, PointSet, SineWave, Sequence, Fruit, TabbyCat { + private Memory memory; + + public Thing() { + memory = new Memory(); + } + + public void addAttribute(Attribute attribute) { } // Not sure what to return - public Object getXPosition() { - return ""; + public Integer getXPosition() { + return 0; } // Not sure what to return @@ -46,8 +52,8 @@ public void lookFor(Thing thing, World world) { } // Not sure what to return - public Object getMemory() { - return ""; + public Memory getMemory() { + return memory; } public void escape(String... things) { @@ -57,8 +63,8 @@ public void escape(String... things) { /* ----- Circle ----- */ // Not sure what to return - public Object getCircumference() { - return ""; + public Circumference getCircumference() { + return new Circumference(); } public void resetCircumference() { @@ -68,8 +74,8 @@ public void resetCircumference() { /* ----- PointSet ----- */ // Not sure what to return - public Object getDimensions() { - return ""; + public Dimension getDimensions() { + return new Dimension(); } public void resetDimentions() { @@ -78,6 +84,10 @@ public void resetDimentions() { /* ----- SineWave ----- */ + public Tangent getTangent(Integer source) { + return new Tangent(); + } + /* ----- Sequence ----- */ public void setLimit(Integer limit) { @@ -87,8 +97,8 @@ public void setLimit(Integer limit) { /* ----- Fruit ----- */ // Not sure what to return - public Object getNutrients() { - return ""; + public Nutrients getNutrients() { + return new Nutrients(); } public void resetNutrients() { @@ -96,11 +106,93 @@ public void resetNutrients() { } // Not sure what to return - public Object getAntioxidants() { - return ""; + public Nutrients getAntioxidants() { + return new Nutrients(); } public void resetAntioxidants() { } + + /* ----- TabbyCat ----- */ + + public void purr() { + + } + + /* ----- Lovable ----- */ + + public void addAction(String name, Object o) { + + } + + public void canSee(Boolean value) { + + } + + public void addFeeling(String feeling) { + + } + + public void setSatisfaction(Integer level) { + + } + + public Integer toSatisfaction() { + return 0; + } + + public Integer getFeelingIndex(String feeling) { + return 0; + } + + public void requestExecution(World world) { + + } + + public void toggleGender() { + + } + + public void toggleRoleBDSM() { + + } + + public Integer getSenseIndex(String sense) { + return 0; + } + + public void removeFeeling(String feeling) { + + } + + public void setOpinion(Object of, Boolean b) { + + } + + public Integer getOpinionIndex(String s) { + return 0; + } + + public void setExecution(Object thing) { + + } + + // Not sure what to return + public Object toExecution() { + return ""; + } + + public void learnTopic(String topic) { + + } + + public void takeExamTopic(String topic) { + + } + + // Not sure what to return + public Object getAlgebraicExpression(String s) { + return ""; + } }