Reformatted, and ported back some enhancements from the Forge version.

2020-08-15 02:51:03 +02:00
parent 0a2f03aa92
commit 6c544f2211
358 changed files with 1124 additions and 1831 deletions
@@ -18,21 +18,15 @@

 package appeng.block;

-import javax.annotation.Nullable;
-
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.fabricmc.fabric.api.tool.attribute.v1.FabricToolTags;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Material;
 import net.minecraft.block.MaterialColor;
-import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.sound.BlockSoundGroup;
-import net.minecraft.util.ActionResult;
-import net.minecraft.util.Hand;
 import net.minecraft.util.Identifier;
-import net.minecraft.util.hit.BlockHitResult;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
 import net.minecraft.util.registry.Registry;
@@ -27,7 +27,6 @@ import javax.annotation.Nullable;

 import com.google.common.collect.Lists;

-import net.fabricmc.fabric.api.event.lifecycle.v1.ServerChunkEvents;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockEntityProvider;
 import net.minecraft.block.BlockState;
@@ -284,7 +283,7 @@ public abstract class AEBaseTileBlock<T extends AEBaseBlockEntity> extends AEBas
    /**
     * Returns the BlockState based on the given BlockState while considering the
     * state of the given TileEntity.
-     *
+     * <p>
     * If the given TileEntity is not of the right type for this block, the state is
     * returned unchanged, this is also the case if the given block state does not
     * belong to this block.
@@ -300,7 +299,7 @@ public abstract class AEBaseTileBlock<T extends AEBaseBlockEntity> extends AEBas
    /**
     * Reimplement this in subclasses to allow tile-entities to update the state of
     * their block when their own state changes.
-     *
+     * <p>
     * It is guaranteed that te is not-null and the block of the given block state
     * is this exact block instance.
     */
@@ -19,13 +19,8 @@
 package appeng.block.crafting;

 import net.minecraft.block.Block;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;

-import appeng.api.features.AEFeature;
 import appeng.block.AEBaseBlockItem;
-import appeng.core.AEConfig;
-import appeng.core.Api;

 public class CraftingStorageItem extends AEBaseBlockItem {

@@ -45,7 +45,7 @@ public class InscriberBlock extends AEBaseTileBlock<InscriberBlockEntity> {
    @Override
    public int getOpacity(BlockState state, BlockView worldIn, BlockPos pos) {
        return 2; // FIXME validate this. a) possibly not required because of getShape b) value
-                  // range. was 2 in 1.10
+        // range. was 2 in 1.10
    }

    @Override
@@ -1,4 +1,3 @@
-
 package appeng.block.misc;

 import net.fabricmc.api.EnvType;
@@ -26,11 +26,7 @@ import javax.annotation.Nullable;

 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
-import net.minecraft.block.Block;
-import net.minecraft.block.BlockState;
-import net.minecraft.block.Blocks;
-import net.minecraft.block.Material;
-import net.minecraft.block.ShapeContext;
+import net.minecraft.block.*;
 import net.minecraft.item.ItemPlacementContext;
 import net.minecraft.sound.BlockSoundGroup;
 import net.minecraft.state.StateManager;
@@ -39,7 +39,6 @@ import net.minecraft.world.BlockView;
 import net.minecraft.world.World;

 import appeng.block.AEBaseTileBlock;
-import appeng.block.networking.WirelessBlock.State;
 import appeng.container.ContainerLocator;
 import appeng.container.ContainerOpener;
 import appeng.container.implementations.WirelessContainer;
@@ -1,4 +1,3 @@
-
 package appeng.block.networking;

 import net.fabricmc.api.EnvType;
@@ -1,4 +1,3 @@
-
 package appeng.block.paint;

 import java.util.Collection;
@@ -1,4 +1,3 @@
-
 package appeng.block.paint;

 import java.util.Collections;
@@ -18,14 +18,7 @@

 package appeng.block.paint;

-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
-import net.minecraft.block.Block;
-import net.minecraft.block.BlockState;
-import net.minecraft.block.Material;
-import net.minecraft.block.MaterialColor;
-import net.minecraft.block.ShapeContext;
-import net.minecraft.fluid.Fluid;
+import net.minecraft.block.*;
 import net.minecraft.item.ItemGroup;
 import net.minecraft.item.ItemPlacementContext;
 import net.minecraft.item.ItemStack;
@@ -1,4 +1,3 @@
-
 package appeng.block.paint;

 import java.util.Collection;
@@ -1,4 +1,3 @@
-
 package appeng.block.paint;

 import net.fabricmc.api.EnvType;
@@ -1,4 +1,3 @@
-
 package appeng.block.qnb;

 import java.util.EnumSet;
@@ -1,4 +1,3 @@
-
 package appeng.block.qnb;

 import java.util.Collection;
@@ -1,4 +1,3 @@
-
 package appeng.block.qnb;

 import java.util.Set;
@@ -1,4 +1,3 @@
-
 package appeng.block.qnb;

 import net.fabricmc.api.EnvType;
@@ -21,7 +21,6 @@ package appeng.block.spatial;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.BlockView;
 import net.minecraft.world.World;

 import appeng.block.AEBaseTileBlock;
@@ -65,7 +65,9 @@ public class SkyChestBlock extends AEBaseTileBlock<SkyChestBlockEntity> {

    public enum SkyChestType {
        STONE, BLOCK
-    };
+    }
+
+    ;

    public final SkyChestType type;