refactor: flatten single component impl

AllayMC · Jul 14, 2024 · 52aad77 · 52aad77
1 parent 49d8c01
commit 52aad77
Show file tree

Hide file tree

Showing 22 changed files with 35 additions and 37 deletions.
diff --git a/.../barrel/BlockBarrelBaseComponentImpl.java → ...mponent/BlockBarrelBaseComponentImpl.java b/.../barrel/BlockBarrelBaseComponentImpl.java → ...mponent/BlockBarrelBaseComponentImpl.java
@@ -1,4 +1,4 @@
-package org.allaymc.server.block.component.barrel;
+package org.allaymc.server.block.component;
 
 import org.allaymc.api.block.BlockBehavior;
 import org.allaymc.api.block.component.annotation.RequireBlockProperty;

diff --git a/...nt/chest/BlockChestBaseComponentImpl.java → ...omponent/BlockChestBaseComponentImpl.java b/...nt/chest/BlockChestBaseComponentImpl.java → ...omponent/BlockChestBaseComponentImpl.java
@@ -1,4 +1,4 @@
-package org.allaymc.server.block.component.chest;
+package org.allaymc.server.block.component;
 
 import org.allaymc.api.block.BlockBehavior;
 import org.allaymc.api.block.component.annotation.RequireBlockProperty;

diff --git a/.../BlockCraftingTableBaseComponentImpl.java → .../BlockCraftingTableBaseComponentImpl.java b/.../BlockCraftingTableBaseComponentImpl.java → .../BlockCraftingTableBaseComponentImpl.java
@@ -1,4 +1,4 @@
-package org.allaymc.server.block.component.craftingtable;
+package org.allaymc.server.block.component;
 
 import org.allaymc.api.block.BlockBehavior;
 import org.allaymc.api.block.component.common.PlayerInteractInfo;

diff --git a/...nt/glass/BlockGlassBaseComponentImpl.java → ...omponent/BlockGlassBaseComponentImpl.java b/...nt/glass/BlockGlassBaseComponentImpl.java → ...omponent/BlockGlassBaseComponentImpl.java
@@ -1,4 +1,4 @@
-package org.allaymc.server.block.component.glass;
+package org.allaymc.server.block.component;
 
 import org.allaymc.api.block.BlockBehavior;
 import org.allaymc.api.block.data.BlockStateWithPos;

diff --git a/...ock/BlockGrassBlockBaseComponentImpl.java → ...ent/BlockGrassBlockBaseComponentImpl.java b/...ock/BlockGrassBlockBaseComponentImpl.java → ...ent/BlockGrassBlockBaseComponentImpl.java
@@ -1,4 +1,4 @@
-package org.allaymc.server.block.component.grassblock;
+package org.allaymc.server.block.component;
 
 import org.allaymc.api.block.BlockBehavior;
 import org.allaymc.api.block.data.BlockStateWithPos;

diff --git a/.../leaves/BlockLeavesBaseComponentImpl.java → ...mponent/BlockLeavesBaseComponentImpl.java b/.../leaves/BlockLeavesBaseComponentImpl.java → ...mponent/BlockLeavesBaseComponentImpl.java
@@ -1,4 +1,4 @@
-package org.allaymc.server.block.component.leaves;
+package org.allaymc.server.block.component;
 
 import org.allaymc.api.block.BlockBehavior;
 import org.allaymc.api.block.data.BlockStateWithPos;

diff --git a/...nent/sand/BlockSandBaseComponentImpl.java → ...component/BlockSandBaseComponentImpl.java b/...nent/sand/BlockSandBaseComponentImpl.java → ...component/BlockSandBaseComponentImpl.java
@@ -1,4 +1,4 @@
-package org.allaymc.server.block.component.sand;
+package org.allaymc.server.block.component;
 
 import org.allaymc.api.block.BlockBehavior;
 import org.allaymc.api.block.component.annotation.RequireBlockProperty;

diff --git a/...box/BlockShulkerBoxBaseComponentImpl.java → ...ent/BlockShulkerBoxBaseComponentImpl.java b/...box/BlockShulkerBoxBaseComponentImpl.java → ...ent/BlockShulkerBoxBaseComponentImpl.java
@@ -1,4 +1,4 @@
-package org.allaymc.server.block.component.shulkerbox;
+package org.allaymc.server.block.component;
 
 import org.allaymc.api.block.BlockBehavior;
 import org.allaymc.api.block.component.common.BlockEntityHolderComponent;

