Update to 1.15.2 and bump version to 2.3.7-pre4

Author: Earthcomputer

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '0.2.5-SNAPSHOT'
+	id 'fabric-loom' version '0.2.7-SNAPSHOT'
 	id 'maven-publish'
 }
 
@@ -25,10 +25,7 @@ dependencies {
 	modCompile "net.fabricmc:fabric-loader:${project.loader_version}"
 	modCompile "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
 
-	modCompile('net.earthcomputer:multiconnect:1.1:api') {
-		transitive = false
-	}
-	include('net.earthcomputer:multiconnect:1.1:api') {
+	modApi('net.earthcomputer:multiconnect:1.2.1:api') {
 		transitive = false
 	}
 }

gradle.properties

@@ -3,15 +3,15 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 	# check these on https://fabricmc.net/use
-	minecraft_version=1.15.1
-	yarn_mappings=1.15.1+build.6
-	loader_version=0.7.2+build.175
+	minecraft_version=1.15.2
+	yarn_mappings=1.15.2+build.1
+	loader_version=0.7.5+build.178
 
 # Mod Properties
-	mod_version = 2.3.7-pre3
+	mod_version = 2.3.7-pre4
 	maven_group = net.earthcomputer
 	archives_base_name = clientcommands
 
 # Dependencies
 	# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
-	fabric_version=0.4.19+build.272-1.15
+	fabric_version=0.4.29+build.290-1.15

src/main/java/net/cortex/clientAddon/cracker/SeedCracker.java

@@ -30,7 +30,7 @@ public interface OnCrack {void callback(long seed); }
     private static boolean throwItems()
     {
         ClientPlayerEntity player = MinecraftClient.getInstance().player;
-        player.setPositionAndAngles(player.getX(), player.getY(), player.getZ(), 0, 90);
+        player.refreshPositionAndAngles(player.getX(), player.getY(), player.getZ(), 0, 90);
         MinecraftClient.getInstance().getNetworkHandler().sendPacket(new PlayerMoveC2SPacket.LookOnly(0, 90, true)); // point to correct location
         for (int i = 0; i < 20; i++) {
             boolean success = PlayerRandCracker.throwItem();

src/main/java/net/earthcomputer/clientcommands/command/LookCommand.java

@@ -61,7 +61,7 @@ private static int lookCardinal(float yaw, float pitch) {
     }
 
     private static int doLook(ClientPlayerEntity player, float yaw, float pitch) {
-        player.setPositionAndAngles(player.getX(), player.getY(), player.getZ(), yaw, pitch);
+        player.refreshPositionAndAngles(player.getX(), player.getY(), player.getZ(), yaw, pitch);
         return 0;
     }
 

src/main/java/net/earthcomputer/clientcommands/features/EnchantmentCracker.java

@@ -346,7 +346,7 @@ public static ManipulateResult manipulateEnchantments(Item item, Predicate<List<
         LongTaskList taskList = new LongTaskList();
         if (timesNeeded != -1) {
             if (timesNeeded != 0) {
-                player.setPositionAndAngles(player.getX(), player.getY(), player.getZ(), player.yaw, 90);
+                player.refreshPositionAndAngles(player.getX(), player.getY(), player.getZ(), player.yaw, 90);
                 // sync rotation to server before we throw any items
                 player.networkHandler.sendPacket(new PlayerMoveC2SPacket.LookOnly(player.yaw, 90, player.onGround));
                 TempRules.playerCrackState = PlayerRandCracker.CrackState.MANIPULATING_ENCHANTMENTS;

src/main/java/net/earthcomputer/clientcommands/mixin/MixinArmorStandEntityRenderer.java

@@ -0,0 +1,28 @@
+package net.earthcomputer.clientcommands.mixin;
+
+import net.earthcomputer.clientcommands.interfaces.IEntity;
+import net.minecraft.client.render.RenderLayer;
+import net.minecraft.client.render.entity.ArmorStandEntityRenderer;
+import net.minecraft.client.render.entity.EntityRenderDispatcher;
+import net.minecraft.client.render.entity.LivingEntityRenderer;
+import net.minecraft.client.render.entity.model.ArmorStandEntityModel;
+import net.minecraft.entity.decoration.ArmorStandEntity;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+@Mixin(ArmorStandEntityRenderer.class)
+public abstract class MixinArmorStandEntityRenderer extends LivingEntityRenderer<ArmorStandEntity, ArmorStandEntityModel> {
+
+    public MixinArmorStandEntityRenderer(EntityRenderDispatcher dispatcher, ArmorStandEntityModel model, float shadowSize) {
+        super(dispatcher, model, shadowSize);
+    }
+
+    @Inject(method = "method_24302", at = @At("HEAD"), cancellable = true)
+    private void onGetRenderLayer(ArmorStandEntity armorStand, boolean visible, boolean translucent, CallbackInfoReturnable<RenderLayer> ci) {
+        if (((IEntity) armorStand).hasGlowingTicket())
+            ci.setReturnValue(super.method_24302(armorStand, visible, translucent));
+    }
+
+}

src/main/java/net/earthcomputer/clientcommands/mixin/MixinLivingEntityRenderer.java

@@ -1,22 +1,31 @@
 package net.earthcomputer.clientcommands.mixin;
 
 import net.earthcomputer.clientcommands.interfaces.IEntity;
+import net.minecraft.client.render.RenderLayer;
+import net.minecraft.client.render.entity.EntityRenderDispatcher;
+import net.minecraft.client.render.entity.EntityRenderer;
 import net.minecraft.client.render.entity.LivingEntityRenderer;
 import net.minecraft.client.render.entity.model.EntityModel;
 import net.minecraft.entity.LivingEntity;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.Redirect;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(LivingEntityRenderer.class)
-public abstract class MixinLivingEntityRenderer<T extends LivingEntity, M extends EntityModel<T>> {
+public abstract class MixinLivingEntityRenderer<T extends LivingEntity, M extends EntityModel<T>> extends EntityRenderer<T> {
 
-    @Shadow protected abstract boolean method_4056(T livingEntity_1, boolean boolean_1);
+    protected MixinLivingEntityRenderer(EntityRenderDispatcher dispatcher) {
+        super(dispatcher);
+    }
 
-    @Redirect(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/entity/LivingEntityRenderer;method_4056(Lnet/minecraft/entity/LivingEntity;Z)Z"))
-    private boolean redirectDisableOutlineRender(LivingEntityRenderer _this, T entity, boolean flag) {
-        return this.method_4056(entity, flag) || ((IEntity) entity).hasGlowingTicket();
+    @SuppressWarnings("UnresolvedMixinReference")
+    @Inject(method = "method_24302", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/LivingEntity;isGlowing()Z"), cancellable = true)
+    private void onGetRenderLayer(T entity, boolean visible, boolean translucent, CallbackInfoReturnable<RenderLayer> ci) {
+        if (((IEntity) entity).hasGlowingTicket())
+            ci.setReturnValue(RenderLayer.getOutline(getTexture(entity)));
     }
 
 }

src/main/java/net/earthcomputer/clientcommands/script/ScriptPlayer.java

@@ -55,7 +55,7 @@ public boolean snapTo(double x, double y, double z, boolean sync) {
         if (dx * dx + dy * dy + dz * dz > 0.5 * 0.5)
             return false;
 
-        getPlayer().setPosition(x, y, z);
+        getPlayer().setPos(x, y, z);
 
         if (sync)
             getPlayer().networkHandler.sendPacket(new PlayerMoveC2SPacket.PositionOnly(x, y, z, getPlayer().onGround));

src/main/java/net/earthcomputer/clientcommands/script/ScriptWorld.java

@@ -21,7 +21,7 @@ private static ClientWorld getWorld() {
     }
 
     public String getDimension() {
-        return ScriptUtil.simplifyIdentifier(Registry.DIMENSION.getId(getWorld().dimension.getType()));
+        return ScriptUtil.simplifyIdentifier(Registry.DIMENSION_TYPE.getId(getWorld().dimension.getType()));
     }
 
     public String getBlock(int x, int y, int z) {

src/main/resources/mixins.clientcommands.json

@@ -50,7 +50,8 @@
     "MixinBlock",
     "MixinMaterial",
     "MixinFireBlock",
-    "MixinTextFieldWidget"
+    "MixinTextFieldWidget",
+    "MixinArmorStandEntityRenderer"
   ],
   "injectors": {
     "defaultRequire": 1