From 5cd6111e926ca2e3930fbe25a3919ea6793872f0 Mon Sep 17 00:00:00 2001
From: James Seibel <jeseibel@gondtc.com>
Date: Sat, 5 Aug 2023 11:11:41 -0500
Subject: [PATCH] Fix TintWithoutLevel... objects for 1.16

---
 .../wrappers/block/TintWithoutLevelOverrider.java      | 10 +++++++++-
 .../block/TintWithoutLevelSmoothOverrider.java         | 10 +++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/TintWithoutLevelOverrider.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/TintWithoutLevelOverrider.java
index a43b79b78..2ddcc671c 100644
--- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/TintWithoutLevelOverrider.java
+++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/TintWithoutLevelOverrider.java
@@ -21,7 +21,6 @@ package com.seibel.distanthorizons.common.wrappers.block;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
-import net.minecraft.core.Holder;
 import net.minecraft.world.level.*;
 import net.minecraft.world.level.biome.Biome;
 import net.minecraft.world.level.block.entity.BlockEntity;
@@ -30,6 +29,10 @@ import net.minecraft.world.level.lighting.LevelLightEngine;
 import net.minecraft.world.level.material.FluidState;
 import org.jetbrains.annotations.Nullable;
 
+#if POST_MC_1_18_2
+import net.minecraft.core.Holder;
+#endif
+
 public class TintWithoutLevelOverrider implements BlockAndTintGetter {
     final BiomeWrapper biome;
 
@@ -70,6 +73,9 @@ public class TintWithoutLevelOverrider implements BlockAndTintGetter {
     public FluidState getFluidState(BlockPos pos) {
         throw new UnsupportedOperationException("ERROR: getFluidState() called on TintWithoutLevelOverrider. Object is for tinting only.");
     }
+	
+	
+	#if POST_MC_1_18_2
     @Override
     public int getHeight() {
         throw new UnsupportedOperationException("ERROR: getHeight() called on TintWithoutLevelOverrider. Object is for tinting only.");
@@ -78,4 +84,6 @@ public class TintWithoutLevelOverrider implements BlockAndTintGetter {
     public int getMinBuildHeight() {
         throw new UnsupportedOperationException("ERROR: getMinBuildHeight() called on TintWithoutLevelOverrider. Object is for tinting only.");
     }
+	#endif
+	
 }
diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/TintWithoutLevelSmoothOverrider.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/TintWithoutLevelSmoothOverrider.java
index bc68a4ee1..5c8a3198d 100644
--- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/TintWithoutLevelSmoothOverrider.java
+++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/TintWithoutLevelSmoothOverrider.java
@@ -21,7 +21,6 @@ package com.seibel.distanthorizons.common.wrappers.block;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
-import net.minecraft.core.Holder;
 import net.minecraft.world.level.BlockAndTintGetter;
 import net.minecraft.world.level.ColorResolver;
 import net.minecraft.world.level.biome.Biome;
@@ -31,6 +30,10 @@ import net.minecraft.world.level.lighting.LevelLightEngine;
 import net.minecraft.world.level.material.FluidState;
 import org.jetbrains.annotations.Nullable;
 
+#if POST_MC_1_18_2
+import net.minecraft.core.Holder;
+#endif
+
 public class TintWithoutLevelSmoothOverrider implements BlockAndTintGetter {
     final BiomeWrapper biome;
     public int smoothingRange;
@@ -102,6 +105,9 @@ public class TintWithoutLevelSmoothOverrider implements BlockAndTintGetter {
     public FluidState getFluidState(BlockPos pos) {
         throw new UnsupportedOperationException("ERROR: getFluidState() called on TintWithoutLevelOverrider. Object is for tinting only.");
     }
+    
+	
+	#if POST_MC_1_18_2
     @Override
     public int getHeight() {
         throw new UnsupportedOperationException("ERROR: getHeight() called on TintWithoutLevelOverrider. Object is for tinting only.");
@@ -110,4 +116,6 @@ public class TintWithoutLevelSmoothOverrider implements BlockAndTintGetter {
     public int getMinBuildHeight() {
         throw new UnsupportedOperationException("ERROR: getMinBuildHeight() called on TintWithoutLevelOverrider. Object is for tinting only.");
     }
+	#endif
+	
 }