diff --git a/.../stairs/BlockStairsBaseComponentImpl.java → ...mponent/BlockStairsBaseComponentImpl.java b/.../stairs/BlockStairsBaseComponentImpl.java → ...mponent/BlockStairsBaseComponentImpl.java
@@ -1,4 +1,4 @@
-package org.allaymc.server.block.component.stairs;
+package org.allaymc.server.block.component;
 
 import org.allaymc.api.block.BlockBehavior;
 import org.allaymc.api.block.component.annotation.RequireBlockProperty;

diff --git a/...nt/stone/BlockStoneBaseComponentImpl.java → ...omponent/BlockStoneBaseComponentImpl.java b/...nt/stone/BlockStoneBaseComponentImpl.java → ...omponent/BlockStoneBaseComponentImpl.java
@@ -1,4 +1,4 @@
-package org.allaymc.server.block.component.stone;
+package org.allaymc.server.block.component;
 
 import org.allaymc.api.block.BlockBehavior;
 import org.allaymc.api.block.data.BlockStateWithPos;

diff --git a/Allay-Server/src/main/java/org/allaymc/server/block/type/BlockTypeInitializer.java b/Allay-Server/src/main/java/org/allaymc/server/block/type/BlockTypeInitializer.java
@@ -13,20 +13,20 @@
 import org.allaymc.api.data.VanillaBlockId;
 import org.allaymc.api.data.VanillaBlockPropertyTypes;
 import org.allaymc.api.math.voxelshape.CommonShapes;
-import org.allaymc.server.block.component.barrel.BlockBarrelBaseComponentImpl;
-import org.allaymc.server.block.component.chest.BlockChestBaseComponentImpl;
+import org.allaymc.server.block.component.BlockBarrelBaseComponentImpl;
+import org.allaymc.server.block.component.BlockChestBaseComponentImpl;
 import org.allaymc.server.block.component.common.BlockFallableBaseComponentImpl;
 import org.allaymc.server.block.component.common.BlockStateDataComponentImpl;
 import org.allaymc.server.block.component.common.BlockTallWheatSeedDropableBaseComponentImpl;
 import org.allaymc.server.block.component.common.BlockWheatSeedDropableBaseComponentImpl;
-import org.allaymc.server.block.component.craftingtable.BlockCraftingTableBaseComponentImpl;
-import org.allaymc.server.block.component.glass.BlockGlassBaseComponentImpl;
-import org.allaymc.server.block.component.grassblock.BlockGrassBlockBaseComponentImpl;
-import org.allaymc.server.block.component.leaves.BlockLeavesBaseComponentImpl;
-import org.allaymc.server.block.component.sand.BlockSandBaseComponentImpl;
-import org.allaymc.server.block.component.shulkerbox.BlockShulkerBoxBaseComponentImpl;
-import org.allaymc.server.block.component.stairs.BlockStairsBaseComponentImpl;
-import org.allaymc.server.block.component.stone.BlockStoneBaseComponentImpl;
+import org.allaymc.server.block.component.BlockCraftingTableBaseComponentImpl;
+import org.allaymc.server.block.component.BlockGlassBaseComponentImpl;
+import org.allaymc.server.block.component.BlockGrassBlockBaseComponentImpl;
+import org.allaymc.server.block.component.BlockLeavesBaseComponentImpl;
+import org.allaymc.server.block.component.BlockSandBaseComponentImpl;
+import org.allaymc.server.block.component.BlockShulkerBoxBaseComponentImpl;
+import org.allaymc.server.block.component.BlockStairsBaseComponentImpl;
+import org.allaymc.server.block.component.BlockStoneBaseComponentImpl;
 import org.allaymc.server.block.component.torch.BlockColoredTorchBaseComponentImpl;
 import org.allaymc.server.block.component.torch.BlockTorchBaseComponentImpl;
 

