Skip to content

Commit a5d15e4

Browse files
zyxkadzyxkad
committed
apply some errorprone suggestions
1 parent ecb4164 commit a5d15e4

10 files changed

Lines changed: 20 additions & 31 deletions

File tree

‎src/main/java/de/srendi/advancedperipherals/common/addons/computercraft/peripheral/MEBridgePeripheral.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -407,8 +407,4 @@ public final MethodResult getCraftingCPUs() {
407407
private ICraftingService getCraftingService() {
408408
return node.getGrid().getCraftingService();
409409
}
410-
411-
private MethodResult notConnected(@Nullable Object defaultValue) {
412-
return MethodResult.of(defaultValue, StatusConstants.NOT_CONNECTED.toString());
413-
}
414410
}

‎src/main/java/de/srendi/advancedperipherals/common/addons/computercraft/peripheral/RSBridgePeripheral.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -359,10 +359,6 @@ private AbstractNetworkNode getNode() {
359359
return (AbstractNetworkNode) owner.getBlockEntity().getNode();
360360
}
361361

362-
private MethodResult notConnected(@Nullable Object defaultValue) {
363-
return MethodResult.of(defaultValue, StatusConstants.NOT_CONNECTED.toString());
364-
}
365-
366362
private <I extends NetworkComponent> I getComponent(@NotNull Class<I> componentClass) {
367363
return getNetwork().getComponent(componentClass);
368364
}

