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/helpers/AEMaterials.java
+2 -2
View File
@@ -24,7 +24,7 @@ import net.minecraft.block.piston.PistonBehavior;
public class AEMaterials {
public static final Material GLASS = new Material(MaterialColor.CLEAR, false, false, true, false, false,
false, PistonBehavior.NORMAL);
public static final Material GLASS = new Material(MaterialColor.CLEAR, false, false, true, false, false, false,
PistonBehavior.NORMAL);
}
src/main/java/appeng/helpers/DualityInterface.java
+17 -14
View File
@@ -28,10 +28,6 @@ import java.util.Optional;
import javax.annotation.Nullable;
import alexiil.mc.lib.attributes.AttributeList;
import alexiil.mc.lib.attributes.AttributeProvider;
import alexiil.mc.lib.attributes.Simulation;
import alexiil.mc.lib.attributes.item.FixedItemInv;
import com.google.common.collect.ImmutableSet;
import net.minecraft.block.Block;
@@ -43,15 +39,20 @@ import net.minecraft.item.ItemStack;
import net.minecraft.item.Items;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.nbt.ListTag;
import net.minecraft.util.hit.BlockHitResult;
import net.minecraft.util.math.Direction;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Vec3d;
import net.minecraft.text.Text;
import net.minecraft.text.LiteralText;
import net.minecraft.text.Text;
import net.minecraft.text.TranslatableText;
import net.minecraft.util.hit.BlockHitResult;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Direction;
import net.minecraft.util.math.Vec3d;
import net.minecraft.world.World;
import alexiil.mc.lib.attributes.AttributeList;
import alexiil.mc.lib.attributes.AttributeProvider;
import alexiil.mc.lib.attributes.Simulation;
import alexiil.mc.lib.attributes.item.FixedItemInv;
import appeng.api.config.Actionable;
import appeng.api.config.Settings;
import appeng.api.config.Upgrades;
@@ -166,7 +167,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
@Override
public void onChangeInventory(final FixedItemInv inv, final int slot, final InvOperation mc,
final ItemStack removed, final ItemStack added) {
final ItemStack removed, final ItemStack added) {
if (this.isWorking == slot) {
return;
}
@@ -970,12 +971,14 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
direction.getOffsetZ() * 0.501);
final Vec3d to = from.add(direction.getOffsetX(), direction.getOffsetY(), direction.getOffsetZ());
final BlockHitResult hit = null;// hostWorld.rayTraceBlocks( from, to ); //FIXME:
// https://github.com/MinecraftForge/MinecraftForge/pull/6708
// https://github.com/MinecraftForge/MinecraftForge/pull/6708
if (hit != null && !BAD_BLOCKS.contains(directedBlock)) {
if (hit.getBlockPos().equals(directedTile.getPos())) {
// FIXME FABRIC: Either add "getName" to the interface adaptor, or special-case cable buses here
// FIXME FABRIC final ItemStack g = directedBlock.getPickBlock(directedBlockState, hit, hostWorld,
// FIXME FABRIC directedTile.getPos(), null);
// FIXME FABRIC: Either add "getName" to the interface adaptor, or special-case
// cable buses here
// FIXME FABRIC final ItemStack g =
// directedBlock.getPickBlock(directedBlockState, hit, hostWorld,
// FIXME FABRIC directedTile.getPos(), null);
// FIXME FABRIC if (!g.isEmpty()) {
// FIXME FABRIC what = g;
// FIXME FABRIC }
src/main/java/appeng/helpers/IContainerCraftingPacket.java
+2 -1
View File
@@ -18,9 +18,10 @@
package appeng.helpers;
import alexiil.mc.lib.attributes.item.FixedItemInv;
import net.minecraft.item.ItemStack;
import alexiil.mc.lib.attributes.item.FixedItemInv;
import appeng.api.networking.IGridNode;
import appeng.api.networking.security.IActionSource;
src/main/java/appeng/helpers/IPriorityHost.java
+1 -1
View File
@@ -18,8 +18,8 @@
package appeng.helpers;
import net.minecraft.screen.ScreenHandlerType;
import net.minecraft.item.ItemStack;
import net.minecraft.screen.ScreenHandlerType;
public interface IPriorityHost {
src/main/java/appeng/helpers/MetaRotation.java
+1 -1
View File
@@ -20,9 +20,9 @@ package appeng.helpers;
import net.minecraft.block.BlockState;
import net.minecraft.state.property.DirectionProperty;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Direction;
import net.minecraft.util.math.Direction.Axis;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.BlockView;
import net.minecraft.world.World;