Merge pull request #5 from koskja/revert-4-main

Revert "Merge upstream"

.github/workflows/main.yml

@@ -131,9 +131,18 @@ jobs:
           target: ${{ matrix.target }}
           override: true
 
+      - name: aarch64-specific items
+        run: |
+          # Use the beta compiler
+          sudo xcode-select -s /Applications/Xcode_12.2.app/Contents/Developer/
+          # Set SDK environment variables
+          echo "SDKROOT=$(xcrun -sdk macosx11.0 --show-sdk-path)" >> $GITHUB_ENV
+          echo "MACOSX_DEPLOYMENT_TARGET=$(xcrun -sdk macosx11.0 --show-sdk-platform-version)" >> $GITHUB_ENV
+        if: matrix.target == 'aarch64-apple-darwin'
+
       - name: Run cargo build
         uses: actions-rs/cargo@v1
         with:
           use-cross: ${{ matrix.use-cross }}
           command: build
-          args: --target=${{ matrix.target }}
+          args: --target=${{ matrix.target }}

.github/workflows/release.yml

@@ -50,10 +50,19 @@ jobs:
           toolchain: stable
           target: ${{ matrix.target }}
           override: true
+
+      - name: aarch64-specific items
+        run: |
+          # Use the beta compiler
+          sudo xcode-select -s /Applications/Xcode_12.2.app/Contents/Developer/
+          # Set SDK environment variables
+          echo "SDKROOT=$(xcrun -sdk macosx11.0 --show-sdk-path)" >> $GITHUB_ENV
+          echo "MACOSX_DEPLOYMENT_TARGET=$(xcrun -sdk macosx11.0 --show-sdk-platform-version)" >> $GITHUB_ENV
+        if: matrix.target == 'aarch64-apple-darwin'
 
       - name: Run cargo build
         uses: actions-rs/cargo@v1
         with:
           use-cross: ${{ matrix.use-cross }}
           command: build
-          args: --release --target ${{ matrix.target }}
+          args: --release --target ${{ matrix.target }}

Cargo.toml

@@ -8,7 +8,6 @@ members = [
     "libcraft/macros",
     "libcraft/particles",
     "libcraft/text",
-    "libcraft/inventory",
 
     # Quill
     "quill/sys-macros",
@@ -30,6 +29,7 @@ members = [
 
     # Feather (common and server)
     "feather/utils",
+    "feather/generated",
     "feather/blocks",
     "feather/blocks/generator",
     "feather/base",

feather/base/Cargo.toml

@@ -12,15 +12,13 @@ bitflags = "1"
 bitvec = "0.21"
 blocks = { path = "../blocks", package = "feather-blocks" }
 byteorder = "1"
+generated = { path = "../generated", package = "feather-generated" }
 hematite-nbt = { git = "https://github.com/PistonDevelopers/hematite_nbt" }
-
 libcraft-blocks = { path = "../../libcraft/blocks" }
 libcraft-core = { path = "../../libcraft/core" }
 libcraft-items = { path = "../../libcraft/items" }
 libcraft-particles = { path = "../../libcraft/particles" }
-libcraft-text = { path = "../../libcraft/text" }
-libcraft-inventory = { path = "../../libcraft/inventory" } 
-
+libcraft-text = { path = "../../libcraft/text" } 
 nom = "5"
 nom_locate = "2"
 num-derive = "0.3"

feather/base/src/anvil/entity.rs

@@ -1,5 +1,5 @@
 use arrayvec::ArrayVec;
-use libcraft_items::{Item, ItemStack, ItemStackBuilder};
+use generated::{Item, ItemStack};
 use serde::ser::Error;
 use serde::{Deserialize, Serialize, Serializer};
 use thiserror::Error;
@@ -219,8 +219,8 @@ where
             Some(nbt)
         };
         Self {
-            count: stack.count() as i8,
-            item: stack.item().name().to_owned(),
+            count: stack.count as i8,
+            item: stack.item.name().to_owned(),
             nbt,
         }
     }
@@ -235,22 +235,12 @@ pub struct ItemNbt {
 }
 
 impl ItemNbt {
-    /// Create an `ItemStack` of the specified item and amount, setting any NBT present.
-    ///
-    /// # Panics
-    /// Panics if `count` is zero.
+    /// Create an `ItemStack` of the specified item and amount, setting any nbt present.
     pub fn item_stack(nbt: &Option<Self>, item: Item, count: u8) -> ItemStack {
-        match nbt {
-            Some(ItemNbt {
-                damage: Some(damage),
-            }) => ItemStackBuilder::with_item(item)
-                .count(count as u32)
-                .damage(*damage)
-                .into(),
-
-            Some(ItemNbt { damage: None }) | None => {
-                ItemStackBuilder::with_item(item).count(count as u32).into()
-            }
+        ItemStack {
+            count: count as u32,
+            item,
+            damage: nbt.as_ref().map(|n| n.damage).flatten().map(|x| x as u32),
         }
     }
 }
@@ -262,7 +252,7 @@ where
     fn from(s: S) -> Self {
         let stack = s.borrow();
         Self {
-            damage: stack.damage_taken().map(|d| d as i32),
+            damage: stack.damage.map(|d| d as i32),
         }
     }
 }

feather/base/src/anvil/level.rs

@@ -1,7 +1,6 @@
 //! Implements level.dat file loading.
 
-use libcraft_core::Biome;
-use libcraft_items::Item;
+use generated::{Biome, Item};
 use serde::{Deserialize, Serialize};
 use std::io::{Cursor, Read, Write};
 use std::{collections::HashMap, fs::File};

feather/base/src/anvil/player.rs

