1.14.3 pre 1

src/main/java/carpet/CarpetSettings.java

@@ -179,7 +179,7 @@ public class CarpetSettings
                                             viewDistance = 64;
                                         }
                                         if (viewDistance != CarpetServer.minecraft_server.getPlayerManager().getViewDistance())
-                                            CarpetServer.minecraft_server.getPlayerManager().setViewDistance(viewDistance, viewDistance);
+                                            CarpetServer.minecraft_server.getPlayerManager().setViewDistance(viewDistance);
                                     }
                                     else
                                     {

src/main/java/carpet/helpers/BlockRotator.java

@@ -56,7 +56,7 @@ public class BlockRotator
         if (true) throw new UnsupportedOperationException("Alternative Block Placement / client controlled / is not implemnted");
 
         Direction facing;
-        Vec3d vec3d = context.getPos();
+        Vec3d vec3d = context.getHitPos();
         float hitX = (float) vec3d.x;
 
         if (hitX<2) // vanilla

src/main/java/carpet/helpers/HopperCounter.java

@@ -53,7 +53,7 @@ public class HopperCounter
             startMillis = System.currentTimeMillis();
         }
         Item item = stack.getItem();
-        counter.put(item, counter.getLong(item) + stack.getAmount());
+        counter.put(item, counter.getLong(item) + stack.getCount());
         // pubSubProvider.publish();
     }
 

src/main/java/carpet/mixins/ContainerMixin.java

