Merge pull request #112 from FlintMC/feature/implement-1.16.5

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 

build.gradle.kts

@@ -69,32 +69,14 @@ 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")
 
     projectFilter {
         !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")

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"))

mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/chat/AccessibleKeybindTextComponent.java → mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/chat/AccessibleKeybindTextComponent.java

@@ -17,15 +17,15 @@
  * 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;
 import net.flintmc.transform.shadow.FieldGetter;
 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")

mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/chat/ChatEventInjector.java → 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();

mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/chat/ChatGuiShadow.java → 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")

mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/chat/VersionedChatController.java → 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;

mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/chat/VersionedKeybindNameMapper.java → 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 {
 
   /**

mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/chat/VersionedLegacyHoverHolder.java → 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 {
 
   /**

mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/chat/VersionedMinecraftComponentMapper.java → 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;

mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/VersionedAgeableEntity.java → 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;

mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/VersionedCreatureEntity.java → 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;

mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/VersionedEntity.java → 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;

mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/VersionedEntitySize.java → mcapi/src/v1_16_5/java/net/flintmc/mcapi/v1_16_5/entity/VersionedEntitySize.java

@@ -17,17 +17,17 @@
  * 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;
 import net.flintmc.framework.inject.implement.Implement;
 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;

mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/VersionedLivingEntity.java → 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<StatusEffect, StatusEffectInstance> activePotions;

mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/VersionedMobEntity.java → 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;

mcapi/src/v1_16_4/java/net/flintmc/mcapi/v1_16_4/entity/ai/VersionedEntitySenses.java → 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 {