Skip to content

Commit b03d1b7

Browse files
committed
improve javadoc slightly
clarify existing check at set use simple name instead of class string
1 parent 2a98aa5 commit b03d1b7

File tree

3 files changed

+15
-5
lines changed

3 files changed

+15
-5
lines changed

src/main/java/gregtech/api/metatileentity/multiblock/AbilityInstances.java

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package gregtech.api.metatileentity.multiblock;
22

3+
import gregtech.api.util.GTLog;
4+
35
import org.jetbrains.annotations.NotNull;
46
import org.jetbrains.annotations.Nullable;
57

@@ -100,7 +102,8 @@ protected boolean canAdd(Object o) {
100102
public void add(int index, Object element) {
101103
if (!key.checkType(element))
102104
throw new IllegalArgumentException(
103-
String.format("element's class \"%s\" is not of type \"%s\"", element.getClass(),
105+
String.format("element \"%s\" does not extend/implement \"%s\"",
106+
element.getClass().getSimpleName(),
104107
this.key.getType()));
105108
if (!instances.contains(element))
106109
instances.add(index, element);
@@ -117,10 +120,16 @@ public void add(int index, Object element) {
117120
public Object set(int index, Object element) {
118121
if (!key.checkType(element))
119122
throw new IllegalArgumentException(
120-
String.format("element's class \"%s\" is not of type \"%s\"", element.getClass(),
123+
String.format("element \"%s\" does not extend/implement \"%s\"",
124+
element.getClass().getSimpleName(),
121125
this.key.getType()));
122-
if (instances.contains(element))
126+
127+
int existing = instances.indexOf(element);
128+
if (existing != -1) {
129+
GTLog.logger.warn("attempted to set \"{}\" at index {} when we already have it at {}",
130+
element.getClass().getSimpleName(), index, existing);
123131
return null;
132+
}
124133

125134
return instances.set(index, element);
126135
}

src/main/java/gregtech/api/metatileentity/multiblock/IMultiblockAbilityPart.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ public interface IMultiblockAbilityPart<T> extends IMultiblockPart {
3030
/**
3131
* Register abilities to the multiblock here
3232
* <br />
33-
* Check {@link AbilityInstances#isKey(MultiblockAbility) AbiliteInstances.isKey()} if you override {@link IMultiblockAbilityPart#getAbilities()}
33+
* Check {@link AbilityInstances#isKey(MultiblockAbility) AbiliteInstances.isKey()} if you override
34+
* {@link IMultiblockAbilityPart#getAbilities()}
3435
*
3536
* @param abilityInstances list to register abilities to
3637
*/

src/main/java/gregtech/api/metatileentity/multiblock/MultiblockAbility.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ public boolean checkType(Object o) {
125125
}
126126

127127
public String getType() {
128-
return this.clazz.toString();
128+
return this.clazz.getSimpleName();
129129
}
130130

131131
public @Nullable T checkAndCast(Object o) {

0 commit comments

Comments
 (0)