From c4b091888be6adaa59e24f8572c8c9307a808858 Mon Sep 17 00:00:00 2001 From: nicksitnikov Date: Thu, 28 May 2026 23:22:17 -0500 Subject: [PATCH] Un-generic-ify `IStructureNavigate` --- .../structure/IStructureNavigate.java | 14 +++++++------- .../structure/StructureUtility.java | 18 ++++++++---------- 2 files changed, 15 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/gtnewhorizon/structurelib/structure/IStructureNavigate.java b/src/main/java/com/gtnewhorizon/structurelib/structure/IStructureNavigate.java index 602a4993..83d66f72 100644 --- a/src/main/java/com/gtnewhorizon/structurelib/structure/IStructureNavigate.java +++ b/src/main/java/com/gtnewhorizon/structurelib/structure/IStructureNavigate.java @@ -10,36 +10,36 @@ import net.minecraft.world.World; /** * Use StructureUtility to instantiate */ -interface IStructureNavigate extends IStructureElement { +interface IStructureNavigate extends IStructureElement { @Override - default boolean check(T t, World world, int x, int y, int z) { + default boolean check(Object t, World world, int x, int y, int z) { return true; } @Override - default boolean couldBeValid(T t, World world, int x, int y, int z, ItemStack trigger) { + default boolean couldBeValid(Object t, World world, int x, int y, int z, ItemStack trigger) { return true; } @Override - default boolean spawnHint(T t, World world, int x, int y, int z, ItemStack trigger) { + default boolean spawnHint(Object t, World world, int x, int y, int z, ItemStack trigger) { return true; } @Override - default boolean placeBlock(T t, World world, int x, int y, int z, ItemStack trigger) { + default boolean placeBlock(Object t, World world, int x, int y, int z, ItemStack trigger) { return true; } @Override - default PlaceResult survivalPlaceBlock(T t, World world, int x, int y, int z, ItemStack trigger, IItemSource s, + default PlaceResult survivalPlaceBlock(Object t, World world, int x, int y, int z, ItemStack trigger, IItemSource s, EntityPlayerMP actor, Consumer chatter) { return PlaceResult.SKIP; } @Override - default PlaceResult survivalPlaceBlock(T t, World world, int x, int y, int z, ItemStack trigger, + default PlaceResult survivalPlaceBlock(Object t, World world, int x, int y, int z, ItemStack trigger, AutoPlaceEnvironment env) { return PlaceResult.SKIP; } diff --git a/src/main/java/com/gtnewhorizon/structurelib/structure/StructureUtility.java b/src/main/java/com/gtnewhorizon/structurelib/structure/StructureUtility.java index 0cfb7fb3..b68da768 100644 --- a/src/main/java/com/gtnewhorizon/structurelib/structure/StructureUtility.java +++ b/src/main/java/com/gtnewhorizon/structurelib/structure/StructureUtility.java @@ -150,7 +150,6 @@ public class StructureUtility { private static final String NICE_CHARS = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789abcdefghijklmnopqrstuvwxyz=|!@#$%&()[]{};:<>/?_,.*^'`"; - @SuppressWarnings("rawtypes") private static final Map STEP = new HashMap<>(); private static final IStructureElement AIR = new StructureElement_Bridge<>() { @@ -3060,15 +3059,14 @@ public class StructureUtility { /** * Used internally, to generate skips for structure definitions */ - static IStructureNavigate step(int a, int b, int c) { + static IStructureNavigate step(int a, int b, int c) { return step(new Vec3Impl(a, b, c)); } /** * Used internally, to generate skips for structure definitions */ - @SuppressWarnings("unchecked") - static IStructureNavigate step(Vec3Impl step) { + static IStructureNavigate step(Vec3Impl step) { if (step == null || step.get0() < 0 || step.get1() < 0 || step.get2() < 0) { throw new IllegalArgumentException(); } @@ -3083,8 +3081,8 @@ public class StructureUtility { }); } - private static IStructureNavigate stepA(int a, int b, int c) { - return new IStructureNavigate<>() { + private static IStructureNavigate stepA(int a, int b, int c) { + return new IStructureNavigate() { @Override public int getStepA() { @@ -3103,8 +3101,8 @@ public class StructureUtility { }; } - private static IStructureNavigate stepB(int a, int b, int c) { - return new IStructureNavigate<>() { + private static IStructureNavigate stepB(int a, int b, int c) { + return new IStructureNavigate() { @Override public int getStepA() { @@ -3128,8 +3126,8 @@ public class StructureUtility { }; } - private static IStructureNavigate stepC(int a, int b, int c) { - return new IStructureNavigate<>() { + private static IStructureNavigate stepC(int a, int b, int c) { + return new IStructureNavigate() { @Override public int getStepA() {