diff --git a/README.md b/README.md index ea9c085d9..e07476e2a 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ ![License](https://img.shields.io/badge/license-LGPL--3.0-blue) ![MC Version](https://img.shields.io/badge/Minecraft-1.15.2-9cf) -![MC Version](https://img.shields.io/badge/Minecraft-1.16.4-9cf) +![MC Version](https://img.shields.io/badge/Minecraft-1.16.5-9cf) [![Discord](https://img.shields.io/discord/784821338199556096.svg?label=&logo=discord&logoColor=ffffff&color=7389D8&labelColor=6A7EC2)](https://discord.gg/tPb9j3ZBXu) Flint is a Minecraft modding framework created by LabyMedia GmbH. It is @@ -17,7 +17,7 @@ Minecraft isn't patched directly - resulting in better compatibility between Mods and a simpler update process. **Warning**: Flint is still in development and not stable yet. We are -currently working with Minecraft 1.15.2 and 1.16.4, but will soon start to implement other +currently working with Minecraft 1.15.2 and 1.16.5, but will soon start to implement other versions (including 1.8.9). Contributions are welcome, just make sure to take a look at our contribution @@ -263,7 +263,7 @@ $ ./gradlew build There is also a task to start a de-obfuscated Minecraft directly out of your development environment. ```bash -$ ./gradlew runClient1.16.4 +$ ./gradlew runClient1.16.5 ``` If you want to login into your Minecraft account, just set the following @@ -301,7 +301,7 @@ version = "1.0.0" flint { // Enter the newest Flint version here flintVersion = "2.0.12" - minecraftVersions("1.15.2", "1.16.4") + minecraftVersions("1.15.2", "1.16.5") authors = arrayOf("Your Name") runs { overrideMainClass("net.flintmc.launcher.FlintLauncher") @@ -317,7 +317,7 @@ dependencies { api(flintApi("mcapi")) api(flintApi("util-task-executor")) - minecraft("1.15.2", "1.16.4") { + minecraft("1.15.2", "1.16.5") { annotationProcessor(flintApi("annotation-processing-autoload")) } } @@ -355,7 +355,7 @@ structure: └── src ├── internal/java/your/group/internal ├── main/java/your/group - └── v1_16_4/java/your/group/v1_16_4 + └── v1_16_5/java/your/group/v1_16_5 ``` If you now add the `ChatHandler` class from the diff --git a/build.gradle.kts b/build.gradle.kts index f2b6a3cd7..020a398fa 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -69,24 +69,6 @@ subprojects { } } -allprojects { - configurations.all { - resolutionStrategy { - force("org.apache.logging.log4j:log4j-api:2.8.2") - force("com.google.guava:guava:27.0.1-jre") - force("org.apache.commons:commons-lang3:3.10") - force("org.apache.logging.log4j:log4j-core:2.8.2") - force("it.unimi.dsi:fastutil:8.2.1") - force("net.java.dev.jna:jna:4.4.0") - force("com.google.code.findbugs:jsr305:3.0.2") - force("com.google.code.gson:gson:2.8.6") - force("commons-io:commons-io:2.6") - force("commons-codec:commons-codec:1.10") - force("com.beust:jcommander:1.78") - } - } -} - flint { flintVersion = System.getenv().getOrDefault("VERSION", "1.0.0") @@ -94,7 +76,7 @@ flint { !arrayOf(":", ":framework", ":render", ":transform", ":util", ":minecraft").contains(it.path) } - minecraftVersions("1.15.2", "1.16.4") + minecraftVersions("1.15.2", "1.16.5") type = net.flintmc.gradle.extension.FlintGradleExtension.Type.LIBRARY authors = arrayOf("LabyMedia GmbH") diff --git a/mcapi/build.gradle.kts b/mcapi/build.gradle.kts index 01437ebb9..9e8128047 100644 --- a/mcapi/build.gradle.kts +++ b/mcapi/build.gradle.kts @@ -24,7 +24,7 @@ plugins { group = "net.flintmc" dependencies { - minecraft("1.15.2", "1.16.4") { + minecraft("1.15.2", "1.16.5") { annotationProcessor(project(":annotation-processing:annotation-processing-autoload")) } annotationProcessor(project(":annotation-processing:annotation-processing-autoload")) diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/chat/AccessibleKeybindTextComponent.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/chat/AccessibleKeybindTextComponent.java similarity index 95% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/chat/AccessibleKeybindTextComponent.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/chat/AccessibleKeybindTextComponent.java index 345c111ae..602228cce 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/chat/AccessibleKeybindTextComponent.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/chat/AccessibleKeybindTextComponent.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.chat; +package net.flintmc.mcapi.v1_16_5.chat; import java.util.function.Function; import java.util.function.Supplier; @@ -25,7 +25,7 @@ import net.flintmc.transform.shadow.Shadow; import net.minecraft.util.text.ITextComponent; -@Shadow(value = "net.minecraft.util.text.KeyBindTextComponent", version = "1.16.4") +@Shadow(value = "net.minecraft.util.text.KeyBindTextComponent", version = "1.16.5") public interface AccessibleKeybindTextComponent { @FieldGetter("displaySupplierFunction") diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/chat/ChatEventInjector.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/chat/ChatEventInjector.java similarity index 97% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/chat/ChatEventInjector.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/chat/ChatEventInjector.java index 0a634cf8c..47067514e 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/chat/ChatEventInjector.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/chat/ChatEventInjector.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.chat; +package net.flintmc.mcapi.v1_16_5.chat; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -61,7 +61,7 @@ private ChatEventInjector( this.receiveFactory = receiveFactory; } - @ClassTransform(value = "net.minecraft.client.gui.NewChatGui", version = "1.16.4") + @ClassTransform(value = "net.minecraft.client.gui.NewChatGui", version = "1.16.5") public void transformChatGui(ClassTransformContext context) throws NotFoundException, CannotCompileException { CtClass transforming = context.getCtClass(); @@ -92,7 +92,7 @@ public ITextComponent handleChatReceive(ITextComponent component, Subscribe.Phas return (ITextComponent) this.componentMapper.toMinecraft(event.getMessage()); } - @ClassTransform(value = "net.minecraft.client.entity.player.ClientPlayerEntity", version = "1.16.4") + @ClassTransform(value = "net.minecraft.client.entity.player.ClientPlayerEntity", version = "1.16.5") public void transformClientPlayerEntity(ClassTransformContext context) throws CannotCompileException, NotFoundException { CtClass transforming = context.getCtClass(); diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/chat/ChatGuiShadow.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/chat/ChatGuiShadow.java similarity index 95% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/chat/ChatGuiShadow.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/chat/ChatGuiShadow.java index 827135ed0..eaf0de680 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/chat/ChatGuiShadow.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/chat/ChatGuiShadow.java @@ -17,14 +17,14 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.chat; +package net.flintmc.mcapi.v1_16_5.chat; import java.util.List; import net.flintmc.transform.shadow.FieldGetter; import net.flintmc.transform.shadow.Shadow; import net.minecraft.client.gui.ChatLine; -@Shadow(value = "net.minecraft.client.gui.NewChatGui", version = "1.16.4") +@Shadow(value = "net.minecraft.client.gui.NewChatGui", version = "1.16.5") public interface ChatGuiShadow { @FieldGetter("chatLines") diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/chat/VersionedChatController.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/chat/VersionedChatController.java similarity index 97% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/chat/VersionedChatController.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/chat/VersionedChatController.java index 5b5234ee3..33d68af3e 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/chat/VersionedChatController.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/chat/VersionedChatController.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.chat; +package net.flintmc.mcapi.v1_16_5.chat; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -35,7 +35,7 @@ import net.minecraft.util.text.ITextComponent; @Singleton -@Implement(value = ChatController.class, version = "1.16.4") +@Implement(value = ChatController.class, version = "1.16.5") public class VersionedChatController implements ChatController { private static final int MAX_MESSAGES = 100; diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/chat/VersionedKeybindNameMapper.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/chat/VersionedKeybindNameMapper.java similarity index 94% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/chat/VersionedKeybindNameMapper.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/chat/VersionedKeybindNameMapper.java index 946103338..3019f9bee 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/chat/VersionedKeybindNameMapper.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/chat/VersionedKeybindNameMapper.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.chat; +package net.flintmc.mcapi.v1_16_5.chat; import com.google.inject.Singleton; import net.flintmc.framework.inject.implement.Implement; @@ -29,7 +29,7 @@ import net.minecraft.util.text.TranslationTextComponent; @Singleton -@Implement(value = KeybindNameMapper.class, version = "1.16.4") +@Implement(value = KeybindNameMapper.class, version = "1.16.5") public class VersionedKeybindNameMapper implements KeybindNameMapper { /** diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/chat/VersionedLegacyHoverHolder.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/chat/VersionedLegacyHoverHolder.java similarity index 91% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/chat/VersionedLegacyHoverHolder.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/chat/VersionedLegacyHoverHolder.java index 27fc00c8e..8634c0417 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/chat/VersionedLegacyHoverHolder.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/chat/VersionedLegacyHoverHolder.java @@ -17,14 +17,14 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.chat; +package net.flintmc.mcapi.v1_16_5.chat; import com.google.inject.Singleton; import net.flintmc.framework.inject.implement.Implement; import net.flintmc.mcapi.internal.chat.serializer.LegacyHoverHolder; @Singleton -@Implement(value = LegacyHoverHolder.class, version = "1.16.4") +@Implement(value = LegacyHoverHolder.class, version = "1.16.5") public class VersionedLegacyHoverHolder implements LegacyHoverHolder { /** diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/chat/VersionedMinecraftComponentMapper.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/chat/VersionedMinecraftComponentMapper.java similarity index 99% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/chat/VersionedMinecraftComponentMapper.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/chat/VersionedMinecraftComponentMapper.java index 78249e744..745bcde7d 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/chat/VersionedMinecraftComponentMapper.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/chat/VersionedMinecraftComponentMapper.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.chat; +package net.flintmc.mcapi.v1_16_5.chat; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -53,7 +53,7 @@ import net.minecraft.util.text.TranslationTextComponent; @Singleton -@Implement(value = MinecraftComponentMapper.class, version = "1.16.4") +@Implement(value = MinecraftComponentMapper.class, version = "1.16.5") public class VersionedMinecraftComponentMapper implements MinecraftComponentMapper { private final ComponentBuilder.Factory builderFactory; diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/VersionedAgeableEntity.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/VersionedAgeableEntity.java similarity index 96% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/VersionedAgeableEntity.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/VersionedAgeableEntity.java index b5fbc81fb..3d449856f 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/VersionedAgeableEntity.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/VersionedAgeableEntity.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.entity; +package net.flintmc.mcapi.v1_16_5.entity; import net.flintmc.framework.inject.assisted.Assisted; import net.flintmc.framework.inject.assisted.AssistedInject; @@ -34,9 +34,9 @@ import net.minecraft.util.ActionResultType; /** - * 1.16.4 implementation of the {@link AgeableEntity}. + * 1.16.5 implementation of the {@link AgeableEntity}. */ -@Implement(value = AgeableEntity.class, version = "1.16.4") +@Implement(value = AgeableEntity.class, version = "1.16.5") public class VersionedAgeableEntity extends VersionedCreatureEntity implements AgeableEntity { private final net.minecraft.entity.AgeableEntity ageableEntity; diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/VersionedCreatureEntity.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/VersionedCreatureEntity.java similarity index 94% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/VersionedCreatureEntity.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/VersionedCreatureEntity.java index d89ba54ce..e5dd95e5e 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/VersionedCreatureEntity.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/VersionedCreatureEntity.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.entity; +package net.flintmc.mcapi.v1_16_5.entity; import net.flintmc.framework.inject.assisted.Assisted; import net.flintmc.framework.inject.assisted.AssistedInject; @@ -31,9 +31,9 @@ import net.minecraft.util.math.BlockPos; /** - * 1.16.4 implementation of the {@link CreatureEntity}. + * 1.16.5 implementation of the {@link CreatureEntity}. */ -@Implement(value = CreatureEntity.class, version = "1.16.4") +@Implement(value = CreatureEntity.class, version = "1.16.5") public class VersionedCreatureEntity extends VersionedMobEntity implements CreatureEntity { private final net.minecraft.entity.CreatureEntity creatureEntity; diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/VersionedEntity.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/VersionedEntity.java similarity index 99% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/VersionedEntity.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/VersionedEntity.java index 520c65a36..4bb826c5f 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/VersionedEntity.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/VersionedEntity.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.entity; +package net.flintmc.mcapi.v1_16_5.entity; import com.google.common.collect.Sets; import java.util.ArrayList; @@ -41,7 +41,7 @@ import net.flintmc.mcapi.entity.type.EntityType; import net.flintmc.mcapi.items.ItemStack; import net.flintmc.mcapi.player.type.sound.Sound; -import net.flintmc.mcapi.v1_16_4.entity.shadow.AccessibleEntity; +import net.flintmc.mcapi.v1_16_5.entity.shadow.AccessibleEntity; import net.flintmc.mcapi.world.World; import net.flintmc.mcapi.world.math.BlockPosition; import net.flintmc.mcapi.world.math.Direction; @@ -54,7 +54,7 @@ import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.vector.Vector3d; -@Implement(value = Entity.class, version = "1.16.4") +@Implement(value = Entity.class, version = "1.16.5") public class VersionedEntity implements Entity { private final EntityType entityType; diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/VersionedEntitySize.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/VersionedEntitySize.java similarity index 93% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/VersionedEntitySize.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/VersionedEntitySize.java index ff9484b85..45c694442 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/VersionedEntitySize.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/VersionedEntitySize.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.entity; +package net.flintmc.mcapi.v1_16_5.entity; import net.flintmc.framework.inject.assisted.Assisted; import net.flintmc.framework.inject.assisted.AssistedInject; @@ -25,9 +25,9 @@ import net.flintmc.mcapi.entity.EntitySize; /** - * 1.16.4 implementation of the {@link EntitySize}. + * 1.16.5 implementation of the {@link EntitySize}. */ -@Implement(value = EntitySize.class, version = "1.16.4") +@Implement(value = EntitySize.class, version = "1.16.5") public class VersionedEntitySize implements EntitySize { private float width; diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/VersionedLivingEntity.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/VersionedLivingEntity.java similarity index 99% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/VersionedLivingEntity.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/VersionedLivingEntity.java index c84677ce6..f94592417 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/VersionedLivingEntity.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/VersionedLivingEntity.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.entity; +package net.flintmc.mcapi.v1_16_5.entity; import java.util.Collection; import java.util.HashMap; @@ -45,7 +45,7 @@ import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.math.BlockPos; -@Implement(value = LivingEntity.class, version = "1.16.4") +@Implement(value = LivingEntity.class, version = "1.16.5") public class VersionedLivingEntity extends VersionedEntity implements LivingEntity { private final Map activePotions; diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/VersionedMobEntity.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/VersionedMobEntity.java similarity index 99% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/VersionedMobEntity.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/VersionedMobEntity.java index 8883976b4..7c2f5e2b8 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/VersionedMobEntity.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/VersionedMobEntity.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.entity; +package net.flintmc.mcapi.v1_16_5.entity; import net.flintmc.framework.inject.assisted.Assisted; import net.flintmc.framework.inject.assisted.AssistedInject; @@ -39,7 +39,7 @@ import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.math.BlockPos; -@Implement(value = MobEntity.class, version = "1.16.4") +@Implement(value = MobEntity.class, version = "1.16.5") public class VersionedMobEntity extends VersionedLivingEntity implements MobEntity { private final net.minecraft.entity.MobEntity mobEntity; diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/ai/VersionedEntitySenses.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/ai/VersionedEntitySenses.java similarity index 92% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/ai/VersionedEntitySenses.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/ai/VersionedEntitySenses.java index 987b0bd2e..eccc1567c 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/ai/VersionedEntitySenses.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/ai/VersionedEntitySenses.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.entity.ai; +package net.flintmc.mcapi.v1_16_5.entity.ai; import net.flintmc.framework.inject.assisted.Assisted; import net.flintmc.framework.inject.assisted.AssistedInject; @@ -28,9 +28,9 @@ import net.flintmc.mcapi.entity.mapper.EntityFoundationMapper; /** - * 1.16.4 implementation of the {@link EntitySenses}. + * 1.16.5 implementation of the {@link EntitySenses}. */ -@Implement(value = EntitySenses.class, version = "1.16.4") +@Implement(value = EntitySenses.class, version = "1.16.5") public class VersionedEntitySenses extends net.minecraft.entity.ai.EntitySenses implements EntitySenses { diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/event/VersionedEntityAttackEventInjector.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/event/VersionedEntityAttackEventInjector.java similarity index 97% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/event/VersionedEntityAttackEventInjector.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/event/VersionedEntityAttackEventInjector.java index 765c755da..c0d641efe 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/event/VersionedEntityAttackEventInjector.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/event/VersionedEntityAttackEventInjector.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.entity.event; +package net.flintmc.mcapi.v1_16_5.entity.event; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -60,7 +60,7 @@ private VersionedEntityAttackEventInjector( @Type(typeName = "net.minecraft.entity.player.PlayerEntity"), @Type(typeName = "net.minecraft.entity.Entity") }, - version = "1.16.4") + version = "1.16.5") public void attackEntity(@Named("args") Object[] args) { Entity entity = this.entityMapper.fromAnyMinecraftEntity(args[1]); if (entity == null) { @@ -79,7 +79,7 @@ public void attackEntity(@Named("args") Object[] args) { @Type(typeName = "net.minecraft.entity.Entity"), @Type(reference = Hand.class) }, - version = "1.16.4") + version = "1.16.5") public void interactWithEntity(@Named("args") Object[] args) { Entity entity = this.entityMapper.fromAnyMinecraftEntity(args[1]); if (entity == null) { diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/event/VersionedEntityRenderNameEventInjector.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/event/VersionedEntityRenderNameEventInjector.java similarity index 98% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/event/VersionedEntityRenderNameEventInjector.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/event/VersionedEntityRenderNameEventInjector.java index d22508acb..a6f3daa13 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/event/VersionedEntityRenderNameEventInjector.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/event/VersionedEntityRenderNameEventInjector.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.entity.event; +package net.flintmc.mcapi.v1_16_5.entity.event; import com.google.inject.Inject; import com.google.inject.Singleton; diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/event/VersionedEntityRenderNameEventInjectorTransformer.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/event/VersionedEntityRenderNameEventInjectorTransformer.java similarity index 98% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/event/VersionedEntityRenderNameEventInjectorTransformer.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/event/VersionedEntityRenderNameEventInjectorTransformer.java index 506f6c99d..78941c38f 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/event/VersionedEntityRenderNameEventInjectorTransformer.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/event/VersionedEntityRenderNameEventInjectorTransformer.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.entity.event; +package net.flintmc.mcapi.v1_16_5.entity.event; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -76,7 +76,7 @@ private VersionedEntityRenderNameEventInjectorTransformer( this.mappingProvider = mappingProvider; } - @ClassTransform(value = "net.minecraft.client.renderer.entity.EntityRenderer", version = "1.16.4") + @ClassTransform(value = "net.minecraft.client.renderer.entity.EntityRenderer", version = "1.16.5") public void transformRenderName(ClassTransformContext context) throws NotFoundException, CannotCompileException, BadBytecode { CtClass[] params = diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/event/VersionedEntitySpawnEventInjector.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/event/VersionedEntitySpawnEventInjector.java similarity index 96% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/event/VersionedEntitySpawnEventInjector.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/event/VersionedEntitySpawnEventInjector.java index 5f2da5f2b..41e940711 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/event/VersionedEntitySpawnEventInjector.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/event/VersionedEntitySpawnEventInjector.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.entity.event; +package net.flintmc.mcapi.v1_16_5.entity.event; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -58,7 +58,7 @@ private VersionedEntitySpawnEventInjector( methodName = "addEntityImpl", parameters = {@Type(reference = int.class), @Type(typeName = "net.minecraft.entity.Entity")}, executionTime = ExecutionTime.BEFORE, - version = "1.16.4") + version = "1.16.5") public void addEntity(@Named("args") Object[] args) { Entity entity = this.entityMapper.fromAnyMinecraftEntity(args[1]); if (entity == null) { @@ -75,7 +75,7 @@ public void addEntity(@Named("args") Object[] args) { className = "net.minecraft.entity.Entity", methodName = "remove", executionTime = ExecutionTime.BEFORE, - version = "1.16.4") + version = "1.16.5") public void remove(@Named("instance") Object instance) { Entity entity = this.entityMapper.fromAnyMinecraftEntity(instance); if (entity == null) { diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/item/VersionedItemEntity.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/item/VersionedItemEntity.java similarity index 97% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/item/VersionedItemEntity.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/item/VersionedItemEntity.java index 385902759..a3ea288df 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/item/VersionedItemEntity.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/item/VersionedItemEntity.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.entity.item; +package net.flintmc.mcapi.v1_16_5.entity.item; import java.util.UUID; import net.flintmc.framework.inject.assisted.Assisted; @@ -29,11 +29,11 @@ import net.flintmc.mcapi.entity.type.EntityTypeRegister; import net.flintmc.mcapi.items.ItemStack; import net.flintmc.mcapi.nbt.NBTCompound; -import net.flintmc.mcapi.v1_16_4.entity.VersionedEntity; +import net.flintmc.mcapi.v1_16_5.entity.VersionedEntity; import net.flintmc.mcapi.world.World; import net.minecraft.nbt.CompoundNBT; -@Implement(value = ItemEntity.class, version = "1.16.4") +@Implement(value = ItemEntity.class, version = "1.16.5") public class VersionedItemEntity extends VersionedEntity implements ItemEntity { private final net.minecraft.entity.item.ItemEntity itemEntity; diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/item/VersionedItemEntityMapper.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/item/VersionedItemEntityMapper.java similarity index 95% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/item/VersionedItemEntityMapper.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/item/VersionedItemEntityMapper.java index dd69ea15c..831187cc3 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/item/VersionedItemEntityMapper.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/item/VersionedItemEntityMapper.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.entity.item; +package net.flintmc.mcapi.v1_16_5.entity.item; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -28,7 +28,7 @@ import net.minecraft.client.Minecraft; @Singleton -@Implement(value = ItemEntityMapper.class, version = "1.16.4") +@Implement(value = ItemEntityMapper.class, version = "1.16.5") public class VersionedItemEntityMapper implements ItemEntityMapper { private final EntityCache entityCache; diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/mapper/VersionedEntityFoundationMapper.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/mapper/VersionedEntityFoundationMapper.java similarity index 98% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/mapper/VersionedEntityFoundationMapper.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/mapper/VersionedEntityFoundationMapper.java index d98e3d32f..8bf13ab4c 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/mapper/VersionedEntityFoundationMapper.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/mapper/VersionedEntityFoundationMapper.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.entity.mapper; +package net.flintmc.mcapi.v1_16_5.entity.mapper; import javax.inject.Inject; import javax.inject.Singleton; @@ -39,10 +39,10 @@ import net.minecraft.world.GameType; /** - * 1.16.4 implementation of the {@link EntityFoundationMapper}. + * 1.16.5 implementation of the {@link EntityFoundationMapper}. */ @Singleton -@Implement(value = EntityFoundationMapper.class, version = "1.16.4") +@Implement(value = EntityFoundationMapper.class, version = "1.16.5") public class VersionedEntityFoundationMapper implements EntityFoundationMapper { private final EntityMapper entityMapper; diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/mapper/VersionedEntityMapper.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/mapper/VersionedEntityMapper.java similarity index 98% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/mapper/VersionedEntityMapper.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/mapper/VersionedEntityMapper.java index 0339234eb..7bff4ae5f 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/mapper/VersionedEntityMapper.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/mapper/VersionedEntityMapper.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.entity.mapper; +package net.flintmc.mcapi.v1_16_5.entity.mapper; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -40,7 +40,7 @@ import net.minecraft.entity.passive.PigEntity; @Singleton -@Implement(value = EntityMapper.class, version = "1.16.4") +@Implement(value = EntityMapper.class, version = "1.16.5") public class VersionedEntityMapper implements EntityMapper { private final EntityCache entityCache; diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/passive/VersionedAmbientEntity.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/passive/VersionedAmbientEntity.java similarity index 91% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/passive/VersionedAmbientEntity.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/passive/VersionedAmbientEntity.java index 91b345a51..a2d5f0cf8 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/passive/VersionedAmbientEntity.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/passive/VersionedAmbientEntity.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.entity.passive; +package net.flintmc.mcapi.v1_16_5.entity.passive; import net.flintmc.framework.inject.assisted.Assisted; import net.flintmc.framework.inject.assisted.AssistedInject; @@ -27,10 +27,10 @@ import net.flintmc.mcapi.entity.passive.AmbientEntity; import net.flintmc.mcapi.entity.type.EntityType; import net.flintmc.mcapi.player.PlayerEntity; -import net.flintmc.mcapi.v1_16_4.entity.VersionedMobEntity; +import net.flintmc.mcapi.v1_16_5.entity.VersionedMobEntity; import net.flintmc.mcapi.world.World; -@Implement(value = AmbientEntity.class, version = "1.16.4") +@Implement(value = AmbientEntity.class, version = "1.16.5") public class VersionedAmbientEntity extends VersionedMobEntity implements AmbientEntity { @AssistedInject diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/passive/VersionedAnimalEntity.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/passive/VersionedAnimalEntity.java similarity index 96% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/passive/VersionedAnimalEntity.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/passive/VersionedAnimalEntity.java index b64d90244..8058ad340 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/passive/VersionedAnimalEntity.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/passive/VersionedAnimalEntity.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.entity.passive; +package net.flintmc.mcapi.v1_16_5.entity.passive; import net.flintmc.framework.inject.assisted.Assisted; import net.flintmc.framework.inject.assisted.AssistedInject; @@ -31,12 +31,12 @@ import net.flintmc.mcapi.nbt.NBTCompound; import net.flintmc.mcapi.player.PlayerEntity; import net.flintmc.mcapi.player.type.hand.Hand; -import net.flintmc.mcapi.v1_16_4.entity.VersionedAgeableEntity; +import net.flintmc.mcapi.v1_16_5.entity.VersionedAgeableEntity; import net.flintmc.mcapi.world.World; import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.ActionResultType; -@Implement(value = AnimalEntity.class, version = "1.16.4") +@Implement(value = AnimalEntity.class, version = "1.16.5") public class VersionedAnimalEntity extends VersionedAgeableEntity implements AnimalEntity { private final net.minecraft.entity.passive.AnimalEntity animalEntity; diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/passive/VersionedPassiveEntityMapper.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/passive/VersionedPassiveEntityMapper.java similarity index 97% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/passive/VersionedPassiveEntityMapper.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/passive/VersionedPassiveEntityMapper.java index 7234eda67..3c70822e5 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/passive/VersionedPassiveEntityMapper.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/passive/VersionedPassiveEntityMapper.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.entity.passive; +package net.flintmc.mcapi.v1_16_5.entity.passive; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -30,7 +30,7 @@ import net.minecraft.client.Minecraft; @Singleton -@Implement(value = PassiveEntityMapper.class, version = "1.16.4") +@Implement(value = PassiveEntityMapper.class, version = "1.16.5") public class VersionedPassiveEntityMapper implements PassiveEntityMapper { private final AmbientEntity.Provider ambientEntityProvider; diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/passive/farmanimal/VersionedPigEntity.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/passive/farmanimal/VersionedPigEntity.java similarity index 94% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/passive/farmanimal/VersionedPigEntity.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/passive/farmanimal/VersionedPigEntity.java index 86f475141..6fe4ed00f 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/passive/farmanimal/VersionedPigEntity.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/passive/farmanimal/VersionedPigEntity.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.entity.passive.farmanimal; +package net.flintmc.mcapi.v1_16_5.entity.passive.farmanimal; import net.flintmc.framework.inject.assisted.Assisted; import net.flintmc.framework.inject.assisted.AssistedInject; @@ -31,13 +31,13 @@ import net.flintmc.mcapi.nbt.NBTCompound; import net.flintmc.mcapi.player.PlayerEntity; import net.flintmc.mcapi.player.type.hand.Hand; -import net.flintmc.mcapi.v1_16_4.entity.passive.VersionedAnimalEntity; -import net.flintmc.mcapi.v1_16_4.entity.passive.farmanimal.shadow.AccessiblePigEntity; +import net.flintmc.mcapi.v1_16_5.entity.passive.VersionedAnimalEntity; +import net.flintmc.mcapi.v1_16_5.entity.passive.farmanimal.shadow.AccessiblePigEntity; import net.flintmc.mcapi.world.World; import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.ActionResultType; -@Implement(value = PigEntity.class, version = "1.16.4") +@Implement(value = PigEntity.class, version = "1.16.5") public class VersionedPigEntity extends VersionedAnimalEntity implements PigEntity { private final net.minecraft.entity.passive.PigEntity pigEntity; diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/passive/farmanimal/shadow/AccessiblePigEntity.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/passive/farmanimal/shadow/AccessiblePigEntity.java similarity index 93% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/passive/farmanimal/shadow/AccessiblePigEntity.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/passive/farmanimal/shadow/AccessiblePigEntity.java index b51eb3a7e..ca12c821a 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/passive/farmanimal/shadow/AccessiblePigEntity.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/passive/farmanimal/shadow/AccessiblePigEntity.java @@ -17,13 +17,13 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.entity.passive.farmanimal.shadow; +package net.flintmc.mcapi.v1_16_5.entity.passive.farmanimal.shadow; import net.flintmc.transform.shadow.FieldGetter; import net.flintmc.transform.shadow.Shadow; import net.minecraft.entity.BoostHelper; -@Shadow(value = "net.minecraft.entity.passive.PigEntity", version = "1.16.4") +@Shadow(value = "net.minecraft.entity.passive.PigEntity", version = "1.16.5") public interface AccessiblePigEntity { @FieldGetter("field_234214_bx_") diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/passive/provider/VersionedAmbientEntityProvider.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/passive/provider/VersionedAmbientEntityProvider.java similarity index 97% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/passive/provider/VersionedAmbientEntityProvider.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/passive/provider/VersionedAmbientEntityProvider.java index 9d371a093..91f02f80d 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/passive/provider/VersionedAmbientEntityProvider.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/passive/provider/VersionedAmbientEntityProvider.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.entity.passive.provider; +package net.flintmc.mcapi.v1_16_5.entity.passive.provider; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -26,7 +26,7 @@ import net.flintmc.mcapi.entity.type.EntityTypeMapper; @Singleton -@Implement(value = AmbientEntity.Provider.class, version = "1.16.4") +@Implement(value = AmbientEntity.Provider.class, version = "1.16.5") public class VersionedAmbientEntityProvider implements AmbientEntity.Provider { private final AmbientEntity.Factory ambientEntityFactory; diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/passive/provider/VersionedAnimalEntityProvider.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/passive/provider/VersionedAnimalEntityProvider.java similarity index 97% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/passive/provider/VersionedAnimalEntityProvider.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/passive/provider/VersionedAnimalEntityProvider.java index 24f7e0fe8..c12788edc 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/passive/provider/VersionedAnimalEntityProvider.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/passive/provider/VersionedAnimalEntityProvider.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.entity.passive.provider; +package net.flintmc.mcapi.v1_16_5.entity.passive.provider; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -26,7 +26,7 @@ import net.flintmc.mcapi.entity.type.EntityTypeMapper; @Singleton -@Implement(value = AnimalEntity.Provider.class, version = "1.16.4") +@Implement(value = AnimalEntity.Provider.class, version = "1.16.5") public class VersionedAnimalEntityProvider implements AnimalEntity.Provider { private final AnimalEntity.Factory animalEntityFactory; diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/projectile/AccessibleAbstractArrowEntity.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/projectile/AccessibleAbstractArrowEntity.java similarity index 96% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/projectile/AccessibleAbstractArrowEntity.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/projectile/AccessibleAbstractArrowEntity.java index 50863ac10..f7b2e9f69 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/projectile/AccessibleAbstractArrowEntity.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/projectile/AccessibleAbstractArrowEntity.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.entity.projectile; +package net.flintmc.mcapi.v1_16_5.entity.projectile; import net.flintmc.mcapi.items.ItemStack; import net.flintmc.transform.shadow.FieldGetter; @@ -29,7 +29,7 @@ /** * A shadow interface for the abstract arrow entity. */ -@Shadow(value = "net.minecraft.entity.projectile.AbstractArrowEntity", version = "1.16.4") +@Shadow(value = "net.minecraft.entity.projectile.AbstractArrowEntity", version = "1.16.5") public interface AccessibleAbstractArrowEntity { /** diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/projectile/VersionedArrowBaseEntity.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/projectile/VersionedArrowBaseEntity.java similarity index 98% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/projectile/VersionedArrowBaseEntity.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/projectile/VersionedArrowBaseEntity.java index 1bde20b5d..30c90f056 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/projectile/VersionedArrowBaseEntity.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/projectile/VersionedArrowBaseEntity.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.entity.projectile; +package net.flintmc.mcapi.v1_16_5.entity.projectile; import net.flintmc.framework.inject.assisted.Assisted; import net.flintmc.framework.inject.assisted.AssistedInject; @@ -32,13 +32,13 @@ import net.flintmc.mcapi.nbt.NBTCompound; import net.flintmc.mcapi.player.PlayerEntity; import net.flintmc.mcapi.player.type.sound.Sound; -import net.flintmc.mcapi.v1_16_4.entity.VersionedEntity; +import net.flintmc.mcapi.v1_16_5.entity.VersionedEntity; import net.flintmc.mcapi.world.World; import net.minecraft.entity.projectile.AbstractArrowEntity; import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.SoundEvent; -@Implement(value = ArrowBaseEntity.class, version = "1.16.4") +@Implement(value = ArrowBaseEntity.class, version = "1.16.5") public class VersionedArrowBaseEntity extends VersionedEntity implements ArrowBaseEntity { private final AccessibleAbstractArrowEntity accessibleAbstractArrowEntity; diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/projectile/VersionedArrowEntity.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/projectile/VersionedArrowEntity.java similarity index 97% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/projectile/VersionedArrowEntity.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/projectile/VersionedArrowEntity.java index a90e3ac2b..5611d4871 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/projectile/VersionedArrowEntity.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/projectile/VersionedArrowEntity.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.entity.projectile; +package net.flintmc.mcapi.v1_16_5.entity.projectile; import net.flintmc.framework.inject.assisted.Assisted; import net.flintmc.framework.inject.assisted.AssistedInject; @@ -31,7 +31,7 @@ import net.flintmc.mcapi.world.World; import net.minecraft.nbt.CompoundNBT; -@Implement(value = ArrowEntity.class, version = "1.16.4") +@Implement(value = ArrowEntity.class, version = "1.16.5") public class VersionedArrowEntity extends VersionedArrowBaseEntity implements ArrowEntity { private final net.minecraft.entity.projectile.ArrowEntity arrowEntity; diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/projectile/VersionedThrowableEntity.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/projectile/VersionedThrowableEntity.java similarity index 95% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/projectile/VersionedThrowableEntity.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/projectile/VersionedThrowableEntity.java index dd61e712f..e51867808 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/projectile/VersionedThrowableEntity.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/projectile/VersionedThrowableEntity.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.entity.projectile; +package net.flintmc.mcapi.v1_16_5.entity.projectile; import net.flintmc.framework.inject.assisted.Assisted; import net.flintmc.framework.inject.assisted.AssistedInject; @@ -28,12 +28,12 @@ import net.flintmc.mcapi.entity.projectile.ThrowableEntity; import net.flintmc.mcapi.entity.type.EntityType; import net.flintmc.mcapi.nbt.NBTCompound; -import net.flintmc.mcapi.v1_16_4.entity.VersionedEntity; -import net.flintmc.mcapi.v1_16_4.entity.shadow.AccessibleEntity; +import net.flintmc.mcapi.v1_16_5.entity.VersionedEntity; +import net.flintmc.mcapi.v1_16_5.entity.shadow.AccessibleEntity; import net.flintmc.mcapi.world.World; import net.minecraft.nbt.CompoundNBT; -@Implement(value = ThrowableEntity.class, version = "1.16.4") +@Implement(value = ThrowableEntity.class, version = "1.16.5") public class VersionedThrowableEntity extends VersionedEntity implements ThrowableEntity { private final net.minecraft.entity.projectile.ThrowableEntity throwableEntity; diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/provider/VersionedAgeableEntityProvider.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/provider/VersionedAgeableEntityProvider.java similarity index 97% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/provider/VersionedAgeableEntityProvider.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/provider/VersionedAgeableEntityProvider.java index 73525ee94..c3f3ff264 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/provider/VersionedAgeableEntityProvider.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/provider/VersionedAgeableEntityProvider.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.entity.provider; +package net.flintmc.mcapi.v1_16_5.entity.provider; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -29,7 +29,7 @@ * 1.15.2 implementation of the {@link AgeableEntity.Provider}. */ @Singleton -@Implement(value = AgeableEntity.Provider.class, version = "1.16.4") +@Implement(value = AgeableEntity.Provider.class, version = "1.16.5") public class VersionedAgeableEntityProvider implements AgeableEntity.Provider { private final AgeableEntity.Factory ageableEntityFactory; diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/provider/VersionedCreatureEntityProvider.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/provider/VersionedCreatureEntityProvider.java similarity index 97% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/provider/VersionedCreatureEntityProvider.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/provider/VersionedCreatureEntityProvider.java index 212087c5d..803a6f573 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/provider/VersionedCreatureEntityProvider.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/provider/VersionedCreatureEntityProvider.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.entity.provider; +package net.flintmc.mcapi.v1_16_5.entity.provider; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -29,7 +29,7 @@ * 1.15.2 implementation of the {@link CreatureEntity.Provider}. */ @Singleton -@Implement(value = CreatureEntity.Provider.class, version = "1.16.4") +@Implement(value = CreatureEntity.Provider.class, version = "1.16.5") public class VersionedCreatureEntityProvider implements CreatureEntity.Provider { private final CreatureEntity.Factory creatureEntityFactory; diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/provider/VersionedLivingEntityProvider.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/provider/VersionedLivingEntityProvider.java similarity index 97% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/provider/VersionedLivingEntityProvider.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/provider/VersionedLivingEntityProvider.java index e9c63f76a..e430e509e 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/provider/VersionedLivingEntityProvider.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/provider/VersionedLivingEntityProvider.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.entity.provider; +package net.flintmc.mcapi.v1_16_5.entity.provider; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -26,7 +26,7 @@ import net.flintmc.mcapi.entity.type.EntityTypeMapper; @Singleton -@Implement(value = LivingEntity.Provider.class, version = "1.16.4") +@Implement(value = LivingEntity.Provider.class, version = "1.16.5") public class VersionedLivingEntityProvider implements LivingEntity.Provider { private final LivingEntity.Factory livingEntityFactory; diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/provider/VersionedMobEntityProvider.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/provider/VersionedMobEntityProvider.java similarity index 94% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/provider/VersionedMobEntityProvider.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/provider/VersionedMobEntityProvider.java index 8b1548d52..903532f63 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/provider/VersionedMobEntityProvider.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/provider/VersionedMobEntityProvider.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.entity.provider; +package net.flintmc.mcapi.v1_16_5.entity.provider; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -29,7 +29,7 @@ * 1.15.2 implementation of the {@link MobEntity.Provider}. */ @Singleton -@Implement(value = MobEntity.Provider.class, version = "1.16.4") +@Implement(value = MobEntity.Provider.class, version = "1.16.5") public class VersionedMobEntityProvider implements MobEntity.Provider { private final MobEntity.Factory mobEntityFactory; diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/shadow/AccessibleEntity.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/shadow/AccessibleEntity.java similarity index 91% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/shadow/AccessibleEntity.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/shadow/AccessibleEntity.java index fb524ea10..ba5fa6665 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/shadow/AccessibleEntity.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/shadow/AccessibleEntity.java @@ -17,13 +17,13 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.entity.shadow; +package net.flintmc.mcapi.v1_16_5.entity.shadow; import net.flintmc.transform.shadow.MethodProxy; import net.flintmc.transform.shadow.Shadow; import net.minecraft.nbt.CompoundNBT; -@Shadow(value = "net.minecraft.entity.Entity", version = "1.16.4") +@Shadow(value = "net.minecraft.entity.Entity", version = "1.16.5") public interface AccessibleEntity { @MethodProxy diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/type/VersionedEntityType.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/type/VersionedEntityType.java similarity index 94% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/type/VersionedEntityType.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/type/VersionedEntityType.java index c12f13027..1426d8941 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/type/VersionedEntityType.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/type/VersionedEntityType.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.entity.type; +package net.flintmc.mcapi.v1_16_5.entity.type; import net.flintmc.framework.inject.assisted.Assisted; import net.flintmc.framework.inject.assisted.AssistedInject; @@ -27,9 +27,9 @@ import net.flintmc.mcapi.entity.type.EntityType; /** - * 1.16.4 implementation of the {@link EntityType}. + * 1.16.5 implementation of the {@link EntityType}. */ -@Implement(value = EntityType.class, version = "1.16.4") +@Implement(value = EntityType.class, version = "1.16.5") public class VersionedEntityType implements EntityType { private final Entity.Classification classification; diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/type/VersionedEntityTypeBuilder.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/type/VersionedEntityTypeBuilder.java similarity index 96% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/type/VersionedEntityTypeBuilder.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/type/VersionedEntityTypeBuilder.java index 9f26994b4..c086b2981 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/type/VersionedEntityTypeBuilder.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/type/VersionedEntityTypeBuilder.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.entity.type; +package net.flintmc.mcapi.v1_16_5.entity.type; import net.flintmc.framework.inject.assisted.Assisted; import net.flintmc.framework.inject.assisted.AssistedInject; @@ -30,7 +30,7 @@ /** * 1.15.2 implementation of the {@link EntityTypeBuilder}. */ -@Implement(value = EntityTypeBuilder.class, version = "1.16.4") +@Implement(value = EntityTypeBuilder.class, version = "1.16.5") public class VersionedEntityTypeBuilder implements EntityTypeBuilder { private final Entity.Classification classification; diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/type/VersionedEntityTypeMapper.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/type/VersionedEntityTypeMapper.java similarity index 96% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/type/VersionedEntityTypeMapper.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/type/VersionedEntityTypeMapper.java index a20dea2de..7487d64ba 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/type/VersionedEntityTypeMapper.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/type/VersionedEntityTypeMapper.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.entity.type; +package net.flintmc.mcapi.v1_16_5.entity.type; import javax.inject.Inject; import javax.inject.Singleton; @@ -30,10 +30,10 @@ import net.minecraft.entity.EntityClassification; /** - * 1.16.4 implementation of the {@link EntityTypeMapper}. + * 1.16.5 implementation of the {@link EntityTypeMapper}. */ @Singleton -@Implement(value = EntityTypeMapper.class, version = "1.16.4") +@Implement(value = EntityTypeMapper.class, version = "1.16.5") public class VersionedEntityTypeMapper implements EntityTypeMapper { private final EntityType.Factory entityTypeFactory; diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/type/VersionedEntityTypeRegister.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/type/VersionedEntityTypeRegister.java similarity index 90% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/type/VersionedEntityTypeRegister.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/type/VersionedEntityTypeRegister.java index 9bbf17c90..2eb2028a4 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/type/VersionedEntityTypeRegister.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/type/VersionedEntityTypeRegister.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.entity.type; +package net.flintmc.mcapi.v1_16_5.entity.type; import com.beust.jcommander.internal.Maps; import java.util.Map; @@ -32,10 +32,10 @@ import net.minecraft.util.registry.Registry; /** - * 1.16.4 implementation of the {@link EntityTypeRegister}. + * 1.16.5 implementation of the {@link EntityTypeRegister}. */ @Singleton -@Implement(value = EntityTypeRegister.class, version = "1.16.4") +@Implement(value = EntityTypeRegister.class, version = "1.16.5") public class VersionedEntityTypeRegister implements EntityTypeRegister { private final EntityTypeMapper entityTypeMapper; @@ -47,7 +47,7 @@ private VersionedEntityTypeRegister(EntityTypeMapper entityTypeMapper) { this.entityTypes = Maps.newHashMap(); } - @Subscribe(phase = Subscribe.Phase.POST, version = "1.16.4") + @Subscribe(phase = Subscribe.Phase.POST, version = "1.16.5") public void convertEntityTypes(OpenGLInitializeEvent event) { for (net.minecraft.entity.EntityType entityType : Registry.ENTITY_TYPE) { String key = Registry.ENTITY_TYPE.getKey(entityType).getPath(); diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/event/IngameMenuEventInjector.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/event/IngameMenuEventInjector.java similarity index 96% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/event/IngameMenuEventInjector.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/event/IngameMenuEventInjector.java index cf270eb6d..3deb4c53b 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/event/IngameMenuEventInjector.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/event/IngameMenuEventInjector.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.event; +package net.flintmc.mcapi.v1_16_5.event; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -53,7 +53,7 @@ private IngameMenuEventInjector( methodName = "displayInGameMenu", parameters = @Type(reference = boolean.class), executionTime = Hook.ExecutionTime.BEFORE, - version = "1.16.4") + version = "1.16.5") public HookResult displayInGameMenu(Hook.ExecutionTime executionTime) { if (Minecraft.getInstance().currentScreen != null) { return HookResult.CONTINUE; @@ -70,7 +70,7 @@ public HookResult displayInGameMenu(Hook.ExecutionTime executionTime) { methodName = "displayGuiScreen", parameters = @Type(typeName = "net.minecraft.client.gui.screen.Screen"), executionTime = Hook.ExecutionTime.BEFORE, - version = "1.16.4") + version = "1.16.5") public void displayGuiScreen(@Named("args") Object[] args, Hook.ExecutionTime executionTime) { Object screen = args[0]; if (screen != null) { diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/event/VersionedMinecraftInitializeEventInjector.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/event/VersionedMinecraftInitializeEventInjector.java similarity index 96% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/event/VersionedMinecraftInitializeEventInjector.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/event/VersionedMinecraftInitializeEventInjector.java index a14dec8f6..14588ef19 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/event/VersionedMinecraftInitializeEventInjector.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/event/VersionedMinecraftInitializeEventInjector.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.event; +package net.flintmc.mcapi.v1_16_5.event; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -46,7 +46,7 @@ public VersionedMinecraftInitializeEventInjector(EventBus eventBus) { methodName = "", parameters = {@Type(reference = GameConfiguration.class)}, executionTime = {Hook.ExecutionTime.BEFORE, Hook.ExecutionTime.AFTER}, - version = "1.16.4") + version = "1.16.5") public void minecraftInitialize(Hook.ExecutionTime executionTime) { this.eventBus.fireEvent(this.event, executionTime); } diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/event/VersionedTabHeaderFooterEventInjector.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/event/VersionedTabHeaderFooterEventInjector.java similarity index 97% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/event/VersionedTabHeaderFooterEventInjector.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/event/VersionedTabHeaderFooterEventInjector.java index fbb9c27fd..c21707830 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/event/VersionedTabHeaderFooterEventInjector.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/event/VersionedTabHeaderFooterEventInjector.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.event; +package net.flintmc.mcapi.v1_16_5.event; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -51,7 +51,7 @@ private VersionedTabHeaderFooterEventInjector( className = "net.minecraft.client.gui.overlay.PlayerTabOverlayGui", methodName = "setHeader", parameters = @Type(typeName = "net.minecraft.util.text.ITextComponent"), - executionTime = {ExecutionTime.BEFORE, ExecutionTime.AFTER}, version = "1.16.4") + executionTime = {ExecutionTime.BEFORE, ExecutionTime.AFTER}, version = "1.16.5") public HookResult handleHeader(@Named("args") Object[] args, ExecutionTime executionTime) { Object newHeader = args[0]; @@ -63,7 +63,7 @@ public HookResult handleHeader(@Named("args") Object[] args, ExecutionTime execu methodName = "setFooter", parameters = @Type(typeName = "net.minecraft.util.text.ITextComponent"), executionTime = {ExecutionTime.BEFORE, ExecutionTime.AFTER}, - version = "1.16.4") + version = "1.16.5") public HookResult handleFooter(@Named("args") Object[] args, ExecutionTime executionTime) { Object newFooter = args[0]; @@ -74,7 +74,7 @@ public HookResult handleFooter(@Named("args") Object[] args, ExecutionTime execu className = "net.minecraft.client.gui.overlay.PlayerTabOverlayGui", methodName = "resetFooterHeader", executionTime = {ExecutionTime.BEFORE, ExecutionTime.AFTER}, - version = "1.16.4") + version = "1.16.5") public HookResult handleReset(ExecutionTime executionTime) { TabHeaderFooterUpdateEvent headerEvent = this.eventFactory.create(null, TabHeaderFooterUpdateEvent.Type.HEADER); diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/event/VersionedTickEventInjector.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/event/VersionedTickEventInjector.java similarity index 95% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/event/VersionedTickEventInjector.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/event/VersionedTickEventInjector.java index f94554127..a7d6d1622 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/event/VersionedTickEventInjector.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/event/VersionedTickEventInjector.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.event; +package net.flintmc.mcapi.v1_16_5.event; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -46,7 +46,7 @@ private VersionedTickEventInjector(EventBus eventBus, TickEvent.Factory factory) executionTime = {ExecutionTime.BEFORE, ExecutionTime.AFTER}, className = "net.minecraft.client.Minecraft", methodName = "runTick", - version = "1.16.4") + version = "1.16.5") public void handleGeneralTick(ExecutionTime executionTime) { this.eventBus.fireEvent(this.generalTickEvent, executionTime); } @@ -55,7 +55,7 @@ public void handleGeneralTick(ExecutionTime executionTime) { executionTime = {ExecutionTime.BEFORE, ExecutionTime.AFTER}, className = "net.minecraft.client.renderer.GameRenderer", methodName = "tick", - version = "1.16.4") + version = "1.16.5") public void handleGameRenderTick(ExecutionTime executionTime) { this.eventBus.fireEvent(this.gameRenderTickEvent, executionTime); } @@ -64,7 +64,7 @@ public void handleGameRenderTick(ExecutionTime executionTime) { executionTime = {ExecutionTime.BEFORE, ExecutionTime.AFTER}, className = "net.minecraft.client.renderer.WorldRenderer", methodName = "tick", - version = "1.16.4") + version = "1.16.5") public void hookWorldRenderTick(ExecutionTime executionTime) { this.eventBus.fireEvent(this.worldRenderTickEvent, executionTime); } diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/items/VersionedItemRegistry.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/items/VersionedItemRegistry.java similarity index 98% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/items/VersionedItemRegistry.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/items/VersionedItemRegistry.java index 56c65f8fe..dba294d65 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/items/VersionedItemRegistry.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/items/VersionedItemRegistry.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.items; +package net.flintmc.mcapi.v1_16_5.items; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -43,7 +43,7 @@ import net.minecraft.util.text.TranslationTextComponent; @Singleton -@Implement(value = ItemRegistry.class, version = "1.16.4") +@Implement(value = ItemRegistry.class, version = "1.16.5") public class VersionedItemRegistry extends DefaultItemRegistry { @Inject diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/items/VersionedItemStackSerializer.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/items/VersionedItemStackSerializer.java similarity index 97% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/items/VersionedItemStackSerializer.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/items/VersionedItemStackSerializer.java index be130767e..9baec0d46 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/items/VersionedItemStackSerializer.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/items/VersionedItemStackSerializer.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.items; +package net.flintmc.mcapi.v1_16_5.items; import com.google.common.base.Preconditions; import com.google.gson.JsonArray; @@ -43,7 +43,7 @@ import net.minecraft.nbt.StringNBT; @Singleton -@Implement(value = ItemStackSerializer.class, version = "1.16.4") +@Implement(value = ItemStackSerializer.class, version = "1.16.5") public class VersionedItemStackSerializer implements ItemStackSerializer { private final ItemRegistry itemRegistry; diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/items/inventory/VersionedInventory.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/items/inventory/VersionedInventory.java similarity index 98% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/items/inventory/VersionedInventory.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/items/inventory/VersionedInventory.java index b157dca67..cf0f47f4e 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/items/inventory/VersionedInventory.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/items/inventory/VersionedInventory.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.items.inventory; +package net.flintmc.mcapi.v1_16_5.items.inventory; import java.util.function.Supplier; import net.flintmc.mcapi.chat.component.ChatComponent; diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/items/inventory/VersionedInventoryController.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/items/inventory/VersionedInventoryController.java similarity index 98% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/items/inventory/VersionedInventoryController.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/items/inventory/VersionedInventoryController.java index 348801fc3..d6493592c 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/items/inventory/VersionedInventoryController.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/items/inventory/VersionedInventoryController.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.items.inventory; +package net.flintmc.mcapi.v1_16_5.items.inventory; import static net.flintmc.mcapi.items.inventory.InventoryDimension.other; import static net.flintmc.mcapi.items.inventory.InventoryDimension.rect; @@ -51,7 +51,7 @@ import net.minecraft.inventory.container.PlayerContainer; @Singleton -@Implement(value = InventoryController.class, version = "1.16.4") +@Implement(value = InventoryController.class, version = "1.16.5") public class VersionedInventoryController extends DefaultInventoryController { private final Map, InternalInventoryMapping> minecraftMappings = diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/items/inventory/VersionedOpenedInventory.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/items/inventory/VersionedOpenedInventory.java similarity index 98% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/items/inventory/VersionedOpenedInventory.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/items/inventory/VersionedOpenedInventory.java index 30bd08c27..0978de04d 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/items/inventory/VersionedOpenedInventory.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/items/inventory/VersionedOpenedInventory.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.items.inventory; +package net.flintmc.mcapi.v1_16_5.items.inventory; import java.util.List; import net.flintmc.mcapi.chat.component.ChatComponent; diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/items/inventory/VersionedPlayerInventory.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/items/inventory/VersionedPlayerInventory.java similarity index 99% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/items/inventory/VersionedPlayerInventory.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/items/inventory/VersionedPlayerInventory.java index 01ccde3f8..7219c3c6f 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/items/inventory/VersionedPlayerInventory.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/items/inventory/VersionedPlayerInventory.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.items.inventory; +package net.flintmc.mcapi.v1_16_5.items.inventory; import net.flintmc.mcapi.chat.builder.ComponentBuilder; import net.flintmc.mcapi.items.ItemRegistry; diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/items/inventory/event/AccessiblePlayerController.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/items/inventory/event/AccessiblePlayerController.java similarity index 93% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/items/inventory/event/AccessiblePlayerController.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/items/inventory/event/AccessiblePlayerController.java index 5095c995c..08f4c1b24 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/items/inventory/event/AccessiblePlayerController.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/items/inventory/event/AccessiblePlayerController.java @@ -17,12 +17,12 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.items.inventory.event; +package net.flintmc.mcapi.v1_16_5.items.inventory.event; import net.flintmc.transform.shadow.FieldGetter; import net.flintmc.transform.shadow.Shadow; -@Shadow(value = "net.minecraft.client.multiplayer.PlayerController", version = "1.16.4") +@Shadow(value = "net.minecraft.client.multiplayer.PlayerController", version = "1.16.5") public interface AccessiblePlayerController { @FieldGetter("currentPlayerItem") diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/items/inventory/event/AccessibleSCloseWindowPacket.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/items/inventory/event/AccessibleSCloseWindowPacket.java similarity index 92% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/items/inventory/event/AccessibleSCloseWindowPacket.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/items/inventory/event/AccessibleSCloseWindowPacket.java index c5fb92379..a88450c71 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/items/inventory/event/AccessibleSCloseWindowPacket.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/items/inventory/event/AccessibleSCloseWindowPacket.java @@ -17,12 +17,12 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.items.inventory.event; +package net.flintmc.mcapi.v1_16_5.items.inventory.event; import net.flintmc.transform.shadow.FieldGetter; import net.flintmc.transform.shadow.Shadow; -@Shadow(value = "net.minecraft.network.play.server.SCloseWindowPacket", version = "1.16.4") +@Shadow(value = "net.minecraft.network.play.server.SCloseWindowPacket", version = "1.16.5") public interface AccessibleSCloseWindowPacket { @FieldGetter("windowId") diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/items/inventory/event/InventoryClickEventInjector.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/items/inventory/event/InventoryClickEventInjector.java similarity index 98% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/items/inventory/event/InventoryClickEventInjector.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/items/inventory/event/InventoryClickEventInjector.java index c1f8677ca..43105ecdd 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/items/inventory/event/InventoryClickEventInjector.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/items/inventory/event/InventoryClickEventInjector.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.items.inventory.event; +package net.flintmc.mcapi.v1_16_5.items.inventory.event; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -67,7 +67,7 @@ private InventoryClickEventInjector( @Type(reference = PlayerEntity.class) }, defaultValue = "net.minecraft.item.ItemStack.EMPTY", - version = "1.16.4") + version = "1.16.5") public HookResult slotClick( @Named("instance") Object instance, @Named("args") Object[] args, diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/items/inventory/event/InventoryCloseEventInjector.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/items/inventory/event/InventoryCloseEventInjector.java similarity index 95% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/items/inventory/event/InventoryCloseEventInjector.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/items/inventory/event/InventoryCloseEventInjector.java index 234bcfe3e..9c1bfb067 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/items/inventory/event/InventoryCloseEventInjector.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/items/inventory/event/InventoryCloseEventInjector.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.items.inventory.event; +package net.flintmc.mcapi.v1_16_5.items.inventory.event; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -46,7 +46,7 @@ public InventoryCloseEventInjector( this.controller = controller; } - @Subscribe(phase = Subscribe.Phase.ANY, version = "1.16.4") + @Subscribe(phase = Subscribe.Phase.ANY, version = "1.16.5") public void fireServerClose(PacketEvent event, Subscribe.Phase phase) { if (event.getDirection() != Direction.RECEIVE || !(event.getPacket() instanceof AccessibleSCloseWindowPacket)) { @@ -66,7 +66,7 @@ public void fireServerClose(PacketEvent event, Subscribe.Phase phase) { executionTime = Hook.ExecutionTime.BEFORE, className = "net.minecraft.client.entity.player.ClientPlayerEntity", methodName = "closeScreen", - version = "1.16.4") + version = "1.16.5") public HookResult closeScreen() { Inventory inventory = this.controller.getOpenInventory(); if (inventory == null) { diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/items/inventory/event/InventoryHeldItemChangeEventInjector.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/items/inventory/event/InventoryHeldItemChangeEventInjector.java similarity index 96% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/items/inventory/event/InventoryHeldItemChangeEventInjector.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/items/inventory/event/InventoryHeldItemChangeEventInjector.java index 38f1723a2..329329e78 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/items/inventory/event/InventoryHeldItemChangeEventInjector.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/items/inventory/event/InventoryHeldItemChangeEventInjector.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.items.inventory.event; +package net.flintmc.mcapi.v1_16_5.items.inventory.event; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -50,7 +50,7 @@ private InventoryHeldItemChangeEventInjector( className = "net.minecraft.client.multiplayer.PlayerController", methodName = "syncCurrentPlayItem", executionTime = ExecutionTime.BEFORE, - version = "1.16.4") + version = "1.16.5") public HookResult fireHeldItemChangeEvent( @Named("instance") Object instance, ExecutionTime executionTime) { int knownSlot = ((AccessiblePlayerController) instance).getCurrentPlayerItem(); diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/items/inventory/event/InventoryOpenEventInjector.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/items/inventory/event/InventoryOpenEventInjector.java similarity index 96% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/items/inventory/event/InventoryOpenEventInjector.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/items/inventory/event/InventoryOpenEventInjector.java index e495125fc..4bf804b8d 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/items/inventory/event/InventoryOpenEventInjector.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/items/inventory/event/InventoryOpenEventInjector.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.items.inventory.event; +package net.flintmc.mcapi.v1_16_5.items.inventory.event; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -54,7 +54,7 @@ public InventoryOpenEventInjector(EventBus eventBus, InventoryController control @Type(typeName = "net.minecraft.client.Minecraft"), @Type(reference = int.class) }, - version = "1.16.4") + version = "1.16.5") public void createScreen() { InventoryOpenEvent event = this.eventFactory.create(this.controller.getOpenInventory()); this.eventBus.fireEvent(event, Subscribe.Phase.POST); @@ -65,7 +65,7 @@ public void createScreen() { methodName = "displayGuiScreen", parameters = @Type(typeName = "net.minecraft.client.gui.screen.Screen"), executionTime = Hook.ExecutionTime.AFTER, - version = "1.16.4") + version = "1.16.5") public void displayGuiScreen(@Named("args") Object[] args) { if (!(args[0] instanceof InventoryScreen)) { return; diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/items/inventory/event/slotupdate/AccessiblePlayerInventory.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/items/inventory/event/slotupdate/AccessiblePlayerInventory.java similarity index 96% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/items/inventory/event/slotupdate/AccessiblePlayerInventory.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/items/inventory/event/slotupdate/AccessiblePlayerInventory.java index 955afcaaf..07f522cc6 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/items/inventory/event/slotupdate/AccessiblePlayerInventory.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/items/inventory/event/slotupdate/AccessiblePlayerInventory.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.items.inventory.event.slotupdate; +package net.flintmc.mcapi.v1_16_5.items.inventory.event.slotupdate; import com.google.common.collect.ImmutableList; import java.util.List; @@ -27,7 +27,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; -@Shadow(value = "net.minecraft.entity.player.PlayerInventory", version = "1.16.4") +@Shadow(value = "net.minecraft.entity.player.PlayerInventory", version = "1.16.5") public interface AccessiblePlayerInventory { @FieldGetter("mainInventory") diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/items/inventory/event/slotupdate/InventoryUpdateSlotEventInjector.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/items/inventory/event/slotupdate/InventoryUpdateSlotEventInjector.java similarity index 96% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/items/inventory/event/slotupdate/InventoryUpdateSlotEventInjector.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/items/inventory/event/slotupdate/InventoryUpdateSlotEventInjector.java index 30b71bd70..6f9c580ad 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/items/inventory/event/slotupdate/InventoryUpdateSlotEventInjector.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/items/inventory/event/slotupdate/InventoryUpdateSlotEventInjector.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.items.inventory.event.slotupdate; +package net.flintmc.mcapi.v1_16_5.items.inventory.event.slotupdate; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -70,7 +70,7 @@ public InventoryUpdateSlotEventInjector( this.airStack = registry.getAirType().createStack(); } - @PreSubscribe(version = "1.16.4") + @PreSubscribe(version = "1.16.5") public void injectUpdatingItemLists(TickEvent event) { ClientPlayerEntity player = Minecraft.getInstance().player; if (player != null) { @@ -82,7 +82,7 @@ public void injectUpdatingItemLists(TickEvent event) { className = "net.minecraft.entity.player.PlayerInventory", methodName = "setInventorySlotContents", parameters = {@Type(reference = int.class), @Type(typeName = "net.minecraft.item.ItemStack")}, - version = "1.16.4") + version = "1.16.5") public void setInventorySlotContents(@Named("instance") Object instance) { this.injectLists((PlayerInventory) instance); } @@ -99,7 +99,7 @@ private void injectLists(PlayerInventory playerInventory) { inventory.updateAllInventories(); } - @Subscribe(phase = Phase.ANY, version = "1.16.4") + @Subscribe(phase = Phase.ANY, version = "1.16.5") public void handleSetSlot(PacketEvent event, Phase phase) { if (event.getDirection() != DirectionalEvent.Direction.RECEIVE || !(event.getPacket() instanceof SSetSlotPacket) @@ -128,7 +128,7 @@ public void handleSetSlot(PacketEvent event, Phase phase) { this.eventBus.fireEvent(this.eventFactory.create(inventory, slot, newItem), phase); } - @Subscribe(phase = Phase.ANY, version = "1.16.4") + @Subscribe(phase = Phase.ANY, version = "1.16.5") public void handleInventoryClick( InventoryClickEvent event, ItemStack.Factory itemFactory, Phase phase) { // only drops/pickups are not confirmed by the server before updated and therefore not updated above diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/items/inventory/event/slotupdate/SlotUpdateHandlingItemList.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/items/inventory/event/slotupdate/SlotUpdateHandlingItemList.java similarity index 98% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/items/inventory/event/slotupdate/SlotUpdateHandlingItemList.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/items/inventory/event/slotupdate/SlotUpdateHandlingItemList.java index 314aa9461..601dcf10d 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/items/inventory/event/slotupdate/SlotUpdateHandlingItemList.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/items/inventory/event/slotupdate/SlotUpdateHandlingItemList.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.items.inventory.event.slotupdate; +package net.flintmc.mcapi.v1_16_5.items.inventory.event.slotupdate; import com.google.common.base.Preconditions; import java.util.Arrays; diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/items/mapper/VersionedMinecraftItemMapper.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/items/mapper/VersionedMinecraftItemMapper.java similarity index 96% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/items/mapper/VersionedMinecraftItemMapper.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/items/mapper/VersionedMinecraftItemMapper.java index bfd8d3d21..b27b05f2f 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/items/mapper/VersionedMinecraftItemMapper.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/items/mapper/VersionedMinecraftItemMapper.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.items.mapper; +package net.flintmc.mcapi.v1_16_5.items.mapper; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -35,7 +35,7 @@ import net.minecraft.util.registry.Registry; @Singleton -@Implement(value = MinecraftItemMapper.class, version = "1.16.4") +@Implement(value = MinecraftItemMapper.class, version = "1.16.5") public class VersionedMinecraftItemMapper implements MinecraftItemMapper { private final ItemRegistry registry; diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/items/meta/VersionedItemMeta.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/items/meta/VersionedItemMeta.java similarity index 98% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/items/meta/VersionedItemMeta.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/items/meta/VersionedItemMeta.java index 5745167f9..fd23c972c 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/items/meta/VersionedItemMeta.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/items/meta/VersionedItemMeta.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.items.meta; +package net.flintmc.mcapi.v1_16_5.items.meta; import com.google.common.base.Preconditions; import com.google.inject.Inject; @@ -40,7 +40,7 @@ import net.minecraft.nbt.ListNBT; import net.minecraft.nbt.StringNBT; -@Implement(value = ItemMeta.class, version = "1.16.4") +@Implement(value = ItemMeta.class, version = "1.16.5") public class VersionedItemMeta extends DefaultItemMeta { private final ItemRegistry itemRegistry; diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/nbt/mapper/VersionedNBTMapper.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/nbt/mapper/VersionedNBTMapper.java similarity index 98% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/nbt/mapper/VersionedNBTMapper.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/nbt/mapper/VersionedNBTMapper.java index dcb87d4d6..eb53056ef 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/nbt/mapper/VersionedNBTMapper.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/nbt/mapper/VersionedNBTMapper.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.nbt.mapper; +package net.flintmc.mcapi.v1_16_5.nbt.mapper; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -53,7 +53,7 @@ import net.minecraft.nbt.StringNBT; @Singleton -@Implement(value = NBTMapper.class, version = "1.16.4") +@Implement(value = NBTMapper.class, version = "1.16.5") public class VersionedNBTMapper implements NBTMapper { private final NBTCreator creator; diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/player/VersionedClientPlayer.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/player/VersionedClientPlayer.java similarity index 99% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/player/VersionedClientPlayer.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/player/VersionedClientPlayer.java index 0244c183a..c57cbb46b 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/player/VersionedClientPlayer.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/player/VersionedClientPlayer.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.player; +package net.flintmc.mcapi.v1_16_5.player; import com.google.common.collect.Sets; import com.google.inject.Inject; @@ -90,7 +90,7 @@ import net.minecraft.world.biome.Biome; @Singleton -@Implement(value = ClientPlayer.class, version = "1.16.4") +@Implement(value = ClientPlayer.class, version = "1.16.5") public class VersionedClientPlayer extends VersionedPlayerEntity implements ClientPlayer { private static final String UNKNOWN_BIOME = "Unknown"; diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/player/VersionedPlayerEntity.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/player/VersionedPlayerEntity.java similarity index 99% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/player/VersionedPlayerEntity.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/player/VersionedPlayerEntity.java index 7c28f69f3..c21dd018c 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/player/VersionedPlayerEntity.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/player/VersionedPlayerEntity.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.player; +package net.flintmc.mcapi.v1_16_5.player; import java.nio.charset.StandardCharsets; import java.util.Optional; @@ -48,7 +48,7 @@ import net.flintmc.mcapi.resources.ResourceLocation; import net.flintmc.mcapi.tileentity.SignTileEntity; import net.flintmc.mcapi.tileentity.mapper.TileEntityMapper; -import net.flintmc.mcapi.v1_16_4.entity.VersionedLivingEntity; +import net.flintmc.mcapi.v1_16_5.entity.VersionedLivingEntity; import net.flintmc.mcapi.world.World; import net.flintmc.mcapi.world.math.BlockPosition; import net.flintmc.mcapi.world.scoreboad.Scoreboard; @@ -66,7 +66,7 @@ import net.minecraft.util.text.ITextComponent; import net.minecraft.world.GameType; -@Implement(value = PlayerEntity.class, version = "1.16.4") +@Implement(value = PlayerEntity.class, version = "1.16.5") public class VersionedPlayerEntity extends VersionedLivingEntity implements PlayerEntity { private final GameProfileSerializer gameProfileSerializer; diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/player/VersionedRemoteClientPlayer.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/player/VersionedRemoteClientPlayer.java similarity index 97% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/player/VersionedRemoteClientPlayer.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/player/VersionedRemoteClientPlayer.java index 1ffa0ee90..88b07c229 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/player/VersionedRemoteClientPlayer.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/player/VersionedRemoteClientPlayer.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.player; +package net.flintmc.mcapi.v1_16_5.player; import net.flintmc.framework.inject.assisted.Assisted; import net.flintmc.framework.inject.assisted.AssistedInject; @@ -37,9 +37,9 @@ import net.flintmc.mcapi.world.World; /** - * 1.16.4 implementation of the {@link RemoteClientPlayer}. + * 1.16.5 implementation of the {@link RemoteClientPlayer}. */ -@Implement(value = RemoteClientPlayer.class, version = "1.16.4") +@Implement(value = RemoteClientPlayer.class, version = "1.16.5") public class VersionedRemoteClientPlayer extends VersionedPlayerEntity implements RemoteClientPlayer { diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/player/network/VersionedNetworkPlayerInfo.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/player/network/VersionedNetworkPlayerInfo.java similarity index 96% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/player/network/VersionedNetworkPlayerInfo.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/player/network/VersionedNetworkPlayerInfo.java index 960f99887..4fa7b9f18 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/player/network/VersionedNetworkPlayerInfo.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/player/network/VersionedNetworkPlayerInfo.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.player.network; +package net.flintmc.mcapi.v1_16_5.player.network; import java.util.UUID; import net.flintmc.framework.inject.assisted.Assisted; @@ -36,9 +36,9 @@ import net.minecraft.util.text.ITextComponent; /** - * 1.16.4 implementation of the {@link NetworkPlayerInfo} + * 1.16.5 implementation of the {@link NetworkPlayerInfo} */ -@Implement(value = NetworkPlayerInfo.class, version = "1.16.4") +@Implement(value = NetworkPlayerInfo.class, version = "1.16.5") public class VersionedNetworkPlayerInfo implements NetworkPlayerInfo { private final GameProfile gameProfile; diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/player/network/VersionedPlayerInfoInterceptor.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/player/network/VersionedPlayerInfoInterceptor.java similarity index 97% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/player/network/VersionedPlayerInfoInterceptor.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/player/network/VersionedPlayerInfoInterceptor.java index 85caf54f4..f177446f1 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/player/network/VersionedPlayerInfoInterceptor.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/player/network/VersionedPlayerInfoInterceptor.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.player.network; +package net.flintmc.mcapi.v1_16_5.player.network; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -56,7 +56,7 @@ private VersionedPlayerInfoInterceptor( this.gameProfileSerializer = gameProfileSerializer; } - @PreSubscribe(version = "1.16.4") + @PreSubscribe(version = "1.16.5") public void handlePlayerList(PacketEvent packetEvent) { if (!(packetEvent.getPacket() instanceof SPlayerListItemPacket)) { return; diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/player/overlay/AccessibleTabOverlay.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/player/overlay/AccessibleTabOverlay.java similarity index 94% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/player/overlay/AccessibleTabOverlay.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/player/overlay/AccessibleTabOverlay.java index 53633126b..3387a2b30 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/player/overlay/AccessibleTabOverlay.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/player/overlay/AccessibleTabOverlay.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.player.overlay; +package net.flintmc.mcapi.v1_16_5.player.overlay; import net.flintmc.transform.shadow.FieldGetter; import net.flintmc.transform.shadow.Shadow; @@ -25,7 +25,7 @@ /** * A shadow interface for the player tab overlay gui. */ -@Shadow(value = "net.minecraft.client.gui.overlay.PlayerTabOverlayGui", version = "1.16.4") +@Shadow(value = "net.minecraft.client.gui.overlay.PlayerTabOverlayGui", version = "1.16.5") public interface AccessibleTabOverlay { /** diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/player/overlay/VersionedTabOverlay.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/player/overlay/VersionedTabOverlay.java similarity index 95% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/player/overlay/VersionedTabOverlay.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/player/overlay/VersionedTabOverlay.java index 6018cbef6..ede2ce0b0 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/player/overlay/VersionedTabOverlay.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/player/overlay/VersionedTabOverlay.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.player.overlay; +package net.flintmc.mcapi.v1_16_5.player.overlay; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -29,10 +29,10 @@ import net.minecraft.util.text.ITextComponent; /** - * 1.16.4 implementation of {@link TabOverlay} + * 1.16.5 implementation of {@link TabOverlay} */ @Singleton -@Implement(value = TabOverlay.class, version = "1.16.4") +@Implement(value = TabOverlay.class, version = "1.16.5") public class VersionedTabOverlay implements TabOverlay { private final MinecraftComponentMapper minecraftComponentMapper; diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/player/provider/VersionedPlayerEntityProvider.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/player/provider/VersionedPlayerEntityProvider.java similarity index 93% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/player/provider/VersionedPlayerEntityProvider.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/player/provider/VersionedPlayerEntityProvider.java index c229b8426..e0438e046 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/player/provider/VersionedPlayerEntityProvider.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/player/provider/VersionedPlayerEntityProvider.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.player.provider; +package net.flintmc.mcapi.v1_16_5.player.provider; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -26,10 +26,10 @@ import net.flintmc.mcapi.player.PlayerEntity; /** - * 1.16.4 implementation of the {@link PlayerEntity.Provider}. + * 1.16.5 implementation of the {@link PlayerEntity.Provider}. */ @Singleton -@Implement(value = PlayerEntity.Provider.class, version = "1.16.4") +@Implement(value = PlayerEntity.Provider.class, version = "1.16.5") public class VersionedPlayerEntityProvider implements PlayerEntity.Provider { private final PlayerEntity.Factory playerEntityFactory; diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/player/provider/VersionedRemoteClientPlayerEntityProvider.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/player/provider/VersionedRemoteClientPlayerEntityProvider.java similarity index 93% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/player/provider/VersionedRemoteClientPlayerEntityProvider.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/player/provider/VersionedRemoteClientPlayerEntityProvider.java index 1cf542bc0..5e5595cc9 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/player/provider/VersionedRemoteClientPlayerEntityProvider.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/player/provider/VersionedRemoteClientPlayerEntityProvider.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.player.provider; +package net.flintmc.mcapi.v1_16_5.player.provider; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -26,10 +26,10 @@ import net.flintmc.mcapi.player.RemoteClientPlayer; /** - * 1.16.4 implementation of the {@link RemoteClientPlayer.Provider}. + * 1.16.5 implementation of the {@link RemoteClientPlayer.Provider}. */ @Singleton -@Implement(value = RemoteClientPlayer.Provider.class, version = "1.16.4") +@Implement(value = RemoteClientPlayer.Provider.class, version = "1.16.5") public class VersionedRemoteClientPlayerEntityProvider implements RemoteClientPlayer.Provider { private final RemoteClientPlayer.Factory remoteClientPlayerEntity; diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/player/serializer/gameprofile/VersionedGameProfileSerializer.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/player/serializer/gameprofile/VersionedGameProfileSerializer.java similarity index 96% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/player/serializer/gameprofile/VersionedGameProfileSerializer.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/player/serializer/gameprofile/VersionedGameProfileSerializer.java index f3ae3ee54..2b4cb4cff 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/player/serializer/gameprofile/VersionedGameProfileSerializer.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/player/serializer/gameprofile/VersionedGameProfileSerializer.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.player.serializer.gameprofile; +package net.flintmc.mcapi.v1_16_5.player.serializer.gameprofile; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -30,10 +30,10 @@ import net.flintmc.mcapi.player.serializer.gameprofile.PropertyMapSerializer; /** - * 1.16.4 implementation of {@link GameProfileSerializer} + * 1.16.5 implementation of {@link GameProfileSerializer} */ @Singleton -@Implement(value = GameProfileSerializer.class, version = "1.16.4") +@Implement(value = GameProfileSerializer.class, version = "1.16.5") public class VersionedGameProfileSerializer implements GameProfileSerializer { diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/player/serializer/gameprofile/VersionedPropertyMapSerializer.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/player/serializer/gameprofile/VersionedPropertyMapSerializer.java similarity index 96% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/player/serializer/gameprofile/VersionedPropertyMapSerializer.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/player/serializer/gameprofile/VersionedPropertyMapSerializer.java index 65292706d..3b60a6562 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/player/serializer/gameprofile/VersionedPropertyMapSerializer.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/player/serializer/gameprofile/VersionedPropertyMapSerializer.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.player.serializer.gameprofile; +package net.flintmc.mcapi.v1_16_5.player.serializer.gameprofile; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -28,10 +28,10 @@ import net.flintmc.mcapi.player.serializer.gameprofile.PropertyMapSerializer; /** - * 1.16.4. implementation of {@link PropertyMapSerializer} + * 1.16.5. implementation of {@link PropertyMapSerializer} */ @Singleton -@Implement(value = PropertyMapSerializer.class, version = "1.16.4") +@Implement(value = PropertyMapSerializer.class, version = "1.16.5") public class VersionedPropertyMapSerializer implements PropertyMapSerializer { diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/player/serializer/network/VersionedNetworkPlayerInfoSerializer.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/player/serializer/network/VersionedNetworkPlayerInfoSerializer.java similarity index 94% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/player/serializer/network/VersionedNetworkPlayerInfoSerializer.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/player/serializer/network/VersionedNetworkPlayerInfoSerializer.java index eec51211a..686dde17a 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/player/serializer/network/VersionedNetworkPlayerInfoSerializer.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/player/serializer/network/VersionedNetworkPlayerInfoSerializer.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.player.serializer.network; +package net.flintmc.mcapi.v1_16_5.player.serializer.network; import com.google.inject.Singleton; import net.flintmc.framework.inject.implement.Implement; @@ -26,10 +26,10 @@ import net.flintmc.mcapi.player.serializer.network.NetworkPlayerInfoSerializer; /** - * 1.16.4 implementation of {@link NetworkPlayerInfoSerializer} + * 1.16.5 implementation of {@link NetworkPlayerInfoSerializer} */ @Singleton -@Implement(value = NetworkPlayerInfoSerializer.class, version = "1.16.4") +@Implement(value = NetworkPlayerInfoSerializer.class, version = "1.16.5") public class VersionedNetworkPlayerInfoSerializer implements NetworkPlayerInfoSerializer { diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/player/transformer/VersionedAbstractClientPlayerTransformer.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/player/transformer/VersionedAbstractClientPlayerTransformer.java similarity index 96% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/player/transformer/VersionedAbstractClientPlayerTransformer.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/player/transformer/VersionedAbstractClientPlayerTransformer.java index b254aaf32..4a199c39d 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/player/transformer/VersionedAbstractClientPlayerTransformer.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/player/transformer/VersionedAbstractClientPlayerTransformer.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.player.transformer; +package net.flintmc.mcapi.v1_16_5.player.transformer; import javassist.CtMethod; import javassist.NotFoundException; @@ -36,7 +36,7 @@ public class VersionedAbstractClientPlayerTransformer { private static final String FOV_MODIFIER_CLASS = FieldOfViewModifier.class.getName(); private static final int LOCAL_FOV = 1; - @ClassTransform(value = "net.minecraft.client.entity.player.AbstractClientPlayerEntity", version = "1.16.4") + @ClassTransform(value = "net.minecraft.client.entity.player.AbstractClientPlayerEntity", version = "1.16.5") public void transform(ClassTransformContext context) throws NotFoundException, BadBytecode { CtMethod fovModifierMethod = context.getDeclaredMethod("getFovModifier"); diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/player/type/hand/VersionedHandMapper.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/player/type/hand/VersionedHandMapper.java similarity index 93% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/player/type/hand/VersionedHandMapper.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/player/type/hand/VersionedHandMapper.java index e7fb0dfce..59323725d 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/player/type/hand/VersionedHandMapper.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/player/type/hand/VersionedHandMapper.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.player.type.hand; +package net.flintmc.mcapi.v1_16_5.player.type.hand; import com.google.inject.Singleton; import net.flintmc.framework.inject.implement.Implement; @@ -26,10 +26,10 @@ import net.minecraft.util.HandSide; /** - * 1.16.4 implementation of {@link HandMapper}. + * 1.16.5 implementation of {@link HandMapper}. */ @Singleton -@Implement(value = HandMapper.class, version = "1.16.4") +@Implement(value = HandMapper.class, version = "1.16.5") public class VersionedHandMapper implements HandMapper { /** diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/player/type/model/VersionedModelMapper.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/player/type/model/VersionedModelMapper.java similarity index 96% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/player/type/model/VersionedModelMapper.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/player/type/model/VersionedModelMapper.java index 33a3f8237..ef3baa0f3 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/player/type/model/VersionedModelMapper.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/player/type/model/VersionedModelMapper.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.player.type.model; +package net.flintmc.mcapi.v1_16_5.player.type.model; import com.google.inject.Singleton; import net.flintmc.framework.inject.implement.Implement; @@ -26,7 +26,7 @@ import net.minecraft.entity.player.PlayerModelPart; @Singleton -@Implement(value = ModelMapper.class, version = "1.16.4") +@Implement(value = ModelMapper.class, version = "1.16.5") public class VersionedModelMapper implements ModelMapper { @Override diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/player/type/sound/VersionedSoundMapper.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/player/type/sound/VersionedSoundMapper.java similarity index 96% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/player/type/sound/VersionedSoundMapper.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/player/type/sound/VersionedSoundMapper.java index d933c43bb..1831ecfbd 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/player/type/sound/VersionedSoundMapper.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/player/type/sound/VersionedSoundMapper.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.player.type.sound; +package net.flintmc.mcapi.v1_16_5.player.type.sound; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -30,10 +30,10 @@ import net.minecraft.util.registry.Registry; /** - * 1.16.4 implementation of the {@link SoundMapper}. + * 1.16.5 implementation of the {@link SoundMapper}. */ @Singleton -@Implement(value = SoundMapper.class, version = "1.16.4") +@Implement(value = SoundMapper.class, version = "1.16.5") public class VersionedSoundMapper implements SoundMapper { private final Sound.Factory soundFactory; diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/potion/VersionedLivingEntityPotionInterceptor.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/potion/VersionedLivingEntityPotionInterceptor.java similarity index 98% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/potion/VersionedLivingEntityPotionInterceptor.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/potion/VersionedLivingEntityPotionInterceptor.java index ce0f5b9f2..90aff4ad8 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/potion/VersionedLivingEntityPotionInterceptor.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/potion/VersionedLivingEntityPotionInterceptor.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.potion; +package net.flintmc.mcapi.v1_16_5.potion; import com.google.common.collect.Maps; import com.google.inject.Inject; @@ -101,7 +101,7 @@ public void removeEntity(EntityDespawnEvent event) { executionTime = {ExecutionTime.AFTER, ExecutionTime.BEFORE}, className = LIVING_ENTITY, methodName = "updatePotionEffects", - version = "1.16.4") + version = "1.16.5") public void hookUpdatePotionEffects( @Named("instance") Object owner, ExecutionTime executionTime) { this.getLivingEntity((LivingEntity) owner) @@ -124,7 +124,7 @@ public void hookUpdatePotionEffects( className = LIVING_ENTITY, methodName = "addPotionEffect", parameters = {@Type(reference = EffectInstance.class)}, - version = "1.16.4") + version = "1.16.5") public void hookAddPotionEffect(@Named("instance") Object owner, @Named("args") Object[] args) { this.getLivingEntity((LivingEntity) owner) .ifPresent( @@ -147,7 +147,7 @@ public void hookAddPotionEffect(@Named("instance") Object owner, @Named("args") className = LIVING_ENTITY, methodName = "removeActivePotionEffect", parameters = {@Type(reference = Effect.class)}, - version = "1.16.4") + version = "1.16.5") public void hookRemoveActivePotionEffect( @Named("instance") Object owner, @Named("args") Object[] args) { this.getLivingEntity((LivingEntity) owner) @@ -171,7 +171,7 @@ public void hookRemoveActivePotionEffect( className = LIVING_ENTITY, methodName = "onNewPotionEffect", parameters = {@Type(reference = EffectInstance.class)}, - version = "1.16.4") + version = "1.16.5") public void hookOnNewPotionEffect(@Named("instance") Object owner, @Named("args") Object[] args) { this.getLivingEntity((LivingEntity) owner) .ifPresent( @@ -189,7 +189,7 @@ public void hookOnNewPotionEffect(@Named("instance") Object owner, @Named("args" className = LIVING_ENTITY, methodName = "onChangedPotionEffect", parameters = {@Type(reference = EffectInstance.class), @Type(reference = boolean.class)}, - version = "1.16.4") + version = "1.16.5") public void hookOnChangedPotionEffect( @Named("instance") Object owner, @Named("args") Object[] args) { this.getLivingEntity((LivingEntity) owner) @@ -208,7 +208,7 @@ public void hookOnChangedPotionEffect( className = LIVING_ENTITY, methodName = "onFinishedPotionEffect", parameters = {@Type(reference = EffectInstance.class)}, - version = "1.16.4") + version = "1.16.5") public void hookOnFinishedPotionEffect( @Named("instance") Object owner, @Named("args") Object[] args) { this.getLivingEntity((LivingEntity) owner) diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/potion/VersionedPotionLoader.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/potion/VersionedPotionLoader.java similarity index 98% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/potion/VersionedPotionLoader.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/potion/VersionedPotionLoader.java index 3776f32f9..76d64e216 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/potion/VersionedPotionLoader.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/potion/VersionedPotionLoader.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.potion; +package net.flintmc.mcapi.v1_16_5.potion; import com.google.inject.Inject; import com.google.inject.Singleton; diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/potion/mapper/VersionedPotionMapper.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/potion/mapper/VersionedPotionMapper.java similarity index 97% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/potion/mapper/VersionedPotionMapper.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/potion/mapper/VersionedPotionMapper.java index eff418567..6196336a5 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/potion/mapper/VersionedPotionMapper.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/potion/mapper/VersionedPotionMapper.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.potion.mapper; +package net.flintmc.mcapi.v1_16_5.potion.mapper; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -32,10 +32,10 @@ import net.minecraft.util.registry.Registry; /** - * 1.16.4 implementation of the {@link PotionMapper}. + * 1.16.5 implementation of the {@link PotionMapper}. */ @Singleton -@Implement(value = PotionMapper.class, version = "1.16.4") +@Implement(value = PotionMapper.class, version = "1.16.5") public class VersionedPotionMapper implements PotionMapper { private final StatusEffect.Factory effectFactory; diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/render/geometric/VersionedRectangleRenderer.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/render/geometric/VersionedRectangleRenderer.java similarity index 96% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/render/geometric/VersionedRectangleRenderer.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/render/geometric/VersionedRectangleRenderer.java index d0e71979a..d114cb923 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/render/geometric/VersionedRectangleRenderer.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/render/geometric/VersionedRectangleRenderer.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.render.geometric; +package net.flintmc.mcapi.v1_16_5.render.geometric; import com.google.inject.Singleton; import com.mojang.blaze3d.systems.RenderSystem; @@ -31,7 +31,7 @@ import net.minecraft.util.math.vector.TransformationMatrix; @Singleton -@Implement(value = RectangleRenderer.class, version = "1.16.4") +@Implement(value = RectangleRenderer.class, version = "1.16.5") public class VersionedRectangleRenderer implements RectangleRenderer { /** diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/render/image/VersionedImageRenderer.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/render/image/VersionedImageRenderer.java similarity index 98% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/render/image/VersionedImageRenderer.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/render/image/VersionedImageRenderer.java index 4174ca84e..6af48e174 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/render/image/VersionedImageRenderer.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/render/image/VersionedImageRenderer.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.render.image; +package net.flintmc.mcapi.v1_16_5.render.image; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -33,7 +33,7 @@ import net.minecraft.util.math.vector.Matrix4f; @Singleton -@Implement(value = ImageRenderer.class, version = "1.16.4") +@Implement(value = ImageRenderer.class, version = "1.16.5") public class VersionedImageRenderer implements ImageRenderer { private final Minecraft minecraft; diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/render/image/util/VersionedItemRenderer.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/render/image/util/VersionedItemRenderer.java similarity index 96% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/render/image/util/VersionedItemRenderer.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/render/image/util/VersionedItemRenderer.java index cfb12f9f1..8ac471d86 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/render/image/util/VersionedItemRenderer.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/render/image/util/VersionedItemRenderer.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.render.image.util; +package net.flintmc.mcapi.v1_16_5.render.image.util; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -35,7 +35,7 @@ * {@inheritDoc} */ @Singleton -@Implement(value = ItemRenderer.class, version = "1.16.4") +@Implement(value = ItemRenderer.class, version = "1.16.5") public class VersionedItemRenderer implements ItemRenderer { private final MinecraftItemMapper itemMapper; diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/render/text/ShadowFontRenderer.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/render/text/ShadowFontRenderer.java similarity index 95% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/render/text/ShadowFontRenderer.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/render/text/ShadowFontRenderer.java index 48ceea5f9..fcc0e6a03 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/render/text/ShadowFontRenderer.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/render/text/ShadowFontRenderer.java @@ -17,14 +17,14 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.render.text; +package net.flintmc.mcapi.v1_16_5.render.text; import net.flintmc.transform.shadow.MethodProxy; import net.flintmc.transform.shadow.Shadow; import net.minecraft.client.gui.fonts.Font; import net.minecraft.util.ResourceLocation; -@Shadow(value = "net.minecraft.client.gui.FontRenderer", version = "1.16.4") +@Shadow(value = "net.minecraft.client.gui.FontRenderer", version = "1.16.5") public interface ShadowFontRenderer { @MethodProxy diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/render/text/VersionedFontRenderer.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/render/text/VersionedFontRenderer.java similarity index 97% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/render/text/VersionedFontRenderer.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/render/text/VersionedFontRenderer.java index 188ec56f3..f203e4443 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/render/text/VersionedFontRenderer.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/render/text/VersionedFontRenderer.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.render.text; +package net.flintmc.mcapi.v1_16_5.render.text; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -34,7 +34,7 @@ import net.minecraft.util.text.Style; @Singleton -@Implement(value = FontRenderer.class, version = "1.16.4") +@Implement(value = FontRenderer.class, version = "1.16.5") public class VersionedFontRenderer implements FontRenderer { private final Minecraft minecraft; diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/render/text/VersionedTooltipRenderer.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/render/text/VersionedTooltipRenderer.java similarity index 96% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/render/text/VersionedTooltipRenderer.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/render/text/VersionedTooltipRenderer.java index b96818684..2675c26b9 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/render/text/VersionedTooltipRenderer.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/render/text/VersionedTooltipRenderer.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.render.text; +package net.flintmc.mcapi.v1_16_5.render.text; import com.google.common.collect.Lists; import com.google.inject.Inject; @@ -35,7 +35,7 @@ import net.minecraft.util.text.StringTextComponent; @Singleton -@Implement(value = TooltipRenderer.class, version = "1.16.4") +@Implement(value = TooltipRenderer.class, version = "1.16.5") public class VersionedTooltipRenderer implements TooltipRenderer { private final FontRenderer fontRenderer; diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/resources/VersionedResourceLocation.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/resources/VersionedResourceLocation.java similarity index 93% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/resources/VersionedResourceLocation.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/resources/VersionedResourceLocation.java index e8ca0cc9e..08ccb8374 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/resources/VersionedResourceLocation.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/resources/VersionedResourceLocation.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.resources; +package net.flintmc.mcapi.v1_16_5.resources; import java.io.IOException; import java.io.InputStream; @@ -28,9 +28,9 @@ import net.minecraft.client.Minecraft; /** - * 1.16.4 implementation of a minecraft resource location. + * 1.16.5 implementation of a minecraft resource location. */ -@Implement(value = ResourceLocation.class, version = "1.16.4") +@Implement(value = ResourceLocation.class, version = "1.16.5") public class VersionedResourceLocation extends net.minecraft.util.ResourceLocation implements ResourceLocation { diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/resources/VersionedResourceLocationProvider.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/resources/VersionedResourceLocationProvider.java similarity index 96% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/resources/VersionedResourceLocationProvider.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/resources/VersionedResourceLocationProvider.java index 51800ecb8..ab1eb3a74 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/resources/VersionedResourceLocationProvider.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/resources/VersionedResourceLocationProvider.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.resources; +package net.flintmc.mcapi.v1_16_5.resources; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -32,10 +32,10 @@ import net.minecraft.resources.IResource; /** - * 1.16.4 implementation of the {@link ResourceLocationProvider} + * 1.16.5 implementation of the {@link ResourceLocationProvider} */ @Singleton -@Implement(value = ResourceLocationProvider.class, version = "1.16.4") +@Implement(value = ResourceLocationProvider.class, version = "1.16.5") public class VersionedResourceLocationProvider implements ResourceLocationProvider { private final VersionedResourceLocation.Factory resourceLocationFactory; diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/resources/pack/VersionedResourcePack.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/resources/pack/VersionedResourcePack.java similarity index 95% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/resources/pack/VersionedResourcePack.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/resources/pack/VersionedResourcePack.java index eaff94970..9c1476cb8 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/resources/pack/VersionedResourcePack.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/resources/pack/VersionedResourcePack.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.resources.pack; +package net.flintmc.mcapi.v1_16_5.resources.pack; import java.io.IOException; import java.io.InputStream; @@ -28,7 +28,7 @@ import net.minecraft.resources.ResourcePackType; /** - * 1.16.4 implementation of a Flint resource pack + * 1.16.5 implementation of a Flint resource pack */ public class VersionedResourcePack implements ResourcePack { diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/resources/pack/VersionedResourcePackProvider.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/resources/pack/VersionedResourcePackProvider.java similarity index 90% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/resources/pack/VersionedResourcePackProvider.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/resources/pack/VersionedResourcePackProvider.java index 4c52a2e0d..796b84f34 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/resources/pack/VersionedResourcePackProvider.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/resources/pack/VersionedResourcePackProvider.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.resources.pack; +package net.flintmc.mcapi.v1_16_5.resources.pack; import com.google.inject.Singleton; import java.util.List; @@ -28,10 +28,10 @@ import net.minecraft.client.Minecraft; /** - * 1.16.4 implementation of the {@link ResourcePackProvider} + * 1.16.5 implementation of the {@link ResourcePackProvider} */ @Singleton -@Implement(value = ResourcePackProvider.class, version = "1.16.4") +@Implement(value = ResourcePackProvider.class, version = "1.16.5") public class VersionedResourcePackProvider implements ResourcePackProvider { /** diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/resources/pack/VersionedResourcePackReloadEventBroadCaster.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/resources/pack/VersionedResourcePackReloadEventBroadCaster.java similarity index 94% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/resources/pack/VersionedResourcePackReloadEventBroadCaster.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/resources/pack/VersionedResourcePackReloadEventBroadCaster.java index c608a69d2..e9e9a5fc6 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/resources/pack/VersionedResourcePackReloadEventBroadCaster.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/resources/pack/VersionedResourcePackReloadEventBroadCaster.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.resources.pack; +package net.flintmc.mcapi.v1_16_5.resources.pack; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -42,7 +42,7 @@ private VersionedResourcePackReloadEventBroadCaster( this.resourcePackReloadEvent = resourcePackReloadEvent; } - @Subscribe(phase = Subscribe.Phase.POST, version = "1.16.4") + @Subscribe(phase = Subscribe.Phase.POST, version = "1.16.5") public void init(OpenGLInitializeEvent event) { // Install a hook on the minecraft resource manager ((SimpleReloadableResourceManager) Minecraft.getInstance().getResourceManager()) diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/server/ConnectingScreenShadow.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/server/ConnectingScreenShadow.java similarity index 95% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/server/ConnectingScreenShadow.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/server/ConnectingScreenShadow.java index e142fc501..17019c284 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/server/ConnectingScreenShadow.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/server/ConnectingScreenShadow.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.server; +package net.flintmc.mcapi.v1_16_5.server; import net.flintmc.transform.shadow.FieldGetter; import net.flintmc.transform.shadow.Shadow; @@ -28,7 +28,7 @@ * Shadow implementation of the {@link ConnectingScreen} in minecraft with a public getter to get * the network manager. */ -@Shadow(value = "net.minecraft.client.gui.screen.ConnectingScreen", version = "1.16.4") +@Shadow(value = "net.minecraft.client.gui.screen.ConnectingScreen", version = "1.16.5") public interface ConnectingScreenShadow { /** diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/server/ServerListShadow.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/server/ServerListShadow.java similarity index 95% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/server/ServerListShadow.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/server/ServerListShadow.java index 111aa8b32..e394e7346 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/server/ServerListShadow.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/server/ServerListShadow.java @@ -17,14 +17,14 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.server; +package net.flintmc.mcapi.v1_16_5.server; import java.util.List; import net.flintmc.transform.shadow.FieldGetter; import net.flintmc.transform.shadow.Shadow; import net.minecraft.client.multiplayer.ServerData; -@Shadow(value = "net.minecraft.client.multiplayer.ServerList", version = "1.16.4") +@Shadow(value = "net.minecraft.client.multiplayer.ServerList", version = "1.16.5") public interface ServerListShadow { @FieldGetter("servers") diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/server/VersionedConnectedServer.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/server/VersionedConnectedServer.java similarity index 98% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/server/VersionedConnectedServer.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/server/VersionedConnectedServer.java index be7544424..a08e57ff8 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/server/VersionedConnectedServer.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/server/VersionedConnectedServer.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.server; +package net.flintmc.mcapi.v1_16_5.server; import com.google.common.base.Preconditions; import com.google.inject.Inject; @@ -45,7 +45,7 @@ import net.minecraft.network.play.client.CCustomPayloadPacket; @Singleton -@Implement(value = ConnectedServer.class, version = "1.16.4") +@Implement(value = ConnectedServer.class, version = "1.16.5") public class VersionedConnectedServer implements ConnectedServer { private final EventBus eventBus; diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/server/VersionedServerAddress.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/server/VersionedServerAddress.java similarity index 95% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/server/VersionedServerAddress.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/server/VersionedServerAddress.java index 2a710b6a1..63ac77cc7 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/server/VersionedServerAddress.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/server/VersionedServerAddress.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.server; +package net.flintmc.mcapi.v1_16_5.server; import com.google.common.base.Preconditions; import java.net.InetSocketAddress; @@ -26,7 +26,7 @@ import net.flintmc.framework.inject.implement.Implement; import net.flintmc.mcapi.server.ServerAddress; -@Implement(value = ServerAddress.class, version = "1.16.4") +@Implement(value = ServerAddress.class, version = "1.16.5") public class VersionedServerAddress implements ServerAddress { private final String ip; diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/server/VersionedServerController.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/server/VersionedServerController.java similarity index 97% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/server/VersionedServerController.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/server/VersionedServerController.java index e69631d26..8b5e9c25d 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/server/VersionedServerController.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/server/VersionedServerController.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.server; +package net.flintmc.mcapi.v1_16_5.server; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -35,7 +35,7 @@ import net.minecraft.util.text.TranslationTextComponent; @Singleton -@Implement(value = ServerController.class, version = "1.16.4") +@Implement(value = ServerController.class, version = "1.16.5") public class VersionedServerController implements ServerController { private final ConnectedServer connectedServer; diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/server/VersionedServerList.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/server/VersionedServerList.java similarity index 98% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/server/VersionedServerList.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/server/VersionedServerList.java index eb23e3dcf..f29e6cc81 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/server/VersionedServerList.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/server/VersionedServerList.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.server; +package net.flintmc.mcapi.v1_16_5.server; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -34,7 +34,7 @@ * {@inheritDoc} */ @Singleton -@Implement(value = net.flintmc.mcapi.server.ServerList.class, version = "1.16.4") +@Implement(value = net.flintmc.mcapi.server.ServerList.class, version = "1.16.5") public class VersionedServerList implements net.flintmc.mcapi.server.ServerList { private final ServerList mcServerList; diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/server/buffer/VersionedPacketBuffer.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/server/buffer/VersionedPacketBuffer.java similarity index 98% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/server/buffer/VersionedPacketBuffer.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/server/buffer/VersionedPacketBuffer.java index c3f09fe5f..d96e68715 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/server/buffer/VersionedPacketBuffer.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/server/buffer/VersionedPacketBuffer.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.server.buffer; +package net.flintmc.mcapi.v1_16_5.server.buffer; import io.netty.buffer.Unpooled; import java.util.UUID; @@ -26,7 +26,7 @@ import net.flintmc.framework.inject.implement.Implement; import net.flintmc.mcapi.server.buffer.PacketBuffer; -@Implement(value = PacketBuffer.class, version = "1.16.4") +@Implement(value = PacketBuffer.class, version = "1.16.5") public class VersionedPacketBuffer implements PacketBuffer { private final net.minecraft.network.PacketBuffer packetBuffer; diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/server/event/ModServerList.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/server/event/ModServerList.java similarity index 99% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/server/event/ModServerList.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/server/event/ModServerList.java index 21c45b233..92cb03acb 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/server/event/ModServerList.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/server/event/ModServerList.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.server.event; +package net.flintmc.mcapi.v1_16_5.server.event; import com.google.inject.Inject; import java.util.ArrayList; diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/server/event/PacketEventInjector.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/server/event/PacketEventInjector.java similarity index 97% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/server/event/PacketEventInjector.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/server/event/PacketEventInjector.java index 79656de01..4b65fc93f 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/server/event/PacketEventInjector.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/server/event/PacketEventInjector.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.server.event; +package net.flintmc.mcapi.v1_16_5.server.event; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -56,7 +56,7 @@ private PacketEventInjector( className = "net.minecraft.network.NetworkManager", methodName = "processPacket", parameters = {@Type(reference = IPacket.class), @Type(reference = INetHandler.class)}, - version = "1.16.4") + version = "1.16.5") public HookResult processIncomingPacket( ExecutionTime executionTime, @Named("args") Object[] args) { Object packet = args[0]; @@ -83,7 +83,7 @@ public HookResult processIncomingPacket( @Type(reference = IPacket.class), @Type(reference = GenericFutureListener.class) }, - version = "1.16.4") + version = "1.16.5") public HookResult dispatchOutgoingPacket( @Named("args") Object[] args, ExecutionTime executionTime) { Object packet = args[0]; diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/server/event/ServerConnectEventInjector.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/server/event/ServerConnectEventInjector.java similarity index 96% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/server/event/ServerConnectEventInjector.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/server/event/ServerConnectEventInjector.java index 43ff34daf..920290969 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/server/event/ServerConnectEventInjector.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/server/event/ServerConnectEventInjector.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.server.event; +package net.flintmc.mcapi.v1_16_5.server.event; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -60,14 +60,14 @@ public ServerConnectEventInjector( className = "net.minecraft.client.gui.screen.ConnectingScreen", methodName = "connect", parameters = {@Type(reference = String.class), @Type(reference = int.class)}, - version = "1.16.4") + version = "1.16.5") public void handleConnect(Hook.ExecutionTime executionTime, @Named("args") Object[] args) { ServerAddress address = this.addressFactory.create((String) args[0], (int) args[1]); this.eventBus.fireEvent(this.eventFactory.create(address), executionTime); } - @PostSubscribe(version = "1.16.4") + @PostSubscribe(version = "1.16.5") public void handleLoginSuccess(PacketEvent event) { if (event.getDirection() != Direction.RECEIVE || event.getPhase() != ProtocolPhase.LOGIN || !(event.getPacket() instanceof SLoginSuccessPacket) diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/server/event/ServerDisconnectEventInjector.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/server/event/ServerDisconnectEventInjector.java similarity index 96% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/server/event/ServerDisconnectEventInjector.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/server/event/ServerDisconnectEventInjector.java index ea1722e21..73bc94b59 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/server/event/ServerDisconnectEventInjector.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/server/event/ServerDisconnectEventInjector.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.server.event; +package net.flintmc.mcapi.v1_16_5.server.event; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -45,7 +45,7 @@ public ServerDisconnectEventInjector( @Hook( className = "net.minecraft.client.world.ClientWorld", methodName = "sendQuittingDisconnectingPacket", - version = "1.16.4") + version = "1.16.5") public void handleDisconnect(Hook.ExecutionTime executionTime) { ServerAddress address = this.controller.isConnected() ? this.controller.getConnectedServer().getAddress() : null; diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/server/event/ServerKickEventInjector.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/server/event/ServerKickEventInjector.java similarity index 97% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/server/event/ServerKickEventInjector.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/server/event/ServerKickEventInjector.java index 0942a55d7..040e84f04 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/server/event/ServerKickEventInjector.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/server/event/ServerKickEventInjector.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.server.event; +package net.flintmc.mcapi.v1_16_5.server.event; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -62,7 +62,7 @@ public ServerKickEventInjector( className = "net.minecraft.client.network.play.ClientPlayNetHandler", methodName = "onDisconnect", parameters = @Type(reference = ITextComponent.class), - version = "1.16.4") + version = "1.16.5") public void handleKick(@Named("args") Object[] args) { ConnectedServer server = this.controller.getConnectedServer(); diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/server/event/ServerLoginSuccessEventInjector.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/server/event/ServerLoginSuccessEventInjector.java similarity index 97% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/server/event/ServerLoginSuccessEventInjector.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/server/event/ServerLoginSuccessEventInjector.java index df859b38e..c46bd2468 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/server/event/ServerLoginSuccessEventInjector.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/server/event/ServerLoginSuccessEventInjector.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.server.event; +package net.flintmc.mcapi.v1_16_5.server.event; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -54,7 +54,7 @@ public ServerLoginSuccessEventInjector( className = "net.minecraft.client.network.login.ClientLoginNetHandler", methodName = "handleLoginSuccess", parameters = @Type(reference = SLoginSuccessPacket.class), - version = "1.16.4") + version = "1.16.5") public void handleLoginSuccess( @Named("instance") Object instance, Hook.ExecutionTime executionTime) { ClientLoginNetHandler handler = (ClientLoginNetHandler) instance; diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/server/event/VersionedServerListUpdateEventInjector.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/server/event/VersionedServerListUpdateEventInjector.java similarity index 97% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/server/event/VersionedServerListUpdateEventInjector.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/server/event/VersionedServerListUpdateEventInjector.java index 9871638ea..e6aa3281b 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/server/event/VersionedServerListUpdateEventInjector.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/server/event/VersionedServerListUpdateEventInjector.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.server.event; +package net.flintmc.mcapi.v1_16_5.server.event; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -48,7 +48,7 @@ private VersionedServerListUpdateEventInjector(ClassMappingProvider mappingProvi this.mappingProvider = mappingProvider; } - @ClassTransform(value = "net.minecraft.client.multiplayer.ServerList", version = "1.16.4") + @ClassTransform(value = "net.minecraft.client.multiplayer.ServerList", version = "1.16.5") public void transformServerList(ClassTransformContext context) throws NotFoundException, CannotCompileException, BadBytecode { CtClass transforming = context.getCtClass(); diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/server/event/shadow/AccessibleCCustomPayloadPacket.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/server/event/shadow/AccessibleCCustomPayloadPacket.java similarity index 94% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/server/event/shadow/AccessibleCCustomPayloadPacket.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/server/event/shadow/AccessibleCCustomPayloadPacket.java index f0d599595..0b42cc4b2 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/server/event/shadow/AccessibleCCustomPayloadPacket.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/server/event/shadow/AccessibleCCustomPayloadPacket.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.server.event.shadow; +package net.flintmc.mcapi.v1_16_5.server.event.shadow; import net.flintmc.transform.shadow.FieldGetter; import net.flintmc.transform.shadow.Shadow; @@ -28,7 +28,7 @@ * Shadow implementation of the {@link net.minecraft.network.play.client.CCustomPayloadPacket} with * public getters for the channel name and data. */ -@Shadow(value = "net.minecraft.network.play.client.CCustomPayloadPacket", version = "1.16.4") +@Shadow(value = "net.minecraft.network.play.client.CCustomPayloadPacket", version = "1.16.5") public interface AccessibleCCustomPayloadPacket { /** diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/server/event/shadow/AccessibleDisconnectedScreen.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/server/event/shadow/AccessibleDisconnectedScreen.java similarity index 94% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/server/event/shadow/AccessibleDisconnectedScreen.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/server/event/shadow/AccessibleDisconnectedScreen.java index 3d31aba2b..dfe321291 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/server/event/shadow/AccessibleDisconnectedScreen.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/server/event/shadow/AccessibleDisconnectedScreen.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.server.event.shadow; +package net.flintmc.mcapi.v1_16_5.server.event.shadow; import net.flintmc.transform.shadow.FieldGetter; import net.flintmc.transform.shadow.Shadow; @@ -27,7 +27,7 @@ * Shadow implementation of the {@link net.minecraft.client.gui.screen.DisconnectedScreen} in * minecraft with a public getter to get the message component. */ -@Shadow(value = "net.minecraft.client.gui.screen.DisconnectedScreen", version = "1.16.4") +@Shadow(value = "net.minecraft.client.gui.screen.DisconnectedScreen", version = "1.16.5") public interface AccessibleDisconnectedScreen { /** diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/server/payload/CustomPayloadInterceptor.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/server/payload/CustomPayloadInterceptor.java similarity index 98% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/server/payload/CustomPayloadInterceptor.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/server/payload/CustomPayloadInterceptor.java index eecb5a466..1f9e178f0 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/server/payload/CustomPayloadInterceptor.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/server/payload/CustomPayloadInterceptor.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.server.payload; +package net.flintmc.mcapi.v1_16_5.server.payload; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -63,7 +63,7 @@ private CustomPayloadInterceptor( this.fieldBuilderFactory = fieldBuilderFactory; } - @ClassTransform(value = "net.minecraft.client.network.play.ClientPlayNetHandler", version = "1.16.4") + @ClassTransform(value = "net.minecraft.client.network.play.ClientPlayNetHandler", version = "1.16.5") public void transform(ClassTransformContext context) throws NotFoundException, BadBytecode, CannotCompileException { diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/server/status/VersionedPendingStatusRequest.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/server/status/VersionedPendingStatusRequest.java similarity index 98% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/server/status/VersionedPendingStatusRequest.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/server/status/VersionedPendingStatusRequest.java index 4b0551343..103ef7f6e 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/server/status/VersionedPendingStatusRequest.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/server/status/VersionedPendingStatusRequest.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.server.status; +package net.flintmc.mcapi.v1_16_5.server.status; import com.google.common.base.Preconditions; import com.google.gson.JsonParseException; @@ -55,7 +55,7 @@ import net.minecraft.util.text.TranslationTextComponent; import org.apache.logging.log4j.Logger; -@Implement(value = PendingStatusRequest.class, version = "1.16.4") +@Implement(value = PendingStatusRequest.class, version = "1.16.5") public class VersionedPendingStatusRequest implements PendingStatusRequest, IClientStatusNetHandler { diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/settings/game/VersionedGameSettingsInterceptor.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/settings/game/VersionedGameSettingsInterceptor.java similarity index 96% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/settings/game/VersionedGameSettingsInterceptor.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/settings/game/VersionedGameSettingsInterceptor.java index 07cceb0ac..c6d371a14 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/settings/game/VersionedGameSettingsInterceptor.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/settings/game/VersionedGameSettingsInterceptor.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.settings.game; +package net.flintmc.mcapi.v1_16_5.settings.game; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -55,7 +55,7 @@ private VersionedGameSettingsInterceptor( className = "net.minecraft.client.GameSettings", methodName = "loadOptions", executionTime = {Hook.ExecutionTime.BEFORE, Hook.ExecutionTime.AFTER}, - version = "1.16.4") + version = "1.16.5") public void hookLoadOptions(Hook.ExecutionTime executionTime) { this.eventBus.fireEvent(this.loadEvent, executionTime); } @@ -64,7 +64,7 @@ public void hookLoadOptions(Hook.ExecutionTime executionTime) { className = "net.minecraft.client.GameSettings", methodName = "saveOptions", executionTime = {Hook.ExecutionTime.BEFORE, Hook.ExecutionTime.AFTER}, - version = "1.16.4") + version = "1.16.5") public void hookSaveOptions(Hook.ExecutionTime executionTime) { this.eventBus.fireEvent(this.saveEvent, executionTime); diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/settings/game/VersionedKeyBinding.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/settings/game/VersionedKeyBinding.java similarity index 90% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/settings/game/VersionedKeyBinding.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/settings/game/VersionedKeyBinding.java index 798485da7..c96a0b980 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/settings/game/VersionedKeyBinding.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/settings/game/VersionedKeyBinding.java @@ -17,21 +17,21 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.settings.game; +package net.flintmc.mcapi.v1_16_5.settings.game; import net.flintmc.framework.inject.assisted.Assisted; import net.flintmc.framework.inject.assisted.AssistedInject; import net.flintmc.framework.inject.implement.Implement; import net.flintmc.mcapi.settings.game.KeyBinding; -import net.flintmc.mcapi.v1_16_4.settings.game.configuration.ShadowKeyBinding; +import net.flintmc.mcapi.v1_16_5.settings.game.configuration.ShadowKeyBinding; import net.flintmc.render.gui.input.Key; import net.minecraft.client.Minecraft; import net.minecraft.client.util.InputMappings; /** - * 1.16.4 implementation of {@link KeyBinding}. + * 1.16.5 implementation of {@link KeyBinding}. */ -@Implement(value = KeyBinding.class, version = "1.16.4") +@Implement(value = KeyBinding.class, version = "1.16.5") public class VersionedKeyBinding extends net.minecraft.client.settings.KeyBinding implements KeyBinding { diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/settings/game/VersionedMinecraftConfiguration.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/settings/game/VersionedMinecraftConfiguration.java similarity index 98% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/settings/game/VersionedMinecraftConfiguration.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/settings/game/VersionedMinecraftConfiguration.java index 7c7d97c27..2476e9823 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/settings/game/VersionedMinecraftConfiguration.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/settings/game/VersionedMinecraftConfiguration.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.settings.game; +package net.flintmc.mcapi.v1_16_5.settings.game; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -39,11 +39,11 @@ import net.minecraft.client.Minecraft; /** - * 1.16.4 implementation of {@link MinecraftConfiguration}. + * 1.16.5 implementation of {@link MinecraftConfiguration}. */ @Singleton @ConfigInit(value = MinecraftInitializeEvent.class, eventPhase = Subscribe.Phase.POST) -@ConfigImplementation(value = MinecraftConfiguration.class, version = "1.16.4") +@ConfigImplementation(value = MinecraftConfiguration.class, version = "1.16.5") public class VersionedMinecraftConfiguration implements MinecraftConfiguration { private final AccessibilityConfiguration accessibilityConfiguration; diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/settings/game/configuration/ShadowKeyBinding.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/settings/game/configuration/ShadowKeyBinding.java similarity index 94% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/settings/game/configuration/ShadowKeyBinding.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/settings/game/configuration/ShadowKeyBinding.java index 59f37fcf1..8d1eaa2d4 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/settings/game/configuration/ShadowKeyBinding.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/settings/game/configuration/ShadowKeyBinding.java @@ -17,13 +17,13 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.settings.game.configuration; +package net.flintmc.mcapi.v1_16_5.settings.game.configuration; import net.flintmc.transform.shadow.FieldGetter; import net.flintmc.transform.shadow.Shadow; import net.minecraft.client.util.InputMappings; -@Shadow(value = "net.minecraft.client.settings.KeyBinding", version = "1.16.4") +@Shadow(value = "net.minecraft.client.settings.KeyBinding", version = "1.16.5") public interface ShadowKeyBinding { @FieldGetter("keyCode") diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/settings/game/configuration/VersionedAccessibilityConfiguration.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/settings/game/configuration/VersionedAccessibilityConfiguration.java similarity index 98% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/settings/game/configuration/VersionedAccessibilityConfiguration.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/settings/game/configuration/VersionedAccessibilityConfiguration.java index 3e7849869..d5b175423 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/settings/game/configuration/VersionedAccessibilityConfiguration.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/settings/game/configuration/VersionedAccessibilityConfiguration.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.settings.game.configuration; +package net.flintmc.mcapi.v1_16_5.settings.game.configuration; import com.google.inject.Singleton; import net.flintmc.framework.config.annotation.implemented.ConfigImplementation; @@ -27,10 +27,10 @@ import net.minecraft.client.Minecraft; /** - * 1.16.4 implementation of {@link AccessibilityConfiguration}. + * 1.16.5 implementation of {@link AccessibilityConfiguration}. */ @Singleton -@ConfigImplementation(value = AccessibilityConfiguration.class, version = "1.16.4") +@ConfigImplementation(value = AccessibilityConfiguration.class, version = "1.16.5") public class VersionedAccessibilityConfiguration implements AccessibilityConfiguration { /** diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/settings/game/configuration/VersionedChatConfiguration.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/settings/game/configuration/VersionedChatConfiguration.java similarity index 98% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/settings/game/configuration/VersionedChatConfiguration.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/settings/game/configuration/VersionedChatConfiguration.java index aa03deab1..ee4153fbd 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/settings/game/configuration/VersionedChatConfiguration.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/settings/game/configuration/VersionedChatConfiguration.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.settings.game.configuration; +package net.flintmc.mcapi.v1_16_5.settings.game.configuration; import com.google.inject.Singleton; import net.flintmc.framework.config.annotation.implemented.ConfigImplementation; @@ -27,10 +27,10 @@ import net.minecraft.client.Minecraft; /** - * 1.16.4 implementation of {@link ChatConfiguration} + * 1.16.5 implementation of {@link ChatConfiguration} */ @Singleton -@ConfigImplementation(value = ChatConfiguration.class, version = "1.16.4") +@ConfigImplementation(value = ChatConfiguration.class, version = "1.16.5") public class VersionedChatConfiguration implements ChatConfiguration { /** diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/settings/game/configuration/VersionedDebugConfiguration.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/settings/game/configuration/VersionedDebugConfiguration.java similarity index 95% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/settings/game/configuration/VersionedDebugConfiguration.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/settings/game/configuration/VersionedDebugConfiguration.java index a6348794d..ab4502711 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/settings/game/configuration/VersionedDebugConfiguration.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/settings/game/configuration/VersionedDebugConfiguration.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.settings.game.configuration; +package net.flintmc.mcapi.v1_16_5.settings.game.configuration; import com.google.inject.Singleton; import net.flintmc.framework.config.annotation.implemented.ConfigImplementation; @@ -25,10 +25,10 @@ import net.minecraft.client.Minecraft; /** - * 1.16.4 implementation of {@link DebugConfiguration}. + * 1.16.5 implementation of {@link DebugConfiguration}. */ @Singleton -@ConfigImplementation(value = DebugConfiguration.class, version = "1.16.4") +@ConfigImplementation(value = DebugConfiguration.class, version = "1.16.5") public class VersionedDebugConfiguration implements DebugConfiguration { /** diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/settings/game/configuration/VersionedGraphicConfiguration.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/settings/game/configuration/VersionedGraphicConfiguration.java similarity index 99% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/settings/game/configuration/VersionedGraphicConfiguration.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/settings/game/configuration/VersionedGraphicConfiguration.java index 368e8f739..7e25f9b75 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/settings/game/configuration/VersionedGraphicConfiguration.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/settings/game/configuration/VersionedGraphicConfiguration.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.settings.game.configuration; +package net.flintmc.mcapi.v1_16_5.settings.game.configuration; import com.google.inject.Singleton; import net.flintmc.framework.config.annotation.implemented.ConfigImplementation; @@ -30,10 +30,10 @@ import net.minecraft.client.Minecraft; /** - * 1.16.4 implementation of {@link GraphicConfiguration} + * 1.16.5 implementation of {@link GraphicConfiguration} */ @Singleton -@ConfigImplementation(value = GraphicConfiguration.class, version = "1.16.4") +@ConfigImplementation(value = GraphicConfiguration.class, version = "1.16.5") public class VersionedGraphicConfiguration implements GraphicConfiguration { /** diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/settings/game/configuration/VersionedKeyBindingConfiguration.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/settings/game/configuration/VersionedKeyBindingConfiguration.java similarity index 97% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/settings/game/configuration/VersionedKeyBindingConfiguration.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/settings/game/configuration/VersionedKeyBindingConfiguration.java index 9af0826df..1f4a318f3 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/settings/game/configuration/VersionedKeyBindingConfiguration.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/settings/game/configuration/VersionedKeyBindingConfiguration.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.settings.game.configuration; +package net.flintmc.mcapi.v1_16_5.settings.game.configuration; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -35,10 +35,10 @@ import net.minecraft.client.util.InputMappings; /** - * 1.16.4 implementation of {@link KeyBindingConfiguration}. + * 1.16.5 implementation of {@link KeyBindingConfiguration}. */ @Singleton -@ConfigImplementation(value = KeyBindingConfiguration.class, version = "1.16.4") +@ConfigImplementation(value = KeyBindingConfiguration.class, version = "1.16.5") public class VersionedKeyBindingConfiguration implements KeyBindingConfiguration { private final KeyBinding.Factory keyBindingFactory; diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/settings/game/configuration/VersionedMouseConfiguration.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/settings/game/configuration/VersionedMouseConfiguration.java similarity index 96% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/settings/game/configuration/VersionedMouseConfiguration.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/settings/game/configuration/VersionedMouseConfiguration.java index 7e9f0ccaf..41279406f 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/settings/game/configuration/VersionedMouseConfiguration.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/settings/game/configuration/VersionedMouseConfiguration.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.settings.game.configuration; +package net.flintmc.mcapi.v1_16_5.settings.game.configuration; import com.google.inject.Singleton; import net.flintmc.framework.config.annotation.implemented.ConfigImplementation; @@ -25,10 +25,10 @@ import net.minecraft.client.Minecraft; /** - * 1.16.4 implementation of the {@link MouseConfiguration}. + * 1.16.5 implementation of the {@link MouseConfiguration}. */ @Singleton -@ConfigImplementation(value = MouseConfiguration.class, version = "1.16.4") +@ConfigImplementation(value = MouseConfiguration.class, version = "1.16.5") public class VersionedMouseConfiguration implements MouseConfiguration { /** diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/settings/game/configuration/VersionedResourcePackConfiguration.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/settings/game/configuration/VersionedResourcePackConfiguration.java similarity index 93% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/settings/game/configuration/VersionedResourcePackConfiguration.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/settings/game/configuration/VersionedResourcePackConfiguration.java index 14b5edae8..d3a8c4f7d 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/settings/game/configuration/VersionedResourcePackConfiguration.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/settings/game/configuration/VersionedResourcePackConfiguration.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.settings.game.configuration; +package net.flintmc.mcapi.v1_16_5.settings.game.configuration; import com.google.inject.Singleton; import java.util.List; @@ -26,10 +26,10 @@ import net.minecraft.client.Minecraft; /** - * 1.16.4 implementation of {@link ResourcePackConfiguration}. + * 1.16.5 implementation of {@link ResourcePackConfiguration}. */ @Singleton -@ConfigImplementation(value = ResourcePackConfiguration.class, version = "1.16.4") +@ConfigImplementation(value = ResourcePackConfiguration.class, version = "1.16.5") public class VersionedResourcePackConfiguration implements ResourcePackConfiguration { /** diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/settings/game/configuration/VersionedSkinConfiguration.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/settings/game/configuration/VersionedSkinConfiguration.java similarity index 98% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/settings/game/configuration/VersionedSkinConfiguration.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/settings/game/configuration/VersionedSkinConfiguration.java index 7168f3339..09ca76f84 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/settings/game/configuration/VersionedSkinConfiguration.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/settings/game/configuration/VersionedSkinConfiguration.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.settings.game.configuration; +package net.flintmc.mcapi.v1_16_5.settings.game.configuration; import com.google.inject.Singleton; import java.util.Set; @@ -34,7 +34,7 @@ * 1.15.2 implementation of {@link SkinConfiguration}. */ @Singleton -@ConfigImplementation(value = SkinConfiguration.class, version = "1.16.4") +@ConfigImplementation(value = SkinConfiguration.class, version = "1.16.5") public class VersionedSkinConfiguration implements SkinConfiguration { /** diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/settings/game/configuration/VersionedSoundConfiguration.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/settings/game/configuration/VersionedSoundConfiguration.java similarity index 94% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/settings/game/configuration/VersionedSoundConfiguration.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/settings/game/configuration/VersionedSoundConfiguration.java index 66ec19ba3..c4d9ac8e5 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/settings/game/configuration/VersionedSoundConfiguration.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/settings/game/configuration/VersionedSoundConfiguration.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.settings.game.configuration; +package net.flintmc.mcapi.v1_16_5.settings.game.configuration; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -28,10 +28,10 @@ import net.minecraft.client.Minecraft; /** - * 1.16.4 implementation of {@link SoundConfiguration}. + * 1.16.5 implementation of {@link SoundConfiguration}. */ @Singleton -@ConfigImplementation(value = SoundConfiguration.class, version = "1.16.4") +@ConfigImplementation(value = SoundConfiguration.class, version = "1.16.5") public class VersionedSoundConfiguration implements SoundConfiguration { private final SoundMapper soundMapper; diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/tileentity/VersionedSignTileEntity.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/tileentity/VersionedSignTileEntity.java similarity index 95% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/tileentity/VersionedSignTileEntity.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/tileentity/VersionedSignTileEntity.java index 8309e0b33..4d4026c8e 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/tileentity/VersionedSignTileEntity.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/tileentity/VersionedSignTileEntity.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.tileentity; +package net.flintmc.mcapi.v1_16_5.tileentity; import net.flintmc.framework.inject.assisted.Assisted; import net.flintmc.framework.inject.assisted.AssistedInject; @@ -29,7 +29,7 @@ import net.flintmc.mcapi.world.World; import net.minecraft.util.text.ITextComponent; -@Implement(value = SignTileEntity.class, version = "1.16.4") +@Implement(value = SignTileEntity.class, version = "1.16.5") public class VersionedSignTileEntity extends VersionedTileEntity implements SignTileEntity { private final net.minecraft.tileentity.SignTileEntity signTileEntity; diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/tileentity/VersionedTileEntity.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/tileentity/VersionedTileEntity.java similarity index 97% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/tileentity/VersionedTileEntity.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/tileentity/VersionedTileEntity.java index f87d4a6a2..5bd3b7ded 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/tileentity/VersionedTileEntity.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/tileentity/VersionedTileEntity.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.tileentity; +package net.flintmc.mcapi.v1_16_5.tileentity; import net.flintmc.framework.inject.assisted.Assisted; import net.flintmc.framework.inject.assisted.AssistedInject; @@ -28,7 +28,7 @@ import net.flintmc.mcapi.world.math.BlockPosition; import net.minecraft.util.math.BlockPos; -@Implement(value = TileEntity.class, version = "1.16.4") +@Implement(value = TileEntity.class, version = "1.16.5") public class VersionedTileEntity implements TileEntity { private final TileEntityType tileEntityType; diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/tileentity/mapper/VersionedTileEntityMapper.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/tileentity/mapper/VersionedTileEntityMapper.java similarity index 97% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/tileentity/mapper/VersionedTileEntityMapper.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/tileentity/mapper/VersionedTileEntityMapper.java index 08b3b9011..468bf42b1 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/tileentity/mapper/VersionedTileEntityMapper.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/tileentity/mapper/VersionedTileEntityMapper.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.tileentity.mapper; +package net.flintmc.mcapi.v1_16_5.tileentity.mapper; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -34,7 +34,7 @@ import net.minecraft.util.registry.Registry; @Singleton -@Implement(value = TileEntityMapper.class, version = "1.16.4") +@Implement(value = TileEntityMapper.class, version = "1.16.5") public class VersionedTileEntityMapper implements TileEntityMapper { private final TileEntityCache tileEntityCache; diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/tileentity/type/VersionedTileEntityType.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/tileentity/type/VersionedTileEntityType.java similarity index 90% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/tileentity/type/VersionedTileEntityType.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/tileentity/type/VersionedTileEntityType.java index 71207238b..abffb2cdd 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/tileentity/type/VersionedTileEntityType.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/tileentity/type/VersionedTileEntityType.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.tileentity.type; +package net.flintmc.mcapi.v1_16_5.tileentity.type; import net.flintmc.framework.inject.implement.Implement; import net.flintmc.mcapi.tileentity.type.TileEntityType; @@ -25,7 +25,7 @@ /** * Represents the Minecraft tile entity type. */ -@Implement(value = TileEntityType.class, version = "1.16.4") +@Implement(value = TileEntityType.class, version = "1.16.5") public class VersionedTileEntityType implements TileEntityType { } diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/tileentity/type/VersionedTileEntityTypeRegister.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/tileentity/type/VersionedTileEntityTypeRegister.java similarity index 95% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/tileentity/type/VersionedTileEntityTypeRegister.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/tileentity/type/VersionedTileEntityTypeRegister.java index 31e4575ba..717289e69 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/tileentity/type/VersionedTileEntityTypeRegister.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/tileentity/type/VersionedTileEntityTypeRegister.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.tileentity.type; +package net.flintmc.mcapi.v1_16_5.tileentity.type; import com.google.common.collect.Maps; import com.google.inject.Inject; @@ -31,7 +31,7 @@ import net.minecraft.util.registry.Registry; @Singleton -@Implement(value = TileEntityTypeRegister.class, version = "1.16.4") +@Implement(value = TileEntityTypeRegister.class, version = "1.16.5") public class VersionedTileEntityTypeRegister implements TileEntityTypeRegister { private final Map tileEntityTypes; @@ -43,7 +43,7 @@ private VersionedTileEntityTypeRegister(TileEntityType.Factory tileEntityTypeFac this.tileEntityTypes = Maps.newHashMap(); } - @Subscribe(phase = Subscribe.Phase.POST, version = "1.16.4") + @Subscribe(phase = Subscribe.Phase.POST, version = "1.16.5") public void convertTileEntityTypes(OpenGLInitializeEvent event) { for (net.minecraft.tileentity.TileEntityType tileEntityType : Registry.BLOCK_ENTITY_TYPE) { String key = Registry.BLOCK_ENTITY_TYPE.getKey(tileEntityType).getPath(); diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/VersionedClientWorld.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/VersionedClientWorld.java similarity index 96% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/VersionedClientWorld.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/VersionedClientWorld.java index 8c1a08d2b..4711a6c06 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/VersionedClientWorld.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/VersionedClientWorld.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.world; +package net.flintmc.mcapi.v1_16_5.world; import com.beust.jcommander.internal.Sets; import com.google.common.collect.Maps; @@ -43,10 +43,10 @@ import net.minecraft.client.Minecraft; /** - * 1.16.4 implementation of {@link ClientWorld} + * 1.16.5 implementation of {@link ClientWorld} */ @Singleton -@Implement(value = ClientWorld.class, version = "1.16.4") +@Implement(value = ClientWorld.class, version = "1.16.5") public class VersionedClientWorld extends VersionedWorld implements ClientWorld { private final ClientPlayer player; diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/VersionedWorld.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/VersionedWorld.java similarity index 99% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/VersionedWorld.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/VersionedWorld.java index d92ad3147..ad6676f70 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/VersionedWorld.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/VersionedWorld.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.world; +package net.flintmc.mcapi.v1_16_5.world; import com.beust.jcommander.internal.Lists; import com.google.inject.Inject; @@ -48,7 +48,7 @@ * 1.15.2 implementation of {@link World}. */ @Singleton -@Implement(value = World.class, version = "1.16.4") +@Implement(value = World.class, version = "1.16.5") public class VersionedWorld implements World { private final BlockState.Factory stateFactory; diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/VersionedWorldInterceptor.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/VersionedWorldInterceptor.java similarity index 95% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/VersionedWorldInterceptor.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/VersionedWorldInterceptor.java index 24eeb6872..247a0f2f4 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/VersionedWorldInterceptor.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/VersionedWorldInterceptor.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.world; +package net.flintmc.mcapi.v1_16_5.world; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -30,7 +30,7 @@ import net.minecraft.util.math.BlockPos; /** - * 1.16.4 implementation nof the world interceptor. + * 1.16.5 implementation nof the world interceptor. */ @Singleton public class VersionedWorldInterceptor { @@ -48,7 +48,7 @@ private VersionedWorldInterceptor(World world, TileEntityMapper tileEntityMapper className = "net.minecraft.world.World", methodName = "addTileEntity", parameters = {@Type(reference = net.minecraft.tileentity.TileEntity.class)}, - version = "1.16.4") + version = "1.16.5") public void hookAfterAddTileEntity(@Named("args") Object[] args) { net.minecraft.tileentity.TileEntity minecraftTileEntity = (net.minecraft.tileentity.TileEntity) args[0]; @@ -68,7 +68,7 @@ public void hookAfterAddTileEntity(@Named("args") Object[] args) { className = "net.minecraft.world.World", methodName = "removeTileEntity", parameters = {@Type(reference = BlockPos.class)}, - version = "1.16.4") + version = "1.16.5") public void hookAfterRemoveTileEntity(@Named("args") Object[] args) { BlockPos blockPos = (BlockPos) args[0]; TileEntity tileEntity = this.world.getTileEntity(this.world.fromMinecraftBlockPos(blockPos)); diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/biome/VersionedBiome.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/biome/VersionedBiome.java similarity index 98% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/biome/VersionedBiome.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/biome/VersionedBiome.java index 6658e3208..dd1cdcdb7 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/biome/VersionedBiome.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/biome/VersionedBiome.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.world.biome; +package net.flintmc.mcapi.v1_16_5.world.biome; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; @@ -44,7 +44,7 @@ import net.minecraft.util.text.LanguageMap; import net.minecraft.world.biome.MobSpawnInfo.Spawners; -@Implement(value = Biome.class, version = "1.16.4") +@Implement(value = Biome.class, version = "1.16.5") public class VersionedBiome implements Biome { private static final EntityClassification[] CLASSIFICATIONS = EntityClassification.values(); diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/biome/VersionedBiomeMapper.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/biome/VersionedBiomeMapper.java similarity index 97% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/biome/VersionedBiomeMapper.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/biome/VersionedBiomeMapper.java index 76f5d8ff8..d5a21bb6a 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/biome/VersionedBiomeMapper.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/biome/VersionedBiomeMapper.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.world.biome; +package net.flintmc.mcapi.v1_16_5.world.biome; import com.google.inject.Singleton; import net.flintmc.framework.inject.implement.Implement; @@ -29,7 +29,7 @@ import net.minecraft.world.biome.Biome.Category; @Singleton -@Implement(value = BiomeMapper.class, version = "1.16.4") +@Implement(value = BiomeMapper.class, version = "1.16.5") public class VersionedBiomeMapper implements BiomeMapper { /** @@ -161,7 +161,7 @@ public Object toMinecraftRainType(RainType rainType) { */ @Override public TemperatureCategory fromMinecraftTemperatureCategory(Object category) { - throw new UnsupportedOperationException("Not supported in 1.16.4"); + throw new UnsupportedOperationException("Not supported in 1.16.5"); } /** @@ -169,6 +169,6 @@ public TemperatureCategory fromMinecraftTemperatureCategory(Object category) { */ @Override public Object toMinecraftTemperatureCategory(TemperatureCategory category) { - throw new UnsupportedOperationException("Not supported in 1.16.4"); + throw new UnsupportedOperationException("Not supported in 1.16.5"); } } diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/biome/VersionedBiomeRegistry.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/biome/VersionedBiomeRegistry.java similarity index 96% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/biome/VersionedBiomeRegistry.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/biome/VersionedBiomeRegistry.java index 0f84ffb0c..7c73fd8f0 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/biome/VersionedBiomeRegistry.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/biome/VersionedBiomeRegistry.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.world.biome; +package net.flintmc.mcapi.v1_16_5.world.biome; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -34,7 +34,7 @@ import net.minecraft.world.biome.Biomes; @Singleton -@Implement(value = BiomeRegistry.class, version = "1.16.4") +@Implement(value = BiomeRegistry.class, version = "1.16.5") public class VersionedBiomeRegistry implements BiomeRegistry { private final Map biomes; diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/biome/WeightedRandomItemShadow.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/biome/WeightedRandomItemShadow.java similarity index 94% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/biome/WeightedRandomItemShadow.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/biome/WeightedRandomItemShadow.java index d306d5ef7..fa4b3bc85 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/biome/WeightedRandomItemShadow.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/biome/WeightedRandomItemShadow.java @@ -17,12 +17,12 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.world.biome; +package net.flintmc.mcapi.v1_16_5.world.biome; import net.flintmc.transform.shadow.FieldGetter; import net.flintmc.transform.shadow.Shadow; -@Shadow(value = "net.minecraft.util.WeightedRandom$Item", version = "1.16.4") +@Shadow(value = "net.minecraft.util.WeightedRandom$Item", version = "1.16.5") public interface WeightedRandomItemShadow { @FieldGetter("itemWeight") diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/block/VersionedBlock.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/block/VersionedBlock.java similarity index 97% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/block/VersionedBlock.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/block/VersionedBlock.java index 1c1963136..3bed11b5c 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/block/VersionedBlock.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/block/VersionedBlock.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.world.block; +package net.flintmc.mcapi.v1_16_5.world.block; import net.flintmc.framework.inject.assisted.Assisted; import net.flintmc.framework.inject.assisted.AssistedInject; @@ -38,7 +38,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.registry.Registry; -@Implement(value = Block.class, version = "1.16.4") +@Implement(value = Block.class, version = "1.16.5") public class VersionedBlock implements Block { private final EntityMapper entityMapper; diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/block/VersionedBlockState.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/block/VersionedBlockState.java similarity index 96% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/block/VersionedBlockState.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/block/VersionedBlockState.java index 8062ce597..bd8754ebf 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/block/VersionedBlockState.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/block/VersionedBlockState.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.world.block; +package net.flintmc.mcapi.v1_16_5.world.block; import net.flintmc.framework.inject.assisted.Assisted; import net.flintmc.framework.inject.assisted.AssistedInject; @@ -29,7 +29,7 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.registry.Registry; -@Implement(value = BlockState.class, version = "1.16.4") +@Implement(value = BlockState.class, version = "1.16.5") public class VersionedBlockState implements BlockState { private final BlockType type; diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/block/VersionedBlockType.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/block/VersionedBlockType.java similarity index 96% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/block/VersionedBlockType.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/block/VersionedBlockType.java index 0815028bf..e5c4e6cd0 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/block/VersionedBlockType.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/block/VersionedBlockType.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.world.block; +package net.flintmc.mcapi.v1_16_5.world.block; import net.flintmc.framework.inject.assisted.Assisted; import net.flintmc.framework.inject.assisted.AssistedInject; @@ -29,7 +29,7 @@ import net.flintmc.mcapi.world.block.BlockType; import net.minecraft.block.Block; -@Implement(value = BlockType.class, version = "1.16.4") +@Implement(value = BlockType.class, version = "1.16.5") public class VersionedBlockType implements BlockType { private final ResourceLocation name; diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/block/VersionedBlockTypeRegistry.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/block/VersionedBlockTypeRegistry.java similarity index 95% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/block/VersionedBlockTypeRegistry.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/block/VersionedBlockTypeRegistry.java index 5f1214255..3c89274eb 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/block/VersionedBlockTypeRegistry.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/block/VersionedBlockTypeRegistry.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.world.block; +package net.flintmc.mcapi.v1_16_5.world.block; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -34,7 +34,7 @@ import net.minecraft.util.registry.Registry; @Singleton -@Implement(value = BlockTypeRegistry.class, version = "1.16.4") +@Implement(value = BlockTypeRegistry.class, version = "1.16.5") public class VersionedBlockTypeRegistry implements BlockTypeRegistry { private final Map types; diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/border/VersionedWorldBorder.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/border/VersionedWorldBorder.java similarity index 97% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/border/VersionedWorldBorder.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/border/VersionedWorldBorder.java index 0ccd29d6d..63c0273c3 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/border/VersionedWorldBorder.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/border/VersionedWorldBorder.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.world.border; +package net.flintmc.mcapi.v1_16_5.world.border; import com.google.inject.Singleton; import net.flintmc.framework.inject.implement.Implement; @@ -27,10 +27,10 @@ import net.minecraft.world.border.BorderStatus; /** - * 1.16.4 implementation of {@link WorldBorder}. + * 1.16.5 implementation of {@link WorldBorder}. */ @Singleton -@Implement(value = WorldBorder.class, version = "1.16.4") +@Implement(value = WorldBorder.class, version = "1.16.5") public class VersionedWorldBorder implements WorldBorder { /** diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/difficulty/VersionedDifficultyLocal.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/difficulty/VersionedDifficultyLocal.java similarity index 95% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/difficulty/VersionedDifficultyLocal.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/difficulty/VersionedDifficultyLocal.java index 5009c36aa..625385531 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/difficulty/VersionedDifficultyLocal.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/difficulty/VersionedDifficultyLocal.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.world.difficulty; +package net.flintmc.mcapi.v1_16_5.world.difficulty; import net.flintmc.framework.inject.assisted.Assisted; import net.flintmc.framework.inject.assisted.AssistedInject; @@ -27,9 +27,9 @@ import net.minecraft.util.math.MathHelper; /** - * 1.16.4 implementation of {@link DifficultyLocal}. + * 1.16.5 implementation of {@link DifficultyLocal}. */ -@Implement(value = DifficultyLocal.class, version = "1.16.4") +@Implement(value = DifficultyLocal.class, version = "1.16.5") public class VersionedDifficultyLocal implements DifficultyLocal { private final Difficulty worldDifficulty; diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/event/DelegatingChunkStatusListener.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/event/DelegatingChunkStatusListener.java similarity index 98% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/event/DelegatingChunkStatusListener.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/event/DelegatingChunkStatusListener.java index 1b1f0de61..abe068d03 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/event/DelegatingChunkStatusListener.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/event/DelegatingChunkStatusListener.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.world.event; +package net.flintmc.mcapi.v1_16_5.world.event; import net.flintmc.framework.eventbus.EventBus; import net.flintmc.framework.eventbus.event.subscribe.Subscribe.Phase; diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/event/VersionedChunkLoadEventInjector.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/event/VersionedChunkLoadEventInjector.java similarity index 96% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/event/VersionedChunkLoadEventInjector.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/event/VersionedChunkLoadEventInjector.java index bb3cb4592..f83788402 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/event/VersionedChunkLoadEventInjector.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/event/VersionedChunkLoadEventInjector.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.world.event; +package net.flintmc.mcapi.v1_16_5.world.event; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -60,7 +60,7 @@ private VersionedChunkLoadEventInjector( @Type(reference = boolean.class) // isFullChunk }, executionTime = Hook.ExecutionTime.BEFORE, - version = "1.16.4") + version = "1.16.5") public void preChunkLoad(@Named("args") Object[] args) { int chunkX = (int) args[0]; int chunkZ = (int) args[1]; @@ -77,7 +77,7 @@ public void preChunkLoad(@Named("args") Object[] args) { @Type(reference = int.class) // chunkZ }, executionTime = Hook.ExecutionTime.AFTER, - version = "1.16.4") + version = "1.16.5") public void postChunkLoad(@Named("args") Object[] args) { int chunkX = (int) args[0]; int chunkZ = (int) args[1]; @@ -95,7 +95,7 @@ public void postChunkLoad(@Named("args") Object[] args) { @Type(typeName = "net.minecraft.world.chunk.Chunk") }, executionTime = Hook.ExecutionTime.BEFORE, - version = "1.16.4") + version = "1.16.5") public void preChunkUnload(@Named("args") Object[] args) { Chunk chunk = (Chunk) args[1]; int chunkX = chunk.getPos().x; @@ -110,7 +110,7 @@ public void preChunkUnload(@Named("args") Object[] args) { methodName = "onChunkUnloaded", parameters = @Type(typeName = "net.minecraft.world.chunk.Chunk"), executionTime = Hook.ExecutionTime.AFTER, - version = "1.16.4") + version = "1.16.5") public void postChunkUnload(@Named("args") Object[] args) { Chunk chunk = (Chunk) args[0]; int chunkX = chunk.getPos().x; diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/event/VersionedSoundPlayEventInjector.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/event/VersionedSoundPlayEventInjector.java similarity index 97% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/event/VersionedSoundPlayEventInjector.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/event/VersionedSoundPlayEventInjector.java index 2c2df6d27..8c83e2875 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/event/VersionedSoundPlayEventInjector.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/event/VersionedSoundPlayEventInjector.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.world.event; +package net.flintmc.mcapi.v1_16_5.world.event; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -66,7 +66,7 @@ private VersionedSoundPlayEventInjector( @Type(reference = boolean.class) // distanceDelay }, executionTime = {ExecutionTime.BEFORE, ExecutionTime.AFTER}, - version = "1.16.4") + version = "1.16.5") public void playSound(@Named("args") Object[] args, ExecutionTime executionTime) { Vector3D position = this.vectorFactory.create((double) args[0], (double) args[1], (double) args[2]); diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/event/VersionedWorldJoinEventInjector.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/event/VersionedWorldJoinEventInjector.java similarity index 95% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/event/VersionedWorldJoinEventInjector.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/event/VersionedWorldJoinEventInjector.java index 78eaed032..d23e7f761 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/event/VersionedWorldJoinEventInjector.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/event/VersionedWorldJoinEventInjector.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.world.event; +package net.flintmc.mcapi.v1_16_5.world.event; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -46,7 +46,7 @@ private VersionedWorldJoinEventInjector(EventBus eventBus, WorldJoinEvent.Factor this.eventFactory = eventFactory; } - @Subscribe(phase = Phase.ANY, version = "1.16.4") + @Subscribe(phase = Phase.ANY, version = "1.16.5") public void fireSingleplayerWorldJoinEvent(ServerConnectEvent event, Phase phase) { WorldJoinEvent joinEvent = this.eventFactory .create(event.getAddress().toString(), WorldJoinEvent.Type.MULTIPLAYER); @@ -65,7 +65,7 @@ public void fireSingleplayerWorldJoinEvent(ServerConnectEvent event, Phase phase @Type(typeName = "net.minecraft.client.Minecraft$WorldSelectionType") }, executionTime = {ExecutionTime.BEFORE, ExecutionTime.AFTER}, - version = "1.16.4" + version = "1.16.5" ) public void launchIntegratedServer(ExecutionTime executionTime, @Named("args") Object[] args) { WorldJoinEvent event = this.eventFactory diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/event/VersionedWorldLoadEventInjector.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/event/VersionedWorldLoadEventInjector.java similarity index 97% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/event/VersionedWorldLoadEventInjector.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/event/VersionedWorldLoadEventInjector.java index cace7c7ba..deb7fad51 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/event/VersionedWorldLoadEventInjector.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/event/VersionedWorldLoadEventInjector.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.world.event; +package net.flintmc.mcapi.v1_16_5.world.event; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -44,7 +44,7 @@ private VersionedWorldLoadEventInjector(ClassMappingProvider mappingProvider) { this.mappingProvider = mappingProvider; } - @ClassTransform(value = "net.minecraft.world.server.ServerWorld", version = "1.16.4") + @ClassTransform(value = "net.minecraft.world.server.ServerWorld", version = "1.16.5") public void transformServerWorld(ClassTransformContext context) throws CannotCompileException { CtClass transforming = context.getCtClass(); ClassMapping classMapping = this.mappingProvider.get("net.minecraft.world.server.ServerWorld"); @@ -58,7 +58,7 @@ public void transformServerWorld(ClassTransformContext context) throws CannotCom transforming)); } - @ClassTransform(value = "net.minecraft.world.server.ChunkManager", version = "1.16.4") + @ClassTransform(value = "net.minecraft.world.server.ChunkManager", version = "1.16.5") public void transformChunkManager(ClassTransformContext context) throws CannotCompileException { CtClass transforming = context.getCtClass(); CtConstructor constructor = transforming.getDeclaredConstructors()[0]; diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/event/VersionedWorldUnloadEventInjector.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/event/VersionedWorldUnloadEventInjector.java similarity index 94% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/event/VersionedWorldUnloadEventInjector.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/event/VersionedWorldUnloadEventInjector.java index bc3e1267d..c894100e0 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/event/VersionedWorldUnloadEventInjector.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/event/VersionedWorldUnloadEventInjector.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.world.event; +package net.flintmc.mcapi.v1_16_5.world.event; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -42,7 +42,7 @@ private VersionedWorldUnloadEventInjector(EventBus eventBus, } @Hook(className = "net.minecraft.client.Minecraft", methodName = "unloadWorld", parameters = { - @Type(reference = Screen.class)}, version = "1.16.4") + @Type(reference = Screen.class)}, version = "1.16.5") public void hookUnloadWorld(Hook.ExecutionTime executionTime) { this.eventBus.fireEvent(this.worldUnloadEvent, executionTime); } diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/generator/DimensionShadow.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/generator/DimensionShadow.java similarity index 95% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/generator/DimensionShadow.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/generator/DimensionShadow.java index 3fc11410c..810366f96 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/generator/DimensionShadow.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/generator/DimensionShadow.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.world.generator; +package net.flintmc.mcapi.v1_16_5.world.generator; import net.flintmc.transform.shadow.FieldSetter; import net.flintmc.transform.shadow.Shadow; diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/generator/SingleBiomeProviderShadow.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/generator/SingleBiomeProviderShadow.java similarity index 93% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/generator/SingleBiomeProviderShadow.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/generator/SingleBiomeProviderShadow.java index bdff94af5..ccb9494e6 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/generator/SingleBiomeProviderShadow.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/generator/SingleBiomeProviderShadow.java @@ -17,14 +17,14 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.world.generator; +package net.flintmc.mcapi.v1_16_5.world.generator; import net.flintmc.transform.shadow.FieldSetter; import net.flintmc.transform.shadow.Shadow; import net.minecraft.world.biome.Biome; import java.util.function.Supplier; -@Shadow(value = "net.minecraft.world.biome.provider.SingleBiomeProvider", version = "1.16.4") +@Shadow(value = "net.minecraft.world.biome.provider.SingleBiomeProvider", version = "1.16.5") public interface SingleBiomeProviderShadow { @FieldSetter("biome") diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/generator/VersionedWorldGenerator.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/generator/VersionedWorldGenerator.java similarity index 98% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/generator/VersionedWorldGenerator.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/generator/VersionedWorldGenerator.java index 6196f1f9c..ee5957943 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/generator/VersionedWorldGenerator.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/generator/VersionedWorldGenerator.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.world.generator; +package net.flintmc.mcapi.v1_16_5.world.generator; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -49,7 +49,7 @@ import net.minecraft.world.gen.settings.DimensionGeneratorSettings; @Singleton -@Implement(value = WorldGenerator.class, version = "1.16.4") +@Implement(value = WorldGenerator.class, version = "1.16.5") public class VersionedWorldGenerator implements WorldGenerator { private final ServerController serverController; diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/generator/VersionedWorldGeneratorMapper.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/generator/VersionedWorldGeneratorMapper.java similarity index 97% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/generator/VersionedWorldGeneratorMapper.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/generator/VersionedWorldGeneratorMapper.java index 5e90e6c71..901e54645 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/generator/VersionedWorldGeneratorMapper.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/generator/VersionedWorldGeneratorMapper.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.world.generator; +package net.flintmc.mcapi.v1_16_5.world.generator; import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; @@ -30,7 +30,7 @@ import java.util.Optional; import net.flintmc.framework.inject.implement.Implement; import net.flintmc.mcapi.resources.ResourceLocationProvider; -import net.flintmc.mcapi.v1_16_4.world.generator.flat.FlatGenerationSettingsShadow; +import net.flintmc.mcapi.v1_16_5.world.generator.flat.FlatGenerationSettingsShadow; import net.flintmc.mcapi.world.World; import net.flintmc.mcapi.world.biome.BiomeRegistry; import net.flintmc.mcapi.world.block.BlockState; @@ -60,10 +60,10 @@ import net.minecraft.world.gen.settings.StructureSpreadSettings; @Singleton -@Implement(value = WorldGeneratorMapper.class, version = "1.16.4") +@Implement(value = WorldGeneratorMapper.class, version = "1.16.5") public class VersionedWorldGeneratorMapper implements WorldGeneratorMapper { - public static final String REGISTRIES_OPTION = "1.16.4_dynamicRegistries"; + public static final String REGISTRIES_OPTION = "1.16.5_dynamicRegistries"; public static final BiMap, FlatWorldStructure> STRUCTURES = HashBiMap.create(); diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/generator/VersionedWorldGeneratorSettingsImplementation.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/generator/VersionedWorldGeneratorSettingsImplementation.java similarity index 97% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/generator/VersionedWorldGeneratorSettingsImplementation.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/generator/VersionedWorldGeneratorSettingsImplementation.java index 52f8b3f4a..24660c4b0 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/generator/VersionedWorldGeneratorSettingsImplementation.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/generator/VersionedWorldGeneratorSettingsImplementation.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.world.generator; +package net.flintmc.mcapi.v1_16_5.world.generator; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -37,7 +37,7 @@ import java.nio.file.Path; @Singleton -@Implement(value = WorldGeneratorSettingsImplementation.class, version = "1.16.4") +@Implement(value = WorldGeneratorSettingsImplementation.class, version = "1.16.5") public class VersionedWorldGeneratorSettingsImplementation implements WorldGeneratorSettingsImplementation { diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/generator/flat/FlatGenerationSettingsShadow.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/generator/flat/FlatGenerationSettingsShadow.java similarity index 93% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/generator/flat/FlatGenerationSettingsShadow.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/generator/flat/FlatGenerationSettingsShadow.java index 920811345..04b164aad 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/generator/flat/FlatGenerationSettingsShadow.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/generator/flat/FlatGenerationSettingsShadow.java @@ -17,14 +17,14 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.world.generator.flat; +package net.flintmc.mcapi.v1_16_5.world.generator.flat; import net.flintmc.transform.shadow.FieldGetter; import net.flintmc.transform.shadow.Shadow; import net.minecraft.util.registry.Registry; import net.minecraft.world.biome.Biome; -@Shadow(value = "net.minecraft.world.gen.FlatGenerationSettings", version = "1.16.4") +@Shadow(value = "net.minecraft.world.gen.FlatGenerationSettings", version = "1.16.5") public interface FlatGenerationSettingsShadow { @FieldGetter("field_242867_d") diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/generator/flat/FlatPresetsShadow.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/generator/flat/FlatPresetsShadow.java similarity index 96% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/generator/flat/FlatPresetsShadow.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/generator/flat/FlatPresetsShadow.java index 394489135..0989a2779 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/generator/flat/FlatPresetsShadow.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/generator/flat/FlatPresetsShadow.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.world.generator.flat; +package net.flintmc.mcapi.v1_16_5.world.generator.flat; import net.flintmc.mcapi.world.generator.flat.FlatWorldGeneratorSettingsSerializer; import net.flintmc.transform.shadow.Shadow; diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/generator/flat/VersionedFlatWorldGeneratorSettingsSerializer.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/generator/flat/VersionedFlatWorldGeneratorSettingsSerializer.java similarity index 97% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/generator/flat/VersionedFlatWorldGeneratorSettingsSerializer.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/generator/flat/VersionedFlatWorldGeneratorSettingsSerializer.java index fedf65fd0..0ef89c8f2 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/generator/flat/VersionedFlatWorldGeneratorSettingsSerializer.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/generator/flat/VersionedFlatWorldGeneratorSettingsSerializer.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.world.generator.flat; +package net.flintmc.mcapi.v1_16_5.world.generator.flat; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -33,7 +33,7 @@ import net.minecraft.world.gen.settings.DimensionStructuresSettings; @Singleton -@Implement(value = FlatWorldGeneratorSettingsSerializer.class, version = "1.16.4") +@Implement(value = FlatWorldGeneratorSettingsSerializer.class, version = "1.16.5") public class VersionedFlatWorldGeneratorSettingsSerializer implements FlatWorldGeneratorSettingsSerializer { diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/generator/flat/VersionedSupportedStructureHolder.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/generator/flat/VersionedSupportedStructureHolder.java similarity index 93% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/generator/flat/VersionedSupportedStructureHolder.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/generator/flat/VersionedSupportedStructureHolder.java index 6da4fd930..0df531e83 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/generator/flat/VersionedSupportedStructureHolder.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/generator/flat/VersionedSupportedStructureHolder.java @@ -17,17 +17,17 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.world.generator.flat; +package net.flintmc.mcapi.v1_16_5.world.generator.flat; import com.google.inject.Singleton; import net.flintmc.framework.inject.implement.Implement; -import net.flintmc.mcapi.v1_16_4.world.generator.VersionedWorldGeneratorMapper; +import net.flintmc.mcapi.v1_16_5.world.generator.VersionedWorldGeneratorMapper; import net.flintmc.mcapi.world.generator.flat.structure.FlatWorldStructure; import net.flintmc.mcapi.world.generator.flat.structure.StructureOption; import net.flintmc.mcapi.world.generator.flat.structure.SupportedStructureHolder; @Singleton -@Implement(value = SupportedStructureHolder.class, version = "1.16.4") +@Implement(value = SupportedStructureHolder.class, version = "1.16.5") public class VersionedSupportedStructureHolder implements SupportedStructureHolder { /** diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/generator/flat/preset/FlatPresetsLayerShadow.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/generator/flat/preset/FlatPresetsLayerShadow.java similarity index 93% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/generator/flat/preset/FlatPresetsLayerShadow.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/generator/flat/preset/FlatPresetsLayerShadow.java index c36aa0b98..70ce7ae4a 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/generator/flat/preset/FlatPresetsLayerShadow.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/generator/flat/preset/FlatPresetsLayerShadow.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.world.generator.flat.preset; +package net.flintmc.mcapi.v1_16_5.world.generator.flat.preset; import net.flintmc.transform.shadow.FieldGetter; import net.flintmc.transform.shadow.Shadow; @@ -28,7 +28,7 @@ import net.minecraft.world.gen.FlatGenerationSettings; import java.util.function.Function; -@Shadow(value = "net.minecraft.client.gui.screen.FlatPresetsScreen$LayerItem", version = "1.16.4") +@Shadow(value = "net.minecraft.client.gui.screen.FlatPresetsScreen$LayerItem", version = "1.16.5") public interface FlatPresetsLayerShadow { @FieldGetter("icon") diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/generator/flat/preset/VersionedFlatWorldPresetRegistry.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/generator/flat/preset/VersionedFlatWorldPresetRegistry.java similarity index 98% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/generator/flat/preset/VersionedFlatWorldPresetRegistry.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/generator/flat/preset/VersionedFlatWorldPresetRegistry.java index e045183c5..c22ed00fc 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/generator/flat/preset/VersionedFlatWorldPresetRegistry.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/generator/flat/preset/VersionedFlatWorldPresetRegistry.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.world.generator.flat.preset; +package net.flintmc.mcapi.v1_16_5.world.generator.flat.preset; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -43,7 +43,7 @@ import net.minecraft.world.gen.FlatGenerationSettings; @Singleton -@Implement(value = FlatWorldPresetRegistry.class, version = "1.16.4") +@Implement(value = FlatWorldPresetRegistry.class, version = "1.16.5") public class VersionedFlatWorldPresetRegistry implements FlatWorldPresetRegistry { private final Collection presets; diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/mapper/VersionedScoreboardMapper.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/mapper/VersionedScoreboardMapper.java similarity index 97% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/mapper/VersionedScoreboardMapper.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/mapper/VersionedScoreboardMapper.java index 21dbbdb28..91a4e59c3 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/mapper/VersionedScoreboardMapper.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/mapper/VersionedScoreboardMapper.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.world.mapper; +package net.flintmc.mcapi.v1_16_5.world.mapper; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -40,10 +40,10 @@ import net.minecraft.scoreboard.Team.Visible; /** - * 1.16.4 implementation of {@link ScoreboardMapper}. + * 1.16.5 implementation of {@link ScoreboardMapper}. */ @Singleton -@Implement(value = ScoreboardMapper.class, version = "1.16.4") +@Implement(value = ScoreboardMapper.class, version = "1.16.5") public class VersionedScoreboardMapper implements ScoreboardMapper { private final Criteria.Factory criteriaFactory; diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/mapper/VersionedWorldMapper.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/mapper/VersionedWorldMapper.java similarity index 96% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/mapper/VersionedWorldMapper.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/mapper/VersionedWorldMapper.java index 35d904bd5..b4dc61402 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/mapper/VersionedWorldMapper.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/mapper/VersionedWorldMapper.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.world.mapper; +package net.flintmc.mcapi.v1_16_5.world.mapper; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -34,7 +34,7 @@ import net.minecraft.world.storage.WorldSummary; @Singleton -@Implement(value = WorldMapper.class, version = "1.16.4") +@Implement(value = WorldMapper.class, version = "1.16.5") public class VersionedWorldMapper implements WorldMapper { private final WorldOverview.Factory worldOverviewFactory; @@ -49,7 +49,7 @@ private VersionedWorldMapper(WorldOverview.Factory worldOverviewFactory) { */ @Override public Object toMinecraftWorldType(WorldType worldType) { - throw new UnsupportedOperationException("Not supported in 1.16.4"); + throw new UnsupportedOperationException("Not supported in 1.16.5"); } /** @@ -57,7 +57,7 @@ public Object toMinecraftWorldType(WorldType worldType) { */ @Override public WorldType fromMinecraftWorldType(Object handle) { - throw new UnsupportedOperationException("Not supported in 1.16.4"); + throw new UnsupportedOperationException("Not supported in 1.16.5"); } /** diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/mapper/WorldSummaryShadow.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/mapper/WorldSummaryShadow.java similarity index 94% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/mapper/WorldSummaryShadow.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/mapper/WorldSummaryShadow.java index 1cf20d03f..88e1516a0 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/mapper/WorldSummaryShadow.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/mapper/WorldSummaryShadow.java @@ -17,13 +17,13 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.world.mapper; +package net.flintmc.mcapi.v1_16_5.world.mapper; import net.flintmc.transform.shadow.FieldGetter; import net.flintmc.transform.shadow.Shadow; import net.minecraft.world.storage.VersionData; -@Shadow(value = "net.minecraft.world.storage.WorldSummary", version = "1.16.4") +@Shadow(value = "net.minecraft.world.storage.WorldSummary", version = "1.16.5") public interface WorldSummaryShadow { @FieldGetter("versionData") diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/scoreboard/VersionedScoreboardInterceptor.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/scoreboard/VersionedScoreboardInterceptor.java similarity index 96% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/scoreboard/VersionedScoreboardInterceptor.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/scoreboard/VersionedScoreboardInterceptor.java index 4a8628f62..6ded58a4a 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/scoreboard/VersionedScoreboardInterceptor.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/scoreboard/VersionedScoreboardInterceptor.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.world.scoreboard; +package net.flintmc.mcapi.v1_16_5.world.scoreboard; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -40,7 +40,7 @@ import net.minecraft.network.play.server.SUpdateScorePacket; /** - * 1.16.4 implementation of the scoreboard interceptor. + * 1.16.5 implementation of the scoreboard interceptor. */ @Singleton public class VersionedScoreboardInterceptor { @@ -64,7 +64,7 @@ public VersionedScoreboardInterceptor( className = "net.minecraft.client.network.play.ClientPlayNetHandler", methodName = "handleScoreboardObjective", parameters = {@Type(reference = SScoreboardObjectivePacket.class)}, - version = "1.16.4") + version = "1.16.5") public void hookHandleScoreboardObjective(@Named("args") Object[] args) { SScoreboardObjectivePacket packet = (SScoreboardObjectivePacket) args[0]; @@ -94,7 +94,7 @@ public void hookHandleScoreboardObjective(@Named("args") Object[] args) { className = "net.minecraft.client.network.play.ClientPlayNetHandler", methodName = "handleUpdateScore", parameters = {@Type(reference = SUpdateScorePacket.class)}, - version = "1.16.4") + version = "1.16.5") public void hookHandleUpdateScore(@Named("args") Object[] args) { SUpdateScorePacket packet = (SUpdateScorePacket) args[0]; @@ -117,7 +117,7 @@ public void hookHandleUpdateScore(@Named("args") Object[] args) { className = "net.minecraft.client.network.play.ClientPlayNetHandler", methodName = "handleDisplayObjective", parameters = {@Type(reference = SDisplayObjectivePacket.class)}, - version = "1.16.4") + version = "1.16.5") public void hookHandleDisplayObjective(@Named("args") Object[] args) { SDisplayObjectivePacket packet = (SDisplayObjectivePacket) args[0]; String name = packet.getName(); @@ -130,7 +130,7 @@ public void hookHandleDisplayObjective(@Named("args") Object[] args) { className = "net.minecraft.client.network.play.ClientPlayNetHandler", methodName = "handleTeams", parameters = {@Type(reference = STeamsPacket.class)}, - version = "1.16.4") + version = "1.16.5") public void hookHandleTeams(@Named("args") Object[] args) { STeamsPacket packet = (STeamsPacket) args[0]; diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/scoreboard/listener/VersionedObjectiveChangeListener.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/scoreboard/listener/VersionedObjectiveChangeListener.java similarity index 97% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/scoreboard/listener/VersionedObjectiveChangeListener.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/scoreboard/listener/VersionedObjectiveChangeListener.java index e5c03e095..61ae72aa0 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/scoreboard/listener/VersionedObjectiveChangeListener.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/scoreboard/listener/VersionedObjectiveChangeListener.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.world.scoreboard.listener; +package net.flintmc.mcapi.v1_16_5.world.scoreboard.listener; import com.google.inject.Inject; import net.flintmc.framework.inject.implement.Implement; @@ -34,7 +34,7 @@ import net.minecraft.util.text.ITextComponent; import java.util.Optional; -@Implement(value = ObjectiveChangeListener.class, version = "1.16.4") +@Implement(value = ObjectiveChangeListener.class, version = "1.16.5") public class VersionedObjectiveChangeListener implements ObjectiveChangeListener { private final MinecraftComponentMapper componentMapper; diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/scoreboard/listener/VersionedPlayerTeamChangeListener.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/scoreboard/listener/VersionedPlayerTeamChangeListener.java similarity index 98% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/scoreboard/listener/VersionedPlayerTeamChangeListener.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/scoreboard/listener/VersionedPlayerTeamChangeListener.java index 71b508f41..c5244ab8c 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/scoreboard/listener/VersionedPlayerTeamChangeListener.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/scoreboard/listener/VersionedPlayerTeamChangeListener.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.world.scoreboard.listener; +package net.flintmc.mcapi.v1_16_5.world.scoreboard.listener; import com.google.inject.Inject; import java.util.Optional; @@ -38,7 +38,7 @@ import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TextFormatting; -@Implement(value = PlayerTeamChangeListener.class, version = "1.16.4") +@Implement(value = PlayerTeamChangeListener.class, version = "1.16.5") public class VersionedPlayerTeamChangeListener implements PlayerTeamChangeListener { private final ScoreboardMapper scoreboardMapper; diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/scoreboard/listener/VersionedScoreChangeListener.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/scoreboard/listener/VersionedScoreChangeListener.java similarity index 94% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/scoreboard/listener/VersionedScoreChangeListener.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/scoreboard/listener/VersionedScoreChangeListener.java index 442f3e75f..01596f748 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/scoreboard/listener/VersionedScoreChangeListener.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/scoreboard/listener/VersionedScoreChangeListener.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.world.scoreboard.listener; +package net.flintmc.mcapi.v1_16_5.world.scoreboard.listener; import com.google.inject.Inject; import java.util.Optional; @@ -29,7 +29,7 @@ import net.minecraft.scoreboard.ScoreObjective; import net.minecraft.scoreboard.Scoreboard; -@Implement(value = ScoreChangeListener.class, version = "1.16.4") +@Implement(value = ScoreChangeListener.class, version = "1.16.5") public class VersionedScoreChangeListener implements ScoreChangeListener { private final ScoreboardMapper scoreboardMapper; diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/storage/VersionedWorldBackupService.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/storage/VersionedWorldBackupService.java similarity index 93% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/storage/VersionedWorldBackupService.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/storage/VersionedWorldBackupService.java index 82dddea8d..a6ed36ddd 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/storage/VersionedWorldBackupService.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/storage/VersionedWorldBackupService.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.world.storage; +package net.flintmc.mcapi.v1_16_5.world.storage; import com.google.inject.Singleton; import java.io.IOException; @@ -27,7 +27,7 @@ import net.minecraft.client.Minecraft; @Singleton -@Implement(value = WorldBackupService.class, version = "1.16.4") +@Implement(value = WorldBackupService.class, version = "1.16.5") public class VersionedWorldBackupService implements WorldBackupService { /** diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/storage/VersionedWorldLauncher.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/storage/VersionedWorldLauncher.java similarity index 91% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/storage/VersionedWorldLauncher.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/storage/VersionedWorldLauncher.java index 39f1a0262..f1ff5c8c5 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/storage/VersionedWorldLauncher.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/storage/VersionedWorldLauncher.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.world.storage; +package net.flintmc.mcapi.v1_16_5.world.storage; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -27,10 +27,10 @@ import net.minecraft.client.Minecraft; /** - * 1.16.4 implementation of the {@link WorldLauncher}. + * 1.16.5 implementation of the {@link WorldLauncher}. */ @Singleton -@Implement(value = WorldLauncher.class, version = "1.16.4") +@Implement(value = WorldLauncher.class, version = "1.16.5") public class VersionedWorldLauncher implements WorldLauncher { @Inject diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/storage/VersionedWorldLoader.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/storage/VersionedWorldLoader.java similarity index 96% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/storage/VersionedWorldLoader.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/storage/VersionedWorldLoader.java index 9addfe380..a6fb4596a 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/storage/VersionedWorldLoader.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/storage/VersionedWorldLoader.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.world.storage; +package net.flintmc.mcapi.v1_16_5.world.storage; import com.google.common.collect.Maps; import com.google.inject.Inject; @@ -36,7 +36,7 @@ import net.minecraft.world.storage.WorldSummary; @Singleton -@Implement(value = WorldLoader.class, version = "1.16.4") +@Implement(value = WorldLoader.class, version = "1.16.5") public class VersionedWorldLoader implements WorldLoader { private final WorldMapper worldMapper; diff --git a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/storage/VersionedWorldTypeRegistry.java b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/storage/VersionedWorldTypeRegistry.java similarity index 96% rename from mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/storage/VersionedWorldTypeRegistry.java rename to mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/storage/VersionedWorldTypeRegistry.java index 05640378f..8d563d221 100644 --- a/mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/world/storage/VersionedWorldTypeRegistry.java +++ b/mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/world/storage/VersionedWorldTypeRegistry.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.mcapi.v1_16_4.world.storage; +package net.flintmc.mcapi.v1_16_5.world.storage; import com.beust.jcommander.internal.Lists; import com.google.inject.Inject; @@ -33,7 +33,7 @@ import net.minecraft.util.text.TranslationTextComponent; @Singleton -@Implement(value = WorldTypeRegistry.class, version = "1.16.4") +@Implement(value = WorldTypeRegistry.class, version = "1.16.5") public class VersionedWorldTypeRegistry implements WorldTypeRegistry { private static final Collection BUFFET_TYPES = diff --git a/minecraft/minecraft-1-16-4/build.gradle.kts b/minecraft/minecraft-1-16-5/build.gradle.kts similarity index 86% rename from minecraft/minecraft-1-16-4/build.gradle.kts rename to minecraft/minecraft-1-16-5/build.gradle.kts index 10d528b87..e219e4879 100644 --- a/minecraft/minecraft-1-16-4/build.gradle.kts +++ b/minecraft/minecraft-1-16-5/build.gradle.kts @@ -29,27 +29,27 @@ flint { staticFiles { create("version.json") { from("build/generated/flint/version.json") - to("versions/flint-1.16.4/flint-version.json") + to("versions/flint-1.16.5/flint-version.json") } create("joined.tsrg") { - from("jar:https://files.minecraftforge.net/maven/de/oceanlabs/mcp/mcp_config/1.16.4/mcp_config-1.16.4.zip!/config/joined.tsrg") - to("flint/assets/1.16.4/joined.tsrg") + from("jar:https://files.minecraftforge.net/maven/de/oceanlabs/mcp/mcp_config/1.16.5/mcp_config-1.16.5.zip!/config/joined.tsrg") + to("flint/assets/1.16.5/joined.tsrg") } create("fields.csv") { from("jar:https://files.minecraftforge.net/maven/de/oceanlabs/mcp/mcp_snapshot/20201028-1.16.3/mcp_snapshot-20201028-1.16.3.zip!/fields.csv") - to("flint/assets/1.16.4/fields.csv") + to("flint/assets/1.16.5/fields.csv") } create("params.csv") { from("jar:https://files.minecraftforge.net/maven/de/oceanlabs/mcp/mcp_snapshot/20201028-1.16.3/mcp_snapshot-20201028-1.16.3.zip!/params.csv") - to("flint/assets/1.16.4/params.csv") + to("flint/assets/1.16.5/params.csv") } create("methods.csv") { from("jar:https://files.minecraftforge.net/maven/de/oceanlabs/mcp/mcp_snapshot/20201028-1.16.3/mcp_snapshot-20201028-1.16.3.zip!/methods.csv") - to("flint/assets/1.16.4/methods.csv") + to("flint/assets/1.16.5/methods.csv") } } } @@ -59,13 +59,13 @@ afterEvaluate { create("generateVersionJson") { doLast { val minecraftVersion = MinecraftVersionGenerator.generateWithProjectDependencies( - gameVersion = "1.16.4", + gameVersion = "1.16.5", versionFile = file("version.json"), project = project.project(":bootstrap") ) minecraftVersion.mainClass = "net.flintmc.bootstrap.Bootstrap" - minecraftVersion.id = "flint-1.16.4" + minecraftVersion.id = "flint-1.16.5" val version = file("build/generated/flint/version.json") version.parentFile.mkdirs() diff --git a/minecraft/minecraft-1-16-4/version.json b/minecraft/minecraft-1-16-5/version.json similarity index 99% rename from minecraft/minecraft-1-16-4/version.json rename to minecraft/minecraft-1-16-5/version.json index 9f61914bd..797c24f05 100644 --- a/minecraft/minecraft-1-16-4/version.json +++ b/minecraft/minecraft-1-16-5/version.json @@ -136,7 +136,7 @@ "url": "https://launcher.mojang.com/v1/objects/d9ae0e8e28475254855430ff051daaa0dd041a08/server.txt" } }, - "id": "1.16.4", + "id": "1.16.5", "libraries": [ { "downloads": { diff --git a/render/gui/build.gradle.kts b/render/gui/build.gradle.kts index 6a34cbcd7..d7d116c41 100644 --- a/render/gui/build.gradle.kts +++ b/render/gui/build.gradle.kts @@ -26,7 +26,7 @@ group = "net.flintmc" dependencies { - minecraft("1.15.2", "1.16.4") { + minecraft("1.15.2", "1.16.5") { annotationProcessor(project(":annotation-processing:annotation-processing-autoload")) implementation(project(":annotation-processing:annotation-processing-autoload")) } diff --git a/render/gui/src/v1_16_4/java/net/flintmc/render/gui/v1_16_4/VersionedGuiInterceptor.java b/render/gui/src/v1_16_5/java/net/flintmc/render/gui/v1_16_5/VersionedGuiInterceptor.java similarity index 95% rename from render/gui/src/v1_16_4/java/net/flintmc/render/gui/v1_16_4/VersionedGuiInterceptor.java rename to render/gui/src/v1_16_5/java/net/flintmc/render/gui/v1_16_5/VersionedGuiInterceptor.java index 2ca6053af..434549b66 100644 --- a/render/gui/src/v1_16_4/java/net/flintmc/render/gui/v1_16_4/VersionedGuiInterceptor.java +++ b/render/gui/src/v1_16_5/java/net/flintmc/render/gui/v1_16_5/VersionedGuiInterceptor.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.render.gui.v1_16_4; +package net.flintmc.render.gui.v1_16_5; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -45,7 +45,7 @@ import net.minecraft.client.Minecraft; /** - * 1.16.4 Implementation of the gui interceptor + * 1.16.5 Implementation of the gui interceptor */ @Singleton public class VersionedGuiInterceptor { @@ -67,12 +67,12 @@ private VersionedGuiInterceptor( this.fieldBuilder = fieldBuilder; } - @PostSubscribe(version = "1.16.4") + @PostSubscribe(version = "1.16.5") public void hookMinecraftWindowRender(ScreenRenderEvent event) { this.windowManager.renderMinecraftWindow(); } - @ClassTransform(version = "1.16.4") + @ClassTransform(version = "1.16.5") @CtClassFilter( className = "net.minecraft.client.gui.screen.Screen", value = CtClassFilters.SUBCLASS_OF) @@ -116,7 +116,7 @@ private void hookScreenRender(ClassTransformContext context) methodName = "displayGuiScreen", parameters = @Type(typeName = "net.minecraft.client.gui.screen.Screen"), executionTime = Hook.ExecutionTime.AFTER, - version = "1.16.4") + version = "1.16.5") public void hookScreenChanged() { ScreenName screenName = this.nameMapper.fromObject(Minecraft.getInstance().currentScreen); this.windowManager.fireEvent(-1, window -> new ScreenChangedEvent(window, screenName)); diff --git a/render/gui/src/v1_16_4/java/net/flintmc/render/gui/v1_16_4/VersionedInputInterceptor.java b/render/gui/src/v1_16_5/java/net/flintmc/render/gui/v1_16_5/VersionedInputInterceptor.java similarity index 96% rename from render/gui/src/v1_16_4/java/net/flintmc/render/gui/v1_16_4/VersionedInputInterceptor.java rename to render/gui/src/v1_16_5/java/net/flintmc/render/gui/v1_16_5/VersionedInputInterceptor.java index 43564df57..4c8a8b7c4 100644 --- a/render/gui/src/v1_16_4/java/net/flintmc/render/gui/v1_16_4/VersionedInputInterceptor.java +++ b/render/gui/src/v1_16_5/java/net/flintmc/render/gui/v1_16_5/VersionedInputInterceptor.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.render.gui.v1_16_4; +package net.flintmc.render.gui.v1_16_5; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -28,7 +28,7 @@ import net.flintmc.framework.inject.InjectedFieldBuilder; import net.flintmc.framework.inject.implement.Implement; import net.flintmc.render.gui.InputInterceptor; -import net.flintmc.render.gui.v1_16_4.glfw.VersionedGLFWCallbacks; +import net.flintmc.render.gui.v1_16_5.glfw.VersionedGLFWCallbacks; import net.flintmc.transform.javassist.ClassTransform; import net.flintmc.transform.javassist.ClassTransformContext; import net.minecraft.client.MainWindow; @@ -44,10 +44,10 @@ import java.nio.DoubleBuffer; /** - * 1.16.4 implementation of the input interceptor + * 1.16.5 implementation of the input interceptor */ @Singleton -@Implement(value = InputInterceptor.class, version = "1.16.4") +@Implement(value = InputInterceptor.class, version = "1.16.5") public class VersionedInputInterceptor implements InputInterceptor { private final InjectedFieldBuilder.Factory fieldBuilderFactory; @@ -131,7 +131,7 @@ public void interceptMouseCallbacks( }); } - @ClassTransform(value = "net.minecraft.client.util.InputMappings", version = "1.16.4") + @ClassTransform(value = "net.minecraft.client.util.InputMappings", version = "1.16.5") public void transformInputMappings(ClassTransformContext context) throws CannotCompileException, NotFoundException { CtField injectedField = @@ -159,7 +159,7 @@ public void transformInputMappings(ClassTransformContext context) setMouseCallbacksMethod.setBody(String.format("%s.interceptMouseCallbacks($$);", fieldName)); } - @ClassTransform(value = "net.minecraft.client.MainWindow", version = "1.16.4") + @ClassTransform(value = "net.minecraft.client.MainWindow", version = "1.16.5") public void hookMainWindowConstructor(ClassTransformContext context) throws NotFoundException, CannotCompileException { CtField injectedField = diff --git a/render/gui/src/v1_16_4/java/net/flintmc/render/gui/v1_16_4/event/VersionedOpenGLInitializeEventInjector.java b/render/gui/src/v1_16_5/java/net/flintmc/render/gui/v1_16_5/event/VersionedOpenGLInitializeEventInjector.java similarity index 95% rename from render/gui/src/v1_16_4/java/net/flintmc/render/gui/v1_16_4/event/VersionedOpenGLInitializeEventInjector.java rename to render/gui/src/v1_16_5/java/net/flintmc/render/gui/v1_16_5/event/VersionedOpenGLInitializeEventInjector.java index 19bbbfec0..401bd5b50 100644 --- a/render/gui/src/v1_16_4/java/net/flintmc/render/gui/v1_16_4/event/VersionedOpenGLInitializeEventInjector.java +++ b/render/gui/src/v1_16_5/java/net/flintmc/render/gui/v1_16_5/event/VersionedOpenGLInitializeEventInjector.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.render.gui.v1_16_4.event; +package net.flintmc.render.gui.v1_16_5.event; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -45,7 +45,7 @@ public VersionedOpenGLInitializeEventInjector(EventBus eventBus) { executionTime = ExecutionTime.BEFORE, className = "net.minecraft.client.Minecraft", methodName = "isMultiplayerEnabled", - version = "1.16.4") + version = "1.16.5") public void preInitialize() { this.eventBus.fireEvent(this.event, Subscribe.Phase.PRE); } @@ -53,7 +53,7 @@ public void preInitialize() { @Hook( className = "net.minecraft.client.MainWindow", methodName = "setLogOnGlError", - version = "1.16.4") + version = "1.16.5") public void postInitialize() { this.eventBus.fireEvent(this.event, Subscribe.Phase.POST); } diff --git a/render/gui/src/v1_16_4/java/net/flintmc/render/gui/v1_16_4/event/VersionedScreenRenderEventInjector.java b/render/gui/src/v1_16_5/java/net/flintmc/render/gui/v1_16_5/event/VersionedScreenRenderEventInjector.java similarity index 96% rename from render/gui/src/v1_16_4/java/net/flintmc/render/gui/v1_16_4/event/VersionedScreenRenderEventInjector.java rename to render/gui/src/v1_16_5/java/net/flintmc/render/gui/v1_16_5/event/VersionedScreenRenderEventInjector.java index c4d91b29d..a032cf073 100644 --- a/render/gui/src/v1_16_4/java/net/flintmc/render/gui/v1_16_4/event/VersionedScreenRenderEventInjector.java +++ b/render/gui/src/v1_16_5/java/net/flintmc/render/gui/v1_16_5/event/VersionedScreenRenderEventInjector.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.render.gui.v1_16_4.event; +package net.flintmc.render.gui.v1_16_5.event; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -48,7 +48,7 @@ private VersionedScreenRenderEventInjector(EventBus eventBus) { @Type(reference = boolean.class) }, executionTime = {Hook.ExecutionTime.BEFORE, Hook.ExecutionTime.AFTER}, - version = "1.16.4") + version = "1.16.5") public void renderScreen(Hook.ExecutionTime executionTime) { this.eventBus.fireEvent(this.event, executionTime); } diff --git a/render/gui/src/v1_16_4/java/net/flintmc/render/gui/v1_16_4/glfw/VersionedGLFWCallbacks.java b/render/gui/src/v1_16_5/java/net/flintmc/render/gui/v1_16_5/glfw/VersionedGLFWCallbacks.java similarity index 99% rename from render/gui/src/v1_16_4/java/net/flintmc/render/gui/v1_16_4/glfw/VersionedGLFWCallbacks.java rename to render/gui/src/v1_16_5/java/net/flintmc/render/gui/v1_16_5/glfw/VersionedGLFWCallbacks.java index 36e51e323..a872f462e 100644 --- a/render/gui/src/v1_16_4/java/net/flintmc/render/gui/v1_16_4/glfw/VersionedGLFWCallbacks.java +++ b/render/gui/src/v1_16_5/java/net/flintmc/render/gui/v1_16_5/glfw/VersionedGLFWCallbacks.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.render.gui.v1_16_4.glfw; +package net.flintmc.render.gui.v1_16_5.glfw; import com.google.inject.Inject; import com.google.inject.Singleton; diff --git a/render/gui/src/v1_16_4/java/net/flintmc/render/gui/v1_16_4/glfw/VersionedGLFWInputConverter.java b/render/gui/src/v1_16_5/java/net/flintmc/render/gui/v1_16_5/glfw/VersionedGLFWInputConverter.java similarity index 99% rename from render/gui/src/v1_16_4/java/net/flintmc/render/gui/v1_16_4/glfw/VersionedGLFWInputConverter.java rename to render/gui/src/v1_16_5/java/net/flintmc/render/gui/v1_16_5/glfw/VersionedGLFWInputConverter.java index f18702126..367de3303 100644 --- a/render/gui/src/v1_16_4/java/net/flintmc/render/gui/v1_16_4/glfw/VersionedGLFWInputConverter.java +++ b/render/gui/src/v1_16_5/java/net/flintmc/render/gui/v1_16_5/glfw/VersionedGLFWInputConverter.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.render.gui.v1_16_4.glfw; +package net.flintmc.render.gui.v1_16_5.glfw; import java.util.EnumSet; import java.util.Set; diff --git a/render/gui/src/v1_16_4/java/net/flintmc/render/gui/v1_16_4/lazy/VersionedBuiltinScreenDisplayInit.java b/render/gui/src/v1_16_5/java/net/flintmc/render/gui/v1_16_5/lazy/VersionedBuiltinScreenDisplayInit.java similarity index 98% rename from render/gui/src/v1_16_4/java/net/flintmc/render/gui/v1_16_4/lazy/VersionedBuiltinScreenDisplayInit.java rename to render/gui/src/v1_16_5/java/net/flintmc/render/gui/v1_16_5/lazy/VersionedBuiltinScreenDisplayInit.java index 8c97e101a..8d1933f76 100644 --- a/render/gui/src/v1_16_4/java/net/flintmc/render/gui/v1_16_4/lazy/VersionedBuiltinScreenDisplayInit.java +++ b/render/gui/src/v1_16_5/java/net/flintmc/render/gui/v1_16_5/lazy/VersionedBuiltinScreenDisplayInit.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.render.gui.v1_16_4.lazy; +package net.flintmc.render.gui.v1_16_5.lazy; import java.util.Map; import java.util.function.Consumer; diff --git a/render/gui/src/v1_16_4/java/net/flintmc/render/gui/v1_16_4/screen/VersionedBuiltinScreenDisplayer.java b/render/gui/src/v1_16_5/java/net/flintmc/render/gui/v1_16_5/screen/VersionedBuiltinScreenDisplayer.java similarity index 94% rename from render/gui/src/v1_16_4/java/net/flintmc/render/gui/v1_16_4/screen/VersionedBuiltinScreenDisplayer.java rename to render/gui/src/v1_16_5/java/net/flintmc/render/gui/v1_16_5/screen/VersionedBuiltinScreenDisplayer.java index bdbdc757b..1a90acd21 100644 --- a/render/gui/src/v1_16_4/java/net/flintmc/render/gui/v1_16_4/screen/VersionedBuiltinScreenDisplayer.java +++ b/render/gui/src/v1_16_5/java/net/flintmc/render/gui/v1_16_5/screen/VersionedBuiltinScreenDisplayer.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.render.gui.v1_16_4.screen; +package net.flintmc.render.gui.v1_16_5.screen; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -27,15 +27,15 @@ import net.flintmc.framework.inject.implement.Implement; import net.flintmc.render.gui.screen.BuiltinScreenDisplayer; import net.flintmc.render.gui.screen.ScreenName; -import net.flintmc.render.gui.v1_16_4.lazy.VersionedBuiltinScreenDisplayInit; +import net.flintmc.render.gui.v1_16_5.lazy.VersionedBuiltinScreenDisplayInit; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.screen.Screen; /** - * 1.16.4 Implementation of the {@link BuiltinScreenDisplayer} + * 1.16.5 Implementation of the {@link BuiltinScreenDisplayer} */ @Singleton -@Implement(value = BuiltinScreenDisplayer.class, version = "1.16.4") +@Implement(value = BuiltinScreenDisplayer.class, version = "1.16.5") public class VersionedBuiltinScreenDisplayer implements BuiltinScreenDisplayer { private final Map> supportedScreens; diff --git a/render/gui/src/v1_16_4/java/net/flintmc/render/gui/v1_16_4/screen/VersionedDummyScreen.java b/render/gui/src/v1_16_5/java/net/flintmc/render/gui/v1_16_5/screen/VersionedDummyScreen.java similarity index 92% rename from render/gui/src/v1_16_4/java/net/flintmc/render/gui/v1_16_4/screen/VersionedDummyScreen.java rename to render/gui/src/v1_16_5/java/net/flintmc/render/gui/v1_16_5/screen/VersionedDummyScreen.java index bfcd8f13e..2302b0f65 100644 --- a/render/gui/src/v1_16_4/java/net/flintmc/render/gui/v1_16_4/screen/VersionedDummyScreen.java +++ b/render/gui/src/v1_16_5/java/net/flintmc/render/gui/v1_16_5/screen/VersionedDummyScreen.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.render.gui.v1_16_4.screen; +package net.flintmc.render.gui.v1_16_5.screen; import com.mojang.blaze3d.matrix.MatrixStack; import net.flintmc.render.gui.screen.BuiltinScreenDisplayer; @@ -25,7 +25,7 @@ import net.minecraft.util.text.StringTextComponent; /** - * Dummy screen for 1.16.4 that renders nothing and only exists to display the mouse. + * Dummy screen for 1.16.5 that renders nothing and only exists to display the mouse. * * @see BuiltinScreenDisplayer#displayMouse() */ diff --git a/render/gui/src/v1_16_4/java/net/flintmc/render/gui/v1_16_4/screen/VersionedScreenNameMapper.java b/render/gui/src/v1_16_5/java/net/flintmc/render/gui/v1_16_5/screen/VersionedScreenNameMapper.java similarity index 95% rename from render/gui/src/v1_16_4/java/net/flintmc/render/gui/v1_16_4/screen/VersionedScreenNameMapper.java rename to render/gui/src/v1_16_5/java/net/flintmc/render/gui/v1_16_5/screen/VersionedScreenNameMapper.java index 768950271..b39a267d4 100644 --- a/render/gui/src/v1_16_4/java/net/flintmc/render/gui/v1_16_4/screen/VersionedScreenNameMapper.java +++ b/render/gui/src/v1_16_5/java/net/flintmc/render/gui/v1_16_5/screen/VersionedScreenNameMapper.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.render.gui.v1_16_4.screen; +package net.flintmc.render.gui.v1_16_5.screen; import com.google.inject.Singleton; import java.util.HashMap; @@ -27,7 +27,7 @@ import net.flintmc.render.gui.screen.ScreenNameMapper; @Singleton -@Implement(value = ScreenNameMapper.class, version = "1.16.4") +@Implement(value = ScreenNameMapper.class, version = "1.16.5") public class VersionedScreenNameMapper implements ScreenNameMapper { // Map of all deobfuscated screen class names to their ScreenName equivalents diff --git a/render/gui/src/v1_16_4/java/net/flintmc/render/gui/v1_16_4/windowing/MinecraftFpsShadow.java b/render/gui/src/v1_16_5/java/net/flintmc/render/gui/v1_16_5/windowing/MinecraftFpsShadow.java similarity index 95% rename from render/gui/src/v1_16_4/java/net/flintmc/render/gui/v1_16_4/windowing/MinecraftFpsShadow.java rename to render/gui/src/v1_16_5/java/net/flintmc/render/gui/v1_16_5/windowing/MinecraftFpsShadow.java index 60ad2c2c8..0f8cb4b7f 100644 --- a/render/gui/src/v1_16_4/java/net/flintmc/render/gui/v1_16_4/windowing/MinecraftFpsShadow.java +++ b/render/gui/src/v1_16_5/java/net/flintmc/render/gui/v1_16_5/windowing/MinecraftFpsShadow.java @@ -17,12 +17,12 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.render.gui.v1_16_4.windowing; +package net.flintmc.render.gui.v1_16_5.windowing; import net.flintmc.transform.shadow.FieldGetter; import net.flintmc.transform.shadow.Shadow; -@Shadow(value = "net.minecraft.client.Minecraft", version = "1.16.4") +@Shadow(value = "net.minecraft.client.Minecraft", version = "1.16.5") public interface MinecraftFpsShadow { @FieldGetter("debugFPS") diff --git a/render/gui/src/v1_16_4/java/net/flintmc/render/gui/v1_16_4/windowing/VersionedMinecraftWindow.java b/render/gui/src/v1_16_5/java/net/flintmc/render/gui/v1_16_5/windowing/VersionedMinecraftWindow.java similarity index 98% rename from render/gui/src/v1_16_4/java/net/flintmc/render/gui/v1_16_4/windowing/VersionedMinecraftWindow.java rename to render/gui/src/v1_16_5/java/net/flintmc/render/gui/v1_16_5/windowing/VersionedMinecraftWindow.java index c9fc19ab5..dcd793d60 100644 --- a/render/gui/src/v1_16_4/java/net/flintmc/render/gui/v1_16_4/windowing/VersionedMinecraftWindow.java +++ b/render/gui/src/v1_16_5/java/net/flintmc/render/gui/v1_16_5/windowing/VersionedMinecraftWindow.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.render.gui.v1_16_4.windowing; +package net.flintmc.render.gui.v1_16_5.windowing; import static org.lwjgl.glfw.GLFW.glfwMakeContextCurrent; import static org.lwjgl.glfw.GLFW.glfwSetWindowShouldClose; @@ -37,7 +37,7 @@ import net.minecraft.client.Minecraft; @Singleton -@Implement(value = MinecraftWindow.class, version = "1.16.4") +@Implement(value = MinecraftWindow.class, version = "1.16.5") public class VersionedMinecraftWindow extends VersionedWindow implements MinecraftWindow { private final ClassMappingProvider classMappingProvider; diff --git a/render/gui/src/v1_16_4/java/net/flintmc/render/gui/v1_16_4/windowing/VersionedWindow.java b/render/gui/src/v1_16_5/java/net/flintmc/render/gui/v1_16_5/windowing/VersionedWindow.java similarity index 96% rename from render/gui/src/v1_16_4/java/net/flintmc/render/gui/v1_16_4/windowing/VersionedWindow.java rename to render/gui/src/v1_16_5/java/net/flintmc/render/gui/v1_16_5/windowing/VersionedWindow.java index 6509a1e44..9173620c5 100644 --- a/render/gui/src/v1_16_4/java/net/flintmc/render/gui/v1_16_4/windowing/VersionedWindow.java +++ b/render/gui/src/v1_16_5/java/net/flintmc/render/gui/v1_16_5/windowing/VersionedWindow.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.render.gui.v1_16_4.windowing; +package net.flintmc.render.gui.v1_16_5.windowing; import static org.lwjgl.glfw.GLFW.GLFW_FOCUSED; import static org.lwjgl.glfw.GLFW.GLFW_TRUE; @@ -39,8 +39,8 @@ import net.flintmc.render.gui.input.Key; import net.flintmc.render.gui.internal.windowing.DefaultWindowManager; import net.flintmc.render.gui.internal.windowing.InternalWindow; -import net.flintmc.render.gui.v1_16_4.glfw.VersionedGLFWCallbacks; -import net.flintmc.render.gui.v1_16_4.glfw.VersionedGLFWInputConverter; +import net.flintmc.render.gui.v1_16_5.glfw.VersionedGLFWCallbacks; +import net.flintmc.render.gui.v1_16_5.glfw.VersionedGLFWInputConverter; import net.flintmc.render.gui.windowing.MinecraftWindow; import net.flintmc.render.gui.windowing.Window; import net.flintmc.render.gui.windowing.WindowRenderer; @@ -48,9 +48,9 @@ import org.lwjgl.system.MemoryStack; /** - * 1.16.4 implementation for {@link Window}. + * 1.16.5 implementation for {@link Window}. */ -@Implement(value = Window.class, version = "1.16.4") +@Implement(value = Window.class, version = "1.16.5") public class VersionedWindow implements InternalWindow { protected final EventBus eventBus; diff --git a/render/shader/build.gradle.kts b/render/shader/build.gradle.kts index 7e919b417..3636d6934 100644 --- a/render/shader/build.gradle.kts +++ b/render/shader/build.gradle.kts @@ -24,7 +24,7 @@ plugins { group = "net.flintmc" dependencies { - minecraft("1.15.2", "1.16.4") { + minecraft("1.15.2", "1.16.5") { annotationProcessor(project(":annotation-processing:annotation-processing-autoload")) } annotationProcessor(project(":annotation-processing:annotation-processing-autoload")) diff --git a/render/shader/src/v1_16_4/java/net/flintmc/render/shader/v1_16_4/VersionedShaderProgram.java b/render/shader/src/v1_16_5/java/net/flintmc/render/shader/v1_16_5/VersionedShaderProgram.java similarity index 98% rename from render/shader/src/v1_16_4/java/net/flintmc/render/shader/v1_16_4/VersionedShaderProgram.java rename to render/shader/src/v1_16_5/java/net/flintmc/render/shader/v1_16_5/VersionedShaderProgram.java index fbae52541..109c453f8 100644 --- a/render/shader/src/v1_16_4/java/net/flintmc/render/shader/v1_16_4/VersionedShaderProgram.java +++ b/render/shader/src/v1_16_5/java/net/flintmc/render/shader/v1_16_5/VersionedShaderProgram.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.render.shader.v1_16_4; +package net.flintmc.render.shader.v1_16_5; import static org.lwjgl.opengl.GL20.GL_COMPILE_STATUS; import static org.lwjgl.opengl.GL20.GL_FRAGMENT_SHADER; @@ -51,7 +51,7 @@ /** * {@inheritDoc} */ -@Implement(value = ShaderProgram.class, version = "1.16.4") +@Implement(value = ShaderProgram.class, version = "1.16.5") public class VersionedShaderProgram implements ShaderProgram { private final List providedShaderUniforms; diff --git a/render/shader/src/v1_16_4/java/net/flintmc/render/shader/v1_16_4/VersionedShaderUniform.java b/render/shader/src/v1_16_5/java/net/flintmc/render/shader/v1_16_5/VersionedShaderUniform.java similarity index 98% rename from render/shader/src/v1_16_4/java/net/flintmc/render/shader/v1_16_4/VersionedShaderUniform.java rename to render/shader/src/v1_16_5/java/net/flintmc/render/shader/v1_16_5/VersionedShaderUniform.java index cc5ab15b7..13e489729 100644 --- a/render/shader/src/v1_16_4/java/net/flintmc/render/shader/v1_16_4/VersionedShaderUniform.java +++ b/render/shader/src/v1_16_5/java/net/flintmc/render/shader/v1_16_5/VersionedShaderUniform.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.render.shader.v1_16_4; +package net.flintmc.render.shader.v1_16_5; import static org.lwjgl.opengl.GL20.glGetUniformLocation; import static org.lwjgl.opengl.GL20.glUniform1f; @@ -47,7 +47,7 @@ /** * {@inheritDoc} */ -@Implement(value = ShaderUniform.class, version = "1.16.4") +@Implement(value = ShaderUniform.class, version = "1.16.5") public class VersionedShaderUniform implements ShaderUniform { private final String name; diff --git a/render/shader/src/v1_16_4/java/net/flintmc/render/shader/v1_16_4/uniformprovider/VersionedPartialTickProvider.java b/render/shader/src/v1_16_5/java/net/flintmc/render/shader/v1_16_5/uniformprovider/VersionedPartialTickProvider.java similarity index 91% rename from render/shader/src/v1_16_4/java/net/flintmc/render/shader/v1_16_4/uniformprovider/VersionedPartialTickProvider.java rename to render/shader/src/v1_16_5/java/net/flintmc/render/shader/v1_16_5/uniformprovider/VersionedPartialTickProvider.java index c2fbb7f0d..319dff6a9 100644 --- a/render/shader/src/v1_16_4/java/net/flintmc/render/shader/v1_16_4/uniformprovider/VersionedPartialTickProvider.java +++ b/render/shader/src/v1_16_5/java/net/flintmc/render/shader/v1_16_5/uniformprovider/VersionedPartialTickProvider.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.render.shader.v1_16_4.uniformprovider; +package net.flintmc.render.shader.v1_16_5.uniformprovider; import com.google.inject.Singleton; import net.flintmc.framework.inject.implement.Implement; @@ -26,7 +26,7 @@ import net.minecraft.client.Minecraft; @Singleton -@Implement(value = PartialTickProvider.class, version = "1.16.4") +@Implement(value = PartialTickProvider.class, version = "1.16.5") public class VersionedPartialTickProvider implements PartialTickProvider { /** diff --git a/render/shader/src/v1_16_4/java/net/flintmc/render/shader/v1_16_4/uniformprovider/VersionedProjectionMatrixProvider.java b/render/shader/src/v1_16_5/java/net/flintmc/render/shader/v1_16_5/uniformprovider/VersionedProjectionMatrixProvider.java similarity index 95% rename from render/shader/src/v1_16_4/java/net/flintmc/render/shader/v1_16_4/uniformprovider/VersionedProjectionMatrixProvider.java rename to render/shader/src/v1_16_5/java/net/flintmc/render/shader/v1_16_5/uniformprovider/VersionedProjectionMatrixProvider.java index 2ca03b294..61eda4296 100644 --- a/render/shader/src/v1_16_4/java/net/flintmc/render/shader/v1_16_4/uniformprovider/VersionedProjectionMatrixProvider.java +++ b/render/shader/src/v1_16_5/java/net/flintmc/render/shader/v1_16_5/uniformprovider/VersionedProjectionMatrixProvider.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.render.shader.v1_16_4.uniformprovider; +package net.flintmc.render.shader.v1_16_5.uniformprovider; import com.google.inject.Singleton; import net.flintmc.framework.inject.implement.Implement; @@ -25,7 +25,7 @@ import net.flintmc.render.shader.uniformprovider.ProjectionMatrixProvider; @Singleton -@Implement(value = ProjectionMatrixProvider.class, version = "1.16.4") +@Implement(value = ProjectionMatrixProvider.class, version = "1.16.5") public class VersionedProjectionMatrixProvider implements ProjectionMatrixProvider { /** diff --git a/render/shader/src/v1_16_4/java/net/flintmc/render/shader/v1_16_4/uniformprovider/VersionedWorldMatrixProvider.java b/render/shader/src/v1_16_5/java/net/flintmc/render/shader/v1_16_5/uniformprovider/VersionedWorldMatrixProvider.java similarity index 90% rename from render/shader/src/v1_16_4/java/net/flintmc/render/shader/v1_16_4/uniformprovider/VersionedWorldMatrixProvider.java rename to render/shader/src/v1_16_5/java/net/flintmc/render/shader/v1_16_5/uniformprovider/VersionedWorldMatrixProvider.java index f4b9b4d81..c750e8ead 100644 --- a/render/shader/src/v1_16_4/java/net/flintmc/render/shader/v1_16_4/uniformprovider/VersionedWorldMatrixProvider.java +++ b/render/shader/src/v1_16_5/java/net/flintmc/render/shader/v1_16_5/uniformprovider/VersionedWorldMatrixProvider.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.render.shader.v1_16_4.uniformprovider; +package net.flintmc.render.shader.v1_16_5.uniformprovider; import com.google.inject.Singleton; import net.flintmc.framework.inject.implement.Implement; @@ -25,7 +25,7 @@ import net.flintmc.render.shader.uniformprovider.WorldMatrixProvider; @Singleton -@Implement(value = WorldMatrixProvider.class, version = "1.16.4") +@Implement(value = WorldMatrixProvider.class, version = "1.16.5") public class VersionedWorldMatrixProvider implements WorldMatrixProvider { /** diff --git a/render/vbo-rendering/build.gradle.kts b/render/vbo-rendering/build.gradle.kts index 1ee4915a4..fe93ce86c 100644 --- a/render/vbo-rendering/build.gradle.kts +++ b/render/vbo-rendering/build.gradle.kts @@ -24,7 +24,7 @@ plugins { group = "net.flintmc" dependencies { - minecraft("1.15.2", "1.16.4"){ + minecraft("1.15.2", "1.16.5"){ annotationProcessor(project(":annotation-processing:annotation-processing-autoload")) } annotationProcessor(project(":annotation-processing:annotation-processing-autoload")) diff --git a/render/vbo-rendering/src/v1_16_4/java/net/flintmc/render/vbo/v1_16_4/VersionedVertexArrayObject.java b/render/vbo-rendering/src/v1_16_5/java/net/flintmc/render/vbo/v1_16_5/VersionedVertexArrayObject.java similarity index 97% rename from render/vbo-rendering/src/v1_16_4/java/net/flintmc/render/vbo/v1_16_4/VersionedVertexArrayObject.java rename to render/vbo-rendering/src/v1_16_5/java/net/flintmc/render/vbo/v1_16_5/VersionedVertexArrayObject.java index 7bc696c77..351a79edc 100644 --- a/render/vbo-rendering/src/v1_16_4/java/net/flintmc/render/vbo/v1_16_4/VersionedVertexArrayObject.java +++ b/render/vbo-rendering/src/v1_16_5/java/net/flintmc/render/vbo/v1_16_5/VersionedVertexArrayObject.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.render.vbo.v1_16_4; +package net.flintmc.render.vbo.v1_16_5; import static org.lwjgl.opengl.GL33.GL_QUADS; import static org.lwjgl.opengl.GL33.GL_TRIANGLES; @@ -41,7 +41,7 @@ /** * {@inheritDoc} */ -@Implement(value = VertexArrayObject.class, version = "1.16.4") +@Implement(value = VertexArrayObject.class, version = "1.16.5") public class VersionedVertexArrayObject implements VertexArrayObject { private final VertexFormat format; diff --git a/render/vbo-rendering/src/v1_16_4/java/net/flintmc/render/vbo/v1_16_4/VersionedVertexBufferObject.java b/render/vbo-rendering/src/v1_16_5/java/net/flintmc/render/vbo/v1_16_5/VersionedVertexBufferObject.java similarity index 97% rename from render/vbo-rendering/src/v1_16_4/java/net/flintmc/render/vbo/v1_16_4/VersionedVertexBufferObject.java rename to render/vbo-rendering/src/v1_16_5/java/net/flintmc/render/vbo/v1_16_5/VersionedVertexBufferObject.java index f917a232c..62f28e3cd 100644 --- a/render/vbo-rendering/src/v1_16_4/java/net/flintmc/render/vbo/v1_16_4/VersionedVertexBufferObject.java +++ b/render/vbo-rendering/src/v1_16_5/java/net/flintmc/render/vbo/v1_16_5/VersionedVertexBufferObject.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.render.vbo.v1_16_4; +package net.flintmc.render.vbo.v1_16_5; import static org.lwjgl.opengl.GL33.GL_ARRAY_BUFFER; import static org.lwjgl.opengl.GL33.GL_ARRAY_BUFFER_BINDING; @@ -41,7 +41,7 @@ /** * {@inheritDoc} */ -@Implement(value = VertexBufferObject.class, version = "1.16.4") +@Implement(value = VertexBufferObject.class, version = "1.16.5") public class VersionedVertexBufferObject implements VertexBufferObject { private final VertexFormat vertexFormat; diff --git a/render/vbo-rendering/src/v1_16_4/java/net/flintmc/render/vbo/v1_16_4/VersionedVertexBuilder.java b/render/vbo-rendering/src/v1_16_5/java/net/flintmc/render/vbo/v1_16_5/VersionedVertexBuilder.java similarity index 98% rename from render/vbo-rendering/src/v1_16_4/java/net/flintmc/render/vbo/v1_16_4/VersionedVertexBuilder.java rename to render/vbo-rendering/src/v1_16_5/java/net/flintmc/render/vbo/v1_16_5/VersionedVertexBuilder.java index a2331fbdd..f51ffdb46 100644 --- a/render/vbo-rendering/src/v1_16_4/java/net/flintmc/render/vbo/v1_16_4/VersionedVertexBuilder.java +++ b/render/vbo-rendering/src/v1_16_5/java/net/flintmc/render/vbo/v1_16_5/VersionedVertexBuilder.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.render.vbo.v1_16_4; +package net.flintmc.render.vbo.v1_16_5; import java.util.LinkedList; import java.util.Queue; @@ -34,7 +34,7 @@ /** * {@inheritDoc} */ -@Implement(value = VertexBuilder.class, version = "1.16.4") +@Implement(value = VertexBuilder.class, version = "1.16.5") public class VersionedVertexBuilder implements VertexBuilder { private final VertexBufferObject vbo; diff --git a/render/vbo-rendering/src/v1_16_4/java/net/flintmc/render/vbo/v1_16_4/VersionedVertexFormat.java b/render/vbo-rendering/src/v1_16_5/java/net/flintmc/render/vbo/v1_16_5/VersionedVertexFormat.java similarity index 96% rename from render/vbo-rendering/src/v1_16_4/java/net/flintmc/render/vbo/v1_16_4/VersionedVertexFormat.java rename to render/vbo-rendering/src/v1_16_5/java/net/flintmc/render/vbo/v1_16_5/VersionedVertexFormat.java index eed383185..20db342e5 100644 --- a/render/vbo-rendering/src/v1_16_4/java/net/flintmc/render/vbo/v1_16_4/VersionedVertexFormat.java +++ b/render/vbo-rendering/src/v1_16_5/java/net/flintmc/render/vbo/v1_16_5/VersionedVertexFormat.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.render.vbo.v1_16_4; +package net.flintmc.render.vbo.v1_16_5; import static org.lwjgl.opengl.GL33.GL_FLOAT; import static org.lwjgl.opengl.GL33.glEnableVertexAttribArray; @@ -35,7 +35,7 @@ /** * {@inheritDoc} */ -@Implement(value = VertexFormat.class, version = "1.16.4") +@Implement(value = VertexFormat.class, version = "1.16.5") public class VersionedVertexFormat implements VertexFormat { private final List attributes; diff --git a/render/vbo-rendering/src/v1_16_4/java/net/flintmc/render/vbo/v1_16_4/VersionedVertexFormatBuilder.java b/render/vbo-rendering/src/v1_16_5/java/net/flintmc/render/vbo/v1_16_5/VersionedVertexFormatBuilder.java similarity index 94% rename from render/vbo-rendering/src/v1_16_4/java/net/flintmc/render/vbo/v1_16_4/VersionedVertexFormatBuilder.java rename to render/vbo-rendering/src/v1_16_5/java/net/flintmc/render/vbo/v1_16_5/VersionedVertexFormatBuilder.java index 4166dd7c8..8883a56b4 100644 --- a/render/vbo-rendering/src/v1_16_4/java/net/flintmc/render/vbo/v1_16_4/VersionedVertexFormatBuilder.java +++ b/render/vbo-rendering/src/v1_16_5/java/net/flintmc/render/vbo/v1_16_5/VersionedVertexFormatBuilder.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.render.vbo.v1_16_4; +package net.flintmc.render.vbo.v1_16_5; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -32,7 +32,7 @@ * {@inheritDoc} */ @Singleton -@Implement(value = VertexFormatBuilder.class, version = "1.16.4") +@Implement(value = VertexFormatBuilder.class, version = "1.16.5") public class VersionedVertexFormatBuilder implements VertexFormatBuilder { private final VertexFormat.Factory vertexFormatFactory; diff --git a/render/vbo-rendering/src/v1_16_4/java/net/flintmc/render/vbo/v1_16_4/VersionedVertexIndexObject.java b/render/vbo-rendering/src/v1_16_5/java/net/flintmc/render/vbo/v1_16_5/VersionedVertexIndexObject.java similarity index 97% rename from render/vbo-rendering/src/v1_16_4/java/net/flintmc/render/vbo/v1_16_4/VersionedVertexIndexObject.java rename to render/vbo-rendering/src/v1_16_5/java/net/flintmc/render/vbo/v1_16_5/VersionedVertexIndexObject.java index 1eaecf625..ef25f3f58 100644 --- a/render/vbo-rendering/src/v1_16_4/java/net/flintmc/render/vbo/v1_16_4/VersionedVertexIndexObject.java +++ b/render/vbo-rendering/src/v1_16_5/java/net/flintmc/render/vbo/v1_16_5/VersionedVertexIndexObject.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.render.vbo.v1_16_4; +package net.flintmc.render.vbo.v1_16_5; import static org.lwjgl.opengl.GL33.GL_ELEMENT_ARRAY_BUFFER; import static org.lwjgl.opengl.GL33.GL_ELEMENT_ARRAY_BUFFER_BINDING; @@ -40,7 +40,7 @@ /** * {@inheritDoc} */ -@Implement(value = VertexIndexObject.class, version = "1.16.4") +@Implement(value = VertexIndexObject.class, version = "1.16.5") public class VersionedVertexIndexObject implements VertexIndexObject { private final List indices; diff --git a/settings.gradle.kts b/settings.gradle.kts index a3c2baa49..0a644b80a 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -26,12 +26,12 @@ fun defineModule(path: String) { pluginManagement { plugins { - id("net.flintmc.flint-gradle") version "2.7.3" + id("net.flintmc.flint-gradle") version "2.8.0" } buildscript { dependencies { - classpath("net.flintmc", "flint-gradle", "2.7.3") + classpath("net.flintmc", "flint-gradle", "2.8.0") } repositories { mavenLocal() @@ -84,5 +84,5 @@ defineModule("util:session-service") defineModule("util:task-executor") defineModule("minecraft:minecraft-1-15-2") -defineModule("minecraft:minecraft-1-16-4") +defineModule("minecraft:minecraft-1-16-5") include("bootstrap") diff --git a/util/i18n/build.gradle.kts b/util/i18n/build.gradle.kts index 2ff2969c0..4ffc5e956 100644 --- a/util/i18n/build.gradle.kts +++ b/util/i18n/build.gradle.kts @@ -24,7 +24,7 @@ plugins { group = "net.flintmc" dependencies { - minecraft("1.15.2", "1.16.4") { + minecraft("1.15.2", "1.16.5") { annotationProcessor(project(":annotation-processing:annotation-processing-autoload")) implementation(project(":transform:transform-hook")) implementation(project(":transform:transform-javassist")) diff --git a/util/i18n/src/v1_16_4/java/net/flintmc/util/i18n/v1_16_4/VersionedI18n.java b/util/i18n/src/v1_16_5/java/net/flintmc/util/i18n/v1_16_5/VersionedI18n.java similarity index 92% rename from util/i18n/src/v1_16_4/java/net/flintmc/util/i18n/v1_16_4/VersionedI18n.java rename to util/i18n/src/v1_16_5/java/net/flintmc/util/i18n/v1_16_5/VersionedI18n.java index 50604a650..dd610e79b 100644 --- a/util/i18n/src/v1_16_4/java/net/flintmc/util/i18n/v1_16_4/VersionedI18n.java +++ b/util/i18n/src/v1_16_5/java/net/flintmc/util/i18n/v1_16_5/VersionedI18n.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.util.i18n.v1_16_4; +package net.flintmc.util.i18n.v1_16_5; import com.google.inject.Singleton; import java.util.Collection; @@ -28,10 +28,10 @@ import net.minecraft.client.resources.Language; /** - * 1.16.4 implementation of the {@link I18n}. + * 1.16.5 implementation of the {@link I18n}. */ @Singleton -@Implement(value = I18n.class, version = "1.16.4") +@Implement(value = I18n.class, version = "1.16.5") public class VersionedI18n implements I18n { /** diff --git a/util/i18n/src/v1_16_4/java/net/flintmc/util/i18n/v1_16_4/VersionedLanguageManagerInterceptor.java b/util/i18n/src/v1_16_5/java/net/flintmc/util/i18n/v1_16_5/VersionedLanguageManagerInterceptor.java similarity index 94% rename from util/i18n/src/v1_16_4/java/net/flintmc/util/i18n/v1_16_4/VersionedLanguageManagerInterceptor.java rename to util/i18n/src/v1_16_5/java/net/flintmc/util/i18n/v1_16_5/VersionedLanguageManagerInterceptor.java index fcab3d11b..a1ee17b53 100644 --- a/util/i18n/src/v1_16_4/java/net/flintmc/util/i18n/v1_16_4/VersionedLanguageManagerInterceptor.java +++ b/util/i18n/src/v1_16_5/java/net/flintmc/util/i18n/v1_16_5/VersionedLanguageManagerInterceptor.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.util.i18n.v1_16_4; +package net.flintmc.util.i18n.v1_16_5; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -26,7 +26,7 @@ import net.flintmc.framework.stereotype.type.Type; import net.flintmc.transform.hook.Hook; import net.flintmc.util.i18n.LocalizationLoader; -import net.flintmc.util.i18n.v1_16_4.shadow.AccessibleClientLanguageMap; +import net.flintmc.util.i18n.v1_16_5.shadow.AccessibleClientLanguageMap; import net.minecraft.client.Minecraft; import net.minecraft.client.resources.ClientLanguageMap; import net.minecraft.client.resources.Language; @@ -46,7 +46,7 @@ private VersionedLanguageManagerInterceptor(LocalizationLoader localizationLoade className = "net.minecraft.client.resources.LanguageManager", methodName = "onResourceManagerReload", parameters = {@Type(reference = IResourceManager.class)}, - version = "1.16.4") + version = "1.16.5") public void hookOnResourceManagerReload(@Named("args") Object[] args) { IResourceManager resourceManager = (IResourceManager) args[0]; diff --git a/util/i18n/src/v1_16_4/java/net/flintmc/util/i18n/v1_16_4/VersionedLocalization.java b/util/i18n/src/v1_16_5/java/net/flintmc/util/i18n/v1_16_5/VersionedLocalization.java similarity index 90% rename from util/i18n/src/v1_16_4/java/net/flintmc/util/i18n/v1_16_4/VersionedLocalization.java rename to util/i18n/src/v1_16_5/java/net/flintmc/util/i18n/v1_16_5/VersionedLocalization.java index cfbae494f..8c1891c66 100644 --- a/util/i18n/src/v1_16_4/java/net/flintmc/util/i18n/v1_16_4/VersionedLocalization.java +++ b/util/i18n/src/v1_16_5/java/net/flintmc/util/i18n/v1_16_5/VersionedLocalization.java @@ -17,16 +17,16 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.util.i18n.v1_16_4; +package net.flintmc.util.i18n.v1_16_5; import com.google.inject.Singleton; import java.util.Map; import net.flintmc.framework.inject.implement.Implement; import net.flintmc.util.i18n.Localization; -import net.flintmc.util.i18n.v1_16_4.shadow.AccessibleClientLanguageMap; +import net.flintmc.util.i18n.v1_16_5.shadow.AccessibleClientLanguageMap; @Singleton -@Implement(value = Localization.class, version = "1.16.4") +@Implement(value = Localization.class, version = "1.16.5") public class VersionedLocalization implements Localization { private final AccessibleClientLanguageMap clientLanguageMap; diff --git a/util/i18n/src/v1_16_4/java/net/flintmc/util/i18n/v1_16_4/VersionedLocalizationLoader.java b/util/i18n/src/v1_16_5/java/net/flintmc/util/i18n/v1_16_5/VersionedLocalizationLoader.java similarity index 93% rename from util/i18n/src/v1_16_4/java/net/flintmc/util/i18n/v1_16_4/VersionedLocalizationLoader.java rename to util/i18n/src/v1_16_5/java/net/flintmc/util/i18n/v1_16_5/VersionedLocalizationLoader.java index aa0bd47a1..b782dd131 100644 --- a/util/i18n/src/v1_16_4/java/net/flintmc/util/i18n/v1_16_4/VersionedLocalizationLoader.java +++ b/util/i18n/src/v1_16_5/java/net/flintmc/util/i18n/v1_16_5/VersionedLocalizationLoader.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.util.i18n.v1_16_4; +package net.flintmc.util.i18n.v1_16_5; import com.google.gson.JsonElement; import com.google.gson.JsonObject; @@ -33,10 +33,10 @@ import net.flintmc.util.i18n.LocalizationLoader; /** - * 1.16.4 implementation of the {@link LocalizationLoader}. + * 1.16.5 implementation of the {@link LocalizationLoader}. */ @Singleton -@Implement(value = LocalizationLoader.class, version = "1.16.4") +@Implement(value = LocalizationLoader.class, version = "1.16.5") public class VersionedLocalizationLoader implements LocalizationLoader { private final PackageLoader packageLoader; diff --git a/util/i18n/src/v1_16_4/java/net/flintmc/util/i18n/v1_16_4/shadow/AccessibleClientLanguageMap.java b/util/i18n/src/v1_16_5/java/net/flintmc/util/i18n/v1_16_5/shadow/AccessibleClientLanguageMap.java similarity index 94% rename from util/i18n/src/v1_16_4/java/net/flintmc/util/i18n/v1_16_4/shadow/AccessibleClientLanguageMap.java rename to util/i18n/src/v1_16_5/java/net/flintmc/util/i18n/v1_16_5/shadow/AccessibleClientLanguageMap.java index 0e05dc938..70e9b322e 100644 --- a/util/i18n/src/v1_16_4/java/net/flintmc/util/i18n/v1_16_4/shadow/AccessibleClientLanguageMap.java +++ b/util/i18n/src/v1_16_5/java/net/flintmc/util/i18n/v1_16_5/shadow/AccessibleClientLanguageMap.java @@ -17,13 +17,13 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.util.i18n.v1_16_4.shadow; +package net.flintmc.util.i18n.v1_16_5.shadow; import java.util.Map; import net.flintmc.transform.shadow.FieldGetter; import net.flintmc.transform.shadow.Shadow; -@Shadow(value = "net.minecraft.client.resources.ClientLanguageMap", version = "1.16.4") +@Shadow(value = "net.minecraft.client.resources.ClientLanguageMap", version = "1.16.5") public interface AccessibleClientLanguageMap { @FieldGetter("field_239495_c_") diff --git a/util/mapping/build.gradle.kts b/util/mapping/build.gradle.kts index 6a545dd34..8b7e531c7 100644 --- a/util/mapping/build.gradle.kts +++ b/util/mapping/build.gradle.kts @@ -26,7 +26,7 @@ group = "net.flintmc" dependencies { - minecraft("1.15.2", "1.16.4") { + minecraft("1.15.2", "1.16.5") { annotationProcessor(project(":annotation-processing:annotation-processing-autoload")) } annotationProcessor(project(":annotation-processing:annotation-processing-autoload")) diff --git a/util/session-service/build.gradle.kts b/util/session-service/build.gradle.kts index 800a0dddb..96efcf3c1 100644 --- a/util/session-service/build.gradle.kts +++ b/util/session-service/build.gradle.kts @@ -24,7 +24,7 @@ plugins { group = "net.flintmc" dependencies { - minecraft("1.15.2", "1.16.4") { + minecraft("1.15.2", "1.16.5") { annotationProcessor(project(":annotation-processing:annotation-processing-autoload")) } annotationProcessor(project(":annotation-processing:annotation-processing-autoload")) diff --git a/util/session-service/src/v1_16_4/java/net/flintmc/util/session/v1_16_4/SessionRefreshableMinecraft.java b/util/session-service/src/v1_16_5/java/net/flintmc/util/session/v1_16_5/SessionRefreshableMinecraft.java similarity index 96% rename from util/session-service/src/v1_16_4/java/net/flintmc/util/session/v1_16_4/SessionRefreshableMinecraft.java rename to util/session-service/src/v1_16_5/java/net/flintmc/util/session/v1_16_5/SessionRefreshableMinecraft.java index 2b96b0a8b..32d15387b 100644 --- a/util/session-service/src/v1_16_4/java/net/flintmc/util/session/v1_16_4/SessionRefreshableMinecraft.java +++ b/util/session-service/src/v1_16_5/java/net/flintmc/util/session/v1_16_5/SessionRefreshableMinecraft.java @@ -17,14 +17,14 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.util.session.v1_16_4; +package net.flintmc.util.session.v1_16_5; import net.flintmc.transform.shadow.FieldSetter; import net.flintmc.transform.shadow.Shadow; import net.minecraft.util.Session; // Minecraft doesn't allow for changing the session -@Shadow(value = "net.minecraft.client.Minecraft", version = "1.16.4") +@Shadow(value = "net.minecraft.client.Minecraft", version = "1.16.5") public interface SessionRefreshableMinecraft { @FieldSetter("session") diff --git a/util/session-service/src/v1_16_4/java/net/flintmc/util/session/v1_16_4/VersionedSessionService.java b/util/session-service/src/v1_16_5/java/net/flintmc/util/session/v1_16_5/VersionedSessionService.java similarity index 96% rename from util/session-service/src/v1_16_4/java/net/flintmc/util/session/v1_16_4/VersionedSessionService.java rename to util/session-service/src/v1_16_5/java/net/flintmc/util/session/v1_16_5/VersionedSessionService.java index 9cb03e2b3..3e3db1307 100644 --- a/util/session-service/src/v1_16_4/java/net/flintmc/util/session/v1_16_4/VersionedSessionService.java +++ b/util/session-service/src/v1_16_5/java/net/flintmc/util/session/v1_16_5/VersionedSessionService.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.util.session.v1_16_4; +package net.flintmc.util.session.v1_16_5; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -44,7 +44,7 @@ import org.apache.logging.log4j.Logger; @Singleton -@Implement(value = SessionService.class, version = "1.16.4") +@Implement(value = SessionService.class, version = "1.16.5") public class VersionedSessionService extends DefaultSessionService { private static final Consumer REFRESHER = @@ -121,7 +121,7 @@ public SessionService newSessionService() { this.resolver); } - @Subscribe(phase = Subscribe.Phase.POST, version = "1.16.4") + @Subscribe(phase = Subscribe.Phase.POST, version = "1.16.5") public void initSession(MinecraftInitializeEvent event) throws IOException { // load the session that has been given to the client by the launcher Session session = Minecraft.getInstance().getSession(); diff --git a/util/session-service/src/v1_16_4/java/net/flintmc/util/session/v1_16_4/launcher/VersionedLauncherProfileResolver.java b/util/session-service/src/v1_16_5/java/net/flintmc/util/session/v1_16_5/launcher/VersionedLauncherProfileResolver.java similarity index 96% rename from util/session-service/src/v1_16_4/java/net/flintmc/util/session/v1_16_4/launcher/VersionedLauncherProfileResolver.java rename to util/session-service/src/v1_16_5/java/net/flintmc/util/session/v1_16_5/launcher/VersionedLauncherProfileResolver.java index edd43f512..c35167ca4 100644 --- a/util/session-service/src/v1_16_4/java/net/flintmc/util/session/v1_16_4/launcher/VersionedLauncherProfileResolver.java +++ b/util/session-service/src/v1_16_5/java/net/flintmc/util/session/v1_16_5/launcher/VersionedLauncherProfileResolver.java @@ -17,7 +17,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package net.flintmc.util.session.v1_16_4.launcher; +package net.flintmc.util.session.v1_16_5.launcher; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -28,7 +28,7 @@ import net.minecraft.client.Minecraft; @Singleton -@Implement(value = LauncherProfileResolver.class, version = "1.16.4") +@Implement(value = LauncherProfileResolver.class, version = "1.16.5") public class VersionedLauncherProfileResolver extends DefaultLauncherProfileResolver { @Inject