Remade item and tile basic system.

Still not funcitonal but the shape is final. Sort of.
This commit is contained in:
Ondřej Hruška
2014-04-19 18:32:14 +02:00
parent ccbc95c74a
commit 65ad97994b
176 changed files with 1561 additions and 1616 deletions
+2 -1
View File
@@ -18,7 +18,8 @@ public class Mutable<T> {
*
* @param o value
*/
public Mutable(T o) {
public Mutable(T o)
{
this.o = o;
}
+3 -2
View File
@@ -31,7 +31,8 @@ public class Pair<T1, T2> {
* @param first 1st object
* @param second 2nd object
*/
public Pair(T1 first, T2 second) {
public Pair(T1 first, T2 second)
{
this.first = first;
this.second = second;
}
@@ -68,7 +69,7 @@ public class Pair<T1, T2> {
final Pair<?, ?> t = (Pair<?, ?>) obj;
return Calc.areObjectsEqual(first, t.first) && Calc.areObjectsEqual(second, t.second);
return Calc.areEqual(first, t.first) && Calc.areEqual(second, t.second);
}
+3 -2
View File
@@ -28,7 +28,8 @@ public class Triad<T1, T2, T3> extends Pair<T1, T2> {
* @param objB 2nd object
* @param objC 3rd object
*/
public Triad(T1 objA, T2 objB, T3 objC) {
public Triad(T1 objA, T2 objB, T3 objC)
{
super(objA, objB);
third = objC;
}
@@ -59,7 +60,7 @@ public class Triad<T1, T2, T3> extends Pair<T1, T2> {
{
if (!super.equals(obj)) return false;
return Calc.areObjectsEqual(third, ((Triad<?, ?, ?>) obj).third);
return Calc.areEqual(third, ((Triad<?, ?, ?>) obj).third);
}