‎src/main/java/de/srendi/advancedperipherals/common/addons/minecolonies/MineColonies.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,6 @@ public static Map<String, Object> skillsToLua(Map<Skill, CitizenSkillHandler.Ski
147147
/**
148148
* Converts a building {@link IBuilding} and job {@link IJob} to a map
149149
*
150-
* @param work the job building
151150
* @param job the job
152151
* @return a map with information about the building and job
153152
*/
@@ -328,10 +327,10 @@ public static List<Map<String, Object>> getResearches(ResourceLocation branch, L
328327
}
329328

330329
/**
331-
* Returns the resources(As items) which the builder needs
330+
* Returns the resource items which the builder needs
332331
*
333332
* @param colony The colony
334-
* @param pos The position of the builder's hut block
333+
* @param building The builder's building
335334
* @return a map with all needed resources
336335
*/
337336
public static List<Map<String, Object>> builderResourcesToLua(IColony colony, IBuilding building) {

‎src/main/java/de/srendi/advancedperipherals/common/network/toclient/RenderableObjectBulkSyncPacket.java‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,8 @@
33
import de.srendi.advancedperipherals.AdvancedPeripherals;
44
import de.srendi.advancedperipherals.client.smartglasses.OverlayObjectHolder;
55
import de.srendi.advancedperipherals.common.network.IAPPacket;
6-
import de.srendi.advancedperipherals.common.setup.APRegistries;
76
import de.srendi.advancedperipherals.common.smartglasses.modules.overlay.OverlayObject;
8-
import de.srendi.advancedperipherals.common.smartglasses.modules.overlay.OverlayObjectType;
97
import io.netty.buffer.Unpooled;
10-
import net.minecraft.core.Registry;
118
import net.minecraft.network.RegistryFriendlyByteBuf;
129
import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
1310
import net.neoforged.neoforge.network.handling.IPayloadContext;
@@ -34,7 +31,6 @@ public RenderableObjectBulkSyncPacket(Collection<OverlayObject> objects) {
3431
}
3532

3633
public RenderableObjectBulkSyncPacket(RegistryFriendlyByteBuf buffer) {
37-
Registry<OverlayObjectType<?>> registry = buffer.registryAccess().registryOrThrow(APRegistries.OVERLAY_OBJECTS);
3834
this.count = buffer.readVarInt();
3935
int size = buffer.readVarInt();
4036
this.data = new RegistryFriendlyByteBuf(Unpooled.buffer(size, size), buffer.registryAccess());
@@ -59,7 +55,6 @@ public void handle(IPayloadContext context) {
5955

6056
@Override
6157
public void write(RegistryFriendlyByteBuf buffer) {
62-
Registry<OverlayObjectType<?>> registry = buffer.registryAccess().registryOrThrow(APRegistries.OVERLAY_OBJECTS);
6358
buffer.writeVarInt(this.count);
6459
this.data.readerIndex(0);
6560
buffer.writeVarInt(this.data.readableBytes());

‎src/main/java/de/srendi/advancedperipherals/common/setup/APDataComponents.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import java.util.function.IntFunction;
2929
import java.util.function.UnaryOperator;
3030

31+
@SuppressWarnings("UnusedMethod")
3132
public class APDataComponents {
3233

3334
public static final DeferredHolder<DataComponentType<?>, DataComponentType<Map<String, Long>>> ABILITY_COOLDOWNS = registerStringKeyMap("cooldowns", Codec.LONG, ByteBufCodecs.VAR_LONG);

‎src/main/java/de/srendi/advancedperipherals/common/smartglasses/modules/overlay/OverlayModule.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
public class OverlayModule implements IModule {
2727
private static final ResourceLocation ID = AdvancedPeripherals.getRL("overlay");
2828

29-
private final Map<Integer, OverlayObject> objects = new ConcurrentHashMap<>();
30-
private final Map<Integer, OverlayObject> objectsToAdd = new ConcurrentHashMap<>();
31-
private final Map<Integer, OverlayObject> objectsToUpdate = new ConcurrentHashMap<>();
29+
private final ConcurrentHashMap<Integer, OverlayObject> objects = new ConcurrentHashMap<>();
30+
private final ConcurrentHashMap<Integer, OverlayObject> objectsToAdd = new ConcurrentHashMap<>();
31+
private final ConcurrentHashMap<Integer, OverlayObject> objectsToUpdate = new ConcurrentHashMap<>();
3232
private final SmartGlassesSideAccess access;
3333

3434
private boolean autoUpdate = true;

‎src/main/java/de/srendi/advancedperipherals/common/smartglasses/modules/overlay/OverlayObject.java‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public abstract class OverlayObject implements IDynamicLuaObject {
4040
private final FieldWithPropertyType[] fields;
4141
private final String[] getterSetterNames;
4242
private final Map<String, FieldWithPropertyType> propertiesMap;
43-
private final FieldEncoder<?, ?>[] fieldEncoders;
43+
private final FieldEncoder<?>[] fieldEncoders;
4444
private final Object2IntMap<String> fieldNameToIndex;
4545

4646
@BooleanProperty
@@ -97,10 +97,10 @@ private OverlayObject() {
9797
}
9898
this.getterSetterNames = getterSetterNames.toArray(String[]::new);
9999

100-
List<FieldEncoder<?, ?>> fieldEncoders = new ArrayList<>();
100+
List<FieldEncoder<?>> fieldEncoders = new ArrayList<>();
101101
this.fieldNameToIndex = new Object2IntOpenHashMap<>();
102102
this.fieldNameToIndex.defaultReturnValue(-1);
103-
BiConsumer<String, FieldEncoder<?, ?>> registrar = (name, encoder) -> {
103+
BiConsumer<String, FieldEncoder<?>> registrar = (name, encoder) -> {
104104
if (this.fieldNameToIndex.containsKey(name)) {
105105
throw new IllegalArgumentException("Field name " + name + " duplicated!");
106106
}
@@ -110,7 +110,7 @@ private OverlayObject() {
110110
for (FieldWithPropertyType field : this.fields) {
111111
registrar.accept(
112112
field.field().getName(),
113-
new FieldEncoder<OverlayObject, Object>(
113+
new FieldEncoder<>(
114114
(StreamCodec<? super RegistryFriendlyByteBuf, Object>) field.type().codec(field.field().getType()),
115115
() -> {
116116
try {
@@ -209,7 +209,7 @@ protected final void markAndTryUpdate(String... fieldNames) {
209209
}
210210

211211
@MustBeInvokedByOverriders
212-
protected void registerFieldEncoders(BiConsumer<String, FieldEncoder<?, ?>> registrar) {
212+
protected void registerFieldEncoders(BiConsumer<String, FieldEncoder<?>> registrar) {
213213
}
214214

215215
@Override
@@ -271,7 +271,7 @@ public void setPropertiesFromTable(LuaTable<?, ?> initFields) throws LuaExceptio
271271
@MustBeInvokedByOverriders
272272
public void encode(RegistryFriendlyByteBuf buffer) {
273273
buffer.writeInt(this.id);
274-
for (FieldEncoder<?, ?> field : this.fieldEncoders) {
274+
for (FieldEncoder<?> field : this.fieldEncoders) {
275275
field.encode(buffer);
276276
}
277277
this.updated.clear();
@@ -280,7 +280,7 @@ public void encode(RegistryFriendlyByteBuf buffer) {
280280
@MustBeInvokedByOverriders
281281
public void decode(RegistryFriendlyByteBuf buffer) {
282282
this.id = buffer.readInt();
283-
for (FieldEncoder<?, ?> field : this.fieldEncoders) {
283+
for (FieldEncoder<?> field : this.fieldEncoders) {
284284
field.decode(buffer);
285285
}
286286
}
@@ -291,7 +291,7 @@ public void encodeUpdated(RegistryFriendlyByteBuf buffer) {
291291
if (!this.updated.get(i)) {
292292
continue;
293293
}
294-
FieldEncoder<?, ?> field = this.fieldEncoders[i];
294+
FieldEncoder<?> field = this.fieldEncoders[i];
295295
field.encode(buffer);
296296
}
297297
this.updated.clear();
@@ -303,7 +303,7 @@ public void decodeUpdated(RegistryFriendlyByteBuf buffer) {
303303
if (!updated.get(i)) {
304304
continue;
305305
}
306-
FieldEncoder<?, ?> field = this.fieldEncoders[i];
306+
FieldEncoder<?> field = this.fieldEncoders[i];
307307
field.decode(buffer);
308308
}
309309
}
@@ -364,7 +364,7 @@ private static Object castValueToFieldType(Field field, Object value) {
364364
return value;
365365
}
366366

367-
public record FieldEncoder<O extends OverlayObject, T>(
367+
public record FieldEncoder<T>(
368368
StreamCodec<? super RegistryFriendlyByteBuf, T> codec,
369369
Supplier<T> getter,
370370
Consumer<T> setter
@@ -379,6 +379,7 @@ public void decode(RegistryFriendlyByteBuf buffer) {
379379
}
380380

381381
private record FieldWithPropertyType(Field field, PropertyType<?, ?> type) {
382+
@SuppressWarnings("rawtypes")
382383
public void setFor(OverlayObject obj, Object value) throws LuaException {
383384
value = castValueToFieldType(this.field, value);
384385
if (!this.type.checkIsValid(value)) {

‎src/main/java/de/srendi/advancedperipherals/common/smartglasses/modules/overlay/objects/three_dim/BlockObject.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ protected BlockState updateStates(BlockState state, Map<?, ?> states) throws Lua
156156
}
157157

158158
@Override
159-
protected void registerFieldEncoders(BiConsumer<String, FieldEncoder<?, ?>> registrar) {
159+
protected void registerFieldEncoders(BiConsumer<String, FieldEncoder<?>> registrar) {
160160
super.registerFieldEncoders(registrar);
161161
registrar.accept("block", new FieldEncoder<>(
162162
BLOCKSTATE_STREAM_CODEC,

‎src/main/java/de/srendi/advancedperipherals/common/smartglasses/modules/overlay/objects/three_dim/TextureObject.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -521,6 +521,7 @@ private static long native2luaColor(int color) {
521521
return ((alpha << 24) | (red << 16) | (green << 8) | blue) & 0xffffffffl;
522522
}
523523

524+
@SuppressWarnings("ArrayRecordComponent")
524525
private record FlattenedImage(int width, int height, int[] data) {
525526
static FlattenedImage tryFlatten(LuaTable<?, ?> image, int optWidth, int optHeight) throws LuaException {
526527
int length = image.length();

‎src/main/java/de/srendi/advancedperipherals/common/smartglasses/modules/overlay/objects/two_dim/ItemObject.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public final void setItem(Optional<String> item) {
5454
}
5555

5656
@Override
57-
protected void registerFieldEncoders(BiConsumer<String, FieldEncoder<?, ?>> registrar) {
57+
protected void registerFieldEncoders(BiConsumer<String, FieldEncoder<?>> registrar) {
5858
super.registerFieldEncoders(registrar);
5959
registrar.accept("item", new FieldEncoder<>(
6060
ByteBufCodecs.optional(ByteBufCodecs.holderRegistry(Registries.ITEM)),

0 commit comments

Comments
 (0)