@@ -38,7 +38,7 @@ public class ContainerMixin
                 if(int_1 == 0 && int_2 == 1)
                 {
                     ItemStack itemStackDropAll = dropAllCrafting(playerEntity_1, int_1, slotList);
-                    while (!itemStackDropAll.isEmpty() && ItemStack.areEqual(slot_4.getStack(), itemStackDropAll))
+                    while (!itemStackDropAll.isEmpty() && ItemStack.areItemsEqual(slot_4.getStack(), itemStackDropAll))
                     {
                         itemStack_1 = itemStackDropAll.copy();
                         itemStackDropAll = dropAllCrafting(playerEntity_1, int_1, slotList);
@@ -61,10 +61,10 @@ public class ContainerMixin
             if (index == 0)
             {
                 playerIn.dropItem(itemstack, true);
-                itemstack1.setAmount(0);
+                itemstack1.setCount(0);
                 slot.onStackChanged(itemstack1, itemstack);
             }
-            if (itemstack.getAmount() == itemstack1.getAmount())
+            if (itemstack.getCount() == itemstack1.getCount())
             {
                 return ItemStack.EMPTY;
             }

src/main/java/carpet/mixins/ItemEntityMixin.java

@@ -55,14 +55,14 @@ public abstract class ItemEntityMixin extends Entity implements IItemEntity {
             method = "method_20397",
             at = @At(
                     value = "INVOKE",
-                    target = "Lnet/minecraft/item/ItemStack;getMaxAmount()I"
+                    target = "Lnet/minecraft/item/ItemStack;getMaxCount()I"
             )
     )
     private int getItemStackMaxAmount(ItemStack stack) {
         if (CarpetSettings.b_stackableShulkerBoxes && stack.getItem() instanceof BlockItem && ((BlockItem)stack.getItem()).getBlock() instanceof ShulkerBoxBlock)
             return SHULKERBOX_MAX_STACK_AMOUNT;
 
-        return stack.getMaxAmount();
+        return stack.getMaxCount();
     }
 
     @Inject(
@@ -82,17 +82,17 @@ public abstract class ItemEntityMixin extends Entity implements IItemEntity {
         if (selfStack.getItem() == otherStack.getItem()
                 && !InventoryHelper.shulkerBoxHasItems(selfStack)
                 && selfStack.hasTag() == otherStack.hasTag()
-                && selfStack.getAmount() + otherStack.getAmount() <= SHULKERBOX_MAX_STACK_AMOUNT)
+                && selfStack.getCount() + otherStack.getCount() <= SHULKERBOX_MAX_STACK_AMOUNT)
         {
-            int amount = Math.min(otherStack.getAmount(), SHULKERBOX_MAX_STACK_AMOUNT - selfStack.getAmount());
+            int amount = Math.min(otherStack.getCount(), SHULKERBOX_MAX_STACK_AMOUNT - selfStack.getCount());
 
-            selfStack.addAmount(amount);
+            selfStack.increment(amount);
             self.setStack(selfStack);
 
             this.pickupDelay = Math.max(((IItemEntity)other).getPickupDelay(), this.pickupDelay);
             this.age = Math.min(((IItemEntity)other).getAge(), this.age);
 
-            otherStack.subtractAmount(amount);
+            otherStack.decrement(amount);
             if (otherStack.isEmpty())
             {
                 other.remove();

src/main/java/carpet/mixins/ServerChunkManagerMixin.java

@@ -1,6 +1,5 @@
 package carpet.mixins;
 
-import carpet.fakes.WorldInterface;
 import carpet.utils.SpawnReporter;
 import it.unimi.dsi.fastutil.objects.Object2IntMap;
 import net.minecraft.entity.EntityCategory;

src/main/java/carpet/mixins/SpawnRestrictionMixin.java

@@ -1,18 +0,0 @@
-package carpet.mixins;
-
-import net.minecraft.entity.EntityType;
-import net.minecraft.entity.SpawnRestriction;
-import net.minecraft.world.Heightmap;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-
-@Mixin(SpawnRestriction.class)
-public abstract class SpawnRestrictionMixin
-{
-    @Shadow
-    private static void register(EntityType<?> a, SpawnRestriction.Location b, Heightmap.Type c) { }
-
-    static {
-        register(EntityType.SHULKER, SpawnRestriction.Location.ON_GROUND, Heightmap.Type.MOTION_BLOCKING_NO_LEAVES);
-    }
-}

src/main/java/carpet/script/CarpetEventServer.java

@@ -249,7 +249,7 @@ public class CarpetEventServer
                     ((c, t) -> new EntityValue(player)),
                     ((c, t) -> ListValue.of(
                             new StringValue(Registry.ITEM.getId(itemstack.getItem()).getPath()),
-                            new NumericValue(itemstack.getAmount()),
+                            new NumericValue(itemstack.getCount()),
                             new StringValue(itemstack.toTag(new CompoundTag()).toString())
                     )),
                     ((c, t) -> new StringValue(enumhand == Hand.MAIN_HAND ? "mainhand" : "offhand"))
@@ -278,7 +278,7 @@ public class CarpetEventServer
                     ((c, t) -> new EntityValue(player)),
                     ((c, t) -> ListValue.of(
                             new StringValue(Registry.ITEM.getId(itemstack.getItem()).getPath()),
-                            new NumericValue(itemstack.getAmount()),
+                            new NumericValue(itemstack.getCount()),
                             new StringValue(itemstack.toTag(new CompoundTag()).toString())
                     )),
                     ((c, t) -> new StringValue(enumhand == Hand.MAIN_HAND ? "mainhand" : "offhand")),

src/main/java/carpet/script/CarpetExpression.java

@@ -770,7 +770,7 @@ public class CarpetExpression
             BlockEntity be = world.getBlockEntity(where);
             world.clearBlockState(where, false);
             ItemStack itemstack2 = player.getMainHandStack();
-            itemstack2.onBlockBroken(player.world, state, where, player);
+            itemstack2.postMine(player.world, state, where, player);
             ItemStack itemstack1 = itemstack2.isEmpty() ? ItemStack.EMPTY : itemstack2.copy();
             state.getBlock().afterBreak(world, player, where,state, be, itemstack1);
             world.playLevelEvent(null, 2001, where, Block.getRawIdFromState(state));

src/main/java/carpet/script/value/EntityValue.java

@@ -178,8 +178,8 @@ public class EntityValue extends Value
         put("width", (e, a) -> new NumericValue(e.getSize(EntityPose.STANDING).width));
         put("eye_height", (e, a) -> new NumericValue(e.getEyeHeight(EntityPose.STANDING)));
         put("age", (e, a) -> new NumericValue(e.age));
-        put("item", (e, a) -> (e instanceof ItemEntity)?new StringValue(((ItemEntity) e).getStack().getDisplayName().getString()):Value.NULL);
-        put("count", (e, a) -> (e instanceof ItemEntity)?new NumericValue(((ItemEntity) e).getStack().getAmount()):Value.NULL);
+        put("item", (e, a) -> (e instanceof ItemEntity)?new StringValue(((ItemEntity) e).getStack().getCustomName().getString()):Value.NULL);
+        put("count", (e, a) -> (e instanceof ItemEntity)?new NumericValue(((ItemEntity) e).getStack().getCount()):Value.NULL);
         // ItemEntity -> despawn timer via ssGetAge
         put("is_baby", (e, a) -> (e instanceof LivingEntity)?new NumericValue(((LivingEntity) e).isBaby()):Value.NULL);
         put("target", (e, a) -> {
@@ -279,7 +279,7 @@ public class EntityValue extends Value
                 {
                     return ListValue.of(
                             new StringValue(Registry.ITEM.getId(itemstack.getItem()).getPath()),
-                            new NumericValue(itemstack.getAmount()),
+                            new NumericValue(itemstack.getCount()),
                             new StringValue(itemstack.toTag(new CompoundTag()).toString())
                     );
                 }

src/main/java/carpet/utils/EntityInfo.java

@@ -39,7 +39,7 @@ public class EntityInfo
         {
             return null;
         } // func_190916_E()
-        String stackname = item.getAmount()>1?String.format("%dx%s",item.getAmount(), item.getDisplayName().getString()):item.getDisplayName().getString();
+        String stackname = item.getCount()>1?String.format("%dx%s",item.getCount(), item.getCustomName().getString()):item.getCustomName().getString();
         if (item.isDamaged())
         {
             stackname += String.format(" %d/%d", item.getMaxUseTime()-item.getDamage(), item.getMaxUseTime());

src/main/resources/carpet.mixins.json

@@ -70,7 +70,6 @@
 
     "FloatingIslandsChunkGeneratorMixin",
     "EndCityFeatureMixin",
-    "SpawnRestrictionMixin",
 
     "InfestedBlockMixin",
     "PlayerEntityMixin"