@@ -1,4 +1,3 @@
-use libcraft_items::{Item, ItemStack};
 use std::{
     collections::HashMap,
     fs,
@@ -10,6 +9,7 @@ use nbt::Value;
 use serde::{Deserialize, Serialize};
 use uuid::Uuid;
 
+use generated::{Item, ItemStack};
 use quill_common::components::{
     CanBuild, CanCreativeFly, CreativeFlying, CreativeFlyingSpeed, Instabreak, Invulnerable,
     WalkSpeed,
@@ -70,8 +70,8 @@ pub struct InventorySlot {
 }
 
 impl InventorySlot {
-    /// Converts an [`ItemStack`] and network protocol index into an [`InventorySlot`].
-    pub fn from_network_index(network: usize, stack: &ItemStack) -> Option<Self> {
+    /// Converts an `ItemStack` and network protocol index into an `InventorySlot`.
+    pub fn from_network_index(network: usize, stack: ItemStack) -> Option<Self> {
         let slot = if SLOT_HOTBAR_OFFSET <= network && network < SLOT_HOTBAR_OFFSET + HOTBAR_SIZE {
             // Hotbar
             (network - SLOT_HOTBAR_OFFSET) as i8
@@ -90,18 +90,18 @@ impl InventorySlot {
         Some(Self::from_inventory_index(slot, stack))
     }
 
-    /// Converts an [`ItemStack`] and inventory position index into an [`InventorySlot`].
-    pub fn from_inventory_index(slot: i8, stack: &ItemStack) -> Self {
+    /// Converts an `ItemStack` and inventory position index into an `InventorySlot`.
+    pub fn from_inventory_index(slot: i8, stack: ItemStack) -> Self {
         let nbt = stack.clone().into();
         let nbt = if nbt == Default::default() {
             None
         } else {
             Some(nbt)
         };
         Self {
-            count: stack.count() as i8,
+            count: stack.count as i8,
             slot,
-            item: stack.item().name().to_owned(),
+            item: stack.item.name().to_owned(),
             nbt,
         }
     }
@@ -222,8 +222,8 @@ mod tests {
         };
 
         let item_stack: ItemStack = slot.into();
-        assert_eq!(item_stack.item(), Item::Feather);
-        assert_eq!(item_stack.count(), 1);
+        assert_eq!(item_stack.item, Item::Feather);
+        assert_eq!(item_stack.count, 1);
     }
 
     #[test]
@@ -236,9 +236,9 @@ mod tests {
         };
 
         let item_stack: ItemStack = slot.into();
-        assert_eq!(item_stack.item(), Item::DiamondAxe);
-        assert_eq!(item_stack.count(), 1);
-        assert_eq!(item_stack.damage_taken(), Some(42));
+        assert_eq!(item_stack.item, Item::DiamondAxe);
+        assert_eq!(item_stack.count, 1);
+        assert_eq!(item_stack.damage, Some(42));
     }
 
     #[test]
@@ -251,7 +251,7 @@ mod tests {
         };
 
         let item_stack: ItemStack = slot.into();
-        assert_eq!(item_stack.item(), Item::Air);
+        assert_eq!(item_stack.item, Item::Air);
     }
 
     #[test]
@@ -285,10 +285,7 @@ mod tests {
             };
             assert_eq!(slot.convert_index().unwrap(), expected);
             assert_eq!(
-                InventorySlot::from_network_index(
-                    expected,
-                    &ItemStack::new(Item::Stone, 1).unwrap()
-                ),
+                InventorySlot::from_network_index(expected, ItemStack::new(Item::Stone, 1)),
                 Some(slot),
             );
         }

feather/base/src/anvil/region.rs

@@ -10,7 +10,7 @@ use super::{block_entity::BlockEntityData, entity::EntityData};
 use bitvec::{bitvec, vec::BitVec};
 use blocks::BlockId;
 use byteorder::{BigEndian, ReadBytesExt, WriteBytesExt};
-use libcraft_core::Biome;
+use generated::Biome;
 use serde::{Deserialize, Serialize};
 use std::borrow::Cow;
 use std::collections::BTreeMap;

feather/base/src/chunk.rs

@@ -1,7 +1,7 @@
 use std::usize;
 
 use ::blocks::BlockId;
-use libcraft_core::Biome;
+use generated::Biome;
 
 use crate::ChunkPosition;
 

feather/base/src/chunk/biome_store.rs

@@ -1,4 +1,4 @@
-use libcraft_core::Biome;
+use generated::Biome;
 
 use crate::{CHUNK_HEIGHT, CHUNK_WIDTH};
 

feather/base/src/lib.rs

@@ -20,13 +20,9 @@ pub use block::{BlockPositionValidationError, ValidBlockPosition};
 pub use blocks::*;
 pub use chunk::{Chunk, ChunkSection, CHUNK_HEIGHT, CHUNK_WIDTH};
 pub use chunk_lock::*;
-
+pub use generated::{Area, Biome, EntityKind, Inventory, Item, ItemStack};
 pub use libcraft_blocks::{BlockKind, BlockState};
-pub use libcraft_core::{
-    position, vec3, Biome, BlockPosition, ChunkPosition, EntityKind, Gamemode, Position, Vec3d,
-};
-pub use libcraft_inventory::{Area, Inventory};
-pub use libcraft_items::{Item, ItemStack, ItemStackBuilder, ItemStackError};
+pub use libcraft_core::{position, vec3, BlockPosition, ChunkPosition, Gamemode, Position, Vec3d};
 pub use libcraft_particles::{Particle, ParticleKind};
 pub use libcraft_text::{deserialize_text, Text, Title};
 #[doc(inline)]