Jika/oc2r
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Yet more records.

Browse Source
This commit is contained in:
Florian Nücke
2022-01-15 19:34:36 +01:00
parent 6e5d71b9b4
commit 4fd47d106f
3 changed files with 7 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/li/cil/oc2/client/model/BusCableBakedModel.java
View File

@@ -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<BusCableSupportSide> BUS_CABLE_SUPPORT_PROPERTY = new ModelProperty<>();
private static final ModelProperty<BusCableFacade> 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

12
src/main/java/li/cil/oc2/client/model/BusCableModel.java
View File

@@ -18,22 +18,12 @@ import java.util.function.Function;
import static java.util.Objects.requireNonNull;
public final class BusCableModel implements IModelGeometry<BusCableModel> {
public record BusCableModel(ModelLoaderRegistry.VanillaProxy proxy) implements IModelGeometry<BusCableModel> {
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<Material, TextureAtlasSprite> spriteGetter, final ModelState modelTransform, final ItemOverrides overrides, final ResourceLocation modelLocation) {
final BakedModel bakedBaseModel = proxy.bake(owner, bakery, spriteGetter, modelTransform, overrides, modelLocation);

24
src/main/java/li/cil/oc2/common/blockentity/ModBlockEntity.java
View File

@@ -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) { }
}