From 4af5bcc0b0ff464e7e7428c389d47140580ea7a7 Mon Sep 17 00:00:00 2001 From: Jonathan Coates Date: Fri, 25 Dec 2020 16:59:09 +0000 Subject: [PATCH] Fix serveral 1.15 -> 1.16 issues Well, strictly speaking some mapping changes. --- .../java/dan200/computercraft/data/BlockModelProvider.java | 3 ++- .../shared/peripheral/monitor/MonitorEdgeState.java | 2 +- .../computercraft/shared/peripheral/monitor/TileMonitor.java | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/dan200/computercraft/data/BlockModelProvider.java b/src/main/java/dan200/computercraft/data/BlockModelProvider.java index 6aea58d25..40b1c0097 100644 --- a/src/main/java/dan200/computercraft/data/BlockModelProvider.java +++ b/src/main/java/dan200/computercraft/data/BlockModelProvider.java @@ -17,6 +17,7 @@ import net.minecraft.util.Direction; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.generators.*; +import net.minecraftforge.common.data.ExistingFileHelper; import javax.annotation.Nonnull; @@ -95,7 +96,7 @@ private void registerMonitors( BlockMonitor block ) VariantBlockStateBuilder builder = getVariantBuilder( block ); for( MonitorEdgeState edge : BlockMonitor.STATE.getAllowedValues() ) { - String suffix = edge == MonitorEdgeState.NONE ? "" : "_" + edge.getName(); + String suffix = edge == MonitorEdgeState.NONE ? "" : "_" + edge.getString(); ModelFile model = models().getBuilder( suffix( block, suffix ) ); for( Direction facing : BlockMonitor.FACING.getAllowedValues() ) diff --git a/src/main/java/dan200/computercraft/shared/peripheral/monitor/MonitorEdgeState.java b/src/main/java/dan200/computercraft/shared/peripheral/monitor/MonitorEdgeState.java index fb879335a..010033df1 100644 --- a/src/main/java/dan200/computercraft/shared/peripheral/monitor/MonitorEdgeState.java +++ b/src/main/java/dan200/computercraft/shared/peripheral/monitor/MonitorEdgeState.java @@ -60,7 +60,7 @@ public static MonitorEdgeState fromConnections( boolean up, boolean down, boolea @Override public String toString() { - return getName(); + return getString(); } @Nonnull diff --git a/src/main/java/dan200/computercraft/shared/peripheral/monitor/TileMonitor.java b/src/main/java/dan200/computercraft/shared/peripheral/monitor/TileMonitor.java index dd0f6638a..1c9973634 100644 --- a/src/main/java/dan200/computercraft/shared/peripheral/monitor/TileMonitor.java +++ b/src/main/java/dan200/computercraft/shared/peripheral/monitor/TileMonitor.java @@ -330,13 +330,13 @@ public Direction getDirection() // Ensure we're actually a monitor block. This _should_ always be the case, but sometimes there's // fun problems with the block being missing on the client. BlockState state = getBlockState(); - return state.has( BlockMonitor.FACING ) ? state.get( BlockMonitor.FACING ) : Direction.NORTH; + return state.hasProperty( BlockMonitor.FACING ) ? state.get( BlockMonitor.FACING ) : Direction.NORTH; } public Direction getOrientation() { BlockState state = getBlockState(); - return state.has( BlockMonitor.ORIENTATION ) ? state.get( BlockMonitor.ORIENTATION ) : Direction.NORTH; + return state.hasProperty( BlockMonitor.ORIENTATION ) ? state.get( BlockMonitor.ORIENTATION ) : Direction.NORTH; } public Direction getFront()