diff --git a/...l/BlockEntityBarrelBaseComponentImpl.java → ...t/BlockEntityBarrelBaseComponentImpl.java b/...l/BlockEntityBarrelBaseComponentImpl.java → ...t/BlockEntityBarrelBaseComponentImpl.java
@@ -1,4 +1,4 @@
-package org.allaymc.server.blockentity.component.barrel;
+package org.allaymc.server.blockentity.component;
 
 import org.allaymc.api.block.type.BlockTypes;
 import org.allaymc.api.blockentity.component.common.BlockEntityContainerHolderComponent;

diff --git a/...st/BlockEntityChestBaseComponentImpl.java → ...nt/BlockEntityChestBaseComponentImpl.java b/...st/BlockEntityChestBaseComponentImpl.java → ...nt/BlockEntityChestBaseComponentImpl.java
@@ -1,4 +1,4 @@
-package org.allaymc.server.blockentity.component.chest;
+package org.allaymc.server.blockentity.component;
 
 import org.allaymc.api.blockentity.component.common.BlockEntityContainerHolderComponent;
 import org.allaymc.api.blockentity.init.BlockEntityInitInfo;

diff --git a/...-Server/src/main/java/org/allaymc/server/blockentity/type/BlockEntityTypeInitializer.java b/...-Server/src/main/java/org/allaymc/server/blockentity/type/BlockEntityTypeInitializer.java
@@ -9,8 +9,8 @@
 import org.allaymc.api.container.impl.BarrelContainer;
 import org.allaymc.api.container.impl.ChestContainer;
 import org.allaymc.api.data.VanillaBlockEntityId;
-import org.allaymc.server.blockentity.component.barrel.BlockEntityBarrelBaseComponentImpl;
-import org.allaymc.server.blockentity.component.chest.BlockEntityChestBaseComponentImpl;
+import org.allaymc.server.blockentity.component.BlockEntityBarrelBaseComponentImpl;
+import org.allaymc.server.blockentity.component.BlockEntityChestBaseComponentImpl;
 import org.allaymc.server.blockentity.component.common.BlockEntityContainerHolderComponentImpl;
 import org.allaymc.server.blockentity.component.shulkerbox.BlockEntityShulkerBoxBaseComponentImpl;
 import org.allaymc.server.blockentity.component.shulkerbox.BlockEntityShulkerBoxContainerHolderComponentImpl;

diff --git a/.../EntityFallingBlockBaseComponentImpl.java → .../EntityFallingBlockBaseComponentImpl.java b/.../EntityFallingBlockBaseComponentImpl.java → .../EntityFallingBlockBaseComponentImpl.java
@@ -1,4 +1,4 @@
-package org.allaymc.server.entity.component.fallingblock;
+package org.allaymc.server.entity.component;
 
 import lombok.Getter;
 import lombok.Setter;

diff --git a/...ent/item/EntityItemBaseComponentImpl.java → ...omponent/EntityItemBaseComponentImpl.java b/...ent/item/EntityItemBaseComponentImpl.java → ...omponent/EntityItemBaseComponentImpl.java
@@ -1,4 +1,4 @@
-package org.allaymc.server.entity.component.item;
+package org.allaymc.server.entity.component;
 
 import lombok.Getter;
 import lombok.Setter;
@@ -18,7 +18,6 @@
 import org.joml.primitives.AABBfc;
 
 import static org.allaymc.api.item.ItemHelper.fromNBT;
