fix CCE

Signed-off-by: Devan-Kerman <devan@cleverpath.com>

README.md

@@ -1,6 +1,6 @@
 # CC:T for Fabric
 
-* [Download on CurseForge](https://www.curseforge.com/minecraft/mc-mods/cc-tweaked-fabric)
+* [Download on CurseForge](https://www.curseforge.com/minecraft/mc-mods/cc-restitched)
 
 A fork of [CC: Tweaked](https://github.com/SquidDev-CC/CC-Tweaked) for use with the latest Fabric.
 

src/main/java/dan200/computercraft/client/render/ItemMapLikeRenderer.java

@@ -68,7 +68,7 @@ public abstract class ItemMapLikeRenderer {
         float tZ = -0.4f * MathHelper.sin(swingRt * (float) Math.PI);
         transform.translate(0, -tX / 2, tZ);
 
-        HeldItemRendererAccess access = (HeldItemRendererAccess) render;
+        HeldItemRendererAccess access = (HeldItemRendererAccess) renderer;
         float pitchAngle = access.callGetMapAngle(pitch);
         transform.translate(0, 0.04F + equipProgress * -1.2f + pitchAngle * -0.5f, -0.72f);
         transform.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(pitchAngle * -85.0f));

src/main/java/dan200/computercraft/mixin/WorldSavePathAccess.java

@@ -7,6 +7,6 @@ import net.minecraft.util.WorldSavePath;
 
 @Mixin (WorldSavePath.class)
 public interface WorldSavePathAccess {
-	@Invoker
+	@Invoker("<init>")
 	static WorldSavePath createWorldSavePath(String relativePath) { throw new UnsupportedOperationException(); }
 }

src/main/java/dan200/computercraft/shared/turtle/core/TurtlePlaceCommand.java

@@ -228,9 +228,9 @@ public class TurtlePlaceCommand implements ITurtleCommand {
             cancelResult = hitEntity.interactAt(turtlePlayer, hitPos, Hand.MAIN_HAND);
         }
 
-        if (cancelResult.isAccepted()) {
+        if (cancelResult != null && cancelResult.isAccepted()) {
             placed = true;
-        } else {
+        } else if (hitEntity instanceof LivingEntity) {
             // See EntityPlayer.interactOn
             cancelResult = stackCopy.useOnEntity(turtlePlayer, (LivingEntity) hitEntity, Hand.MAIN_HAND);
             if (cancelResult != null && cancelResult.isAccepted()) {
@@ -238,7 +238,7 @@ public class TurtlePlaceCommand implements ITurtleCommand {
             } else if (cancelResult == null) {
                 if (hitEntity.interact(turtlePlayer, Hand.MAIN_HAND) == ActionResult.CONSUME) {
                     placed = true;
-                } else if (hitEntity instanceof LivingEntity) {
+                } else {
                     placed = stackCopy.useOnEntity(turtlePlayer, (LivingEntity) hitEntity, Hand.MAIN_HAND)
                                       .isAccepted();
                     if (placed) {

src/main/java/dan200/computercraft/shared/turtle/core/TurtlePlayer.java

@@ -26,12 +26,14 @@ import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityDimensions;
 import net.minecraft.entity.EntityPose;
 import net.minecraft.entity.EntityType;
+import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.effect.StatusEffectInstance;
 import net.minecraft.entity.passive.HorseBaseEntity;
 import net.minecraft.inventory.Inventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.screen.NamedScreenHandlerFactory;
 import net.minecraft.server.world.ServerWorld;
+import net.minecraft.util.ActionResult;
 import net.minecraft.util.Hand;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;

src/main/resources/computercraft.mixins.json

@@ -3,10 +3,6 @@
     "package": "dan200.computercraft.mixin",
     "compatibilityLevel": "JAVA_8",
     "mixins": [
-        "AffineTransformationAccess",
-        "BakedQuadAccess",
-        "ChatHudAccess",
-        "HeldItemRendererAccess",
         "MinecraftServerAccess",
         "MixinBlock",
         "MixinEntity",
@@ -17,6 +13,10 @@
         "WorldSavePathAccess"
     ],
     "client": [
+        "AffineTransformationAccess",
+        "BakedQuadAccess",
+        "ChatHudAccess",
+        "HeldItemRendererAccess",
         "MixinHeldItemRenderer",
         "MixinItemFrameEntityRenderer",
         "MixinMinecraftGame",

src/main/resources/fabric.mod.json

@@ -1,6 +1,5 @@
 {
     "schemaVersion": 1,
-
     "id": "computercraft",
     "name": "CC:T for Fabric",
     "version": "${version}",
@@ -26,8 +25,12 @@
     },
     "environment": "*",
     "entrypoints": {
-        "main": [ "dan200.computercraft.ComputerCraft" ],
-        "client": ["dan200.computercraft.client.proxy.ComputerCraftProxyClient"]
+        "main": [
+            "dan200.computercraft.ComputerCraft"
+        ],
+        "client": [
+            "dan200.computercraft.client.proxy.ComputerCraftProxyClient"
+        ]
     },
     "mixins": [
         "computercraft.mixins.json"