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

reformatted all src files (#141)

Browse Source
This commit is contained in:
YoungOnion
2022-09-17 05:08:02 -06:00
committed by GitHub
parent 3328bfcda2
commit 9011273229
1056 changed files with 88127 additions and 110597 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/server/AECommand.java
+49 -77
View File
@@ -20,7 +20,6 @@ package appeng.server;
import com.google.common.base.Joiner;
import net.minecraft.command.CommandBase;
import net.minecraft.command.CommandException;
import net.minecraft.command.ICommandSender;
@@ -28,85 +27,58 @@ import net.minecraft.command.WrongUsageException;
import net.minecraft.server.MinecraftServer;
public final class AECommand extends CommandBase
{
private final MinecraftServer srv;
public final class AECommand extends CommandBase {
private final MinecraftServer srv;
public AECommand( final MinecraftServer server )
{
this.srv = server;
}
public AECommand(final MinecraftServer server) {
this.srv = server;
}
@Override
public int getRequiredPermissionLevel()
{
return 0;
}
@Override
public int getRequiredPermissionLevel() {
return 0;
}
@Override
public String getName()
{
return "ae2";
}
@Override
public String getName() {
return "ae2";
}
@Override
public String getUsage( final ICommandSender icommandsender )
{
return "commands.ae2.usage";
}
@Override
public String getUsage(final ICommandSender icommandsender) {
return "commands.ae2.usage";
}
@Override
public void execute( final MinecraftServer server, final ICommandSender sender, final String[] args ) throws CommandException
{
if( args.length == 0 )
{
throw new WrongUsageException( "commands.ae2.usage" );
}
else if( "help".equals( args[0] ) )
{
try
{
if( args.length > 1 )
{
final Commands c = Commands.valueOf( args[1] );
throw new WrongUsageException( c.command.getHelp( this.srv ) );
}
}
catch( final WrongUsageException wrong )
{
throw wrong;
}
catch( final Throwable er )
{
throw new WrongUsageException( "commands.ae2.usage" );
}
}
else if( "list".equals( args[0] ) )
{
throw new WrongUsageException( Joiner.on( ", " ).join( Commands.values() ) );
}
else
{
try
{
final Commands c = Commands.valueOf( args[0] );
if( sender.canUseCommand( c.level, this.getName() ) )
{
c.command.call( this.srv, args, sender );
}
else
{
throw new WrongUsageException( "commands.ae2.permissions" );
}
}
catch( final WrongUsageException wrong )
{
throw wrong;
}
catch( final Throwable er )
{
throw new WrongUsageException( "commands.ae2.usage" );
}
}
}
@Override
public void execute(final MinecraftServer server, final ICommandSender sender, final String[] args) throws CommandException {
if (args.length == 0) {
throw new WrongUsageException("commands.ae2.usage");
} else if ("help".equals(args[0])) {
try {
if (args.length > 1) {
final Commands c = Commands.valueOf(args[1]);
throw new WrongUsageException(c.command.getHelp(this.srv));
}
} catch (final WrongUsageException wrong) {
throw wrong;
} catch (final Throwable er) {
throw new WrongUsageException("commands.ae2.usage");
}
} else if ("list".equals(args[0])) {
throw new WrongUsageException(Joiner.on(", ").join(Commands.values()));
} else {
try {
final Commands c = Commands.valueOf(args[0]);
if (sender.canUseCommand(c.level, this.getName())) {
c.command.call(this.srv, args, sender);
} else {
throw new WrongUsageException("commands.ae2.permissions");
}
} catch (final WrongUsageException wrong) {
throw wrong;
} catch (final Throwable er) {
throw new WrongUsageException("commands.ae2.usage");
}
}
}
}
src/main/java/appeng/server/AccessType.java
+25 -26
View File
@@ -19,35 +19,34 @@
package appeng.server;
public enum AccessType
{
/**
* allows basic access to manipulate the block via gui, or other.
*/
BLOCK_ACCESS,
public enum AccessType {
/**
* allows basic access to manipulate the block via gui, or other.
*/
BLOCK_ACCESS,
/**
* Can player deposit items into the network.
*/
NETWORK_DEPOSIT,
/**
* Can player deposit items into the network.
*/
NETWORK_DEPOSIT,
/**
* can player withdraw items from the network.
*/
NETWORK_WITHDRAW,
/**
* can player withdraw items from the network.
*/
NETWORK_WITHDRAW,
/**
* can player issue crafting requests?
*/
NETWORK_CRAFT,
/**
* can player issue crafting requests?
*/
NETWORK_CRAFT,
/**
* can player add new blocks to the network.
*/
NETWORK_BUILD,
/**
* can player add new blocks to the network.
*/
NETWORK_BUILD,
/**
* can player manipulate security settings.
*/
NETWORK_SECURITY
/**
* can player manipulate security settings.
*/
NETWORK_SECURITY
}
src/main/java/appeng/server/Commands.java
+12 -15
View File
@@ -23,23 +23,20 @@ import appeng.server.subcommands.ChunkLogger;
import appeng.server.subcommands.Supporters;
public enum Commands
{
Chunklogger( 4, new ChunkLogger() ), Supporters( 0, new Supporters() );
public enum Commands {
Chunklogger(4, new ChunkLogger()), Supporters(0, new Supporters());
public final int level;
public final ISubCommand command;
public final int level;
public final ISubCommand command;
Commands( final int level, final ISubCommand w )
{
this.level = level;
this.command = w;
}
Commands(final int level, final ISubCommand w) {
this.level = level;
this.command = w;
}
@Override
public String toString()
{
return this.name();
}
@Override
public String toString() {
return this.name();
}
}
src/main/java/appeng/server/ISubCommand.java
+3 -4
View File
@@ -23,10 +23,9 @@ import net.minecraft.command.ICommandSender;
import net.minecraft.server.MinecraftServer;
public interface ISubCommand
{
public interface ISubCommand {
String getHelp( MinecraftServer srv );
String getHelp(MinecraftServer srv);
void call( MinecraftServer srv, String[] args, ICommandSender sender );
void call(MinecraftServer srv, String[] args, ICommandSender sender);
}
src/main/java/appeng/server/ServerHelper.java
+106 -135
View File
@@ -19,10 +19,15 @@
package appeng.server;
import java.util.ArrayList;
import java.util.List;
import java.util.Random;
import appeng.api.parts.CableRenderMode;
import appeng.block.AEBaseBlock;
import appeng.client.ActionKey;
import appeng.client.EffectType;
import appeng.core.CommonHelper;
import appeng.core.sync.AppEngPacket;
import appeng.core.sync.network.NetworkHandler;
import appeng.items.tools.ToolNetworkTool;
import appeng.util.Platform;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.entity.player.InventoryPlayer;
@@ -34,166 +39,132 @@ import net.minecraft.util.math.RayTraceResult;
import net.minecraft.world.World;
import net.minecraftforge.fml.common.FMLCommonHandler;
import appeng.api.parts.CableRenderMode;
import appeng.block.AEBaseBlock;
import appeng.client.ActionKey;
import appeng.client.EffectType;
import appeng.core.CommonHelper;
import appeng.core.sync.AppEngPacket;
import appeng.core.sync.network.NetworkHandler;
import appeng.items.tools.ToolNetworkTool;
import appeng.util.Platform;
import java.util.ArrayList;
import java.util.List;
import java.util.Random;
public class ServerHelper extends CommonHelper
{
public class ServerHelper extends CommonHelper {
private EntityPlayer renderModeBased;
private EntityPlayer renderModeBased;
@Override
public void preinit()
{
@Override
public void preinit() {
}
}
@Override
public void init()
{
@Override
public void init() {
}
}
@Override
public World getWorld()
{
throw new UnsupportedOperationException( "This is a server..." );
}
@Override
public World getWorld() {
throw new UnsupportedOperationException("This is a server...");
}
@Override
public void bindTileEntitySpecialRenderer( final Class<? extends TileEntity> tile, final AEBaseBlock blk )
{
throw new UnsupportedOperationException( "This is a server..." );
}
@Override
public void bindTileEntitySpecialRenderer(final Class<? extends TileEntity> tile, final AEBaseBlock blk) {
throw new UnsupportedOperationException("This is a server...");
}
@Override
public List<EntityPlayer> getPlayers()
{
if( !Platform.isClient() )
{
final MinecraftServer server = FMLCommonHandler.instance().getMinecraftServerInstance();
@Override
public List<EntityPlayer> getPlayers() {
if (!Platform.isClient()) {
final MinecraftServer server = FMLCommonHandler.instance().getMinecraftServerInstance();
if( server != null )
{
return (List) server.getPlayerList().getPlayers();
}
}
if (server != null) {
return (List) server.getPlayerList().getPlayers();
}
}
return new ArrayList<>();
}
return new ArrayList<>();
}
@Override
public void sendToAllNearExcept( final EntityPlayer p, final double x, final double y, final double z, final double dist, final World w, final AppEngPacket packet )
{
if( Platform.isClient() )
{
return;
}
@Override
public void sendToAllNearExcept(final EntityPlayer p, final double x, final double y, final double z, final double dist, final World w, final AppEngPacket packet) {
if (Platform.isClient()) {
return;
}
for( final EntityPlayer o : this.getPlayers() )
{
final EntityPlayerMP entityplayermp = (EntityPlayerMP) o;
for (final EntityPlayer o : this.getPlayers()) {
final EntityPlayerMP entityplayermp = (EntityPlayerMP) o;
if( entityplayermp != p && entityplayermp.world == w )
{
final double dX = x - entityplayermp.posX;
final double dY = y - entityplayermp.posY;
final double dZ = z - entityplayermp.posZ;
if (entityplayermp != p && entityplayermp.world == w) {
final double dX = x - entityplayermp.posX;
final double dY = y - entityplayermp.posY;
final double dZ = z - entityplayermp.posZ;
if( dX * dX + dY * dY + dZ * dZ < dist * dist )
{
NetworkHandler.instance().sendTo( packet, entityplayermp );
}
}
}
}
if (dX * dX + dY * dY + dZ * dZ < dist * dist) {
NetworkHandler.instance().sendTo(packet, entityplayermp);
}
}
}
}
@Override
public void spawnEffect( final EffectType type, final World world, final double posX, final double posY, final double posZ, final Object o )
{
// :P
}
@Override
public void spawnEffect(final EffectType type, final World world, final double posX, final double posY, final double posZ, final Object o) {
// :P
}
@Override
public boolean shouldAddParticles( final Random r )
{
return false;
}
@Override
public boolean shouldAddParticles(final Random r) {
return false;
}
@Override
public RayTraceResult getRTR()
{
return null;
}
@Override
public RayTraceResult getRTR() {
return null;
}
@Override
public void postInit()
{
@Override
public void postInit() {
}
}
@Override
public CableRenderMode getRenderMode()
{
if( this.renderModeBased == null )
{
return CableRenderMode.STANDARD;
}
@Override
public CableRenderMode getRenderMode() {
if (this.renderModeBased == null) {
return CableRenderMode.STANDARD;
}
return this.renderModeForPlayer( this.renderModeBased );
}
return this.renderModeForPlayer(this.renderModeBased);
}
@Override
public void triggerUpdates()
{
@Override
public void triggerUpdates() {
}
}
@Override
public void updateRenderMode( final EntityPlayer player )
{
this.renderModeBased = player;
}
@Override
public void updateRenderMode(final EntityPlayer player) {
this.renderModeBased = player;
}
protected CableRenderMode renderModeForPlayer( final EntityPlayer player )
{
if( player != null )
{
for( int x = 0; x < InventoryPlayer.getHotbarSize(); x++ )
{
final ItemStack is = player.inventory.getStackInSlot( x );
protected CableRenderMode renderModeForPlayer(final EntityPlayer player) {
if (player != null) {
for (int x = 0; x < InventoryPlayer.getHotbarSize(); x++) {
final ItemStack is = player.inventory.getStackInSlot(x);
if( !is.isEmpty() && is.getItem() instanceof ToolNetworkTool )
{
final NBTTagCompound c = is.getTagCompound();
if( c != null && c.getBoolean( "hideFacades" ) )
{
return CableRenderMode.CABLE_VIEW;
}
}
}
}
if (!is.isEmpty() && is.getItem() instanceof ToolNetworkTool) {
final NBTTagCompound c = is.getTagCompound();
if (c != null && c.getBoolean("hideFacades")) {
return CableRenderMode.CABLE_VIEW;
}
}
}
}
return CableRenderMode.STANDARD;
}
return CableRenderMode.STANDARD;
}
@Override
public boolean isKeyPressed( ActionKey key )
{
return false;
}
@Override
public boolean isKeyPressed(ActionKey key) {
return false;
}
@Override
public boolean isActionKey( ActionKey key, int pressedKeyCode )
{
return false;
}
@Override
public boolean isActionKey(ActionKey key, int pressedKeyCode) {
return false;
}
}
src/main/java/appeng/server/subcommands/ChunkLogger.java
+47 -64
View File
@@ -19,6 +19,10 @@
package appeng.server.subcommands;
import appeng.core.AEConfig;
import appeng.core.AELog;
import appeng.core.features.AEFeature;
import appeng.server.ISubCommand;
import net.minecraft.command.ICommandSender;
import net.minecraft.server.MinecraftServer;
import net.minecraft.util.text.TextComponentTranslation;
@@ -26,76 +30,55 @@ import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.world.ChunkEvent;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import appeng.core.AEConfig;
import appeng.core.AELog;
import appeng.core.features.AEFeature;
import appeng.server.ISubCommand;
public class ChunkLogger implements ISubCommand {
public class ChunkLogger implements ISubCommand
{
private boolean enabled = false;
private boolean enabled = false;
@SubscribeEvent
public void onChunkLoadEvent(final ChunkEvent.Load event) {
if (!event.getWorld().isRemote) {
AELog.info("Chunk Loaded: " + event.getChunk().x + ", " + event.getChunk().z);
this.displayStack();
}
}
@SubscribeEvent
public void onChunkLoadEvent( final ChunkEvent.Load event )
{
if( !event.getWorld().isRemote )
{
AELog.info( "Chunk Loaded: " + event.getChunk().x + ", " + event.getChunk().z );
this.displayStack();
}
}
private void displayStack() {
if (AEConfig.instance().isFeatureEnabled(AEFeature.CHUNK_LOGGER_TRACE)) {
boolean output = false;
for (final StackTraceElement e : Thread.currentThread().getStackTrace()) {
if (output) {
AELog.info(" " + e.getClassName() + '.' + e.getMethodName() + " (" + e.getLineNumber() + ')');
} else {
output = e.getClassName().contains("EventBus") && e.getMethodName().contains("post");
}
}
}
}
private void displayStack()
{
if( AEConfig.instance().isFeatureEnabled( AEFeature.CHUNK_LOGGER_TRACE ) )
{
boolean output = false;
for( final StackTraceElement e : Thread.currentThread().getStackTrace() )
{
if( output )
{
AELog.info( " " + e.getClassName() + '.' + e.getMethodName() + " (" + e.getLineNumber() + ')' );
}
else
{
output = e.getClassName().contains( "EventBus" ) && e.getMethodName().contains( "post" );
}
}
}
}
@SubscribeEvent
public void onChunkUnloadEvent(final ChunkEvent.Unload unload) {
if (!unload.getWorld().isRemote) {
AELog.info("Chunk Unloaded: " + unload.getChunk().x + ", " + unload.getChunk().z);
this.displayStack();
}
}
@SubscribeEvent
public void onChunkUnloadEvent( final ChunkEvent.Unload unload )
{
if( !unload.getWorld().isRemote )
{
AELog.info( "Chunk Unloaded: " + unload.getChunk().x + ", " + unload.getChunk().z );
this.displayStack();
}
}
@Override
public String getHelp(final MinecraftServer srv) {
return "commands.ae2.ChunkLogger";
}
@Override
public String getHelp( final MinecraftServer srv )
{
return "commands.ae2.ChunkLogger";
}
@Override
public void call(final MinecraftServer srv, final String[] data, final ICommandSender sender) {
this.enabled = !this.enabled;
@Override
public void call( final MinecraftServer srv, final String[] data, final ICommandSender sender )
{
this.enabled = !this.enabled;
if( this.enabled )
{
MinecraftForge.EVENT_BUS.register( this );
sender.sendMessage( new TextComponentTranslation( "commands.ae2.ChunkLoggerOn" ) );
}
else
{
MinecraftForge.EVENT_BUS.unregister( this );
sender.sendMessage( new TextComponentTranslation( "commands.ae2.ChunkLoggerOff" ) );
}
}
if (this.enabled) {
MinecraftForge.EVENT_BUS.register(this);
sender.sendMessage(new TextComponentTranslation("commands.ae2.ChunkLoggerOn"));
} else {
MinecraftForge.EVENT_BUS.unregister(this);
sender.sendMessage(new TextComponentTranslation("commands.ae2.ChunkLoggerOff"));
}
}
}
src/main/java/appeng/server/subcommands/Supporters.java
+11 -16
View File
@@ -19,28 +19,23 @@
package appeng.server.subcommands;
import appeng.server.ISubCommand;
import com.google.common.base.Joiner;
import net.minecraft.command.ICommandSender;
import net.minecraft.server.MinecraftServer;
import net.minecraft.util.text.TextComponentString;
import appeng.server.ISubCommand;
public class Supporters implements ISubCommand {
public class Supporters implements ISubCommand
{
@Override
public String getHelp(final MinecraftServer srv) {
return "commands.ae2.Supporters";
}
@Override
public String getHelp( final MinecraftServer srv )
{
return "commands.ae2.Supporters";
}
@Override
public void call( final MinecraftServer srv, final String[] data, final ICommandSender sender )
{
final String[] who = { "Stig Halvorsen", "Josh Ricker", "Jenny \"Othlon\" Sutherland", "Hristo Bogdanov", "BevoLJ" };
sender.sendMessage( new TextComponentString( "Special thanks to " + Joiner.on( ", " ).join( who ) ) );
}
@Override
public void call(final MinecraftServer srv, final String[] data, final ICommandSender sender) {
final String[] who = {"Stig Halvorsen", "Josh Ricker", "Jenny \"Othlon\" Sutherland", "Hristo Bogdanov", "BevoLJ"};
sender.sendMessage(new TextComponentString("Special thanks to " + Joiner.on(", ").join(who)));
}
}