-import static org.allaymc.api.item.component.common.ItemBaseComponent.EMPTY_STACK_NETWORK_ID;
 
 /**
  * Allay Project 2023/9/23

diff --git a/...ain/java/org/allaymc/server/entity/component/player/EntityPlayerNetworkComponentImpl.java b/...ain/java/org/allaymc/server/entity/component/player/EntityPlayerNetworkComponentImpl.java
@@ -331,7 +331,7 @@ public void initializePlayer() {
         startGamePacket.setWorldEditor(false);
         startGamePacket.setChatRestrictionLevel(ChatRestrictionLevel.NONE);
         startGamePacket.setSpawnBiomeType(SpawnBiomeType.DEFAULT);
-        startGamePacket.setCustomBiomeName("");
+        startGamePacket.setCustomBiomeName("plains");
         startGamePacket.setEducationProductionId("");
         startGamePacket.setForceExperimentalGameplay(OptionalBoolean.empty());
         startGamePacket.setBlockNetworkIdsHashed(true);

diff --git a/Allay-Server/src/main/java/org/allaymc/server/entity/type/EntityTypeInitializer.java b/Allay-Server/src/main/java/org/allaymc/server/entity/type/EntityTypeInitializer.java
@@ -10,8 +10,8 @@
 import org.allaymc.api.entity.type.EntityTypes;
 import org.allaymc.server.entity.component.common.EntityAttributeComponentImpl;
 import org.allaymc.server.entity.component.common.EntityDamageComponentImpl;
-import org.allaymc.server.entity.component.fallingblock.EntityFallingBlockBaseComponentImpl;
-import org.allaymc.server.entity.component.item.EntityItemBaseComponentImpl;
+import org.allaymc.server.entity.component.EntityFallingBlockBaseComponentImpl;
+import org.allaymc.server.entity.component.EntityItemBaseComponentImpl;
 import org.allaymc.server.entity.component.player.*;
 
 import static org.allaymc.api.entity.component.common.EntityAttributeComponent.basicEntityAttributes;

diff --git a/...mponent/air/ItemAirBaseComponentImpl.java → ...m/component/ItemAirBaseComponentImpl.java b/...mponent/air/ItemAirBaseComponentImpl.java → ...m/component/ItemAirBaseComponentImpl.java
@@ -1,4 +1,4 @@
-package org.allaymc.server.item.component.air;
+package org.allaymc.server.item.component;
 
 import org.allaymc.api.component.interfaces.ComponentInitInfo;
 import org.allaymc.api.item.init.SimpleItemStackInitInfo;

diff --git a/...ent/armor/ItemArmorBaseComponentImpl.java → ...component/ItemArmorBaseComponentImpl.java b/...ent/armor/ItemArmorBaseComponentImpl.java → ...component/ItemArmorBaseComponentImpl.java
@@ -1,4 +1,4 @@
-package org.allaymc.server.item.component.armor;
+package org.allaymc.server.item.component;
 
 import org.allaymc.api.block.component.common.PlayerInteractInfo;
 import org.allaymc.api.container.FullContainerType;

diff --git a/...uldron/ItemCauldronBaseComponentImpl.java → ...ponent/ItemCauldronBaseComponentImpl.java b/...uldron/ItemCauldronBaseComponentImpl.java → ...ponent/ItemCauldronBaseComponentImpl.java
@@ -1,4 +1,4 @@
-package org.allaymc.server.item.component.cauldron;
+package org.allaymc.server.item.component;
 
 import org.allaymc.api.block.component.common.PlayerInteractInfo;
 import org.allaymc.api.item.init.ItemStackInitInfo;

diff --git a/Allay-Server/src/main/java/org/allaymc/server/item/type/ItemTypeInitializer.java b/Allay-Server/src/main/java/org/allaymc/server/item/type/ItemTypeInitializer.java
@@ -13,17 +13,16 @@
 import org.allaymc.api.item.interfaces.egg.*;
 import org.allaymc.api.item.interfaces.helmet.*;
 import org.allaymc.api.item.interfaces.hoe.*;
-import org.allaymc.api.item.interfaces.leaves.ItemAcaciaLeavesStack;
 import org.allaymc.api.item.interfaces.leggings.*;
 import org.allaymc.api.item.interfaces.pickaxe.*;
 import org.allaymc.api.item.interfaces.shovel.*;
 import org.allaymc.api.item.interfaces.shulkerbox.*;
 import org.allaymc.api.item.interfaces.sword.*;
 import org.allaymc.api.item.type.ItemTypeBuilder;
 import org.allaymc.api.item.type.ItemTypes;
-import org.allaymc.server.item.component.air.ItemAirBaseComponentImpl;
-import org.allaymc.server.item.component.armor.ItemArmorBaseComponentImpl;
-import org.allaymc.server.item.component.cauldron.ItemCauldronBaseComponentImpl;
+import org.allaymc.server.item.component.ItemAirBaseComponentImpl;
+import org.allaymc.server.item.component.ItemArmorBaseComponentImpl;
+import org.allaymc.server.item.component.ItemCauldronBaseComponentImpl;
 import org.allaymc.server.item.component.common.ItemItemStorableComponentImpl;
 import org.allaymc.server.item.component.food.*;
 import org.allaymc.server.item.component.spawnegg.ItemEvokerSpawnEggBaseComponentImpl;