diff --git a/src/main/java/org/violetmoon/quark/content/management/module/HotbarChangerModule.java b/src/main/java/org/violetmoon/quark/content/management/module/HotbarChangerModule.java index 786db668b0..3aa1246764 100644 --- a/src/main/java/org/violetmoon/quark/content/management/module/HotbarChangerModule.java +++ b/src/main/java/org/violetmoon/quark/content/management/module/HotbarChangerModule.java @@ -58,7 +58,6 @@ public void onKeyInput(ZInput.Key event) { acceptInput(event.getKey()); } - //fixme Needs splitting up @PlayEvent public void hudHeathPre(ZRenderGuiOverlay.PlayerHealth.Pre event) { float shift = -getRealHeight(event.getPartialTick()) + 22; diff --git a/src/main/java/org/violetmoon/zeta/event/bus/helpers/LivingGetter.java b/src/main/java/org/violetmoon/zeta/event/bus/helpers/LivingGetter.java index 612904fc2b..ff12a62f76 100644 --- a/src/main/java/org/violetmoon/zeta/event/bus/helpers/LivingGetter.java +++ b/src/main/java/org/violetmoon/zeta/event/bus/helpers/LivingGetter.java @@ -2,7 +2,6 @@ import net.minecraft.world.entity.LivingEntity; -//fixme Move this into a lifelong home & make other interfaces use this more public interface LivingGetter { LivingEntity getEntity(); } diff --git a/src/main/java/org/violetmoon/zeta/event/bus/helpers/PlayerGetter.java b/src/main/java/org/violetmoon/zeta/event/bus/helpers/PlayerGetter.java index a40a5a2239..e30bda39b3 100644 --- a/src/main/java/org/violetmoon/zeta/event/bus/helpers/PlayerGetter.java +++ b/src/main/java/org/violetmoon/zeta/event/bus/helpers/PlayerGetter.java @@ -3,7 +3,6 @@ import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.player.Player; -//fixme Move this into a lifelong home & make other interfaces use this more public interface PlayerGetter extends LivingGetter { default Player getPlayer() { LivingEntity living = getEntity(); diff --git a/src/main/java/org/violetmoon/zeta/event/bus/helpers/README.md b/src/main/java/org/violetmoon/zeta/event/bus/helpers/README.md deleted file mode 100644 index ef2e1099b2..0000000000 --- a/src/main/java/org/violetmoon/zeta/event/bus/helpers/README.md +++ /dev/null @@ -1,4 +0,0 @@ -No idea where to place these so uhhh -//fixme -bwomp will eventually fix :3 -- IThundxr \ No newline at end of file diff --git a/src/main/java/org/violetmoon/zeta/temp/EnvType.java b/src/main/java/org/violetmoon/zeta/temp/EnvType.java new file mode 100644 index 0000000000..11dd371aef --- /dev/null +++ b/src/main/java/org/violetmoon/zeta/temp/EnvType.java @@ -0,0 +1,31 @@ +package org.violetmoon.zeta.temp; + +/** + * Represents a type of environment. + * + *
A type of environment is a jar file in a Minecraft version's json file's {@code download} + * subsection, including the {@code client.jar} and the {@code server.jar}.
+ * + * @see Environment + */ +public enum EnvType { + /** + * Represents the client environment type, in which the {@code client.jar} for a + * Minecraft version is the main game jar. + * + *A client environment type has all client logic (client rendering and integrated + * server logic), the data generator logic, and dedicated server logic. It encompasses + * everything that is available on the {@linkplain #SERVER server environment type}.
+ */ + CLIENT, + /** + * Represents the server environment type, in which the {@code server.jar} for a + * Minecraft version is the main game jar. + * + *A server environment type has the dedicated server logic and data generator + * logic, which are all included in the {@linkplain #CLIENT client environment type}. + * However, the server environment type has its libraries embedded compared to the + * client.
+ */ + SERVER +} \ No newline at end of file diff --git a/src/main/java/org/violetmoon/zeta/temp/Environment.java b/src/main/java/org/violetmoon/zeta/temp/Environment.java new file mode 100644 index 0000000000..3797485c71 --- /dev/null +++ b/src/main/java/org/violetmoon/zeta/temp/Environment.java @@ -0,0 +1,27 @@ +package org.violetmoon.zeta.temp; + +import java.lang.annotation.*; + +/** + * Applied to declare that the annotated element is present only in the specified environment. + * + *Use with caution, as Fabric-loader will remove the annotated element in a mismatched environment!
+ * + *When the annotated element is removed, bytecode associated with the element will not be removed. + * For example, if a field is removed, its initializer code will not, and will cause an error on execution.
+ * + *If an overriding method has this annotation and its overridden method doesn't, + * unexpected behavior may happen. If an overridden method has this annotation + * while the overriding method doesn't, it is safe, but the method can be used from + * the overridden class only in the specified environment.
+ */ +@Retention(RetentionPolicy.CLASS) +@Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD, ElementType.CONSTRUCTOR, ElementType.PACKAGE}) +@Documented +public @interface Environment { + /** + * Returns the environment type that the annotated element is only present in. + */ + EnvType value(); +} +