20w45a

Author: gnembon

gradle.properties

@@ -3,8 +3,8 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 	# check these on https://fabricmc.net/use
-	minecraft_version=1.16.4
-	yarn_mappings=1.16.4+build.3
+	minecraft_version=20w45a
+	yarn_mappings=20w45a+build.1
 	loader_version=0.10.6+build.214
 
 # Mod Properties

src/main/java/carpet/mixins/HopperBlockEntityMixin.java

@@ -1,13 +1,16 @@
 package carpet.mixins;
 
 import carpet.CarpetSettings;
+import net.minecraft.block.BlockState;
 import net.minecraft.block.HopperBlock;
 import net.minecraft.block.entity.BlockEntityType;
 import net.minecraft.block.entity.HopperBlockEntity;
 import net.minecraft.block.entity.LootableContainerBlockEntity;
+import net.minecraft.inventory.Inventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.DyeColor;
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
@@ -19,8 +22,10 @@
 @Mixin(HopperBlockEntity.class)
 public abstract class HopperBlockEntityMixin extends LootableContainerBlockEntity {
 
-    protected HopperBlockEntityMixin(BlockEntityType<?> blockEntityType_1) {
-        super(blockEntityType_1);
+
+    protected HopperBlockEntityMixin(BlockEntityType<?> blockEntityType, BlockPos blockPos, BlockState blockState)
+    {
+        super(blockEntityType, blockPos, blockState);
     }
 
     @Shadow
@@ -37,21 +42,21 @@ protected HopperBlockEntityMixin(BlockEntityType<?> blockEntityType_1) {
     @Shadow public abstract void setStack(int slot, ItemStack stack);
 
     @Inject(method = "insert", at = @At("HEAD"), cancellable = true)
-    private void onInsert(CallbackInfoReturnable<Boolean> cir)
+    private static void onInsert(World world, BlockPos blockPos, BlockState blockState, Inventory inventory, CallbackInfoReturnable<Boolean> cir)
     {
         if (CarpetSettings.hopperCounters) {
             DyeColor wool_color = WoolTool.getWoolColorAtPosition(
-                    getWorld(),
-                    new BlockPos(getHopperX(), getHopperY(), getHopperZ()).offset(this.getCachedState().get(HopperBlock.FACING)));
+                    world,
+                    blockPos.offset(blockState.get(HopperBlock.FACING)));
             if (wool_color != null)
             {
-                for (int i = 0; i < size(); ++i)
+                for (int i = 0; i < inventory.size(); ++i)
                 {
-                    if (!this.getStack(i).isEmpty())
+                    if (!inventory.getStack(i).isEmpty())
                     {
-                        ItemStack itemstack = this.getStack(i);//.copy();
-                        HopperCounter.COUNTERS.get(wool_color).add(this.getWorld().getServer(), itemstack);
-                        this.setStack(i, ItemStack.EMPTY);
+                        ItemStack itemstack = inventory.getStack(i);//.copy();
+                        HopperCounter.COUNTERS.get(wool_color).add(world.getServer(), itemstack);
+                        inventory.setStack(i, ItemStack.EMPTY);
                     }
                 }
                 cir.setReturnValue(true);

src/main/java/carpet/mixins/ServerWorld_fakePlayersMixin.java

@@ -16,7 +16,7 @@ public abstract class ServerWorld_fakePlayersMixin
 {
 
     @Shadow /*@Nonnull*/ public abstract MinecraftServer getServer();
-
+/*
     @Shadow private boolean inEntityTick;
 
     @Redirect( method = "removePlayer", at  = @At(
@@ -26,13 +26,13 @@ public abstract class ServerWorld_fakePlayersMixin
     private void crashRemovePlayer(ServerWorld serverWorld, Entity entity_1, ServerPlayerEntity serverPlayerEntity_1)
     {
         if ( !(inEntityTick && serverPlayerEntity_1 instanceof EntityPlayerMPFake) )
-            serverWorld.removeEntity(entity_1);
+            serverWorld.removePlayer(); removeEntity(entity_1);
         else
             getServer().send(new ServerTask(getServer().getTicks(), () ->
             {
                 serverWorld.removeEntity(serverPlayerEntity_1);
                 serverPlayerEntity_1.onTeleportationDone();
             }));
 
-    }
+    }*/
 }

src/main/java/carpet/patches/EntityPlayerMPFake.java

@@ -42,7 +42,8 @@ public static EntityPlayerMPFake createFake(String username, MinecraftServer ser
         server.getPlayerManager().onPlayerConnect(new NetworkManagerFake(NetworkSide.SERVERBOUND), instance);
         instance.teleport(worldIn, d0, d1, d2, (float)yaw, (float)pitch);
         instance.setHealth(20.0F);
-        instance.removed = false;
+        //instance.removed = false;
+        instance.method_31482(); // set not removed
         instance.stepHeight = 0.6F;
         interactionManagerIn.setGameMode(gamemode);
         server.getPlayerManager().sendToDimension(new EntitySetHeadYawS2CPacket(instance, (byte) (instance.headYaw * 256 / 360)), dimensionId);//instance.dimension);

src/main/java/carpet/utils/SpawnReporter.java

@@ -148,23 +148,23 @@ public static void killEntity(LivingEntity entity)
     {
         if (entity.hasVehicle())
         {
-            entity.getVehicle().remove();
+            entity.getVehicle().remove(Entity.class_5529.field_26999);
         }
         if (entity.hasPassengers())
         {
             for (Entity e: entity.getPassengerList())
             {
-                e.remove();
+                e.remove(Entity.class_5529.field_26999);
             }
         }
         if (entity instanceof OcelotEntity)
         {
             for (Entity e: entity.getEntityWorld().getOtherEntities(entity, entity.getBoundingBox()))
             {
-                e.remove();
+                e.remove(Entity.class_5529.field_26999);
             }
         }
-        entity.remove();
+        entity.remove(Entity.class_5529.field_26999);
     }
 
     // yeeted from SpawnHelper - temporary fix

src/main/resources/fabric.mod.json

@@ -27,7 +27,7 @@
 
   "depends": {
     "fabricloader": ">=0.7.1",
-    "minecraft": "1.16.x"
+    "minecraft": "1.17.*"
   },
   "suggests": {
     "flamingo": "*"