fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added spotless back and reformatted

Browse Source
This commit is contained in:
Sebastian Hartte
2020-07-27 20:07:27 +02:00
parent 49296915c9
commit 780f68952b
593 changed files with 4192 additions and 3969 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/debug/ChunkLoaderBlockEntity.java
+2 -2
View File
@@ -18,11 +18,11 @@
package appeng.debug;
import net.minecraft.util.Tickable;
import net.minecraft.block.entity.BlockEntityType;
import net.minecraft.server.world.ServerWorld;
import net.minecraft.util.Tickable;
import net.minecraft.util.math.ChunkPos;
import net.minecraft.world.World;
import net.minecraft.server.world.ServerWorld;
import appeng.core.AELog;
import appeng.tile.AEBaseBlockEntity;
src/main/java/appeng/debug/CubeGeneratorBlockEntity.java
+5 -5
View File
@@ -18,17 +18,17 @@
package appeng.debug;
import net.minecraft.block.entity.BlockEntityType;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.AutomaticItemPlacementContext;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.item.ItemUsageContext;
import net.minecraft.util.Tickable;
import net.minecraft.block.entity.BlockEntityType;
import net.minecraft.util.Util;
import net.minecraft.util.math.Direction;
import net.minecraft.util.math.BlockPos;
import net.minecraft.text.LiteralText;
import net.minecraft.util.Tickable;
import net.minecraft.util.Util;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Direction;
import appeng.core.AppEng;
import appeng.tile.AEBaseBlockEntity;
src/main/java/appeng/debug/DebugCardItem.java
+4 -4
View File
@@ -21,18 +21,16 @@ package appeng.debug;
import java.util.HashSet;
import java.util.Set;
import appeng.hooks.AEToolItem;
import appeng.tile.networking.ControllerBlockEntity;
import net.minecraft.block.entity.BlockEntity;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.ItemStack;
import net.minecraft.item.ItemUsageContext;
import net.minecraft.block.entity.BlockEntity;
import net.minecraft.text.LiteralText;
import net.minecraft.util.ActionResult;
import net.minecraft.util.Util;
import net.minecraft.util.math.Direction;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Direction;
import net.minecraft.world.World;
import appeng.api.networking.IGridConnection;
@@ -46,12 +44,14 @@ import appeng.api.networking.ticking.ITickManager;
import appeng.api.parts.IPart;
import appeng.api.parts.IPartHost;
import appeng.api.util.AEPartLocation;
import appeng.hooks.AEToolItem;
import appeng.hooks.TickHandler;
import appeng.items.AEBaseItem;
import appeng.me.Grid;
import appeng.me.GridNode;
import appeng.me.cache.TickManagerCache;
import appeng.parts.p2p.P2PTunnelPart;
import appeng.tile.networking.ControllerBlockEntity;
public class DebugCardItem extends AEBaseItem implements AEToolItem {
src/main/java/appeng/debug/DebugPartPlacerItem.java
+2 -2
View File
@@ -2,7 +2,6 @@ package appeng.debug;
import java.util.Arrays;
import appeng.hooks.AEToolItem;
import net.minecraft.block.entity.BlockEntity;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.Item;
@@ -11,8 +10,8 @@ import net.minecraft.item.ItemUsageContext;
import net.minecraft.text.LiteralText;
import net.minecraft.util.ActionResult;
import net.minecraft.util.Util;
import net.minecraft.util.math.Direction;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Direction;
import net.minecraft.util.math.Vec3i;
import net.minecraft.util.registry.Registry;
import net.minecraft.world.World;
@@ -21,6 +20,7 @@ import appeng.api.parts.IPart;
import appeng.api.parts.IPartHost;
import appeng.api.parts.PartItemStack;
import appeng.api.util.AEPartLocation;
import appeng.hooks.AEToolItem;
import appeng.items.AEBaseItem;
import appeng.items.parts.ColoredPartItem;
import appeng.items.parts.PartItem;
src/main/java/appeng/debug/EraserItem.java
+1 -1
View File
@@ -23,7 +23,6 @@ import java.util.HashSet;
import java.util.Queue;
import java.util.Set;
import appeng.hooks.AEToolItem;
import net.minecraft.block.Block;
import net.minecraft.block.Blocks;
import net.minecraft.entity.player.PlayerEntity;
@@ -35,6 +34,7 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import appeng.core.AELog;
import appeng.hooks.AEToolItem;
import appeng.items.AEBaseItem;
public class EraserItem extends AEBaseItem implements AEToolItem {
src/main/java/appeng/debug/ItemGenBlockEntity.java
+10 -8
View File
@@ -18,12 +18,9 @@
package appeng.debug;
import alexiil.mc.lib.attributes.AttributeList;
import alexiil.mc.lib.attributes.Simulation;
import alexiil.mc.lib.attributes.item.ItemExtractable;
import alexiil.mc.lib.attributes.item.filter.ExactItemStackFilter;
import alexiil.mc.lib.attributes.item.filter.ItemFilter;
import appeng.tile.AEBaseBlockEntity;
import java.util.ArrayDeque;
import java.util.Queue;
import net.minecraft.block.BlockState;
import net.minecraft.block.entity.BlockEntityType;
import net.minecraft.item.Item;
@@ -34,8 +31,13 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.util.registry.Registry;
import net.minecraft.world.World;
import java.util.ArrayDeque;
import java.util.Queue;
import alexiil.mc.lib.attributes.AttributeList;
import alexiil.mc.lib.attributes.Simulation;
import alexiil.mc.lib.attributes.item.ItemExtractable;
import alexiil.mc.lib.attributes.item.filter.ExactItemStackFilter;
import alexiil.mc.lib.attributes.item.filter.ItemFilter;
import appeng.tile.AEBaseBlockEntity;
public class ItemGenBlockEntity extends AEBaseBlockEntity {
src/main/java/appeng/debug/MeteoritePlacerItem.java
+8 -8
View File
@@ -18,32 +18,32 @@
package appeng.debug;
import appeng.hooks.AEToolItem;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.network.packet.s2c.play.ChunkDataS2CPacket;
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.item.ItemStack;
import net.minecraft.item.ItemUsageContext;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.network.packet.s2c.play.ChunkDataS2CPacket;
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.server.world.ServerWorld;
import net.minecraft.text.LiteralText;
import net.minecraft.util.TypedActionResult;
import net.minecraft.util.ActionResult;
import net.minecraft.util.Hand;
import net.minecraft.util.TypedActionResult;
import net.minecraft.util.Util;
import net.minecraft.util.math.BlockBox;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.ChunkPos;
import net.minecraft.world.World;
import net.minecraft.world.chunk.Chunk;
import net.minecraft.server.world.ServerWorld;
import net.minecraft.world.chunk.WorldChunk;
import appeng.hooks.AEToolItem;
import appeng.items.AEBaseItem;
import appeng.util.Platform;
import appeng.worldgen.meteorite.CraterType;
import appeng.worldgen.meteorite.MeteoritePlacer;
import appeng.worldgen.meteorite.PlacedMeteoriteSettings;
import appeng.worldgen.meteorite.debug.MeteoriteSpawner;
import net.minecraft.world.chunk.WorldChunk;
public class MeteoritePlacerItem extends AEBaseItem implements AEToolItem {
@@ -117,8 +117,8 @@ public class MeteoritePlacerItem extends AEBaseItem implements AEToolItem {
// we have to assume maximum size
int range = (int) Math.ceil((coreRadius * 2 + 5) * 5f);
BlockBox boundingBox = new BlockBox(pos.getX() - range, pos.getY(), pos.getZ() - range,
pos.getX() + range, pos.getY(), pos.getZ() + range);
BlockBox boundingBox = new BlockBox(pos.getX() - range, pos.getY(), pos.getZ() - range, pos.getX() + range,
pos.getY(), pos.getZ() + range);
final MeteoritePlacer placer = new MeteoritePlacer(world, spawned, boundingBox);
placer.place();
src/main/java/appeng/debug/ReplicatorCardItem.java
+9 -7
View File
@@ -18,23 +18,22 @@
package appeng.debug;
import appeng.hooks.AEToolItem;
import net.minecraft.block.Block;
import net.minecraft.block.BlockEntityProvider;
import net.minecraft.block.BlockState;
import net.minecraft.block.entity.BlockEntity;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.ItemStack;
import net.minecraft.item.ItemUsageContext;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.block.entity.BlockEntity;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.world.ServerWorld;
import net.minecraft.text.LiteralText;
import net.minecraft.util.*;
import net.minecraft.util.ActionResult;
import net.minecraft.util.math.Direction;
import net.minecraft.util.math.BlockPos;
import net.minecraft.text.LiteralText;
import net.minecraft.util.math.Direction;
import net.minecraft.util.math.MathHelper;
import net.minecraft.util.registry.Registry;
import net.minecraft.util.registry.RegistryKey;
@@ -47,6 +46,7 @@ import appeng.api.networking.IGridNode;
import appeng.api.networking.spatial.ISpatialCache;
import appeng.api.util.AEPartLocation;
import appeng.api.util.DimensionalCoord;
import appeng.hooks.AEToolItem;
import appeng.items.AEBaseItem;
public class ReplicatorCardItem extends AEBaseItem implements AEToolItem {
@@ -118,7 +118,8 @@ public class ReplicatorCardItem extends AEBaseItem implements AEToolItem {
final int src_z = ish.getInt("z");
final int src_side = ish.getInt("side");
final String worldId = ish.getString("w");
final World src_w = world.getServer().getWorld(RegistryKey.of(Registry.DIMENSION, new Identifier(worldId)));
final World src_w = world.getServer()
.getWorld(RegistryKey.of(Registry.DIMENSION, new Identifier(worldId)));
final int replications = ish.getInt("r") + 1;
final BlockEntity te = src_w.getBlockEntity(new BlockPos(src_x, src_y, src_z));
@@ -182,9 +183,10 @@ public class ReplicatorCardItem extends AEBaseItem implements AEToolItem {
world.setBlockState(d, state);
if (blk instanceof BlockEntityProvider) {
BlockEntityProvider blkEntityProvider = (BlockEntityProvider)blk;
BlockEntityProvider blkEntityProvider = (BlockEntityProvider) blk;
final BlockEntity ote = src_w.getBlockEntity(p);
final BlockEntity nte = blkEntityProvider.createBlockEntity(world);
final BlockEntity nte = blkEntityProvider
.createBlockEntity(world);
final CompoundTag data = new CompoundTag();
ote.toTag(data);
nte.fromTag(state, data.copy());