From b2c8cfb4ec8b82337a95f51364277964ec968b52 Mon Sep 17 00:00:00 2001 From: Jason Mitchell Date: Mon, 1 May 2023 02:45:56 -0700 Subject: ForgeDirection (#608) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * ForgeDirection WIP * Fix GTPP_Render_MachineBlock Fix handling of getTexture with facing mask for pipes Kill a bunch of magic numbers * spotlessApply (#612) Co-authored-by: GitHub GTNH Actions <> * Bump bw/tt deps --------- Co-authored-by: Léa Gris Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- src/main/java/gtPlusPlus/api/objects/data/AutoMap.java | 7 +++++++ src/main/java/gtPlusPlus/api/objects/data/ReverseAutoMap.java | 1 + src/main/java/gtPlusPlus/api/objects/data/TypeCounter.java | 1 + 3 files changed, 9 insertions(+) (limited to 'src/main/java/gtPlusPlus/api/objects/data') diff --git a/src/main/java/gtPlusPlus/api/objects/data/AutoMap.java b/src/main/java/gtPlusPlus/api/objects/data/AutoMap.java index 9e26ea9174..f4b2550b5a 100644 --- a/src/main/java/gtPlusPlus/api/objects/data/AutoMap.java +++ b/src/main/java/gtPlusPlus/api/objects/data/AutoMap.java @@ -118,6 +118,7 @@ public class AutoMap implements Iterable, Cloneable, Serializable, Collect return set(object); } + @Override public synchronized boolean add(V object) { return set(object) != null; } @@ -130,6 +131,7 @@ public class AutoMap implements Iterable, Cloneable, Serializable, Collect return mInternalMap.put(mInternalID++, object); } + @Override public synchronized V get(int id) { return mInternalMap.get(id); } @@ -138,6 +140,7 @@ public class AutoMap implements Iterable, Cloneable, Serializable, Collect return mInternalMap.values(); } + @Override public synchronized int size() { return mInternalMap.size(); } @@ -154,10 +157,12 @@ public class AutoMap implements Iterable, Cloneable, Serializable, Collect return mInternalMap.containsValue(value); } + @Override public synchronized boolean isEmpty() { return mInternalMap.isEmpty(); } + @Override public synchronized void clear() { this.mInternalID = 0; this.mInternalMap.clear(); @@ -165,6 +170,7 @@ public class AutoMap implements Iterable, Cloneable, Serializable, Collect return; } + @Override @SuppressWarnings("unchecked") public V[] toArray() { V[] toR = (V[]) java.lang.reflect.Array.newInstance(mInternalMap.get(0).getClass(), mInternalMap.size()); @@ -178,6 +184,7 @@ public class AutoMap implements Iterable, Cloneable, Serializable, Collect return mInternalID; } + @Override public final synchronized boolean remove(Object value) { value.getClass(); if (this.mInternalMap.containsValue(value)) { diff --git a/src/main/java/gtPlusPlus/api/objects/data/ReverseAutoMap.java b/src/main/java/gtPlusPlus/api/objects/data/ReverseAutoMap.java index da6fc7d181..275dad9d42 100644 --- a/src/main/java/gtPlusPlus/api/objects/data/ReverseAutoMap.java +++ b/src/main/java/gtPlusPlus/api/objects/data/ReverseAutoMap.java @@ -24,6 +24,7 @@ public class ReverseAutoMap extends AutoMap { return values().iterator(); } + @Override public synchronized boolean setValue(N object) { int mOriginalID = this.mInternalID; put(object); diff --git a/src/main/java/gtPlusPlus/api/objects/data/TypeCounter.java b/src/main/java/gtPlusPlus/api/objects/data/TypeCounter.java index c282ce1eb3..e4b4e0db88 100644 --- a/src/main/java/gtPlusPlus/api/objects/data/TypeCounter.java +++ b/src/main/java/gtPlusPlus/api/objects/data/TypeCounter.java @@ -46,6 +46,7 @@ public class TypeCounter implements Set { } } + @Override public boolean add(V arg0) { return add(arg0, null); } -- cgit