From 4fd47d106fedb4d4916b31f053789cf1445708ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20N=C3=BCcke?= Date: Sat, 15 Jan 2022 19:34:36 +0100 Subject: [PATCH] Yet more records. --- .../oc2/client/model/BusCableBakedModel.java | 18 ++++---------- .../cil/oc2/client/model/BusCableModel.java | 12 +--------- .../common/blockentity/ModBlockEntity.java | 24 +------------------ 3 files changed, 7 insertions(+), 47 deletions(-) diff --git a/src/main/java/li/cil/oc2/client/model/BusCableBakedModel.java b/src/main/java/li/cil/oc2/client/model/BusCableBakedModel.java index 6ff8ca5d..ecc37825 100644 --- a/src/main/java/li/cil/oc2/client/model/BusCableBakedModel.java +++ b/src/main/java/li/cil/oc2/client/model/BusCableBakedModel.java @@ -33,22 +33,14 @@ import java.util.Collections; import java.util.List; import java.util.Random; -public final class BusCableBakedModel implements IDynamicBakedModel { +public record BusCableBakedModel( + BakedModel proxy, + BakedModel[] straightModelByAxis, + BakedModel[] supportModelByFace +) implements IDynamicBakedModel { private static final ModelProperty BUS_CABLE_SUPPORT_PROPERTY = new ModelProperty<>(); private static final ModelProperty BUS_CABLE_FACADE_PROPERTY = new ModelProperty<>(); - private final BakedModel proxy; - private final BakedModel[] straightModelByAxis; - private final BakedModel[] supportModelByFace; - - /////////////////////////////////////////////////////////////////// - - public BusCableBakedModel(final BakedModel proxy, final BakedModel[] straightModelByAxis, final BakedModel[] supportModelByFace) { - this.proxy = proxy; - this.straightModelByAxis = straightModelByAxis; - this.supportModelByFace = supportModelByFace; - } - /////////////////////////////////////////////////////////////////// @Override diff --git a/src/main/java/li/cil/oc2/client/model/BusCableModel.java b/src/main/java/li/cil/oc2/client/model/BusCableModel.java index 535dd416..d8b6cb03 100644 --- a/src/main/java/li/cil/oc2/client/model/BusCableModel.java +++ b/src/main/java/li/cil/oc2/client/model/BusCableModel.java @@ -18,22 +18,12 @@ import java.util.function.Function; import static java.util.Objects.requireNonNull; -public final class BusCableModel implements IModelGeometry { +public record BusCableModel(ModelLoaderRegistry.VanillaProxy proxy) implements IModelGeometry { private static final ResourceLocation BUS_CABLE_STRAIGHT_MODEL = new ResourceLocation(API.MOD_ID, "block/cable_straight"); private static final ResourceLocation BUS_CABLE_SUPPORT_MODEL = new ResourceLocation(API.MOD_ID, "block/cable_support"); /////////////////////////////////////////////////////////////////// - private final ModelLoaderRegistry.VanillaProxy proxy; - - /////////////////////////////////////////////////////////////////// - - public BusCableModel(final ModelLoaderRegistry.VanillaProxy proxy) { - this.proxy = proxy; - } - - /////////////////////////////////////////////////////////////////// - @Override public BakedModel bake(final IModelConfiguration owner, final ModelBakery bakery, final Function spriteGetter, final ModelState modelTransform, final ItemOverrides overrides, final ResourceLocation modelLocation) { final BakedModel bakedBaseModel = proxy.bake(owner, bakery, spriteGetter, modelTransform, overrides, modelLocation); diff --git a/src/main/java/li/cil/oc2/common/blockentity/ModBlockEntity.java b/src/main/java/li/cil/oc2/common/blockentity/ModBlockEntity.java index 4546bf1f..89a07d59 100644 --- a/src/main/java/li/cil/oc2/common/blockentity/ModBlockEntity.java +++ b/src/main/java/li/cil/oc2/common/blockentity/ModBlockEntity.java @@ -14,7 +14,6 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.util.ArrayList; import java.util.HashMap; -import java.util.Objects; public abstract class ModBlockEntity extends BlockEntity { private final Runnable onWorldUnloaded = this::onWorldUnloaded; @@ -160,26 +159,5 @@ public abstract class ModBlockEntity extends BlockEntity { /////////////////////////////////////////////////////////////////// - private static final class CapabilityCacheKey { - public final Capability capability; - @Nullable public final Direction direction; - - public CapabilityCacheKey(final Capability capability, @Nullable final Direction direction) { - this.capability = capability; - this.direction = direction; - } - - @Override - public boolean equals(final Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - final CapabilityCacheKey that = (CapabilityCacheKey) o; - return capability.equals(that.capability) && direction == that.direction; - } - - @Override - public int hashCode() { - return Objects.hash(capability, direction); - } - } + private record CapabilityCacheKey(Capability capability, @Nullable Direction direction) { } }