From fff5b2cb01dbcdcb2651d734d64cd47c9532c2ac Mon Sep 17 00:00:00 2001 From: ah-OOG-ah <75745146+ah-OOG-ah@users.noreply.github.com> Date: Thu, 15 Feb 2024 10:49:47 -0500 Subject: [PATCH] Implement initial BlockState API --- .../angelica/api/BlockState.java | 14 +++++++++ .../angelica/common/BlockTest.java | 31 ++++++++++++++++++- .../assets/minecraft/blockstates/lectern.json | 19 ++++++++++++ 3 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/gtnewhorizons/angelica/api/BlockState.java create mode 100644 src/main/resources/assets/minecraft/blockstates/lectern.json diff --git a/src/main/java/com/gtnewhorizons/angelica/api/BlockState.java b/src/main/java/com/gtnewhorizons/angelica/api/BlockState.java new file mode 100644 index 000000000..bdd8cd1c4 --- /dev/null +++ b/src/main/java/com/gtnewhorizons/angelica/api/BlockState.java @@ -0,0 +1,14 @@ +package com.gtnewhorizons.angelica.api; + +import net.minecraftforge.common.util.ForgeDirection; + +/** + *
Modern versions have BlockState, which allows you to query properties in a fairly standardized way. We don't have
+ * that on 1.7.10, so let's roll our own. Blocks can implement this to convert metas to properties.
+ */
+public interface BlockState {
+
+ default boolean hasFacing() { return false; }
+
+ default ForgeDirection getFacing(int meta) { return ForgeDirection.UNKNOWN; }
+}
diff --git a/src/main/java/com/gtnewhorizons/angelica/common/BlockTest.java b/src/main/java/com/gtnewhorizons/angelica/common/BlockTest.java
index ce1f1f9d5..6df04f343 100644
--- a/src/main/java/com/gtnewhorizons/angelica/common/BlockTest.java
+++ b/src/main/java/com/gtnewhorizons/angelica/common/BlockTest.java
@@ -3,6 +3,7 @@ package com.gtnewhorizons.angelica.common;
import com.gtnewhorizons.angelica.api.QuadProvider;
import com.gtnewhorizons.angelica.compat.mojang.BlockPos;
import com.gtnewhorizons.angelica.compat.nd.Quad;
+import com.gtnewhorizons.angelica.api.BlockState;
import com.gtnewhorizons.angelica.models.json.JsonModel;
import com.gtnewhorizons.angelica.models.json.Loader;
import com.gtnewhorizons.angelica.utils.ObjectPooler;
@@ -14,9 +15,11 @@ import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.util.ResourceLocation;
import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
+import org.jetbrains.annotations.NotNull;
-public class BlockTest extends Block implements QuadProvider {
+public class BlockTest extends Block implements QuadProvider, BlockState {
public static final ResourceLocation modelId = new ResourceLocation("blocks/lectern");
public static final List