diff --git a/src/main/java/org/saturnclient/common/MinecraftBinding.java b/src/main/java/org/saturnclient/common/MinecraftBinding.java deleted file mode 100644 index 61f3eb2..0000000 --- a/src/main/java/org/saturnclient/common/MinecraftBinding.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.saturnclient.common; - -public class MinecraftBinding { - public Object inner; - - public MinecraftBinding(Object binding) { - this.inner = binding; - } - - @SuppressWarnings("unchecked") - public T get() { - try { - return (T) inner; - } catch (ClassCastException e) { - return null; - } - } -} diff --git a/src/main/java/org/saturnclient/common/ref/asset/IdentifierRef.java b/src/main/java/org/saturnclient/common/ref/asset/IdentifierRef.java index 1626059..5fd90bb 100644 --- a/src/main/java/org/saturnclient/common/ref/asset/IdentifierRef.java +++ b/src/main/java/org/saturnclient/common/ref/asset/IdentifierRef.java @@ -1,33 +1,18 @@ package org.saturnclient.common.ref.asset; -import org.saturnclient.common.MinecraftBinding; -import org.saturnclient.common.MinecraftProvider; - -public class IdentifierRef extends MinecraftBinding { - public IdentifierRef(String namespace, String path) { - super(MinecraftProvider.PROVIDER.createIdentifier(namespace, path)); - } - - public IdentifierRef(Object o) { - super(o); - } - +public interface IdentifierRef { public static IdentifierRef of(String namespace, String path) { - return new IdentifierRef(namespace, path); + return null; } public static IdentifierRef of(String fullPath) { - String[] p = fullPath.split(":", 2); - - return new IdentifierRef(p[0], p[1]); + return null; } public static IdentifierRef ofVanilla(String path) { - return new IdentifierRef("minecraft", path); + return null; } @Override - public String toString() { - return this.inner.toString(); - } + public String toString(); } diff --git a/src/main/java/org/saturnclient/common/ref/asset/SpriteRef.java b/src/main/java/org/saturnclient/common/ref/asset/SpriteRef.java index d6c2e0c..154af73 100644 --- a/src/main/java/org/saturnclient/common/ref/asset/SpriteRef.java +++ b/src/main/java/org/saturnclient/common/ref/asset/SpriteRef.java @@ -1,9 +1,4 @@ package org.saturnclient.common.ref.asset; -import org.saturnclient.common.MinecraftBinding; - -public class SpriteRef extends MinecraftBinding { - public SpriteRef(Object binding) { - super(binding); - } +public interface SpriteRef { } diff --git a/src/main/java/org/saturnclient/common/ref/game/ItemStackRef.java b/src/main/java/org/saturnclient/common/ref/game/ItemStackRef.java index f487172..4edfcd7 100644 --- a/src/main/java/org/saturnclient/common/ref/game/ItemStackRef.java +++ b/src/main/java/org/saturnclient/common/ref/game/ItemStackRef.java @@ -1,9 +1,4 @@ package org.saturnclient.common.ref.game; -import org.saturnclient.common.MinecraftBinding; - -public class ItemStackRef extends MinecraftBinding { - public ItemStackRef(Object binding) { - super(binding); - } +public interface ItemStackRef { } diff --git a/src/main/java/org/saturnclient/common/ref/game/MinecraftClientRef.java b/src/main/java/org/saturnclient/common/ref/game/MinecraftClientRef.java new file mode 100644 index 0000000..32d14db --- /dev/null +++ b/src/main/java/org/saturnclient/common/ref/game/MinecraftClientRef.java @@ -0,0 +1,16 @@ +package org.saturnclient.common.ref.game; + +import java.io.File; +import java.io.InputStream; + +import org.saturnclient.common.ref.asset.IdentifierRef; +import org.saturnclient.common.ref.render.WindowRef; + +public interface MinecraftClientRef { + + public File getRunDirectory(); + + public InputStream getResource(IdentifierRef identifier); + + public WindowRef getWindow(); +} diff --git a/src/main/java/org/saturnclient/common/ref/render/MatrixStackRef.java b/src/main/java/org/saturnclient/common/ref/render/MatrixStackRef.java index f44e1c8..40417f0 100644 --- a/src/main/java/org/saturnclient/common/ref/render/MatrixStackRef.java +++ b/src/main/java/org/saturnclient/common/ref/render/MatrixStackRef.java @@ -7,9 +7,9 @@ public interface MatrixStackRef { public void scale(float x, float y, float z); - public void multiply(SaturnQuaternionf quaternion); + public void multiply(QuaternionfRef quaternion); - public void multiply(SaturnQuaternionf quaternion, float originX, float originY, float originZ); + public void multiply(QuaternionfRef quaternion, float originX, float originY, float originZ); public void push(); diff --git a/src/main/java/org/saturnclient/common/ref/render/QuaternionfRef.java b/src/main/java/org/saturnclient/common/ref/render/QuaternionfRef.java new file mode 100644 index 0000000..df7cda0 --- /dev/null +++ b/src/main/java/org/saturnclient/common/ref/render/QuaternionfRef.java @@ -0,0 +1,4 @@ +package org.saturnclient.common.ref.render; + +public interface QuaternionfRef { +} diff --git a/src/main/java/org/saturnclient/common/ref/render/SaturnQuaternionf.java b/src/main/java/org/saturnclient/common/ref/render/SaturnQuaternionf.java deleted file mode 100644 index e7c64a0..0000000 --- a/src/main/java/org/saturnclient/common/ref/render/SaturnQuaternionf.java +++ /dev/null @@ -1,9 +0,0 @@ -package org.saturnclient.common.ref.render; - -import org.saturnclient.common.MinecraftBinding; - -public class SaturnQuaternionf extends MinecraftBinding { - public SaturnQuaternionf(Object o) { - super(o); - } -}