diff --git a/.clang-format b/.clang-format
new file mode 100644
index 000000000..d48bed8d6
--- /dev/null
+++ b/.clang-format
@@ -0,0 +1,130 @@
+---
+AccessModifierOffset: 0
+AlignAfterOpenBracket: BlockIndent
+AlignArrayOfStructures: None
+AlignConsecutiveAssignments: None
+AlignConsecutiveMacros: None
+AlignConsecutiveBitFields: None
+AlignConsecutiveDeclarations: None
+AlignEscapedNewlines: DontAlign
+AlignOperands: DontAlign
+AlignTrailingComments: false
+AllowAllArgumentsOnNextLine: true
+AllowAllParametersOfDeclarationOnNextLine: true
+AllowShortBlocksOnASingleLine: Empty
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortEnumsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: Empty
+AllowShortIfStatementsOnASingleLine: Never
+AllowShortLambdasOnASingleLine: All
+AllowShortLoopsOnASingleLine: false
+AlwaysBreakAfterReturnType: None
+AlwaysBreakBeforeMultilineStrings: true
+AlwaysBreakTemplateDeclarations: MultiLine
+AttributeMacros: []
+BinPackArguments: false
+BinPackParameters: false
+BitFieldColonSpacing: After
+BraceWrapping:
+ AfterCaseLabel: false
+ AfterClass: false
+ AfterControlStatement: Never
+ AfterEnum: false
+ AfterFunction: false
+ AfterNamespace: false
+ AfterStruct: false
+ AfterUnion: false
+ AfterExternBlock: false
+ BeforeCatch: false
+ BeforeElse: false
+ BeforeLambdaBody: false
+ BeforeWhile: false
+ IndentBraces: false
+ SplitEmptyFunction: false
+ SplitEmptyRecord: false
+ SplitEmptyNamespace: false
+BreakAfterJavaFieldAnnotations: true
+#BreakArrays: false
+BreakBeforeBinaryOperators: All
+BreakBeforeBraces: Custom
+BreakBeforeConceptDeclarations: true
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializers: AfterColon
+BreakInheritanceList: AfterColon
+BreakStringLiterals: true
+ColumnLimit: 90
+CompactNamespaces: false
+ConstructorInitializerIndentWidth: 4
+ContinuationIndentWidth: 4
+Cpp11BracedListStyle: false
+DeriveLineEnding: false
+DerivePointerAlignment: false
+DisableFormat: false # wtf
+EmptyLineAfterAccessModifier: Never
+EmptyLineBeforeAccessModifier: Always
+ExperimentalAutoDetectBinPacking: false
+FixNamespaceComments: false
+ForEachMacros: ["BOOST_FOREACH"]
+IfMacros: []
+IncludeBlocks: Regroup
+IndentAccessModifiers: false
+IndentCaseBlocks: false
+IndentCaseLabels: true
+IndentExternBlock: Indent
+IndentGotoLabels: true
+IndentPPDirectives: BeforeHash
+#IndentRequiresClause: false
+IndentWidth: 4
+IndentWrappedFunctionNames: false
+#InsertBraces: false
+InsertTrailingCommas: Wrapped
+JavaImportGroups: ["java"]
+JavaScriptQuotes: Double
+JavaScriptWrapImports: true
+KeepEmptyLinesAtTheStartOfBlocks: false
+LambdaBodyIndentation: OuterScope
+MaxEmptyLinesToKeep: 1
+NamespaceIndentation: All
+PackConstructorInitializers: NextLine
+PointerAlignment: Left
+QualifierAlignment: Left
+ReferenceAlignment: Left
+ReflowComments: true
+#RemoveSemicolon: true
+#RequiresClausePosition: OwnLine
+#RequiresExpressionIndentation: OuterScope
+SeparateDefinitionBlocks: Always
+SortIncludes: CaseInsensitive
+SortJavaStaticImport: Before
+SortUsingDeclarations: true
+SpaceAfterCStyleCast: true
+SpaceAfterLogicalNot: false
+SpaceAfterTemplateKeyword: false
+SpaceAroundPointerQualifiers: After
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeCaseColon: false
+SpaceBeforeCpp11BracedList: false
+SpaceBeforeCtorInitializerColon: false
+SpaceBeforeInheritanceColon: false
+SpaceBeforeParens: ControlStatementsExceptControlMacros
+SpaceBeforeRangeBasedForLoopColon: true
+SpaceBeforeSquareBrackets: false
+SpaceInEmptyBlock: false
+SpaceInEmptyParentheses: false
+SpacesInAngles: Never
+SpacesInCStyleCastParentheses: false
+SpacesInConditionalStatement: false
+SpacesInContainerLiterals: false
+SpacesInLineCommentPrefix:
+ Minimum: 0
+ Maximum: -1
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+Standard: c++20
+StatementAttributeLikeMacros: []
+StatementMacros: []
+TabWidth: 4
+TypenameMacros: []
+UseCRLF: false # wtf
+UseTab: Never
+WhitespaceSensitiveMacros: ["BOOST_PP_STRINGSIZE"]
diff --git a/src/main/java/cofh/api/CoFHAPIProps.java b/src/main/java/cofh/api/CoFHAPIProps.java
index 5d21f6369..c3ea0ed99 100644
--- a/src/main/java/cofh/api/CoFHAPIProps.java
+++ b/src/main/java/cofh/api/CoFHAPIProps.java
@@ -1,11 +1,7 @@
package cofh.api;
public class CoFHAPIProps {
+ private CoFHAPIProps() {}
- private CoFHAPIProps() {
-
- }
-
- public static final String VERSION = "1.7.10R1.3.1";
-
+ public static final String VERSION = "1.7.10R1.3.1";
}
diff --git a/src/main/java/cofh/api/energy/EnergyStorage.java b/src/main/java/cofh/api/energy/EnergyStorage.java
index 25e0126ab..23f70883b 100644
--- a/src/main/java/cofh/api/energy/EnergyStorage.java
+++ b/src/main/java/cofh/api/energy/EnergyStorage.java
@@ -3,156 +3,141 @@ package cofh.api.energy;
import net.minecraft.nbt.NBTTagCompound;
/**
- * Reference implementation of {@link IEnergyStorage}. Use/extend this or implement your own.
+ * Reference implementation of {@link IEnergyStorage}. Use/extend this or implement your
+ * own.
*
* @author King Lemming
*
*/
public class EnergyStorage implements IEnergyStorage {
+ protected int energy;
+ protected int capacity;
+ protected int maxReceive;
+ protected int maxExtract;
- protected int energy;
- protected int capacity;
- protected int maxReceive;
- protected int maxExtract;
+ public EnergyStorage(int capacity) {
+ this(capacity, capacity, capacity);
+ }
- public EnergyStorage(int capacity) {
+ public EnergyStorage(int capacity, int maxTransfer) {
+ this(capacity, maxTransfer, maxTransfer);
+ }
- this(capacity, capacity, capacity);
- }
+ public EnergyStorage(int capacity, int maxReceive, int maxExtract) {
+ this.capacity = capacity;
+ this.maxReceive = maxReceive;
+ this.maxExtract = maxExtract;
+ }
- public EnergyStorage(int capacity, int maxTransfer) {
+ public EnergyStorage readFromNBT(NBTTagCompound nbt) {
+ this.energy = nbt.getInteger("Energy");
- this(capacity, maxTransfer, maxTransfer);
- }
+ if (energy > capacity) {
+ energy = capacity;
+ }
+ return this;
+ }
- public EnergyStorage(int capacity, int maxReceive, int maxExtract) {
+ public NBTTagCompound writeToNBT(NBTTagCompound nbt) {
+ if (energy < 0) {
+ energy = 0;
+ }
+ nbt.setInteger("Energy", energy);
+ return nbt;
+ }
- this.capacity = capacity;
- this.maxReceive = maxReceive;
- this.maxExtract = maxExtract;
- }
+ public void setCapacity(int capacity) {
+ this.capacity = capacity;
- public EnergyStorage readFromNBT(NBTTagCompound nbt) {
+ if (energy > capacity) {
+ energy = capacity;
+ }
+ }
- this.energy = nbt.getInteger("Energy");
+ public void setMaxTransfer(int maxTransfer) {
+ setMaxReceive(maxTransfer);
+ setMaxExtract(maxTransfer);
+ }
- if (energy > capacity) {
- energy = capacity;
- }
- return this;
- }
+ public void setMaxReceive(int maxReceive) {
+ this.maxReceive = maxReceive;
+ }
- public NBTTagCompound writeToNBT(NBTTagCompound nbt) {
+ public void setMaxExtract(int maxExtract) {
+ this.maxExtract = maxExtract;
+ }
- if (energy < 0) {
- energy = 0;
- }
- nbt.setInteger("Energy", energy);
- return nbt;
- }
+ public int getMaxReceive() {
+ return maxReceive;
+ }
- public void setCapacity(int capacity) {
+ public int getMaxExtract() {
+ return maxExtract;
+ }
- this.capacity = capacity;
+ /**
+ * This function is included to allow for server -> client sync. Do not call this
+ * externally to the containing Tile Entity, as not all IEnergyHandlers are guaranteed
+ * to have it.
+ *
+ * @param energy
+ */
+ public void setEnergyStored(int energy) {
+ this.energy = energy;
- if (energy > capacity) {
- energy = capacity;
- }
- }
+ if (this.energy > capacity) {
+ this.energy = capacity;
+ } else if (this.energy < 0) {
+ this.energy = 0;
+ }
+ }
- public void setMaxTransfer(int maxTransfer) {
+ /**
+ * This function is included to allow the containing tile to directly and efficiently
+ * modify the energy contained in the EnergyStorage. Do not rely on this externally,
+ * as not all IEnergyHandlers are guaranteed to have it.
+ *
+ * @param energy
+ */
+ public void modifyEnergyStored(int energy) {
+ this.energy += energy;
- setMaxReceive(maxTransfer);
- setMaxExtract(maxTransfer);
- }
+ if (this.energy > capacity) {
+ this.energy = capacity;
+ } else if (this.energy < 0) {
+ this.energy = 0;
+ }
+ }
- public void setMaxReceive(int maxReceive) {
+ /* IEnergyStorage */
+ @Override
+ public int receiveEnergy(int maxReceive, boolean simulate) {
+ int energyReceived
+ = Math.min(capacity - energy, Math.min(this.maxReceive, maxReceive));
- this.maxReceive = maxReceive;
- }
+ if (!simulate) {
+ energy += energyReceived;
+ }
+ return energyReceived;
+ }
- public void setMaxExtract(int maxExtract) {
+ @Override
+ public int extractEnergy(int maxExtract, boolean simulate) {
+ int energyExtracted = Math.min(energy, Math.min(this.maxExtract, maxExtract));
- this.maxExtract = maxExtract;
- }
+ if (!simulate) {
+ energy -= energyExtracted;
+ }
+ return energyExtracted;
+ }
- public int getMaxReceive() {
-
- return maxReceive;
- }
-
- public int getMaxExtract() {
-
- return maxExtract;
- }
-
- /**
- * This function is included to allow for server -> client sync. Do not call this externally to the containing Tile Entity, as not all IEnergyHandlers
- * are guaranteed to have it.
- *
- * @param energy
- */
- public void setEnergyStored(int energy) {
-
- this.energy = energy;
-
- if (this.energy > capacity) {
- this.energy = capacity;
- } else if (this.energy < 0) {
- this.energy = 0;
- }
- }
-
- /**
- * This function is included to allow the containing tile to directly and efficiently modify the energy contained in the EnergyStorage. Do not rely on this
- * externally, as not all IEnergyHandlers are guaranteed to have it.
- *
- * @param energy
- */
- public void modifyEnergyStored(int energy) {
-
- this.energy += energy;
-
- if (this.energy > capacity) {
- this.energy = capacity;
- } else if (this.energy < 0) {
- this.energy = 0;
- }
- }
-
- /* IEnergyStorage */
- @Override
- public int receiveEnergy(int maxReceive, boolean simulate) {
-
- int energyReceived = Math.min(capacity - energy, Math.min(this.maxReceive, maxReceive));
-
- if (!simulate) {
- energy += energyReceived;
- }
- return energyReceived;
- }
-
- @Override
- public int extractEnergy(int maxExtract, boolean simulate) {
-
- int energyExtracted = Math.min(energy, Math.min(this.maxExtract, maxExtract));
-
- if (!simulate) {
- energy -= energyExtracted;
- }
- return energyExtracted;
- }
-
- @Override
- public int getEnergyStored() {
-
- return energy;
- }
-
- @Override
- public int getMaxEnergyStored() {
-
- return capacity;
- }
+ @Override
+ public int getEnergyStored() {
+ return energy;
+ }
+ @Override
+ public int getMaxEnergyStored() {
+ return capacity;
+ }
}
diff --git a/src/main/java/cofh/api/energy/IEnergyConnection.java b/src/main/java/cofh/api/energy/IEnergyConnection.java
index 301271e5a..79bdaf648 100644
--- a/src/main/java/cofh/api/energy/IEnergyConnection.java
+++ b/src/main/java/cofh/api/energy/IEnergyConnection.java
@@ -3,19 +3,17 @@ package cofh.api.energy;
import net.minecraftforge.common.util.ForgeDirection;
/**
- * Implement this interface on TileEntities which should connect to energy transportation blocks. This is intended for blocks which generate energy but do not
- * accept it; otherwise just use IEnergyHandler.
- *
- * Note that {@link IEnergyHandler} is an extension of this.
+ * Implement this interface on TileEntities which should connect to energy transportation
+ * blocks. This is intended for blocks which generate energy but do not accept it;
+ * otherwise just use IEnergyHandler.
Note that {@link IEnergyHandler} is an extension
+ * of this.
*
* @author King Lemming
*
*/
public interface IEnergyConnection {
-
- /**
- * Returns TRUE if the TileEntity can connect on a given side.
- */
- boolean canConnectEnergy(ForgeDirection from);
-
+ /**
+ * Returns TRUE if the TileEntity can connect on a given side.
+ */
+ boolean canConnectEnergy(ForgeDirection from);
}
diff --git a/src/main/java/cofh/api/energy/IEnergyContainerItem.java b/src/main/java/cofh/api/energy/IEnergyContainerItem.java
index 3ef725765..2bd8babd7 100644
--- a/src/main/java/cofh/api/energy/IEnergyContainerItem.java
+++ b/src/main/java/cofh/api/energy/IEnergyContainerItem.java
@@ -3,50 +3,51 @@ package cofh.api.energy;
import net.minecraft.item.ItemStack;
/**
- * Implement this interface on Item classes that support external manipulation of their internal energy storages.
- *
- * A reference implementation is provided {@link ItemEnergyContainer}.
+ * Implement this interface on Item classes that support external manipulation of their
+ * internal energy storages.
A reference implementation is provided {@link
+ * ItemEnergyContainer}.
*
* @author King Lemming
*
*/
public interface IEnergyContainerItem {
+ /**
+ * Adds energy to a container item. Returns the quantity of energy that was accepted.
+ * This should always return 0 if the item cannot be externally charged.
+ *
+ * @param container
+ * ItemStack to be charged.
+ * @param maxReceive
+ * Maximum amount of energy to be sent into the item.
+ * @param simulate
+ * If TRUE, the charge will only be simulated.
+ * @return Amount of energy that was (or would have been, if simulated) received by
+ * the item.
+ */
+ int receiveEnergy(ItemStack container, int maxReceive, boolean simulate);
- /**
- * Adds energy to a container item. Returns the quantity of energy that was accepted. This should always return 0 if the item cannot be externally charged.
- *
- * @param container
- * ItemStack to be charged.
- * @param maxReceive
- * Maximum amount of energy to be sent into the item.
- * @param simulate
- * If TRUE, the charge will only be simulated.
- * @return Amount of energy that was (or would have been, if simulated) received by the item.
- */
- int receiveEnergy(ItemStack container, int maxReceive, boolean simulate);
+ /**
+ * Removes energy from a container item. Returns the quantity of energy that was
+ * removed. This should always return 0 if the item cannot be externally discharged.
+ *
+ * @param container
+ * ItemStack to be discharged.
+ * @param maxExtract
+ * Maximum amount of energy to be extracted from the item.
+ * @param simulate
+ * If TRUE, the discharge will only be simulated.
+ * @return Amount of energy that was (or would have been, if simulated) extracted from
+ * the item.
+ */
+ int extractEnergy(ItemStack container, int maxExtract, boolean simulate);
- /**
- * Removes energy from a container item. Returns the quantity of energy that was removed. This should always return 0 if the item cannot be externally
- * discharged.
- *
- * @param container
- * ItemStack to be discharged.
- * @param maxExtract
- * Maximum amount of energy to be extracted from the item.
- * @param simulate
- * If TRUE, the discharge will only be simulated.
- * @return Amount of energy that was (or would have been, if simulated) extracted from the item.
- */
- int extractEnergy(ItemStack container, int maxExtract, boolean simulate);
-
- /**
- * Get the amount of energy currently stored in the container item.
- */
- int getEnergyStored(ItemStack container);
-
- /**
- * Get the max amount of energy that can be stored in the container item.
- */
- int getMaxEnergyStored(ItemStack container);
+ /**
+ * Get the amount of energy currently stored in the container item.
+ */
+ int getEnergyStored(ItemStack container);
+ /**
+ * Get the max amount of energy that can be stored in the container item.
+ */
+ int getMaxEnergyStored(ItemStack container);
}
diff --git a/src/main/java/cofh/api/energy/IEnergyHandler.java b/src/main/java/cofh/api/energy/IEnergyHandler.java
index 6a4600a4e..734bc4768 100644
--- a/src/main/java/cofh/api/energy/IEnergyHandler.java
+++ b/src/main/java/cofh/api/energy/IEnergyHandler.java
@@ -3,55 +3,56 @@ package cofh.api.energy;
import net.minecraftforge.common.util.ForgeDirection;
/**
- * Implement this interface on Tile Entities which should handle energy, generally storing it in one or more internal {@link IEnergyStorage} objects.
- *
- * A reference implementation is provided {@link TileEnergyHandler}.
+ * Implement this interface on Tile Entities which should handle energy, generally storing
+ * it in one or more internal {@link IEnergyStorage} objects.
A reference
+ * implementation is provided {@link TileEnergyHandler}.
*
* @author King Lemming
*
*/
public interface IEnergyHandler extends IEnergyProvider, IEnergyReceiver {
+ // merely a convenience interface (remove these methods in 1.8; provided here for
+ // back-compat via compiler doing things)
- // merely a convenience interface (remove these methods in 1.8; provided here for back-compat via compiler doing things)
+ /**
+ * Add energy to an IEnergyReceiver, internal distribution is left entirely to the
+ * IEnergyReceiver.
+ *
+ * @param from
+ * Orientation the energy is received from.
+ * @param maxReceive
+ * Maximum amount of energy to receive.
+ * @param simulate
+ * If TRUE, the charge will only be simulated.
+ * @return Amount of energy that was (or would have been, if simulated) received.
+ */
+ @Override
+ int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate);
- /**
- * Add energy to an IEnergyReceiver, internal distribution is left entirely to the IEnergyReceiver.
- *
- * @param from
- * Orientation the energy is received from.
- * @param maxReceive
- * Maximum amount of energy to receive.
- * @param simulate
- * If TRUE, the charge will only be simulated.
- * @return Amount of energy that was (or would have been, if simulated) received.
- */
- @Override
- int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate);
+ /**
+ * Remove energy from an IEnergyProvider, internal distribution is left entirely to
+ * the IEnergyProvider.
+ *
+ * @param from
+ * Orientation the energy is extracted from.
+ * @param maxExtract
+ * Maximum amount of energy to extract.
+ * @param simulate
+ * If TRUE, the extraction will only be simulated.
+ * @return Amount of energy that was (or would have been, if simulated) extracted.
+ */
+ @Override
+ int extractEnergy(ForgeDirection from, int maxExtract, boolean simulate);
- /**
- * Remove energy from an IEnergyProvider, internal distribution is left entirely to the IEnergyProvider.
- *
- * @param from
- * Orientation the energy is extracted from.
- * @param maxExtract
- * Maximum amount of energy to extract.
- * @param simulate
- * If TRUE, the extraction will only be simulated.
- * @return Amount of energy that was (or would have been, if simulated) extracted.
- */
- @Override
- int extractEnergy(ForgeDirection from, int maxExtract, boolean simulate);
-
- /**
- * Returns the amount of energy currently stored.
- */
- @Override
- int getEnergyStored(ForgeDirection from);
-
- /**
- * Returns the maximum amount of energy that can be stored.
- */
- @Override
- int getMaxEnergyStored(ForgeDirection from);
+ /**
+ * Returns the amount of energy currently stored.
+ */
+ @Override
+ int getEnergyStored(ForgeDirection from);
+ /**
+ * Returns the maximum amount of energy that can be stored.
+ */
+ @Override
+ int getMaxEnergyStored(ForgeDirection from);
}
diff --git a/src/main/java/cofh/api/energy/IEnergyProvider.java b/src/main/java/cofh/api/energy/IEnergyProvider.java
index 05287b35e..d99793048 100644
--- a/src/main/java/cofh/api/energy/IEnergyProvider.java
+++ b/src/main/java/cofh/api/energy/IEnergyProvider.java
@@ -3,36 +3,35 @@ package cofh.api.energy;
import net.minecraftforge.common.util.ForgeDirection;
/**
- * Implement this interface on Tile Entities which should provide energy, generally storing it in one or more internal {@link IEnergyStorage} objects.
- *
- * A reference implementation is provided {@link TileEnergyHandler}.
+ * Implement this interface on Tile Entities which should provide energy, generally
+ * storing it in one or more internal {@link IEnergyStorage} objects.
A reference
+ * implementation is provided {@link TileEnergyHandler}.
*
* @author King Lemming
*
*/
public interface IEnergyProvider extends IEnergyConnection {
+ /**
+ * Remove energy from an IEnergyProvider, internal distribution is left entirely to
+ * the IEnergyProvider.
+ *
+ * @param from
+ * Orientation the energy is extracted from.
+ * @param maxExtract
+ * Maximum amount of energy to extract.
+ * @param simulate
+ * If TRUE, the extraction will only be simulated.
+ * @return Amount of energy that was (or would have been, if simulated) extracted.
+ */
+ int extractEnergy(ForgeDirection from, int maxExtract, boolean simulate);
- /**
- * Remove energy from an IEnergyProvider, internal distribution is left entirely to the IEnergyProvider.
- *
- * @param from
- * Orientation the energy is extracted from.
- * @param maxExtract
- * Maximum amount of energy to extract.
- * @param simulate
- * If TRUE, the extraction will only be simulated.
- * @return Amount of energy that was (or would have been, if simulated) extracted.
- */
- int extractEnergy(ForgeDirection from, int maxExtract, boolean simulate);
-
- /**
- * Returns the amount of energy currently stored.
- */
- int getEnergyStored(ForgeDirection from);
-
- /**
- * Returns the maximum amount of energy that can be stored.
- */
- int getMaxEnergyStored(ForgeDirection from);
+ /**
+ * Returns the amount of energy currently stored.
+ */
+ int getEnergyStored(ForgeDirection from);
+ /**
+ * Returns the maximum amount of energy that can be stored.
+ */
+ int getMaxEnergyStored(ForgeDirection from);
}
diff --git a/src/main/java/cofh/api/energy/IEnergyReceiver.java b/src/main/java/cofh/api/energy/IEnergyReceiver.java
index c726e09e0..9a344728d 100644
--- a/src/main/java/cofh/api/energy/IEnergyReceiver.java
+++ b/src/main/java/cofh/api/energy/IEnergyReceiver.java
@@ -3,36 +3,35 @@ package cofh.api.energy;
import net.minecraftforge.common.util.ForgeDirection;
/**
- * Implement this interface on Tile Entities which should receive energy, generally storing it in one or more internal {@link IEnergyStorage} objects.
- *
- * A reference implementation is provided {@link TileEnergyHandler}.
+ * Implement this interface on Tile Entities which should receive energy, generally
+ * storing it in one or more internal {@link IEnergyStorage} objects.
A reference
+ * implementation is provided {@link TileEnergyHandler}.
*
* @author King Lemming
*
*/
public interface IEnergyReceiver extends IEnergyConnection {
+ /**
+ * Add energy to an IEnergyReceiver, internal distribution is left entirely to the
+ * IEnergyReceiver.
+ *
+ * @param from
+ * Orientation the energy is received from.
+ * @param maxReceive
+ * Maximum amount of energy to receive.
+ * @param simulate
+ * If TRUE, the charge will only be simulated.
+ * @return Amount of energy that was (or would have been, if simulated) received.
+ */
+ int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate);
- /**
- * Add energy to an IEnergyReceiver, internal distribution is left entirely to the IEnergyReceiver.
- *
- * @param from
- * Orientation the energy is received from.
- * @param maxReceive
- * Maximum amount of energy to receive.
- * @param simulate
- * If TRUE, the charge will only be simulated.
- * @return Amount of energy that was (or would have been, if simulated) received.
- */
- int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate);
-
- /**
- * Returns the amount of energy currently stored.
- */
- int getEnergyStored(ForgeDirection from);
-
- /**
- * Returns the maximum amount of energy that can be stored.
- */
- int getMaxEnergyStored(ForgeDirection from);
+ /**
+ * Returns the amount of energy currently stored.
+ */
+ int getEnergyStored(ForgeDirection from);
+ /**
+ * Returns the maximum amount of energy that can be stored.
+ */
+ int getMaxEnergyStored(ForgeDirection from);
}
diff --git a/src/main/java/cofh/api/energy/IEnergyStorage.java b/src/main/java/cofh/api/energy/IEnergyStorage.java
index 414b26566..be66f40af 100644
--- a/src/main/java/cofh/api/energy/IEnergyStorage.java
+++ b/src/main/java/cofh/api/energy/IEnergyStorage.java
@@ -10,37 +10,37 @@ package cofh.api.energy;
*
*/
public interface IEnergyStorage {
+ /**
+ * Adds energy to the storage. Returns quantity of energy that was accepted.
+ *
+ * @param maxReceive
+ * Maximum amount of energy to be inserted.
+ * @param simulate
+ * If TRUE, the insertion will only be simulated.
+ * @return Amount of energy that was (or would have been, if simulated) accepted by
+ * the storage.
+ */
+ int receiveEnergy(int maxReceive, boolean simulate);
- /**
- * Adds energy to the storage. Returns quantity of energy that was accepted.
- *
- * @param maxReceive
- * Maximum amount of energy to be inserted.
- * @param simulate
- * If TRUE, the insertion will only be simulated.
- * @return Amount of energy that was (or would have been, if simulated) accepted by the storage.
- */
- int receiveEnergy(int maxReceive, boolean simulate);
+ /**
+ * Removes energy from the storage. Returns quantity of energy that was removed.
+ *
+ * @param maxExtract
+ * Maximum amount of energy to be extracted.
+ * @param simulate
+ * If TRUE, the extraction will only be simulated.
+ * @return Amount of energy that was (or would have been, if simulated) extracted from
+ * the storage.
+ */
+ int extractEnergy(int maxExtract, boolean simulate);
- /**
- * Removes energy from the storage. Returns quantity of energy that was removed.
- *
- * @param maxExtract
- * Maximum amount of energy to be extracted.
- * @param simulate
- * If TRUE, the extraction will only be simulated.
- * @return Amount of energy that was (or would have been, if simulated) extracted from the storage.
- */
- int extractEnergy(int maxExtract, boolean simulate);
-
- /**
- * Returns the amount of energy currently stored.
- */
- int getEnergyStored();
-
- /**
- * Returns the maximum amount of energy that can be stored.
- */
- int getMaxEnergyStored();
+ /**
+ * Returns the amount of energy currently stored.
+ */
+ int getEnergyStored();
+ /**
+ * Returns the maximum amount of energy that can be stored.
+ */
+ int getMaxEnergyStored();
}
diff --git a/src/main/java/cofh/api/energy/IEnergyTransport.java b/src/main/java/cofh/api/energy/IEnergyTransport.java
index ab45e04fe..89a705115 100644
--- a/src/main/java/cofh/api/energy/IEnergyTransport.java
+++ b/src/main/java/cofh/api/energy/IEnergyTransport.java
@@ -5,105 +5,108 @@ import net.minecraftforge.common.util.ForgeDirection;
/**
* Implement this interface on Tile Entities which transport energy.
*
- * This is used to "negotiate" connection types between two separate IEnergyTransports, allowing users to set flow direction and allowing for networks Of
- * IEnergyTransports to intelligently transfer energy to other networks.
+ * This is used to "negotiate" connection types between two separate IEnergyTransports,
+ * allowing users to set flow direction and allowing for networks Of IEnergyTransports to
+ * intelligently transfer energy to other networks.
*/
public interface IEnergyTransport extends IEnergyProvider, IEnergyReceiver {
+ /**
+ * The type of interface for a given side of a {@link IEnergyTransport}.
+ *
+ * Values are:
+ * {@link SEND} for sending only
+ * {@link RECEIVE} for receiving only
+ * {@link BALANCE} for sending and receiving, and the default state
+ */
+ public enum InterfaceType {
+ /**
+ * Indicates that this {@link IEnergyTransport} is only sending power on this
+ * side.
+ */
+ SEND,
+ /**
+ * Indicates that this {@link IEnergyTransport} is only receiving power on this
+ * side.
+ */
+ RECEIVE,
+ /**
+ * Indicates that this {@link IEnergyTransport} wants to balance power between
+ * itself and the senders/receivers on this side. This is the default state.
+ * To block any connection, use {@link IEnergyConnection#canConnectEnergy}
+ *
+ * IEnergyTransport based senders should check that the total power in the
+ * destination IEnergyTransport is less than the power in themselves before
+ * sending.
Active IEnergyTransport receivers (i.e., those that call {@link
+ * IEnergyProvider#extractEnergy}) should check that they contain less power than
+ * the source IEnergyTransport.
+ */
+ BALANCE;
- /**
- * The type of interface for a given side of a {@link IEnergyTransport}.
- *
- * Values are:
- * {@link SEND} for sending only
- * {@link RECEIVE} for receiving only
- * {@link BALANCE} for sending and receiving, and the default state
- */
- public enum InterfaceType {
- /**
- * Indicates that this {@link IEnergyTransport} is only sending power on this side.
- */
- SEND,
- /**
- * Indicates that this {@link IEnergyTransport} is only receiving power on this side.
- */
- RECEIVE,
- /**
- * Indicates that this {@link IEnergyTransport} wants to balance power between itself and the
- * senders/receivers on this side. This is the default state.
- * To block any connection, use {@link IEnergyConnection#canConnectEnergy}
- *
- * IEnergyTransport based senders should check that the total power in the destination IEnergyTransport is less than the power in themselves before sending.
- *
- * Active IEnergyTransport receivers (i.e., those that call {@link IEnergyProvider#extractEnergy}) should check that they contain less power than the
- * source IEnergyTransport.
- */
- BALANCE;
+ /**
+ * Returns the opposite state to this InterfaceType.
+ *
+ * {@link #BALANCE} is considered its own opposite.
+ * {@link #SEND} is the opposite of {@link #RECEIVE} and visa versa.
+ */
+ public InterfaceType getOpposite() {
+ return this == BALANCE ? BALANCE : this == SEND ? RECEIVE : SEND;
+ }
- /**
- * Returns the opposite state to this InterfaceType.
- *
- * {@link #BALANCE} is considered its own opposite.
- * {@link #SEND} is the opposite of {@link #RECEIVE} and visa versa.
- */
- public InterfaceType getOpposite() {
+ /**
+ * Returns the next InterfaceType as described in {@link
+ * IEnergyTransport#getTransportState}
+ */
+ public InterfaceType rotate() {
+ return rotate(true);
+ }
- return this == BALANCE ? BALANCE : this == SEND ? RECEIVE : SEND;
- }
+ /**
+ * Returns the next InterfaceType as described in {@link
+ * IEnergyTransport#getTransportState}
+ *
+ * @param forward
+ * Whether to step in the order specified by {@link
+ * IEnergyTransport#getTransportState} (true) or to step in the opposite
+ * direction
+ */
+ public InterfaceType rotate(boolean forward) {
+ if (forward) {
+ return this == BALANCE ? RECEIVE : this == RECEIVE ? SEND : BALANCE;
+ } else {
+ return this == BALANCE ? SEND : this == SEND ? RECEIVE : BALANCE;
+ }
+ }
+ }
- /**
- * Returns the next InterfaceType as described in {@link IEnergyTransport#getTransportState}
- */
- public InterfaceType rotate() {
+ /**
+ * {@inheritDoc}
+ * This method cannot be a no-op for IEnergyTransport.
+ */
+ @Override
+ int getEnergyStored(ForgeDirection from);
- return rotate(true);
- }
-
- /**
- * Returns the next InterfaceType as described in {@link IEnergyTransport#getTransportState}
- *
- * @param forward
- * Whether to step in the order specified by {@link IEnergyTransport#getTransportState} (true) or to step in the opposite direction
- */
- public InterfaceType rotate(boolean forward) {
-
- if (forward) {
- return this == BALANCE ? RECEIVE : this == RECEIVE ? SEND : BALANCE;
- } else {
- return this == BALANCE ? SEND : this == SEND ? RECEIVE : BALANCE;
- }
- }
- }
-
- /**
- * {@inheritDoc}
- * This method cannot be a no-op for IEnergyTransport.
- */
- @Override
- int getEnergyStored(ForgeDirection from);
-
- /**
- * Indicates to other IEnergyTransports the state of the given side. See {@link #InterfaceType} for details.
- *
- * For clarity of state tracking, on a tile update from another IEnergyTransport, if its mode has changed from the opposite of your own mode on that side, you
- * should change your mode to the opposite of its mode.
- *
- * When the user alters your mode and your state is:
- * BALANCE, your mode should change to {@link InterFaceType#RECEIVE}.
- * RECEIVE, your mode should change to {@link InterFaceType#SEND}.
- * SEND, your mode should change to {@link InterFaceType#BALANCE}.
- * This is not required, but will be easier for users.
- *
- * @return The type of connection to establish on this side. null is NOT a valid value
- */
- InterfaceType getTransportState(ForgeDirection from);
-
- /**
- * This method is provided primarily for the purposes of automation tools, and should not need to be called by another IEnergyTransport.
- *
- * Calls to this method may fail if this IEnergyTransport has been secured by a user.
- *
- * @return Whether or not state was successfully altered.
- */
- boolean setTransportState(InterfaceType state, ForgeDirection from);
+ /**
+ * Indicates to other IEnergyTransports the state of the given side. See {@link
+ * #InterfaceType} for details.
For clarity of state tracking, on a tile update
+ * from another IEnergyTransport, if its mode has changed from the opposite of your
+ * own mode on that side, you should change your mode to the opposite of its mode.
+ * When the user alters your mode and your state is:
+ * BALANCE, your mode should change to {@link InterFaceType#RECEIVE}.
+ * RECEIVE, your mode should change to {@link InterFaceType#SEND}.
+ * SEND, your mode should change to {@link InterFaceType#BALANCE}.
+ * This is not required, but will be easier for users.
+ *
+ * @return The type of connection to establish on this side. null is NOT a valid
+ * value
+ */
+ InterfaceType getTransportState(ForgeDirection from);
+ /**
+ * This method is provided primarily for the purposes of automation tools, and should
+ * not need to be called by another IEnergyTransport.
Calls to this method may
+ * fail if this IEnergyTransport has been secured by a user.
+ *
+ * @return Whether or not state was successfully altered.
+ */
+ boolean setTransportState(InterfaceType state, ForgeDirection from);
}
diff --git a/src/main/java/cofh/api/energy/ItemEnergyContainer.java b/src/main/java/cofh/api/energy/ItemEnergyContainer.java
index 2d3659cb6..cd8b2d3f1 100644
--- a/src/main/java/cofh/api/energy/ItemEnergyContainer.java
+++ b/src/main/java/cofh/api/energy/ItemEnergyContainer.java
@@ -5,106 +5,95 @@ import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
/**
- * Reference implementation of {@link IEnergyContainerItem}. Use/extend this or implement your own.
+ * Reference implementation of {@link IEnergyContainerItem}. Use/extend this or implement
+ * your own.
*
* @author King Lemming
*
*/
public class ItemEnergyContainer extends Item implements IEnergyContainerItem {
+ protected int capacity;
+ protected int maxReceive;
+ protected int maxExtract;
- protected int capacity;
- protected int maxReceive;
- protected int maxExtract;
+ public ItemEnergyContainer() {}
- public ItemEnergyContainer() {
+ public ItemEnergyContainer(int capacity) {
+ this(capacity, capacity, capacity);
+ }
- }
+ public ItemEnergyContainer(int capacity, int maxTransfer) {
+ this(capacity, maxTransfer, maxTransfer);
+ }
- public ItemEnergyContainer(int capacity) {
+ public ItemEnergyContainer(int capacity, int maxReceive, int maxExtract) {
+ this.capacity = capacity;
+ this.maxReceive = maxReceive;
+ this.maxExtract = maxExtract;
+ }
- this(capacity, capacity, capacity);
- }
+ public ItemEnergyContainer setCapacity(int capacity) {
+ this.capacity = capacity;
+ return this;
+ }
- public ItemEnergyContainer(int capacity, int maxTransfer) {
+ public void setMaxTransfer(int maxTransfer) {
+ setMaxReceive(maxTransfer);
+ setMaxExtract(maxTransfer);
+ }
- this(capacity, maxTransfer, maxTransfer);
- }
+ public void setMaxReceive(int maxReceive) {
+ this.maxReceive = maxReceive;
+ }
- public ItemEnergyContainer(int capacity, int maxReceive, int maxExtract) {
+ public void setMaxExtract(int maxExtract) {
+ this.maxExtract = maxExtract;
+ }
- this.capacity = capacity;
- this.maxReceive = maxReceive;
- this.maxExtract = maxExtract;
- }
+ /* IEnergyContainerItem */
+ @Override
+ public int receiveEnergy(ItemStack container, int maxReceive, boolean simulate) {
+ if (container.stackTagCompound == null) {
+ container.stackTagCompound = new NBTTagCompound();
+ }
+ int energy = container.stackTagCompound.getInteger("Energy");
+ int energyReceived
+ = Math.min(capacity - energy, Math.min(this.maxReceive, maxReceive));
- public ItemEnergyContainer setCapacity(int capacity) {
+ if (!simulate) {
+ energy += energyReceived;
+ container.stackTagCompound.setInteger("Energy", energy);
+ }
+ return energyReceived;
+ }
- this.capacity = capacity;
- return this;
- }
+ @Override
+ public int extractEnergy(ItemStack container, int maxExtract, boolean simulate) {
+ if (container.stackTagCompound == null
+ || !container.stackTagCompound.hasKey("Energy")) {
+ return 0;
+ }
+ int energy = container.stackTagCompound.getInteger("Energy");
+ int energyExtracted = Math.min(energy, Math.min(this.maxExtract, maxExtract));
- public void setMaxTransfer(int maxTransfer) {
+ if (!simulate) {
+ energy -= energyExtracted;
+ container.stackTagCompound.setInteger("Energy", energy);
+ }
+ return energyExtracted;
+ }
- setMaxReceive(maxTransfer);
- setMaxExtract(maxTransfer);
- }
-
- public void setMaxReceive(int maxReceive) {
-
- this.maxReceive = maxReceive;
- }
-
- public void setMaxExtract(int maxExtract) {
-
- this.maxExtract = maxExtract;
- }
-
- /* IEnergyContainerItem */
- @Override
- public int receiveEnergy(ItemStack container, int maxReceive, boolean simulate) {
-
- if (container.stackTagCompound == null) {
- container.stackTagCompound = new NBTTagCompound();
- }
- int energy = container.stackTagCompound.getInteger("Energy");
- int energyReceived = Math.min(capacity - energy, Math.min(this.maxReceive, maxReceive));
-
- if (!simulate) {
- energy += energyReceived;
- container.stackTagCompound.setInteger("Energy", energy);
- }
- return energyReceived;
- }
-
- @Override
- public int extractEnergy(ItemStack container, int maxExtract, boolean simulate) {
-
- if (container.stackTagCompound == null || !container.stackTagCompound.hasKey("Energy")) {
- return 0;
- }
- int energy = container.stackTagCompound.getInteger("Energy");
- int energyExtracted = Math.min(energy, Math.min(this.maxExtract, maxExtract));
-
- if (!simulate) {
- energy -= energyExtracted;
- container.stackTagCompound.setInteger("Energy", energy);
- }
- return energyExtracted;
- }
-
- @Override
- public int getEnergyStored(ItemStack container) {
-
- if (container.stackTagCompound == null || !container.stackTagCompound.hasKey("Energy")) {
- return 0;
- }
- return container.stackTagCompound.getInteger("Energy");
- }
-
- @Override
- public int getMaxEnergyStored(ItemStack container) {
-
- return capacity;
- }
+ @Override
+ public int getEnergyStored(ItemStack container) {
+ if (container.stackTagCompound == null
+ || !container.stackTagCompound.hasKey("Energy")) {
+ return 0;
+ }
+ return container.stackTagCompound.getInteger("Energy");
+ }
+ @Override
+ public int getMaxEnergyStored(ItemStack container) {
+ return capacity;
+ }
}
diff --git a/src/main/java/cofh/api/energy/TileEnergyHandler.java b/src/main/java/cofh/api/energy/TileEnergyHandler.java
index 7cc655e92..84ebb0c21 100644
--- a/src/main/java/cofh/api/energy/TileEnergyHandler.java
+++ b/src/main/java/cofh/api/energy/TileEnergyHandler.java
@@ -5,61 +5,53 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.util.ForgeDirection;
/**
- * Reference implementation of {@link IEnergyHandler}. Use/extend this or implement your own.
+ * Reference implementation of {@link IEnergyHandler}. Use/extend this or implement your
+ * own.
*
* @author King Lemming
*
*/
public class TileEnergyHandler extends TileEntity implements IEnergyHandler {
+ protected EnergyStorage storage = new EnergyStorage(32000);
- protected EnergyStorage storage = new EnergyStorage(32000);
+ @Override
+ public void readFromNBT(NBTTagCompound nbt) {
+ super.readFromNBT(nbt);
+ storage.readFromNBT(nbt);
+ }
- @Override
- public void readFromNBT(NBTTagCompound nbt) {
+ @Override
+ public void writeToNBT(NBTTagCompound nbt) {
+ super.writeToNBT(nbt);
+ storage.writeToNBT(nbt);
+ }
- super.readFromNBT(nbt);
- storage.readFromNBT(nbt);
- }
+ /* IEnergyConnection */
+ @Override
+ public boolean canConnectEnergy(ForgeDirection from) {
+ return true;
+ }
- @Override
- public void writeToNBT(NBTTagCompound nbt) {
+ /* IEnergyReceiver */
+ @Override
+ public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) {
+ return storage.receiveEnergy(maxReceive, simulate);
+ }
- super.writeToNBT(nbt);
- storage.writeToNBT(nbt);
- }
+ /* IEnergyProvider */
+ @Override
+ public int extractEnergy(ForgeDirection from, int maxExtract, boolean simulate) {
+ return storage.extractEnergy(maxExtract, simulate);
+ }
- /* IEnergyConnection */
- @Override
- public boolean canConnectEnergy(ForgeDirection from) {
-
- return true;
- }
-
- /* IEnergyReceiver */
- @Override
- public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) {
-
- return storage.receiveEnergy(maxReceive, simulate);
- }
-
- /* IEnergyProvider */
- @Override
- public int extractEnergy(ForgeDirection from, int maxExtract, boolean simulate) {
-
- return storage.extractEnergy(maxExtract, simulate);
- }
-
- /* IEnergyReceiver and IEnergyProvider */
- @Override
- public int getEnergyStored(ForgeDirection from) {
-
- return storage.getEnergyStored();
- }
-
- @Override
- public int getMaxEnergyStored(ForgeDirection from) {
-
- return storage.getMaxEnergyStored();
- }
+ /* IEnergyReceiver and IEnergyProvider */
+ @Override
+ public int getEnergyStored(ForgeDirection from) {
+ return storage.getEnergyStored();
+ }
+ @Override
+ public int getMaxEnergyStored(ForgeDirection from) {
+ return storage.getMaxEnergyStored();
+ }
}
diff --git a/src/main/java/cofh/api/energy/package-info.java b/src/main/java/cofh/api/energy/package-info.java
index 7379702b8..921f1099c 100644
--- a/src/main/java/cofh/api/energy/package-info.java
+++ b/src/main/java/cofh/api/energy/package-info.java
@@ -7,4 +7,3 @@ package cofh.api.energy;
import cofh.api.CoFHAPIProps;
import cpw.mods.fml.common.API;
-
diff --git a/src/main/java/cofh/api/item/IAugmentItem.java b/src/main/java/cofh/api/item/IAugmentItem.java
index e17fa8dec..3d92f90d0 100644
--- a/src/main/java/cofh/api/item/IAugmentItem.java
+++ b/src/main/java/cofh/api/item/IAugmentItem.java
@@ -5,25 +5,25 @@ import java.util.Set;
import net.minecraft.item.ItemStack;
public interface IAugmentItem {
+ /**
+ * Get the augmentation level for a given Augment and Augment Type.
+ *
+ * @param stack
+ * ItemStack representing the Augment.
+ * @param type
+ * String containing the Augment type name.
+ * @return The Augment level of the stack for the requested type - 0 if it does not
+ * affect that attribute.
+ */
+ int getAugmentLevel(ItemStack stack, String type);
- /**
- * Get the augmentation level for a given Augment and Augment Type.
- *
- * @param stack
- * ItemStack representing the Augment.
- * @param type
- * String containing the Augment type name.
- * @return The Augment level of the stack for the requested type - 0 if it does not affect that attribute.
- */
- int getAugmentLevel(ItemStack stack, String type);
-
- /**
- * Get the Augment Types for a given Augment. Set ensure that there are no duplicates.
- *
- * @param stack
- * ItemStack representing the Augment.
- * @return Set of the Augmentation Types. Should return an empty set if there are none (but this would be really stupid to make). DO NOT RETURN NULL.
- */
- Set getAugmentTypes(ItemStack stack);
-
+ /**
+ * Get the Augment Types for a given Augment. Set ensure that there are no duplicates.
+ *
+ * @param stack
+ * ItemStack representing the Augment.
+ * @return Set of the Augmentation Types. Should return an empty set if there are none
+ * (but this would be really stupid to make). DO NOT RETURN NULL.
+ */
+ Set getAugmentTypes(ItemStack stack);
}
diff --git a/src/main/java/cofh/api/item/IEmpowerableItem.java b/src/main/java/cofh/api/item/IEmpowerableItem.java
index 428771100..a313973f8 100644
--- a/src/main/java/cofh/api/item/IEmpowerableItem.java
+++ b/src/main/java/cofh/api/item/IEmpowerableItem.java
@@ -4,38 +4,36 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
/**
- * Implement this interface on Item classes which may be "Empowered" - what that means is completely up to you. This just provides a uniform way of dealing with
- * them.
+ * Implement this interface on Item classes which may be "Empowered" - what that means is
+ * completely up to you. This just provides a uniform way of dealing with them.
*
* @author King Lemming
*
*/
public interface IEmpowerableItem {
+ /**
+ * Check whether or not a given item is currently in an empowered state.
+ */
+ boolean isEmpowered(ItemStack stack);
- /**
- * Check whether or not a given item is currently in an empowered state.
- */
- boolean isEmpowered(ItemStack stack);
-
- /**
- * Attempt to set the empowered state of the item.
- *
- * @param stack
- * ItemStack to be empowered/disempowered.
- * @param state
- * Desired state.
- * @return TRUE if the operation was successful, FALSE if it was not.
- */
- boolean setEmpoweredState(ItemStack stack, boolean state);
-
- /**
- * Callback method for reacting to a state change. Useful in KeyBinding handlers.
- *
- * @param player
- * Player holding the item, if applicable.
- * @param stack
- * The item being held.
- */
- void onStateChange(EntityPlayer player, ItemStack stack);
+ /**
+ * Attempt to set the empowered state of the item.
+ *
+ * @param stack
+ * ItemStack to be empowered/disempowered.
+ * @param state
+ * Desired state.
+ * @return TRUE if the operation was successful, FALSE if it was not.
+ */
+ boolean setEmpoweredState(ItemStack stack, boolean state);
+ /**
+ * Callback method for reacting to a state change. Useful in KeyBinding handlers.
+ *
+ * @param player
+ * Player holding the item, if applicable.
+ * @param stack
+ * The item being held.
+ */
+ void onStateChange(EntityPlayer player, ItemStack stack);
}
diff --git a/src/main/java/cofh/api/item/IInventoryContainerItem.java b/src/main/java/cofh/api/item/IInventoryContainerItem.java
index adadf10a7..2c59fee6e 100644
--- a/src/main/java/cofh/api/item/IInventoryContainerItem.java
+++ b/src/main/java/cofh/api/item/IInventoryContainerItem.java
@@ -11,10 +11,8 @@ import net.minecraft.item.ItemStack;
*
*/
public interface IInventoryContainerItem {
-
- /**
- * Get the size of this inventory of this container item.
- */
- int getSizeInventory(ItemStack container);
-
+ /**
+ * Get the size of this inventory of this container item.
+ */
+ int getSizeInventory(ItemStack container);
}
diff --git a/src/main/java/cofh/api/item/IMultiModeItem.java b/src/main/java/cofh/api/item/IMultiModeItem.java
index c236bbfbd..82b865ee7 100644
--- a/src/main/java/cofh/api/item/IMultiModeItem.java
+++ b/src/main/java/cofh/api/item/IMultiModeItem.java
@@ -4,53 +4,51 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
/**
- * Implement this interface on Item classes which may be "Empowered" - what that means is completely up to you. This just provides a uniform way of dealing with
- * them.
+ * Implement this interface on Item classes which may be "Empowered" - what that means is
+ * completely up to you. This just provides a uniform way of dealing with them.
*
* @author King Lemming
*
*/
public interface IMultiModeItem {
+ /**
+ * Get the current mode of an item.
+ */
+ int getMode(ItemStack stack);
- /**
- * Get the current mode of an item.
- */
- int getMode(ItemStack stack);
+ /**
+ * Attempt to set the empowered state of the item.
+ *
+ * @param stack
+ * ItemStack to set the mode on.
+ * @param mode
+ * Desired mode.
+ * @return TRUE if the operation was successful, FALSE if it was not.
+ */
+ boolean setMode(ItemStack stack, int mode);
- /**
- * Attempt to set the empowered state of the item.
- *
- * @param stack
- * ItemStack to set the mode on.
- * @param mode
- * Desired mode.
- * @return TRUE if the operation was successful, FALSE if it was not.
- */
- boolean setMode(ItemStack stack, int mode);
+ /**
+ * Increment the current mode of an item.
+ */
+ boolean incrMode(ItemStack stack);
- /**
- * Increment the current mode of an item.
- */
- boolean incrMode(ItemStack stack);
+ /**
+ * Decrement the current mode of an item.
+ */
+ boolean decrMode(ItemStack stack);
- /**
- * Decrement the current mode of an item.
- */
- boolean decrMode(ItemStack stack);
-
- /**
- * Returns the number of possible modes.
- */
- int getNumModes(ItemStack stack);
-
- /**
- * Callback method for reacting to a state change. Useful in KeyBinding handlers.
- *
- * @param player
- * Player holding the item, if applicable.
- * @param stack
- * The item being held.
- */
- void onModeChange(EntityPlayer player, ItemStack stack);
+ /**
+ * Returns the number of possible modes.
+ */
+ int getNumModes(ItemStack stack);
+ /**
+ * Callback method for reacting to a state change. Useful in KeyBinding handlers.
+ *
+ * @param player
+ * Player holding the item, if applicable.
+ * @param stack
+ * The item being held.
+ */
+ void onModeChange(EntityPlayer player, ItemStack stack);
}
diff --git a/src/main/java/cofh/api/item/ISpecialFilterFluid.java b/src/main/java/cofh/api/item/ISpecialFilterFluid.java
index 7e8d3d025..815d6dd4d 100644
--- a/src/main/java/cofh/api/item/ISpecialFilterFluid.java
+++ b/src/main/java/cofh/api/item/ISpecialFilterFluid.java
@@ -4,21 +4,23 @@ import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidStack;
/**
- * Implement this interface on subclasses of Item to change how the item works in Thermal Dynamics Fluiducts filter slots.
+ * Implement this interface on subclasses of Item to change how the item works in Thermal
+ * Dynamics Fluiducts filter slots.
*
- * This can be used to create customizable Items which are determined to be "equal" for the purposes of filtering.
+ * This can be used to create customizable Items which are determined to be "equal" for
+ * the purposes of filtering.
*/
public interface ISpecialFilterFluid {
-
- /**
- * This method is called to find out if the given FluidStack should be matched by the given Filter ItemStack.
- *
- * @param filter
- * ItemStack representing the filter.
- * @param fluid
- * FluidStack representing the queried fluid.
- * @return True if the filter should match the FluidStack. False if the default matching should be used.
- */
- public boolean matchesFluid(ItemStack filter, FluidStack fluid);
-
+ /**
+ * This method is called to find out if the given FluidStack should be matched by the
+ * given Filter ItemStack.
+ *
+ * @param filter
+ * ItemStack representing the filter.
+ * @param fluid
+ * FluidStack representing the queried fluid.
+ * @return True if the filter should match the FluidStack. False if the default
+ * matching should be used.
+ */
+ public boolean matchesFluid(ItemStack filter, FluidStack fluid);
}
diff --git a/src/main/java/cofh/api/item/ISpecialFilterItem.java b/src/main/java/cofh/api/item/ISpecialFilterItem.java
index ef9f953d8..8c2b46bc1 100644
--- a/src/main/java/cofh/api/item/ISpecialFilterItem.java
+++ b/src/main/java/cofh/api/item/ISpecialFilterItem.java
@@ -3,21 +3,23 @@ package cofh.api.item;
import net.minecraft.item.ItemStack;
/**
- * Implement this interface on subclasses of Item to change how the item works in Thermal Dynamics Itemducts filter slots.
+ * Implement this interface on subclasses of Item to change how the item works in Thermal
+ * Dynamics Itemducts filter slots.
*
- * This can be used to create customizable Items which are determined to be "equal" for the purposes of filtering.
+ * This can be used to create customizable Items which are determined to be "equal" for
+ * the purposes of filtering.
*/
public interface ISpecialFilterItem {
-
- /**
- * This method is called to find out if the given ItemStack should be matched by the given Filter ItemStack.
- *
- * @param filter
- * ItemStack representing the filter.
- * @param item
- * ItemStack representing the queried item.
- * @return True if the filter should match. False if the default matching should be used.
- */
- public boolean matchesItem(ItemStack filter, ItemStack item);
-
+ /**
+ * This method is called to find out if the given ItemStack should be matched by the
+ * given Filter ItemStack.
+ *
+ * @param filter
+ * ItemStack representing the filter.
+ * @param item
+ * ItemStack representing the queried item.
+ * @return True if the filter should match. False if the default matching should be
+ * used.
+ */
+ public boolean matchesItem(ItemStack filter, ItemStack item);
}
diff --git a/src/main/java/cofh/api/item/IToolHammer.java b/src/main/java/cofh/api/item/IToolHammer.java
index f1b4bb9bb..05e61d265 100644
--- a/src/main/java/cofh/api/item/IToolHammer.java
+++ b/src/main/java/cofh/api/item/IToolHammer.java
@@ -4,41 +4,42 @@ import net.minecraft.entity.EntityLivingBase;
import net.minecraft.item.ItemStack;
/**
- * Implement this interface on subclasses of Item to have that item work as a tool for CoFH mods.
+ * Implement this interface on subclasses of Item to have that item work as a tool for
+ * CoFH mods.
*/
public interface IToolHammer {
+ /**
+ * Called to ensure that the tool can be used.
+ *
+ * @param item
+ * The itemstack for the tool. Not required to match equipped item (e.g.,
+ * multi-tools that contain other tools)
+ * @param user
+ * The entity using the tool
+ * @param x
+ * X location of the block/tile
+ * @param y
+ * Y location of the block/tile
+ * @param z
+ * Z location of the block/tile
+ * @return True if this tool can be used
+ */
+ boolean isUsable(ItemStack item, EntityLivingBase user, int x, int y, int z);
- /**
- * Called to ensure that the tool can be used.
- *
- * @param item
- * The itemstack for the tool. Not required to match equipped item (e.g., multi-tools that contain other tools)
- * @param user
- * The entity using the tool
- * @param x
- * X location of the block/tile
- * @param y
- * Y location of the block/tile
- * @param z
- * Z location of the block/tile
- * @return True if this tool can be used
- */
- boolean isUsable(ItemStack item, EntityLivingBase user, int x, int y, int z);
-
- /**
- * Callback for when the tool has been used reactively.
- *
- * @param item
- * The ItemStack for the tool. Not required to match equipped item (e.g., multi-tools that contain other tools)
- * @param user
- * The entity using the tool
- * @param x
- * X location of the block/tile
- * @param y
- * Y location of the block/tile
- * @param z
- * Z location of the block/tile
- */
- void toolUsed(ItemStack item, EntityLivingBase user, int x, int y, int z);
-
+ /**
+ * Callback for when the tool has been used reactively.
+ *
+ * @param item
+ * The ItemStack for the tool. Not required to match equipped item (e.g.,
+ * multi-tools that contain other tools)
+ * @param user
+ * The entity using the tool
+ * @param x
+ * X location of the block/tile
+ * @param y
+ * Y location of the block/tile
+ * @param z
+ * Z location of the block/tile
+ */
+ void toolUsed(ItemStack item, EntityLivingBase user, int x, int y, int z);
}
diff --git a/src/main/java/cofh/api/item/package-info.java b/src/main/java/cofh/api/item/package-info.java
index 49608fd13..6cb155896 100644
--- a/src/main/java/cofh/api/item/package-info.java
+++ b/src/main/java/cofh/api/item/package-info.java
@@ -7,4 +7,3 @@ package cofh.api.item;
import cofh.api.CoFHAPIProps;
import cpw.mods.fml.common.API;
-
diff --git a/src/main/java/cofh/api/package-info.java b/src/main/java/cofh/api/package-info.java
index 08ff5fcb6..22f29a0c8 100644
--- a/src/main/java/cofh/api/package-info.java
+++ b/src/main/java/cofh/api/package-info.java
@@ -6,4 +6,3 @@
package cofh.api;
import cpw.mods.fml.common.API;
-
diff --git a/src/main/java/com/jadarstudios/developercapes/DevCapes.java b/src/main/java/com/jadarstudios/developercapes/DevCapes.java
index 5539eb084..ffedde83d 100644
--- a/src/main/java/com/jadarstudios/developercapes/DevCapes.java
+++ b/src/main/java/com/jadarstudios/developercapes/DevCapes.java
@@ -6,19 +6,20 @@
*/
package com.jadarstudios.developercapes;
+import java.io.*;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLConnection;
+
import com.jadarstudios.developercapes.cape.CapeConfig;
import com.jadarstudios.developercapes.cape.CapeConfigManager;
import net.minecraftforge.common.MinecraftForge;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
-import java.io.*;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLConnection;
-
/**
- * DeveloperCapes is a library for Minecraft. It allows developers to quickly add capes for players they specify. DevCapes uses Minecraft Forge.
+ * DeveloperCapes is a library for Minecraft. It allows developers to quickly add capes
+ * for players they specify. DevCapes uses Minecraft Forge.
*
* @author jadar
*/
@@ -40,14 +41,16 @@ public class DevCapes {
/**
* InputStream.close() needs to be called on this after you're done!
- *
+ *
* @return {@link InputStream} for the {@link URL}
*/
public InputStream getStreamForURL(URL url) {
InputStream is = null;
try {
URLConnection connection = url.openConnection();
- connection.setRequestProperty("User-Agent", System.getProperty("java.version"));
+ connection.setRequestProperty(
+ "User-Agent", System.getProperty("java.version")
+ );
connection.connect();
is = connection.getInputStream();
@@ -59,7 +62,7 @@ public class DevCapes {
/**
* InputStream.close() needs to be called on this after you're done!
- *
+ *
* @return {@link InputStream} for the {@link File}
*/
public InputStream getStreamForFile(File file) {
@@ -132,7 +135,9 @@ public class DevCapes {
InputStream is = this.getStreamForURL(jsonUrl);
if (is == null) {
- DevCapes.logger.error(String.format("Unable to establish a connection to the server, %s", jsonUrl.getHost()));
+ DevCapes.logger.error(String.format(
+ "Unable to establish a connection to the server, %s", jsonUrl.getHost()
+ ));
return id;
}
@@ -153,7 +158,6 @@ public class DevCapes {
private static void silentClose(InputStream is) {
try {
is.close();
- } catch (IOException ignored) {
- }
+ } catch (IOException ignored) {}
}
}
\ No newline at end of file
diff --git a/src/main/java/com/jadarstudios/developercapes/HDImageBuffer.java b/src/main/java/com/jadarstudios/developercapes/HDImageBuffer.java
index 884c8ca7c..912f2b1d6 100644
--- a/src/main/java/com/jadarstudios/developercapes/HDImageBuffer.java
+++ b/src/main/java/com/jadarstudios/developercapes/HDImageBuffer.java
@@ -6,13 +6,13 @@
*/
package com.jadarstudios.developercapes;
+import java.awt.Graphics;
+import java.awt.image.BufferedImage;
+
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.IImageBuffer;
-import java.awt.Graphics;
-import java.awt.image.BufferedImage;
-
/**
* This class is an implementation of {@link IImageBuffer} that allows capes to be in HD
*
diff --git a/src/main/java/com/jadarstudios/developercapes/RenderEventHandler.java b/src/main/java/com/jadarstudios/developercapes/RenderEventHandler.java
index 4494c87e3..6ae5b167a 100644
--- a/src/main/java/com/jadarstudios/developercapes/RenderEventHandler.java
+++ b/src/main/java/com/jadarstudios/developercapes/RenderEventHandler.java
@@ -15,21 +15,22 @@ import net.minecraftforge.client.event.RenderPlayerEvent;
/**
* This is not the class you are looking for.
- *
+ *
* @author jadar
*/
public class RenderEventHandler {
-
@SubscribeEvent
public void renderPlayer(RenderPlayerEvent.Specials.Pre event) {
AbstractClientPlayer player = (AbstractClientPlayer) event.entityPlayer;
UserManager manager = UserManager.getInstance();
User user = manager.getUser(player.getUniqueID().toString());
- if (user == null) return;
+ if (user == null)
+ return;
ICape cape = user.capes.get(0);
- if (cape == null) return;
+ if (cape == null)
+ return;
boolean flag = cape.isTextureLoaded(player);
if (!flag) {
diff --git a/src/main/java/com/jadarstudios/developercapes/cape/AbstractCape.java b/src/main/java/com/jadarstudios/developercapes/cape/AbstractCape.java
index 075bc52df..7424ce1a7 100644
--- a/src/main/java/com/jadarstudios/developercapes/cape/AbstractCape.java
+++ b/src/main/java/com/jadarstudios/developercapes/cape/AbstractCape.java
@@ -11,7 +11,7 @@ import net.minecraft.util.ResourceLocation;
/**
* Abstract Implementation of ICape used within Dev. Capes
- *
+ *
* @author jadar
*/
public abstract class AbstractCape implements ICape {
diff --git a/src/main/java/com/jadarstudios/developercapes/cape/CapeConfig.java b/src/main/java/com/jadarstudios/developercapes/cape/CapeConfig.java
index 345bb1b1c..ccdb38a3e 100644
--- a/src/main/java/com/jadarstudios/developercapes/cape/CapeConfig.java
+++ b/src/main/java/com/jadarstudios/developercapes/cape/CapeConfig.java
@@ -6,14 +6,14 @@
*/
package com.jadarstudios.developercapes.cape;
+import java.util.HashMap;
+
import com.jadarstudios.developercapes.user.Group;
import com.jadarstudios.developercapes.user.User;
-import java.util.HashMap;
-
/**
* The players that need to be outfitted are stored here
- *
+ *
* @author jadar
*/
public class CapeConfig {
diff --git a/src/main/java/com/jadarstudios/developercapes/cape/CapeConfigManager.java b/src/main/java/com/jadarstudios/developercapes/cape/CapeConfigManager.java
index d91bc7f0a..8157b5335 100644
--- a/src/main/java/com/jadarstudios/developercapes/cape/CapeConfigManager.java
+++ b/src/main/java/com/jadarstudios/developercapes/cape/CapeConfigManager.java
@@ -6,6 +6,13 @@
*/
package com.jadarstudios.developercapes.cape;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.BitSet;
+import java.util.Map;
+
import com.google.common.collect.HashBiMap;
import com.google.common.primitives.UnsignedBytes;
import com.google.gson.Gson;
@@ -17,22 +24,14 @@ import com.jadarstudios.developercapes.user.User;
import com.jadarstudios.developercapes.user.UserManager;
import org.apache.commons.lang3.ObjectUtils;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.util.BitSet;
-import java.util.Map;
-
/**
* All configs need a manager, this is it.
- *
+ *
* @author jadar
*/
public class CapeConfigManager {
-
protected static CapeConfigManager instance;
-
+
protected static BitSet availableIds = new BitSet(256);
protected HashBiMap configs;
@@ -57,18 +56,18 @@ public class CapeConfigManager {
addUsers(config.users);
addGroups(config.groups);
}
-
- protected void addUsers(Map users){
- try {
- UserManager.getInstance().addUsers(users.values());
+
+ protected void addUsers(Map users) {
+ try {
+ UserManager.getInstance().addUsers(users.values());
} catch (Exception e) {
e.printStackTrace();
}
}
-
- protected void addGroups(Map groups){
- try {
- GroupManager.getInstance().addGroups(groups.values());
+
+ protected void addGroups(Map groups) {
+ try {
+ GroupManager.getInstance().addGroups(groups.values());
} catch (Exception e) {
e.printStackTrace();
}
@@ -87,8 +86,10 @@ public class CapeConfigManager {
}
public static int claimId(int id) throws InvalidCapeConfigIdException {
- if(id <= 0){
- throw new InvalidCapeConfigIdException("The config ID must be a positive non-zero integer");
+ if (id <= 0) {
+ throw new InvalidCapeConfigIdException(
+ "The config ID must be a positive non-zero integer"
+ );
}
try {
UnsignedBytes.checkedCast(id);
@@ -98,7 +99,9 @@ public class CapeConfigManager {
boolean isRegistered = availableIds.get(id);
if (isRegistered) {
- throw new InvalidCapeConfigIdException(String.format("The config ID %d is already claimed.", id));
+ throw new InvalidCapeConfigIdException(
+ String.format("The config ID %d is already claimed.", id)
+ );
}
availableIds.set(id);
@@ -122,34 +125,35 @@ public class CapeConfigManager {
if (obj instanceof Map) {
parseGroup(instance, nodeName, (Map) obj);
} else if (obj instanceof String) {
- parseUser(instance, nodeName, (String) obj);
+ parseUser(instance, nodeName, (String) obj);
}
}
} catch (JsonSyntaxException e) {
- DevCapes.logger.error("CapeConfig could not be parsed because:");
+ DevCapes.logger.error("CapeConfig could not be parsed because:");
e.printStackTrace();
}
return instance;
}
-
+
protected void parseGroup(CapeConfig config, String node, Map group) {
Group g = GroupManager.getInstance().parse(node, group);
if (g != null) {
- config.groups.put(g.name, g);
+ config.groups.put(g.name, g);
}
}
-
+
protected void parseUser(CapeConfig config, String node, String user) {
- User u = UserManager.getInstance().parse(node, user);
+ User u = UserManager.getInstance().parse(node, user);
if (u != null) {
- config.users.put(node, u);
+ config.users.put(node, u);
}
}
/**
- * DEPRECATED! Please use {@link com.jadarstudios.developercapes.cape.CapeConfigManager#parse(java.io.InputStream is)}
- * This will be removed in the next major release.
+ * DEPRECATED! Please use {@link
+ * com.jadarstudios.developercapes.cape.CapeConfigManager#parse(java.io.InputStream
+ * is)} This will be removed in the next major release.
*/
@Deprecated
public CapeConfig parseFromStream(InputStream is) {
diff --git a/src/main/java/com/jadarstudios/developercapes/cape/CapeManager.java b/src/main/java/com/jadarstudios/developercapes/cape/CapeManager.java
index d08003754..4c60f2b25 100644
--- a/src/main/java/com/jadarstudios/developercapes/cape/CapeManager.java
+++ b/src/main/java/com/jadarstudios/developercapes/cape/CapeManager.java
@@ -6,20 +6,19 @@
*/
package com.jadarstudios.developercapes.cape;
-import com.jadarstudios.developercapes.DevCapes;
-
import java.net.MalformedURLException;
import java.net.URL;
import java.util.Collection;
import java.util.HashMap;
+import com.jadarstudios.developercapes.DevCapes;
+
/**
* This manages all of the capes, be nice to it or you won't get one!
- *
+ *
* @author jadar
*/
public class CapeManager {
-
protected static CapeManager instance;
private HashMap capes;
@@ -56,13 +55,16 @@ public class CapeManager {
this.capes.put(name, cape);
return cape;
}
-
+
public ICape parse(String name, Object object) {
ICape cape = null;
- if(object instanceof String || object instanceof URL){
- cape = parse(name, object.toString());
- }else{
- DevCapes.logger.error(String.format("Cape, %s, could not be parsed because it is not in an accepted format!", object));
+ if (object instanceof String || object instanceof URL) {
+ cape = parse(name, object.toString());
+ } else {
+ DevCapes.logger.error(String.format(
+ "Cape, %s, could not be parsed because it is not in an accepted format!",
+ object
+ ));
}
return cape;
}
@@ -73,7 +75,9 @@ public class CapeManager {
try {
cape = new StaticCape(name, new URL(url));
} catch (MalformedURLException e) {
- DevCapes.logger.error(String.format("Are you crazy?? \"%s\" is not a valid URL!", url));
+ DevCapes.logger.error(
+ String.format("Are you crazy?? \"%s\" is not a valid URL!", url)
+ );
e.printStackTrace();
}
return cape;
diff --git a/src/main/java/com/jadarstudios/developercapes/cape/ICape.java b/src/main/java/com/jadarstudios/developercapes/cape/ICape.java
index 79a652432..70614874f 100644
--- a/src/main/java/com/jadarstudios/developercapes/cape/ICape.java
+++ b/src/main/java/com/jadarstudios/developercapes/cape/ICape.java
@@ -12,11 +12,10 @@ import net.minecraft.util.ResourceLocation;
/**
* Any class implementing this will be requested to act as a cape.
- *
+ *
* @author jadar
*/
public interface ICape {
-
public String getName();
public ITextureObject getTexture();
diff --git a/src/main/java/com/jadarstudios/developercapes/cape/StaticCape.java b/src/main/java/com/jadarstudios/developercapes/cape/StaticCape.java
index 1844f9528..f9499a9e1 100644
--- a/src/main/java/com/jadarstudios/developercapes/cape/StaticCape.java
+++ b/src/main/java/com/jadarstudios/developercapes/cape/StaticCape.java
@@ -6,6 +6,8 @@
*/
package com.jadarstudios.developercapes.cape;
+import java.net.URL;
+
import com.jadarstudios.developercapes.HDImageBuffer;
import com.mojang.authlib.minecraft.MinecraftProfileTexture;
import net.minecraft.client.Minecraft;
@@ -13,15 +15,12 @@ import net.minecraft.client.entity.AbstractClientPlayer;
import net.minecraft.client.renderer.ThreadDownloadImageData;
import net.minecraft.util.ResourceLocation;
-import java.net.URL;
-
/**
* Default Cape implementation
- *
+ *
* @author jadar
*/
public class StaticCape extends AbstractCape {
-
public StaticCape(String name, URL url) {
this.setName(name);
this.setURL(url);
@@ -50,7 +49,9 @@ public class StaticCape extends AbstractCape {
this.texture = null;
return;
}
- this.texture = new ThreadDownloadImageData(null, url.toString(), null, new HDImageBuffer());
+ this.texture = new ThreadDownloadImageData(
+ null, url.toString(), null, new HDImageBuffer()
+ );
}
public void setName(String name) {
diff --git a/src/main/java/com/jadarstudios/developercapes/user/Group.java b/src/main/java/com/jadarstudios/developercapes/user/Group.java
index 220db855d..f47c3361c 100644
--- a/src/main/java/com/jadarstudios/developercapes/user/Group.java
+++ b/src/main/java/com/jadarstudios/developercapes/user/Group.java
@@ -6,18 +6,17 @@
*/
package com.jadarstudios.developercapes.user;
-import com.jadarstudios.developercapes.cape.ICape;
-
import java.util.HashMap;
import java.util.Set;
+import com.jadarstudios.developercapes.cape.ICape;
+
/**
* This represents a group of players that share a cape
- *
+ *
* @author jadar
*/
public class Group {
-
protected HashMap users;
protected ICape cape;
public final String name;
diff --git a/src/main/java/com/jadarstudios/developercapes/user/GroupManager.java b/src/main/java/com/jadarstudios/developercapes/user/GroupManager.java
index b513c73ed..d0eaad813 100644
--- a/src/main/java/com/jadarstudios/developercapes/user/GroupManager.java
+++ b/src/main/java/com/jadarstudios/developercapes/user/GroupManager.java
@@ -6,21 +6,20 @@
*/
package com.jadarstudios.developercapes.user;
-import com.jadarstudios.developercapes.DevCapes;
-import com.jadarstudios.developercapes.cape.CapeManager;
-
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
+import com.jadarstudios.developercapes.DevCapes;
+import com.jadarstudios.developercapes.cape.CapeManager;
+
/**
* All groups have to be managed
- *
+ *
* @author jadar
*/
public class GroupManager {
-
protected static GroupManager instance;
private HashMap groups;
@@ -46,18 +45,17 @@ public class GroupManager {
e.printStackTrace();
}
}
-
+
public void addGroups(Collection groups) {
- for (Group g : groups) {
+ for (Group g : groups) {
GroupManager.getInstance().addGroup(g);
}
- }
-
+ }
+
public Group getGroup(String capeName) {
return groups.get(capeName);
}
-
public Group newGroup(String name) {
if (this.getGroup(name) != null) {
return this.getGroup(name);
@@ -73,17 +71,20 @@ public class GroupManager {
Object capeUrlObj = data.get("capeUrl");
if (!(usersObj instanceof ArrayList) || !(capeUrlObj instanceof String)) {
- DevCapes.logger.error(String.format("Group %s could not be parsed because it either is invalid or missing elements.", name));
+ DevCapes.logger.error(String.format(
+ "Group %s could not be parsed because it either is invalid or missing elements.",
+ name
+ ));
return null;
}
- ArrayList users = (ArrayList)usersObj;
- String capeUrl = (String)capeUrlObj;
+ ArrayList users = (ArrayList) usersObj;
+ String capeUrl = (String) capeUrlObj;
group.cape = CapeManager.getInstance().parse(name, capeUrl);
for (Object obj : users) {
- User user = UserManager.getInstance().parse((String)obj, group.cape);
+ User user = UserManager.getInstance().parse((String) obj, group.cape);
if (user != null) {
group.addUser(user);
}
diff --git a/src/main/java/com/jadarstudios/developercapes/user/User.java b/src/main/java/com/jadarstudios/developercapes/user/User.java
index e72b135b1..3010171ed 100644
--- a/src/main/java/com/jadarstudios/developercapes/user/User.java
+++ b/src/main/java/com/jadarstudios/developercapes/user/User.java
@@ -6,18 +6,17 @@
*/
package com.jadarstudios.developercapes.user;
-import com.jadarstudios.developercapes.cape.ICape;
-
import java.util.ArrayList;
import java.util.List;
+import com.jadarstudios.developercapes.cape.ICape;
+
/**
* This player is getting their own cape
- *
+ *
* @author jadar
*/
public class User {
-
public List capes;
public final String userUUID;
diff --git a/src/main/java/com/jadarstudios/developercapes/user/UserManager.java b/src/main/java/com/jadarstudios/developercapes/user/UserManager.java
index 82b91c368..9e4bcab75 100644
--- a/src/main/java/com/jadarstudios/developercapes/user/UserManager.java
+++ b/src/main/java/com/jadarstudios/developercapes/user/UserManager.java
@@ -6,20 +6,19 @@
*/
package com.jadarstudios.developercapes.user;
+import java.util.Collection;
+import java.util.HashMap;
+
import com.jadarstudios.developercapes.DevCapes;
import com.jadarstudios.developercapes.cape.CapeManager;
import com.jadarstudios.developercapes.cape.ICape;
-import java.util.Collection;
-import java.util.HashMap;
-
/**
* Users can not be trusted to put capes on by themselves
- *
+ *
* @author jadar
*/
public class UserManager {
-
protected static UserManager instance;
protected HashMap users;
@@ -69,12 +68,15 @@ public class UserManager {
public User parse(String user, Object cape) {
User userInstance = new User(user);
- ICape capeInstance = (cape instanceof ICape) ? (ICape)cape : CapeManager.getInstance().parse(user, cape.toString());
+ ICape capeInstance = (cape instanceof ICape)
+ ? (ICape) cape
+ : CapeManager.getInstance().parse(user, cape.toString());
if (capeInstance != null) {
userInstance.capes.add(capeInstance);
} else {
- DevCapes.logger.error(String.format("Error parsing cape, %s", cape.toString()));
+ DevCapes.logger.error(String.format("Error parsing cape, %s", cape.toString())
+ );
}
return userInstance;
diff --git a/src/main/java/mekanism/api/Chunk3D.java b/src/main/java/mekanism/api/Chunk3D.java
index 28a0949d3..3d19073a1 100644
--- a/src/main/java/mekanism/api/Chunk3D.java
+++ b/src/main/java/mekanism/api/Chunk3D.java
@@ -6,113 +6,102 @@ import net.minecraft.world.World;
import net.minecraft.world.chunk.Chunk;
/**
- * Chunk3D - an integer-based way to keep track of and perform operations on chunks in a Minecraft-based environment. This also takes
- * in account the dimension the chunk is in.
+ * Chunk3D - an integer-based way to keep track of and perform operations on chunks in a
+ * Minecraft-based environment. This also takes in account the dimension the chunk is in.
* @author aidancbrady
*
*/
-public class Chunk3D
-{
- public int dimensionId;
-
- public int xCoord;
- public int zCoord;
-
- /**
- * Creates a Chunk3D object from the given x and z coordinates, as well as a dimension.
- * @param x - chunk x location
- * @param z - chunk z location
- * @param dimension - the dimension this Chunk3D is in
- */
- public Chunk3D(int x, int z, int dimension)
- {
- xCoord = x;
- zCoord = z;
-
- dimensionId = dimension;
- }
-
- /**
- * Creates a Chunk3D from an entity based on it's location and dimension.
- * @param entity - the entity to get the Chunk3D object from
- */
- public Chunk3D(Entity entity)
- {
- xCoord = ((int)entity.posX) >> 4;
- zCoord = ((int)entity.posZ) >> 4;
-
- dimensionId = entity.dimension;
- }
-
- /**
- * Creates a Chunk3D from a Coord4D based on it's coordinates and dimension.
- * @param coord - the Coord4D object to get this Chunk3D from
- */
- public Chunk3D(Coord4D coord)
- {
- xCoord = coord.xCoord >> 4;
- zCoord = coord.zCoord >> 4;
-
- dimensionId = coord.dimensionId;
- }
-
- /**
- * Whether or not this chunk exists in the given world.
- * @param world - the world to check in
- * @return if the chunk exists
- */
- public boolean exists(World world)
- {
- return world.getChunkProvider().chunkExists(xCoord, zCoord);
- }
-
- /**
- * Gets a Chunk object corresponding to this Chunk3D's coordinates.
- * @param world - the world to get the Chunk object from
- * @return the corresponding Chunk object
- */
- public Chunk getChunk(World world)
- {
- return world.getChunkFromChunkCoords(xCoord, zCoord);
- }
-
- /**
- * Returns this Chunk3D in the Minecraft-based ChunkCoordIntPair format.
- * @return this Chunk3D as a ChunkCoordIntPair
- */
- public ChunkCoordIntPair toPair()
- {
- return new ChunkCoordIntPair(xCoord, zCoord);
- }
-
- @Override
- public Chunk3D clone()
- {
- return new Chunk3D(xCoord, zCoord, dimensionId);
- }
+public class Chunk3D {
+ public int dimensionId;
- @Override
- public String toString()
- {
- return "[Chunk3D: " + xCoord + ", " + zCoord + ", dim=" + dimensionId + "]";
- }
+ public int xCoord;
+ public int zCoord;
- @Override
- public boolean equals(Object obj)
- {
- return obj instanceof Chunk3D &&
- ((Chunk3D)obj).xCoord == xCoord &&
- ((Chunk3D)obj).zCoord == zCoord &&
- ((Chunk3D)obj).dimensionId == dimensionId;
- }
+ /**
+ * Creates a Chunk3D object from the given x and z coordinates, as well as a
+ * dimension.
+ * @param x - chunk x location
+ * @param z - chunk z location
+ * @param dimension - the dimension this Chunk3D is in
+ */
+ public Chunk3D(int x, int z, int dimension) {
+ xCoord = x;
+ zCoord = z;
- @Override
- public int hashCode()
- {
- int code = 1;
- code = 31 * code + xCoord;
- code = 31 * code + zCoord;
- code = 31 * code + dimensionId;
- return code;
- }
+ dimensionId = dimension;
+ }
+
+ /**
+ * Creates a Chunk3D from an entity based on it's location and dimension.
+ * @param entity - the entity to get the Chunk3D object from
+ */
+ public Chunk3D(Entity entity) {
+ xCoord = ((int) entity.posX) >> 4;
+ zCoord = ((int) entity.posZ) >> 4;
+
+ dimensionId = entity.dimension;
+ }
+
+ /**
+ * Creates a Chunk3D from a Coord4D based on it's coordinates and dimension.
+ * @param coord - the Coord4D object to get this Chunk3D from
+ */
+ public Chunk3D(Coord4D coord) {
+ xCoord = coord.xCoord >> 4;
+ zCoord = coord.zCoord >> 4;
+
+ dimensionId = coord.dimensionId;
+ }
+
+ /**
+ * Whether or not this chunk exists in the given world.
+ * @param world - the world to check in
+ * @return if the chunk exists
+ */
+ public boolean exists(World world) {
+ return world.getChunkProvider().chunkExists(xCoord, zCoord);
+ }
+
+ /**
+ * Gets a Chunk object corresponding to this Chunk3D's coordinates.
+ * @param world - the world to get the Chunk object from
+ * @return the corresponding Chunk object
+ */
+ public Chunk getChunk(World world) {
+ return world.getChunkFromChunkCoords(xCoord, zCoord);
+ }
+
+ /**
+ * Returns this Chunk3D in the Minecraft-based ChunkCoordIntPair format.
+ * @return this Chunk3D as a ChunkCoordIntPair
+ */
+ public ChunkCoordIntPair toPair() {
+ return new ChunkCoordIntPair(xCoord, zCoord);
+ }
+
+ @Override
+ public Chunk3D clone() {
+ return new Chunk3D(xCoord, zCoord, dimensionId);
+ }
+
+ @Override
+ public String toString() {
+ return "[Chunk3D: " + xCoord + ", " + zCoord + ", dim=" + dimensionId + "]";
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ return obj instanceof Chunk3D && ((Chunk3D) obj).xCoord == xCoord
+ && ((Chunk3D) obj).zCoord == zCoord
+ && ((Chunk3D) obj).dimensionId == dimensionId;
+ }
+
+ @Override
+ public int hashCode() {
+ int code = 1;
+ code = 31 * code + xCoord;
+ code = 31 * code + zCoord;
+ code = 31 * code + dimensionId;
+ return code;
+ }
}
diff --git a/src/main/java/mekanism/api/Coord4D.java b/src/main/java/mekanism/api/Coord4D.java
index 4a62f845b..85322fc94 100644
--- a/src/main/java/mekanism/api/Coord4D.java
+++ b/src/main/java/mekanism/api/Coord4D.java
@@ -1,9 +1,9 @@
package mekanism.api;
-import io.netty.buffer.ByteBuf;
-
import java.util.ArrayList;
+import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint;
+import io.netty.buffer.ByteBuf;
import net.minecraft.block.Block;
import net.minecraft.entity.Entity;
import net.minecraft.init.Blocks;
@@ -17,406 +17,402 @@ import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraft.world.chunk.Chunk;
import net.minecraftforge.common.util.ForgeDirection;
-import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint;
/**
- * Coord4D - an integer-based way to keep track of and perform operations on blocks in a Minecraft-based environment. This also takes
- * in account the dimension the coordinate is in.
+ * Coord4D - an integer-based way to keep track of and perform operations on blocks in a
+ * Minecraft-based environment. This also takes in account the dimension the coordinate is
+ * in.
* @author aidancbrady
*
*/
-public class Coord4D
-{
- public int xCoord;
- public int yCoord;
- public int zCoord;
+public class Coord4D {
+ public int xCoord;
+ public int yCoord;
+ public int zCoord;
- public int dimensionId;
+ public int dimensionId;
- /**
- * Creates a Coord4D WITHOUT a dimensionId. Don't use unless absolutely necessary.
- * @param x - x coordinate
- * @param y - y coordinate
- * @param z - z coordinate
- */
- public Coord4D(int x, int y, int z)
- {
- xCoord = x;
- yCoord = y;
- zCoord = z;
+ /**
+ * Creates a Coord4D WITHOUT a dimensionId. Don't use unless absolutely necessary.
+ * @param x - x coordinate
+ * @param y - y coordinate
+ * @param z - z coordinate
+ */
+ public Coord4D(int x, int y, int z) {
+ xCoord = x;
+ yCoord = y;
+ zCoord = z;
- dimensionId = 0;
- }
-
- /**
- * Creates a Coord4D from an entity's position, rounded down.
- * @param entity - entity to create the Coord4D from
- */
- public Coord4D(Entity entity)
- {
- xCoord = (int)entity.posX;
- yCoord = (int)entity.posY;
- zCoord = (int)entity.posZ;
-
- dimensionId = entity.worldObj.provider.dimensionId;
- }
-
- /**
- * Creates a Coord4D from the defined x, y, z, and dimension values.
- * @param x - x coordinate
- * @param y - y coordinate
- * @param z - z coordinate
- * @param dimension - dimension ID
- */
- public Coord4D(int x, int y, int z, int dimension)
- {
- xCoord = x;
- yCoord = y;
- zCoord = z;
-
- dimensionId = dimension;
- }
-
- public Coord4D(MovingObjectPosition mop)
- {
- xCoord = mop.blockX;
- yCoord = mop.blockY;
- zCoord = mop.blockZ;
- }
-
- /**
- * Gets the metadata of the block representing this Coord4D.
- * @param world - world this Coord4D is in
- * @return the metadata of this Coord4D's block
- */
- public int getMetadata(IBlockAccess world)
- {
- return world.getBlockMetadata(xCoord, yCoord, zCoord);
- }
-
- /**
- * Gets the TileEntity of the block representing this Coord4D.
- * @param world - world this Coord4D is in
- * @return the TileEntity of this Coord4D's block
- */
- public TileEntity getTileEntity(IBlockAccess world)
- {
- if(world instanceof World && !exists((World)world))
- {
- return null;
- }
-
- return world.getTileEntity(xCoord, yCoord, zCoord);
- }
-
- /**
- * Gets the Block value of the block representing this Coord4D.
- * @param world - world this Coord4D is in
- * @return the Block value of this Coord4D's block
- */
- public Block getBlock(IBlockAccess world)
- {
- if(world instanceof World && !exists((World)world))
- {
- return null;
- }
-
- return world.getBlock(xCoord, yCoord, zCoord);
- }
-
- /**
- * Writes this Coord4D's data to an NBTTagCompound.
- * @param nbtTags - tag compound to write to
- * @return the tag compound with this Coord4D's data
- */
- public NBTTagCompound write(NBTTagCompound nbtTags)
- {
- nbtTags.setInteger("x", xCoord);
- nbtTags.setInteger("y", yCoord);
- nbtTags.setInteger("z", zCoord);
- nbtTags.setInteger("dimensionId", dimensionId);
-
- return nbtTags;
- }
-
- /**
- * Writes this Coord4D's data to an ArrayList for packet transfer.
- * @param data - the ArrayList to add the data to
- */
- public void write(ArrayList data)
- {
- data.add(xCoord);
- data.add(yCoord);
- data.add(zCoord);
- data.add(dimensionId);
- }
-
- /**
- * Writes this Coord4D's data to a ByteBuf for packet transfer.
- * @param dataStream - the ByteBuf to add the data to
- */
- public void write(ByteBuf dataStream)
- {
- dataStream.writeInt(xCoord);
- dataStream.writeInt(yCoord);
- dataStream.writeInt(zCoord);
- dataStream.writeInt(dimensionId);
- }
-
- /**
- * Translates this Coord4D by the defined x, y, and z values.
- * @param x - x value to translate
- * @param y - y value to translate
- * @param z - z value to translate
- * @return translated Coord4D
- */
- public Coord4D translate(int x, int y, int z)
- {
- xCoord += x;
- yCoord += y;
- zCoord += z;
-
- return this;
- }
-
- /**
- * Translates this Coord4D by the defined Coord4D's coordinates, regardless of dimension.
- * @param coord - coordinates to translate by
- * @return translated Coord4D
- */
- public Coord4D translate(Coord4D coord)
- {
- translate(coord.xCoord, coord.yCoord, coord.zCoord);
-
- return this;
- }
-
- /**
- * Creates and returns a new Coord4D translated to the defined offsets of the side.
- * @param side - side to translate this Coord4D to
- * @return translated Coord4D
- */
- public Coord4D getFromSide(ForgeDirection side)
- {
- return getFromSide(side, 1);
- }
-
- /**
- * Creates and returns a new Coord4D translated to the defined offsets of the side by the defined amount.
- * @param side - side to translate this Coord4D to
- * @param amount - how far to translate this Coord4D
- * @return translated Coord4D
- */
- public Coord4D getFromSide(ForgeDirection side, int amount)
- {
- return new Coord4D(xCoord+(side.offsetX*amount), yCoord+(side.offsetY*amount), zCoord+(side.offsetZ*amount), dimensionId);
- }
-
- public ItemStack getStack(IBlockAccess world)
- {
- Block block = getBlock(world);
-
- if(block == null || block == Blocks.air)
- {
- return null;
- }
-
- return new ItemStack(block, 1, getMetadata(world));
- }
-
- /**
- * Returns a new Coord4D from a defined TileEntity's xCoord, yCoord and zCoord values.
- * @param tileEntity - TileEntity at the location that will represent this Coord4D
- * @return the Coord4D object from the TileEntity
- */
- public static Coord4D get(TileEntity tileEntity)
- {
- return new Coord4D(tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord, tileEntity.getWorldObj().provider.dimensionId);
- }
-
- /**
- * Returns a new Coord4D from a tag compound.
- * @param tag - tag compound to read from
- * @return the Coord4D from the tag compound
- */
- public static Coord4D read(NBTTagCompound tag)
- {
- return new Coord4D(tag.getInteger("x"), tag.getInteger("y"), tag.getInteger("z"), tag.getInteger("id"));
+ dimensionId = 0;
}
- /**
- * Returns a new Coord4D from a ByteBuf.
- * @param dataStream - data input to read from
- * @return the Coord4D from the data input
- */
- public static Coord4D read(ByteBuf dataStream)
- {
- return new Coord4D(dataStream.readInt(), dataStream.readInt(), dataStream.readInt(), dataStream.readInt());
- }
+ /**
+ * Creates a Coord4D from an entity's position, rounded down.
+ * @param entity - entity to create the Coord4D from
+ */
+ public Coord4D(Entity entity) {
+ xCoord = (int) entity.posX;
+ yCoord = (int) entity.posY;
+ zCoord = (int) entity.posZ;
- /**
- * Creates and returns a new Coord4D with values representing the difference between the defined Coord4D
- * @param other - the Coord4D to subtract from this
- * @return a Coord4D representing the distance between the defined Coord4D
- */
- public Coord4D difference(Coord4D other)
- {
- return new Coord4D(xCoord-other.xCoord, yCoord-other.yCoord, zCoord-other.zCoord, dimensionId);
- }
+ dimensionId = entity.worldObj.provider.dimensionId;
+ }
- /**
- * A method used to find the ForgeDirection represented by the distance of the defined Coord4D. Most likely won't have many
- * applicable uses.
- * @param other - Coord4D to find the side difference of
- * @return ForgeDirection representing the side the defined relative Coord4D is on to this
- */
- public ForgeDirection sideDifference(Coord4D other)
- {
- Coord4D diff = difference(other);
+ /**
+ * Creates a Coord4D from the defined x, y, z, and dimension values.
+ * @param x - x coordinate
+ * @param y - y coordinate
+ * @param z - z coordinate
+ * @param dimension - dimension ID
+ */
+ public Coord4D(int x, int y, int z, int dimension) {
+ xCoord = x;
+ yCoord = y;
+ zCoord = z;
- for(ForgeDirection side : ForgeDirection.VALID_DIRECTIONS)
- {
- if(side.offsetX == diff.xCoord && side.offsetY == diff.yCoord && side.offsetZ == diff.zCoord)
- {
- return side;
- }
- }
+ dimensionId = dimension;
+ }
- return ForgeDirection.UNKNOWN;
- }
+ public Coord4D(MovingObjectPosition mop) {
+ xCoord = mop.blockX;
+ yCoord = mop.blockY;
+ zCoord = mop.blockZ;
+ }
- /**
- * Gets the distance to a defined Coord4D.
- * @param obj - the Coord4D to find the distance to
- * @return the distance to the defined Coord4D
- */
- public int distanceTo(Coord4D obj)
- {
- int subX = xCoord - obj.xCoord;
- int subY = yCoord - obj.yCoord;
- int subZ = zCoord - obj.zCoord;
- return (int)MathHelper.sqrt_double(subX * subX + subY * subY + subZ * subZ);
- }
+ /**
+ * Gets the metadata of the block representing this Coord4D.
+ * @param world - world this Coord4D is in
+ * @return the metadata of this Coord4D's block
+ */
+ public int getMetadata(IBlockAccess world) {
+ return world.getBlockMetadata(xCoord, yCoord, zCoord);
+ }
- /**
- * Whether or not the defined side of this Coord4D is visible.
- * @param side - side to check
- * @param world - world this Coord4D is in
- * @return
- */
- public boolean sideVisible(ForgeDirection side, IBlockAccess world)
- {
- return world.isAirBlock(xCoord+side.offsetX, yCoord+side.offsetY, zCoord+side.offsetZ);
- }
-
- /**
- * Gets a TargetPoint with the defined range from this Coord4D with the appropriate coordinates and dimension ID.
- * @param range - the range the packet can be sent in of this Coord4D
- * @return TargetPoint relative to this Coord4D
- */
- public TargetPoint getTargetPoint(double range)
- {
- return new TargetPoint(dimensionId, xCoord, yCoord, zCoord, range);
- }
+ /**
+ * Gets the TileEntity of the block representing this Coord4D.
+ * @param world - world this Coord4D is in
+ * @return the TileEntity of this Coord4D's block
+ */
+ public TileEntity getTileEntity(IBlockAccess world) {
+ if (world instanceof World && !exists((World) world)) {
+ return null;
+ }
- /**
- * Steps this Coord4D in the defined side's offset without creating a new value.
- * @param side - side to step towards
- * @return this Coord4D
- */
- public Coord4D step(ForgeDirection side)
- {
- return translate(side.offsetX, side.offsetY, side.offsetZ);
- }
+ return world.getTileEntity(xCoord, yCoord, zCoord);
+ }
- /**
- * Whether or not the chunk this Coord4D is in exists and is loaded.
- * @param world - world this Coord4D is in
- * @return the chunk of this Coord4D
- */
- public boolean exists(World world)
- {
- return world.getChunkProvider() == null || world.getChunkProvider().chunkExists(xCoord >> 4, zCoord >> 4);
- }
+ /**
+ * Gets the Block value of the block representing this Coord4D.
+ * @param world - world this Coord4D is in
+ * @return the Block value of this Coord4D's block
+ */
+ public Block getBlock(IBlockAccess world) {
+ if (world instanceof World && !exists((World) world)) {
+ return null;
+ }
- /**
- * Gets the chunk this Coord4D is in.
- * @param world - world this Coord4D is in
- * @return the chunk of this Coord4D
- */
- public Chunk getChunk(World world)
- {
- return world.getChunkFromBlockCoords(xCoord, zCoord);
- }
-
- /**
- * Gets the Chunk3D object with chunk coordinates correlating to this Coord4D's location
- * @return Chunk3D with correlating chunk coordinates.
- */
- public Chunk3D getChunk3D()
- {
- return new Chunk3D(this);
- }
+ return world.getBlock(xCoord, yCoord, zCoord);
+ }
- /**
- * Whether or not the block this Coord4D represents is an air block.
- * @param world - world this Coord4D is in
- * @return if this Coord4D is an air block
- */
- public boolean isAirBlock(IBlockAccess world)
- {
- return world.isAirBlock(xCoord, yCoord, zCoord);
- }
-
- /**
- * Whether or not this block this Coord4D represents is replaceable.
- * @param world - world this Coord4D is in
- * @return if this Coord4D is replaceable
- */
- public boolean isReplaceable(IBlockAccess world)
- {
- return getBlock(world).isReplaceable(world, xCoord, yCoord, zCoord);
- }
-
- /**
- * Gets a bounding box that contains the area this Coord4D would take up in a world.
- * @return this Coord4D's bounding box
- */
- public AxisAlignedBB getBoundingBox()
- {
- return AxisAlignedBB.getBoundingBox(xCoord, yCoord, zCoord, xCoord+1, yCoord+1, zCoord+1);
- }
+ /**
+ * Writes this Coord4D's data to an NBTTagCompound.
+ * @param nbtTags - tag compound to write to
+ * @return the tag compound with this Coord4D's data
+ */
+ public NBTTagCompound write(NBTTagCompound nbtTags) {
+ nbtTags.setInteger("x", xCoord);
+ nbtTags.setInteger("y", yCoord);
+ nbtTags.setInteger("z", zCoord);
+ nbtTags.setInteger("dimensionId", dimensionId);
- @Override
- public Coord4D clone()
- {
- return new Coord4D(xCoord, yCoord, zCoord, dimensionId);
- }
+ return nbtTags;
+ }
- @Override
- public String toString()
- {
- return "[Coord4D: " + xCoord + ", " + yCoord + ", " + zCoord + ", dim=" + dimensionId + "]";
- }
+ /**
+ * Writes this Coord4D's data to an ArrayList for packet transfer.
+ * @param data - the ArrayList to add the data to
+ */
+ public void write(ArrayList data) {
+ data.add(xCoord);
+ data.add(yCoord);
+ data.add(zCoord);
+ data.add(dimensionId);
+ }
- @Override
- public boolean equals(Object obj)
- {
- return obj instanceof Coord4D &&
- ((Coord4D)obj).xCoord == xCoord &&
- ((Coord4D)obj).yCoord == yCoord &&
- ((Coord4D)obj).zCoord == zCoord &&
- ((Coord4D)obj).dimensionId == dimensionId;
- }
+ /**
+ * Writes this Coord4D's data to a ByteBuf for packet transfer.
+ * @param dataStream - the ByteBuf to add the data to
+ */
+ public void write(ByteBuf dataStream) {
+ dataStream.writeInt(xCoord);
+ dataStream.writeInt(yCoord);
+ dataStream.writeInt(zCoord);
+ dataStream.writeInt(dimensionId);
+ }
- @Override
- public int hashCode()
- {
- int code = 1;
- code = 31 * code + xCoord;
- code = 31 * code + yCoord;
- code = 31 * code + zCoord;
- code = 31 * code + dimensionId;
- return code;
- }
+ /**
+ * Translates this Coord4D by the defined x, y, and z values.
+ * @param x - x value to translate
+ * @param y - y value to translate
+ * @param z - z value to translate
+ * @return translated Coord4D
+ */
+ public Coord4D translate(int x, int y, int z) {
+ xCoord += x;
+ yCoord += y;
+ zCoord += z;
+
+ return this;
+ }
+
+ /**
+ * Translates this Coord4D by the defined Coord4D's coordinates, regardless of
+ * dimension.
+ * @param coord - coordinates to translate by
+ * @return translated Coord4D
+ */
+ public Coord4D translate(Coord4D coord) {
+ translate(coord.xCoord, coord.yCoord, coord.zCoord);
+
+ return this;
+ }
+
+ /**
+ * Creates and returns a new Coord4D translated to the defined offsets of the side.
+ * @param side - side to translate this Coord4D to
+ * @return translated Coord4D
+ */
+ public Coord4D getFromSide(ForgeDirection side) {
+ return getFromSide(side, 1);
+ }
+
+ /**
+ * Creates and returns a new Coord4D translated to the defined offsets of the side by
+ * the defined amount.
+ * @param side - side to translate this Coord4D to
+ * @param amount - how far to translate this Coord4D
+ * @return translated Coord4D
+ */
+ public Coord4D getFromSide(ForgeDirection side, int amount) {
+ return new Coord4D(
+ xCoord + (side.offsetX * amount),
+ yCoord + (side.offsetY * amount),
+ zCoord + (side.offsetZ * amount),
+ dimensionId
+ );
+ }
+
+ public ItemStack getStack(IBlockAccess world) {
+ Block block = getBlock(world);
+
+ if (block == null || block == Blocks.air) {
+ return null;
+ }
+
+ return new ItemStack(block, 1, getMetadata(world));
+ }
+
+ /**
+ * Returns a new Coord4D from a defined TileEntity's xCoord, yCoord and zCoord values.
+ * @param tileEntity - TileEntity at the location that will represent this Coord4D
+ * @return the Coord4D object from the TileEntity
+ */
+ public static Coord4D get(TileEntity tileEntity) {
+ return new Coord4D(
+ tileEntity.xCoord,
+ tileEntity.yCoord,
+ tileEntity.zCoord,
+ tileEntity.getWorldObj().provider.dimensionId
+ );
+ }
+
+ /**
+ * Returns a new Coord4D from a tag compound.
+ * @param tag - tag compound to read from
+ * @return the Coord4D from the tag compound
+ */
+ public static Coord4D read(NBTTagCompound tag) {
+ return new Coord4D(
+ tag.getInteger("x"),
+ tag.getInteger("y"),
+ tag.getInteger("z"),
+ tag.getInteger("id")
+ );
+ }
+
+ /**
+ * Returns a new Coord4D from a ByteBuf.
+ * @param dataStream - data input to read from
+ * @return the Coord4D from the data input
+ */
+ public static Coord4D read(ByteBuf dataStream) {
+ return new Coord4D(
+ dataStream.readInt(),
+ dataStream.readInt(),
+ dataStream.readInt(),
+ dataStream.readInt()
+ );
+ }
+
+ /**
+ * Creates and returns a new Coord4D with values representing the difference between
+ * the defined Coord4D
+ * @param other - the Coord4D to subtract from this
+ * @return a Coord4D representing the distance between the defined Coord4D
+ */
+ public Coord4D difference(Coord4D other) {
+ return new Coord4D(
+ xCoord - other.xCoord,
+ yCoord - other.yCoord,
+ zCoord - other.zCoord,
+ dimensionId
+ );
+ }
+
+ /**
+ * A method used to find the ForgeDirection represented by the distance of the defined
+ * Coord4D. Most likely won't have many applicable uses.
+ * @param other - Coord4D to find the side difference of
+ * @return ForgeDirection representing the side the defined relative Coord4D is on to
+ * this
+ */
+ public ForgeDirection sideDifference(Coord4D other) {
+ Coord4D diff = difference(other);
+
+ for (ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) {
+ if (side.offsetX == diff.xCoord && side.offsetY == diff.yCoord
+ && side.offsetZ == diff.zCoord) {
+ return side;
+ }
+ }
+
+ return ForgeDirection.UNKNOWN;
+ }
+
+ /**
+ * Gets the distance to a defined Coord4D.
+ * @param obj - the Coord4D to find the distance to
+ * @return the distance to the defined Coord4D
+ */
+ public int distanceTo(Coord4D obj) {
+ int subX = xCoord - obj.xCoord;
+ int subY = yCoord - obj.yCoord;
+ int subZ = zCoord - obj.zCoord;
+ return (int) MathHelper.sqrt_double(subX * subX + subY * subY + subZ * subZ);
+ }
+
+ /**
+ * Whether or not the defined side of this Coord4D is visible.
+ * @param side - side to check
+ * @param world - world this Coord4D is in
+ * @return
+ */
+ public boolean sideVisible(ForgeDirection side, IBlockAccess world) {
+ return world.isAirBlock(
+ xCoord + side.offsetX, yCoord + side.offsetY, zCoord + side.offsetZ
+ );
+ }
+
+ /**
+ * Gets a TargetPoint with the defined range from this Coord4D with the appropriate
+ * coordinates and dimension ID.
+ * @param range - the range the packet can be sent in of this Coord4D
+ * @return TargetPoint relative to this Coord4D
+ */
+ public TargetPoint getTargetPoint(double range) {
+ return new TargetPoint(dimensionId, xCoord, yCoord, zCoord, range);
+ }
+
+ /**
+ * Steps this Coord4D in the defined side's offset without creating a new value.
+ * @param side - side to step towards
+ * @return this Coord4D
+ */
+ public Coord4D step(ForgeDirection side) {
+ return translate(side.offsetX, side.offsetY, side.offsetZ);
+ }
+
+ /**
+ * Whether or not the chunk this Coord4D is in exists and is loaded.
+ * @param world - world this Coord4D is in
+ * @return the chunk of this Coord4D
+ */
+ public boolean exists(World world) {
+ return world.getChunkProvider() == null
+ || world.getChunkProvider().chunkExists(xCoord >> 4, zCoord >> 4);
+ }
+
+ /**
+ * Gets the chunk this Coord4D is in.
+ * @param world - world this Coord4D is in
+ * @return the chunk of this Coord4D
+ */
+ public Chunk getChunk(World world) {
+ return world.getChunkFromBlockCoords(xCoord, zCoord);
+ }
+
+ /**
+ * Gets the Chunk3D object with chunk coordinates correlating to this Coord4D's
+ * location
+ * @return Chunk3D with correlating chunk coordinates.
+ */
+ public Chunk3D getChunk3D() {
+ return new Chunk3D(this);
+ }
+
+ /**
+ * Whether or not the block this Coord4D represents is an air block.
+ * @param world - world this Coord4D is in
+ * @return if this Coord4D is an air block
+ */
+ public boolean isAirBlock(IBlockAccess world) {
+ return world.isAirBlock(xCoord, yCoord, zCoord);
+ }
+
+ /**
+ * Whether or not this block this Coord4D represents is replaceable.
+ * @param world - world this Coord4D is in
+ * @return if this Coord4D is replaceable
+ */
+ public boolean isReplaceable(IBlockAccess world) {
+ return getBlock(world).isReplaceable(world, xCoord, yCoord, zCoord);
+ }
+
+ /**
+ * Gets a bounding box that contains the area this Coord4D would take up in a world.
+ * @return this Coord4D's bounding box
+ */
+ public AxisAlignedBB getBoundingBox() {
+ return AxisAlignedBB.getBoundingBox(
+ xCoord, yCoord, zCoord, xCoord + 1, yCoord + 1, zCoord + 1
+ );
+ }
+
+ @Override
+ public Coord4D clone() {
+ return new Coord4D(xCoord, yCoord, zCoord, dimensionId);
+ }
+
+ @Override
+ public String toString() {
+ return "[Coord4D: " + xCoord + ", " + yCoord + ", " + zCoord
+ + ", dim=" + dimensionId + "]";
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ return obj instanceof Coord4D && ((Coord4D) obj).xCoord == xCoord
+ && ((Coord4D) obj).yCoord == yCoord && ((Coord4D) obj).zCoord == zCoord
+ && ((Coord4D) obj).dimensionId == dimensionId;
+ }
+
+ @Override
+ public int hashCode() {
+ int code = 1;
+ code = 31 * code + xCoord;
+ code = 31 * code + yCoord;
+ code = 31 * code + zCoord;
+ code = 31 * code + dimensionId;
+ return code;
+ }
}
\ No newline at end of file
diff --git a/src/main/java/mekanism/api/EnumColor.java b/src/main/java/mekanism/api/EnumColor.java
index df9ba7433..58caa45bf 100644
--- a/src/main/java/mekanism/api/EnumColor.java
+++ b/src/main/java/mekanism/api/EnumColor.java
@@ -7,106 +7,101 @@ import net.minecraft.util.StatCollector;
* @author AidanBrady
*
*/
-public enum EnumColor
-{
- BLACK("\u00a70", "black", "Black", new int[] {0, 0, 0}, 0),
- DARK_BLUE("\u00a71", "darkBlue", "Blue", new int[] {0, 0, 170}, 4),
- DARK_GREEN("\u00a72", "darkGreen", "Green", new int[] {0, 170, 0}, 2),
- DARK_AQUA("\u00a73", "darkAqua", "Cyan", new int[] {0, 255, 255}, 6),
- DARK_RED("\u00a74", "darkRed", null, new int[] {170, 0, 0}, -1),
- PURPLE("\u00a75", "purple", "Purple", new int[] {170, 0, 170}, 5),
- ORANGE("\u00a76", "orange", "Orange", new int[] {255, 170, 0}, 14),
- GREY("\u00a77", "grey", "LightGray", new int[] {170, 170, 170}, 7),
- DARK_GREY("\u00a78", "darkGrey", "Gray", new int[] {85, 85, 85}, 8),
- INDIGO("\u00a79", "indigo", "LightBlue", new int[] {85, 85, 255}, 12),
- BRIGHT_GREEN("\u00a7a", "brightGreen", "Lime", new int[] {85, 255, 85}, 10),
- AQUA("\u00a7b", "aqua", null, new int[] {85, 255, 255}, -1),
- RED("\u00a7c", "red", "Red", new int[] {255, 0, 0}, 1),
- PINK("\u00a7d", "pink", "Magenta", new int[] {255, 85, 255}, 13),
- YELLOW("\u00a7e", "yellow", "Yellow", new int[] {255, 255, 85}, 11),
- WHITE("\u00a7f", "white", "White", new int[] {255, 255, 255}, 15),
- //Extras for dye-completeness
- BROWN("\u00a76", "brown", "Brown", new int[] {150, 75, 0}, 3),
- BRIGHT_PINK("\u00a7d", "brightPink", "Pink", new int[] {255, 192, 203}, 9);
+public enum EnumColor {
+ BLACK("\u00a70", "black", "Black", new int[] { 0, 0, 0 }, 0),
+ DARK_BLUE("\u00a71", "darkBlue", "Blue", new int[] { 0, 0, 170 }, 4),
+ DARK_GREEN("\u00a72", "darkGreen", "Green", new int[] { 0, 170, 0 }, 2),
+ DARK_AQUA("\u00a73", "darkAqua", "Cyan", new int[] { 0, 255, 255 }, 6),
+ DARK_RED("\u00a74", "darkRed", null, new int[] { 170, 0, 0 }, -1),
+ PURPLE("\u00a75", "purple", "Purple", new int[] { 170, 0, 170 }, 5),
+ ORANGE("\u00a76", "orange", "Orange", new int[] { 255, 170, 0 }, 14),
+ GREY("\u00a77", "grey", "LightGray", new int[] { 170, 170, 170 }, 7),
+ DARK_GREY("\u00a78", "darkGrey", "Gray", new int[] { 85, 85, 85 }, 8),
+ INDIGO("\u00a79", "indigo", "LightBlue", new int[] { 85, 85, 255 }, 12),
+ BRIGHT_GREEN("\u00a7a", "brightGreen", "Lime", new int[] { 85, 255, 85 }, 10),
+ AQUA("\u00a7b", "aqua", null, new int[] { 85, 255, 255 }, -1),
+ RED("\u00a7c", "red", "Red", new int[] { 255, 0, 0 }, 1),
+ PINK("\u00a7d", "pink", "Magenta", new int[] { 255, 85, 255 }, 13),
+ YELLOW("\u00a7e", "yellow", "Yellow", new int[] { 255, 255, 85 }, 11),
+ WHITE("\u00a7f", "white", "White", new int[] { 255, 255, 255 }, 15),
+ //Extras for dye-completeness
+ BROWN("\u00a76", "brown", "Brown", new int[] { 150, 75, 0 }, 3),
+ BRIGHT_PINK("\u00a7d", "brightPink", "Pink", new int[] { 255, 192, 203 }, 9);
- public static EnumColor[] DYES = new EnumColor[] {BLACK, RED, DARK_GREEN, BROWN, DARK_BLUE, PURPLE, DARK_AQUA, GREY, DARK_GREY, BRIGHT_PINK, BRIGHT_GREEN, YELLOW, INDIGO, PINK, ORANGE, WHITE};
+ public static EnumColor[] DYES = new EnumColor[] {
+ BLACK, RED, DARK_GREEN, BROWN, DARK_BLUE, PURPLE, DARK_AQUA, GREY,
+ DARK_GREY, BRIGHT_PINK, BRIGHT_GREEN, YELLOW, INDIGO, PINK, ORANGE, WHITE
+ };
- /** The color code that will be displayed */
- public final String code;
+ /** The color code that will be displayed */
+ public final String code;
- public final int[] rgbCode;
+ public final int[] rgbCode;
- public final int mcMeta;
+ public final int mcMeta;
- /** A friendly name of the color. */
- public String unlocalizedName;
-
- public String dyeName;
+ /** A friendly name of the color. */
+ public String unlocalizedName;
- private EnumColor(String s, String n, String dye, int[] rgb, int meta)
- {
- code = s;
- unlocalizedName = n;
- dyeName = dye;
- rgbCode = rgb;
- mcMeta = meta;
- }
+ public String dyeName;
- /**
- * Gets the localized name of this color by translating the unlocalized name.
- * @return localized name
- */
- public String getLocalizedName()
- {
- return StatCollector.translateToLocal("color." + unlocalizedName);
- }
+ private EnumColor(String s, String n, String dye, int[] rgb, int meta) {
+ code = s;
+ unlocalizedName = n;
+ dyeName = dye;
+ rgbCode = rgb;
+ mcMeta = meta;
+ }
- public String getDyeName()
- {
- return StatCollector.translateToLocal("dye." + unlocalizedName);
- }
-
- public String getOreDictName()
- {
- return dyeName;
- }
+ /**
+ * Gets the localized name of this color by translating the unlocalized name.
+ * @return localized name
+ */
+ public String getLocalizedName() {
+ return StatCollector.translateToLocal("color." + unlocalizedName);
+ }
- /**
- * Gets the name of this color with it's color prefix code.
- * @return the color's name and color prefix
- */
- public String getName()
- {
- return code + getLocalizedName();
- }
+ public String getDyeName() {
+ return StatCollector.translateToLocal("dye." + unlocalizedName);
+ }
- public String getDyedName()
- {
- return code + getDyeName();
- }
+ public String getOreDictName() {
+ return dyeName;
+ }
- /**
- * Gets the 0-1 of this color's RGB value by dividing by 255 (used for OpenGL coloring).
- * @param index - R:0, G:1, B:2
- * @return the color value
- */
- public float getColor(int index)
- {
- return (float)rgbCode[index]/255F;
- }
+ /**
+ * Gets the name of this color with it's color prefix code.
+ * @return the color's name and color prefix
+ */
+ public String getName() {
+ return code + getLocalizedName();
+ }
- /**
- * Gets the value of this color mapped to MC in-game item colors present in dyes and wool.
- * @return mc meta value
- */
- public int getMetaValue()
- {
- return mcMeta;
- }
+ public String getDyedName() {
+ return code + getDyeName();
+ }
- @Override
- public String toString()
- {
- return code;
- }
+ /**
+ * Gets the 0-1 of this color's RGB value by dividing by 255 (used for OpenGL
+ * coloring).
+ * @param index - R:0, G:1, B:2
+ * @return the color value
+ */
+ public float getColor(int index) {
+ return (float) rgbCode[index] / 255F;
+ }
+
+ /**
+ * Gets the value of this color mapped to MC in-game item colors present in dyes and
+ * wool.
+ * @return mc meta value
+ */
+ public int getMetaValue() {
+ return mcMeta;
+ }
+
+ @Override
+ public String toString() {
+ return code;
+ }
}
diff --git a/src/main/java/mekanism/api/IAlloyInteraction.java b/src/main/java/mekanism/api/IAlloyInteraction.java
index b2a2198d8..73ee9e282 100644
--- a/src/main/java/mekanism/api/IAlloyInteraction.java
+++ b/src/main/java/mekanism/api/IAlloyInteraction.java
@@ -7,12 +7,12 @@ import net.minecraft.entity.player.EntityPlayer;
* @author aidancbrady
*
*/
-public interface IAlloyInteraction
-{
- /**
- * Called when a player right-clicks this block with an alloy.
- * @param player - the player right-clicking the block
- * @param tierOrdinal - the ordinal tier of the alloy (1 = advanced, 2 = elite, 3 = ultimate)
- */
- public void onAlloyInteraction(EntityPlayer player, int tierOrdinal);
+public interface IAlloyInteraction {
+ /**
+ * Called when a player right-clicks this block with an alloy.
+ * @param player - the player right-clicking the block
+ * @param tierOrdinal - the ordinal tier of the alloy (1 = advanced, 2 = elite, 3 =
+ * ultimate)
+ */
+ public void onAlloyInteraction(EntityPlayer player, int tierOrdinal);
}
diff --git a/src/main/java/mekanism/api/IClientTicker.java b/src/main/java/mekanism/api/IClientTicker.java
index 228897370..b5c56ebf2 100644
--- a/src/main/java/mekanism/api/IClientTicker.java
+++ b/src/main/java/mekanism/api/IClientTicker.java
@@ -1,8 +1,7 @@
package mekanism.api;
-public interface IClientTicker
-{
- public void clientTick();
+public interface IClientTicker {
+ public void clientTick();
- public boolean needsTicks();
+ public boolean needsTicks();
}
diff --git a/src/main/java/mekanism/api/IConfigCardAccess.java b/src/main/java/mekanism/api/IConfigCardAccess.java
index 881d8a035..bf100d11e 100644
--- a/src/main/java/mekanism/api/IConfigCardAccess.java
+++ b/src/main/java/mekanism/api/IConfigCardAccess.java
@@ -3,32 +3,33 @@ package mekanism.api;
import net.minecraft.nbt.NBTTagCompound;
/**
- * Implement this in your TileEntity class if you wish for Mekanism filters to be able to store any of their
- * information.
+ * Implement this in your TileEntity class if you wish for Mekanism filters to be able to
+ * store any of their information.
* @author aidancbrady
*
*/
-public interface IConfigCardAccess
-{
- public static interface ISpecialConfigData extends IConfigCardAccess
- {
- /**
- * Collects the TileEntity's filter card data into the parameterized NBTTagCompound.
- * @param nbtTags - the NBTTagCompound of the filter card ItemStack
- * @return the NBTTagCompound that now contains the TileEntity's filter card data
- */
- public NBTTagCompound getConfigurationData(NBTTagCompound nbtTags);
-
- /**
- * Retrieves the TileEntity's data contained in the filter card based on the given NBTTagCompopund.
- * @param nbtTags - the NBTTagCompound of the filter card ItemStack
- */
- public void setConfigurationData(NBTTagCompound nbtTags);
-
- /**
- * A String name of this TileEntity that will be displayed as the type of data on the filter card.
- * @return the String name of this TileEntity
- */
- public String getDataType();
- }
+public interface IConfigCardAccess {
+ public static interface ISpecialConfigData extends IConfigCardAccess {
+ /**
+ * Collects the TileEntity's filter card data into the parameterized
+ * NBTTagCompound.
+ * @param nbtTags - the NBTTagCompound of the filter card ItemStack
+ * @return the NBTTagCompound that now contains the TileEntity's filter card data
+ */
+ public NBTTagCompound getConfigurationData(NBTTagCompound nbtTags);
+
+ /**
+ * Retrieves the TileEntity's data contained in the filter card based on the given
+ * NBTTagCompopund.
+ * @param nbtTags - the NBTTagCompound of the filter card ItemStack
+ */
+ public void setConfigurationData(NBTTagCompound nbtTags);
+
+ /**
+ * A String name of this TileEntity that will be displayed as the type of data on
+ * the filter card.
+ * @return the String name of this TileEntity
+ */
+ public String getDataType();
+ }
}
diff --git a/src/main/java/mekanism/api/IConfigurable.java b/src/main/java/mekanism/api/IConfigurable.java
index 512fabf43..adc0dc32c 100644
--- a/src/main/java/mekanism/api/IConfigurable.java
+++ b/src/main/java/mekanism/api/IConfigurable.java
@@ -3,25 +3,25 @@ package mekanism.api;
import net.minecraft.entity.player.EntityPlayer;
/**
- * Implement this in your TileEntity class if your block can be modified by a Configurator.
+ * Implement this in your TileEntity class if your block can be modified by a
+ * Configurator.
* @author aidancbrady
*
*/
-public interface IConfigurable
-{
- /**
- * Called when a player shift-right clicks this block with a Configurator.
- * @param player - the player who clicked the block
- * @param side - the side the block was clicked on
- * @return whether or not an action was performed
- */
- public boolean onSneakRightClick(EntityPlayer player, int side);
+public interface IConfigurable {
+ /**
+ * Called when a player shift-right clicks this block with a Configurator.
+ * @param player - the player who clicked the block
+ * @param side - the side the block was clicked on
+ * @return whether or not an action was performed
+ */
+ public boolean onSneakRightClick(EntityPlayer player, int side);
- /**
- * Called when a player right clicks this block with a Configurator.
- * @param player - the player who clicked the block
- * @param side - the side the block was clicked on
- * @return whether or not an action was performed
- */
- public boolean onRightClick(EntityPlayer player, int side);
+ /**
+ * Called when a player right clicks this block with a Configurator.
+ * @param player - the player who clicked the block
+ * @param side - the side the block was clicked on
+ * @return whether or not an action was performed
+ */
+ public boolean onRightClick(EntityPlayer player, int side);
}
diff --git a/src/main/java/mekanism/api/IEvaporationSolar.java b/src/main/java/mekanism/api/IEvaporationSolar.java
index fd5d2cf7d..33f6a36df 100644
--- a/src/main/java/mekanism/api/IEvaporationSolar.java
+++ b/src/main/java/mekanism/api/IEvaporationSolar.java
@@ -1,11 +1,11 @@
package mekanism.api;
/**
- * Implement this class in a TileEntity if you wish for it to be able to heat up a Salination Plant.
+ * Implement this class in a TileEntity if you wish for it to be able to heat up a
+ * Salination Plant.
* @author aidancbrady
*
*/
-public interface IEvaporationSolar
-{
- public boolean seesSun();
+public interface IEvaporationSolar {
+ public boolean seesSun();
}
diff --git a/src/main/java/mekanism/api/IHeatTransfer.java b/src/main/java/mekanism/api/IHeatTransfer.java
index da682e116..31af69dc5 100644
--- a/src/main/java/mekanism/api/IHeatTransfer.java
+++ b/src/main/java/mekanism/api/IHeatTransfer.java
@@ -2,27 +2,26 @@ package mekanism.api;
import net.minecraftforge.common.util.ForgeDirection;
-public interface IHeatTransfer
-{
- /**The value of the zero point of our temperature scale in kelvin*/
- public static final double AMBIENT_TEMP = 300;
+public interface IHeatTransfer {
+ /**The value of the zero point of our temperature scale in kelvin*/
+ public static final double AMBIENT_TEMP = 300;
- /**The heat transfer coefficient for air*/
- public static final double AIR_INVERSE_COEFFICIENT = 10000;
+ /**The heat transfer coefficient for air*/
+ public static final double AIR_INVERSE_COEFFICIENT = 10000;
- public double getTemp();
+ public double getTemp();
- public double getInverseConductionCoefficient();
+ public double getInverseConductionCoefficient();
- public double getInsulationCoefficient(ForgeDirection side);
+ public double getInsulationCoefficient(ForgeDirection side);
- public void transferHeatTo(double heat);
+ public void transferHeatTo(double heat);
- public double[] simulateHeat();
+ public double[] simulateHeat();
- public double applyTemperatureChange();
+ public double applyTemperatureChange();
- public boolean canConnectHeat(ForgeDirection side);
+ public boolean canConnectHeat(ForgeDirection side);
- public IHeatTransfer getAdjacent(ForgeDirection side);
+ public IHeatTransfer getAdjacent(ForgeDirection side);
}
diff --git a/src/main/java/mekanism/api/IMekWrench.java b/src/main/java/mekanism/api/IMekWrench.java
index 6ac4b052e..4d080af7d 100644
--- a/src/main/java/mekanism/api/IMekWrench.java
+++ b/src/main/java/mekanism/api/IMekWrench.java
@@ -2,7 +2,6 @@ package mekanism.api;
import net.minecraft.entity.player.EntityPlayer;
-public interface IMekWrench
-{
- public boolean canUseWrench(EntityPlayer player, int x, int y, int z);
+public interface IMekWrench {
+ public boolean canUseWrench(EntityPlayer player, int x, int y, int z);
}
diff --git a/src/main/java/mekanism/api/ItemRetriever.java b/src/main/java/mekanism/api/ItemRetriever.java
index c2820f0bc..525df1033 100644
--- a/src/main/java/mekanism/api/ItemRetriever.java
+++ b/src/main/java/mekanism/api/ItemRetriever.java
@@ -10,103 +10,100 @@ import net.minecraft.item.ItemStack;
* @author AidanBrady
*
*/
-public final class ItemRetriever
-{
- /** The 'MekanismItems' class that items are retrieved from. */
- private static Class MekanismItems;
-
- /** The 'MekanismBlocks' class that blocks are retrieved from. */
- private static Class MekanismBlocks;
+public final class ItemRetriever {
+ /** The 'MekanismItems' class that items are retrieved from. */
+ private static Class MekanismItems;
- /**
- * Attempts to retrieve an ItemStack of an item with the declared identifier.
- *
- * Mekanism identifiers follow an easy-to-remember pattern. All identifiers
- * are identical to the String returned by 'getItemName().' None include spaces,
- * and all start with a capital letter. The name that shows up in-game can be
- * stripped down to identifier form by removing spaces and all non-alphabetic
- * characters (,./'=-_). Below is an example:
- *
- * ItemStack enrichedAlloy = ItemRetriever.getItem("EnrichedAlloy");
- *
- * Note that for items or blocks that have specific metadata you will need to create
- * a new ItemStack with that specified value, as this will only return an ItemStack
- * with the meta value '0.'
- *
- * Make sure you run this in or after FMLPostInitializationEvent runs, because most
- * items are registered when FMLInitializationEvent runs. However, some items ARE
- * registered later in order to hook into other mods. In a rare circumstance you may
- * have to add "after:Mekanism" in the @Mod 'dependencies' annotation.
- *
- * @param identifier - a String to be searched in the 'MekanismItems' class
- * @return an ItemStack of the declared identifier, otherwise null.
- */
- public static ItemStack getItem(String identifier)
- {
- try {
- if(MekanismItems == null)
- {
- MekanismItems = Class.forName("mekanism.common.MekanismItems");
- }
+ /** The 'MekanismBlocks' class that blocks are retrieved from. */
+ private static Class MekanismBlocks;
- Object ret = MekanismItems.getField(identifier).get(null);
+ /**
+ * Attempts to retrieve an ItemStack of an item with the declared identifier.
+ *
+ * Mekanism identifiers follow an easy-to-remember pattern. All identifiers
+ * are identical to the String returned by 'getItemName().' None include spaces,
+ * and all start with a capital letter. The name that shows up in-game can be
+ * stripped down to identifier form by removing spaces and all non-alphabetic
+ * characters (,./'=-_). Below is an example:
+ *
+ * ItemStack enrichedAlloy = ItemRetriever.getItem("EnrichedAlloy");
+ *
+ * Note that for items or blocks that have specific metadata you will need to create
+ * a new ItemStack with that specified value, as this will only return an ItemStack
+ * with the meta value '0.'
+ *
+ * Make sure you run this in or after FMLPostInitializationEvent runs, because most
+ * items are registered when FMLInitializationEvent runs. However, some items ARE
+ * registered later in order to hook into other mods. In a rare circumstance you may
+ * have to add "after:Mekanism" in the @Mod 'dependencies' annotation.
+ *
+ * @param identifier - a String to be searched in the 'MekanismItems' class
+ * @return an ItemStack of the declared identifier, otherwise null.
+ */
+ public static ItemStack getItem(String identifier) {
+ try {
+ if (MekanismItems == null) {
+ MekanismItems = Class.forName("mekanism.common.MekanismItems");
+ }
- if(ret instanceof Item)
- {
- return new ItemStack((Item)ret, 1);
- }
- else {
- return null;
- }
- } catch(Exception e) {
- System.err.println("Error retrieving item with identifier '" + identifier + "': " + e.getMessage());
- return null;
- }
- }
-
- /**
- * Attempts to retrieve an ItemStack of a block with the declared identifier.
- *
- * Mekanism identifiers follow an easy-to-remember pattern. All identifiers
- * are identical to the String returned by 'getItemName().' None include spaces,
- * and all start with a capital letter. The name that shows up in-game can be
- * stripped down to identifier form by removing spaces and all non-alphabetic
- * characters (,./'=-_). Below is an example:
- *
- * ItemStack enrichedAlloy = ItemRetriever.getItem("EnrichedAlloy");
- *
- * Note that for items or blocks that have specific metadata you will need to create
- * a new ItemStack with that specified value, as this will only return an ItemStack
- * with the meta value '0.'
- *
- * Make sure you run this in or after FMLPostInitializationEvent runs, because most
- * items are registered when FMLInitializationEvent runs. However, some items ARE
- * registered later in order to hook into other mods. In a rare circumstance you may
- * have to add "after:Mekanism" in the @Mod 'dependencies' annotation.
- *
- * @param identifier - a String to be searched in the 'MekanismBlocks' class
- * @return an ItemStack of the declared identifier, otherwise null.
- */
- public static ItemStack getBlock(String identifier)
- {
- try {
- if(MekanismBlocks == null)
- {
- MekanismBlocks = Class.forName("mekanism.common.MekanismBlocks");
- }
+ Object ret = MekanismItems.getField(identifier).get(null);
- Object ret = MekanismBlocks.getField(identifier).get(null);
+ if (ret instanceof Item) {
+ return new ItemStack((Item) ret, 1);
+ } else {
+ return null;
+ }
+ } catch (Exception e) {
+ System.err.println(
+ "Error retrieving item with identifier '" + identifier
+ + "': " + e.getMessage()
+ );
+ return null;
+ }
+ }
- if(ret instanceof Block)
- {
- return new ItemStack((Block)ret, 1);
- }
- else {
- return null;
- }
- } catch(Exception e) {
- System.err.println("Error retrieving block with identifier '" + identifier + "': " + e.getMessage());
- return null;
- }
- }
+ /**
+ * Attempts to retrieve an ItemStack of a block with the declared identifier.
+ *
+ * Mekanism identifiers follow an easy-to-remember pattern. All identifiers
+ * are identical to the String returned by 'getItemName().' None include spaces,
+ * and all start with a capital letter. The name that shows up in-game can be
+ * stripped down to identifier form by removing spaces and all non-alphabetic
+ * characters (,./'=-_). Below is an example:
+ *
+ * ItemStack enrichedAlloy = ItemRetriever.getItem("EnrichedAlloy");
+ *
+ * Note that for items or blocks that have specific metadata you will need to create
+ * a new ItemStack with that specified value, as this will only return an ItemStack
+ * with the meta value '0.'
+ *
+ * Make sure you run this in or after FMLPostInitializationEvent runs, because most
+ * items are registered when FMLInitializationEvent runs. However, some items ARE
+ * registered later in order to hook into other mods. In a rare circumstance you may
+ * have to add "after:Mekanism" in the @Mod 'dependencies' annotation.
+ *
+ * @param identifier - a String to be searched in the 'MekanismBlocks' class
+ * @return an ItemStack of the declared identifier, otherwise null.
+ */
+ public static ItemStack getBlock(String identifier) {
+ try {
+ if (MekanismBlocks == null) {
+ MekanismBlocks = Class.forName("mekanism.common.MekanismBlocks");
+ }
+
+ Object ret = MekanismBlocks.getField(identifier).get(null);
+
+ if (ret instanceof Block) {
+ return new ItemStack((Block) ret, 1);
+ } else {
+ return null;
+ }
+ } catch (Exception e) {
+ System.err.println(
+ "Error retrieving block with identifier '" + identifier
+ + "': " + e.getMessage()
+ );
+ return null;
+ }
+ }
}
diff --git a/src/main/java/mekanism/api/MekanismAPI.java b/src/main/java/mekanism/api/MekanismAPI.java
index 8594b6c44..6b57e6eaa 100644
--- a/src/main/java/mekanism/api/MekanismAPI.java
+++ b/src/main/java/mekanism/api/MekanismAPI.java
@@ -3,47 +3,42 @@ package mekanism.api;
import java.util.HashSet;
import java.util.Set;
+import cpw.mods.fml.common.eventhandler.Event;
import mekanism.api.util.BlockInfo;
import net.minecraft.block.Block;
import net.minecraft.item.Item;
import net.minecraftforge.oredict.OreDictionary;
-import cpw.mods.fml.common.eventhandler.Event;
-public class MekanismAPI
-{
- //Add a BlockInfo value here if you don't want a certain block to be picked up by cardboard boxes
- private static Set cardboardBoxIgnore = new HashSet();
-
- /** Mekanism debug mode */
- public static boolean debug = false;
+public class MekanismAPI {
+ //Add a BlockInfo value here if you don't want a certain block to be picked up by
+ //cardboard boxes
+ private static Set cardboardBoxIgnore = new HashSet();
- public static boolean isBlockCompatible(Item item, int meta)
- {
- for(BlockInfo i : cardboardBoxIgnore)
- {
- if(i.block == Block.getBlockFromItem(item) && (i.meta == OreDictionary.WILDCARD_VALUE || i.meta == meta))
- {
- return false;
- }
- }
+ /** Mekanism debug mode */
+ public static boolean debug = false;
- return true;
- }
+ public static boolean isBlockCompatible(Item item, int meta) {
+ for (BlockInfo i : cardboardBoxIgnore) {
+ if (i.block == Block.getBlockFromItem(item)
+ && (i.meta == OreDictionary.WILDCARD_VALUE || i.meta == meta)) {
+ return false;
+ }
+ }
- public static void addBoxBlacklist(Block block, int meta)
- {
- cardboardBoxIgnore.add(new BlockInfo(block, meta));
- }
+ return true;
+ }
- public static void removeBoxBlacklist(Block block, int meta)
- {
- cardboardBoxIgnore.remove(new BlockInfo(block, meta));
- }
+ public static void addBoxBlacklist(Block block, int meta) {
+ cardboardBoxIgnore.add(new BlockInfo(block, meta));
+ }
- public static Set getBoxIgnore()
- {
- return cardboardBoxIgnore;
- }
+ public static void removeBoxBlacklist(Block block, int meta) {
+ cardboardBoxIgnore.remove(new BlockInfo(block, meta));
+ }
- public static class BoxBlacklistEvent extends Event {}
+ public static Set getBoxIgnore() {
+ return cardboardBoxIgnore;
+ }
+
+ public static class BoxBlacklistEvent extends Event {}
}
diff --git a/src/main/java/mekanism/api/MekanismConfig.java b/src/main/java/mekanism/api/MekanismConfig.java
index 0edca9b8c..63742afd3 100644
--- a/src/main/java/mekanism/api/MekanismConfig.java
+++ b/src/main/java/mekanism/api/MekanismConfig.java
@@ -6,162 +6,153 @@ import java.util.Map;
import mekanism.api.util.UnitDisplayUtils.EnergyType;
import mekanism.api.util.UnitDisplayUtils.TempType;
-public class MekanismConfig
-{
- public static class general
- {
- public static boolean updateNotifications = true;
- public static boolean controlCircuitOreDict = true;
- public static boolean logPackets = false;
- public static boolean dynamicTankEasterEgg = false;
- public static boolean voiceServerEnabled = true;
- public static boolean cardboardSpawners = true;
- public static boolean enableWorldRegeneration = true;
- public static boolean spawnBabySkeletons = true;
- public static int obsidianTNTBlastRadius = 12;
- public static int osmiumPerChunk = 12;
- public static int copperPerChunk = 16;
- public static int tinPerChunk = 14;
- public static int saltPerChunk = 2;
- public static int obsidianTNTDelay = 100;
- public static int UPDATE_DELAY = 10;
- public static int VOICE_PORT = 36123;
- public static int maxUpgradeMultiplier = 10;
- public static int userWorldGenVersion = 0;
- public static double ENERGY_PER_REDSTONE = 10000;
- public static int ETHENE_BURN_TIME = 40;
- public static int METHANE_BURN_TIME = 10;
- public static double DISASSEMBLER_USAGE = 10;
- public static EnergyType energyUnit = EnergyType.J;
- public static TempType tempUnit = TempType.K;
- public static double TO_IC2;
- public static double TO_TE;
- public static double FROM_H2;
- public static double FROM_IC2;
- public static double FROM_TE;
- public static int laserRange;
- public static double laserEnergyNeededPerHardness;
- public static double minerSilkMultiplier = 6;
- public static boolean blacklistIC2;
- public static boolean blacklistRF;
- public static boolean destroyDisabledBlocks;
- public static boolean prefilledFluidTanks;
- public static boolean prefilledGasTanks;
- public static double armoredJetpackDamageRatio;
- public static int armoredJetpackDamageMax;
- public static boolean aestheticWorldDamage;
- public static boolean opsBypassRestrictions;
- public static double thermalEvaporationSpeed;
- public static int maxJetpackGas;
- public static int maxScubaGas;
- public static int maxFlamethrowerGas;
- public static int maxPumpRange;
- public static boolean pumpWaterSources;
- public static int maxPlenisherNodes;
- public static double evaporationHeatDissipation = 0.02;
- public static double evaporationTempMultiplier = 0.1;
- public static double evaporationSolarMultiplier = 0.2;
- public static double evaporationMaxTemp = 3000;
- public static double energyPerHeat = 1000;
- public static double maxEnergyPerSteam = 100;
- public static double superheatingHeatTransfer = 10000;
- public static double heatPerFuelTick = 4;
- public static boolean allowTransmitterAlloyUpgrade;
- public static boolean allowProtection = true;
- public static boolean EnableQuartzCompat;
- public static boolean EnableDiamondCompat;
- public static boolean EnablePoorOresCompat;
- public static boolean OreDictOsmium;
- public static boolean OreDictPlatinum;
- public static int elementizerFailChanceMultiplier;
- }
+public class MekanismConfig {
+ public static class general {
+ public static boolean updateNotifications = true;
+ public static boolean controlCircuitOreDict = true;
+ public static boolean logPackets = false;
+ public static boolean dynamicTankEasterEgg = false;
+ public static boolean voiceServerEnabled = true;
+ public static boolean cardboardSpawners = true;
+ public static boolean enableWorldRegeneration = true;
+ public static boolean spawnBabySkeletons = true;
+ public static int obsidianTNTBlastRadius = 12;
+ public static int osmiumPerChunk = 12;
+ public static int copperPerChunk = 16;
+ public static int tinPerChunk = 14;
+ public static int saltPerChunk = 2;
+ public static int obsidianTNTDelay = 100;
+ public static int UPDATE_DELAY = 10;
+ public static int VOICE_PORT = 36123;
+ public static int maxUpgradeMultiplier = 10;
+ public static int userWorldGenVersion = 0;
+ public static double ENERGY_PER_REDSTONE = 10000;
+ public static int ETHENE_BURN_TIME = 40;
+ public static int METHANE_BURN_TIME = 10;
+ public static double DISASSEMBLER_USAGE = 10;
+ public static EnergyType energyUnit = EnergyType.J;
+ public static TempType tempUnit = TempType.K;
+ public static double TO_IC2;
+ public static double TO_TE;
+ public static double FROM_H2;
+ public static double FROM_IC2;
+ public static double FROM_TE;
+ public static int laserRange;
+ public static double laserEnergyNeededPerHardness;
+ public static double minerSilkMultiplier = 6;
+ public static boolean blacklistIC2;
+ public static boolean blacklistRF;
+ public static boolean destroyDisabledBlocks;
+ public static boolean prefilledFluidTanks;
+ public static boolean prefilledGasTanks;
+ public static double armoredJetpackDamageRatio;
+ public static int armoredJetpackDamageMax;
+ public static boolean aestheticWorldDamage;
+ public static boolean opsBypassRestrictions;
+ public static double thermalEvaporationSpeed;
+ public static int maxJetpackGas;
+ public static int maxScubaGas;
+ public static int maxFlamethrowerGas;
+ public static int maxPumpRange;
+ public static boolean pumpWaterSources;
+ public static int maxPlenisherNodes;
+ public static double evaporationHeatDissipation = 0.02;
+ public static double evaporationTempMultiplier = 0.1;
+ public static double evaporationSolarMultiplier = 0.2;
+ public static double evaporationMaxTemp = 3000;
+ public static double energyPerHeat = 1000;
+ public static double maxEnergyPerSteam = 100;
+ public static double superheatingHeatTransfer = 10000;
+ public static double heatPerFuelTick = 4;
+ public static boolean allowTransmitterAlloyUpgrade;
+ public static boolean allowProtection = true;
+ public static boolean EnableQuartzCompat;
+ public static boolean EnableDiamondCompat;
+ public static boolean EnablePoorOresCompat;
+ public static boolean OreDictOsmium;
+ public static boolean OreDictPlatinum;
+ public static int elementizerFailChanceMultiplier;
+ }
- public static class client
- {
- public static boolean enablePlayerSounds = true;
- public static boolean enableMachineSounds = true;
- public static boolean holidays = true;
- public static float baseSoundVolume = 1F;
- public static boolean machineEffects = true;
- public static boolean oldTransmitterRender = false;
- public static boolean replaceSoundsWhenResuming = true;
- public static boolean renderCTM = true;
- public static boolean enableAmbientLighting;
- public static int ambientLightingLevel;
- public static boolean opaqueTransmitters = false;
- public static boolean doMultiblockSparkle = true;
- public static int multiblockSparkleIntensity = 6;
- }
-
- public static class machines
- {
- private static Map config = new HashMap();
-
- public static boolean isEnabled(String type)
- {
- return config.get(type) != null && config.get(type);
- }
-
- public static void setEntry(String type, boolean enabled)
- {
- config.put(type, enabled);
- }
- }
+ public static class client {
+ public static boolean enablePlayerSounds = true;
+ public static boolean enableMachineSounds = true;
+ public static boolean holidays = true;
+ public static float baseSoundVolume = 1F;
+ public static boolean machineEffects = true;
+ public static boolean oldTransmitterRender = false;
+ public static boolean replaceSoundsWhenResuming = true;
+ public static boolean renderCTM = true;
+ public static boolean enableAmbientLighting;
+ public static int ambientLightingLevel;
+ public static boolean opaqueTransmitters = false;
+ public static boolean doMultiblockSparkle = true;
+ public static int multiblockSparkleIntensity = 6;
+ }
- public static class usage
- {
- public static double enrichmentChamberUsage;
- public static double osmiumCompressorUsage;
- public static double combinerUsage;
- public static double crusherUsage;
- public static double factoryUsage;
- public static double metallurgicInfuserUsage;
- public static double purificationChamberUsage;
- public static double energizedSmelterUsage;
- public static double digitalMinerUsage;
- public static double electricPumpUsage;
- public static double rotaryCondensentratorUsage;
- public static double oxidationChamberUsage;
- public static double chemicalInfuserUsage;
- public static double chemicalInjectionChamberUsage;
- public static double precisionSawmillUsage;
- public static double chemicalDissolutionChamberUsage;
- public static double chemicalWasherUsage;
- public static double chemicalCrystallizerUsage;
- public static double seismicVibratorUsage;
- public static double pressurizedReactionBaseUsage;
- public static double fluidicPlenisherUsage;
- public static double laserUsage;
- public static double gasCentrifugeUsage;
- public static double heavyWaterElectrolysisUsage;
- public static double formulaicAssemblicatorUsage;
- }
+ public static class machines {
+ private static Map config = new HashMap();
- public static class generators
- {
- public static double advancedSolarGeneration;
- public static double bioGeneration;
- public static double heatGeneration;
- public static double heatGenerationLava;
- public static double heatGenerationNether;
- public static int heatGenerationFluidRate;
- public static boolean heatGenEnable;
- public static double solarGeneration;
+ public static boolean isEnabled(String type) {
+ return config.get(type) != null && config.get(type);
+ }
- public static double windGenerationMin;
- public static double windGenerationMax;
+ public static void setEntry(String type, boolean enabled) {
+ config.put(type, enabled);
+ }
+ }
- public static int windGenerationMinY;
- public static int windGenerationMaxY;
-
- public static int turbineBladesPerCoil;
- public static double turbineVentGasFlow;
- public static double turbineDisperserGasFlow;
- public static int condenserRate;
- }
+ public static class usage {
+ public static double enrichmentChamberUsage;
+ public static double osmiumCompressorUsage;
+ public static double combinerUsage;
+ public static double crusherUsage;
+ public static double factoryUsage;
+ public static double metallurgicInfuserUsage;
+ public static double purificationChamberUsage;
+ public static double energizedSmelterUsage;
+ public static double digitalMinerUsage;
+ public static double electricPumpUsage;
+ public static double rotaryCondensentratorUsage;
+ public static double oxidationChamberUsage;
+ public static double chemicalInfuserUsage;
+ public static double chemicalInjectionChamberUsage;
+ public static double precisionSawmillUsage;
+ public static double chemicalDissolutionChamberUsage;
+ public static double chemicalWasherUsage;
+ public static double chemicalCrystallizerUsage;
+ public static double seismicVibratorUsage;
+ public static double pressurizedReactionBaseUsage;
+ public static double fluidicPlenisherUsage;
+ public static double laserUsage;
+ public static double gasCentrifugeUsage;
+ public static double heavyWaterElectrolysisUsage;
+ public static double formulaicAssemblicatorUsage;
+ }
- public static class tools
- {
- public static double armorSpawnRate;
- }
+ public static class generators {
+ public static double advancedSolarGeneration;
+ public static double bioGeneration;
+ public static double heatGeneration;
+ public static double heatGenerationLava;
+ public static double heatGenerationNether;
+ public static int heatGenerationFluidRate;
+ public static boolean heatGenEnable;
+ public static double solarGeneration;
+
+ public static double windGenerationMin;
+ public static double windGenerationMax;
+
+ public static int windGenerationMinY;
+ public static int windGenerationMaxY;
+
+ public static int turbineBladesPerCoil;
+ public static double turbineVentGasFlow;
+ public static double turbineDisperserGasFlow;
+ public static int condenserRate;
+ }
+
+ public static class tools {
+ public static double armorSpawnRate;
+ }
}
diff --git a/src/main/java/mekanism/api/Pos3D.java b/src/main/java/mekanism/api/Pos3D.java
index 75f83a048..96068418b 100644
--- a/src/main/java/mekanism/api/Pos3D.java
+++ b/src/main/java/mekanism/api/Pos3D.java
@@ -14,228 +14,213 @@ import net.minecraftforge.common.util.ForgeDirection;
* @author aidancbrady
*
*/
-public class Pos3D
-{
- public double xPos;
- public double yPos;
- public double zPos;
+public class Pos3D {
+ public double xPos;
+ public double yPos;
+ public double zPos;
- public Pos3D()
- {
- this(0, 0, 0);
- }
-
- public Pos3D(Vec3 vec)
- {
- xPos = vec.xCoord;
- yPos = vec.yCoord;
- zPos = vec.zCoord;
- }
-
- public Pos3D(MovingObjectPosition mop)
- {
- xPos = mop.blockX;
- yPos = mop.blockY;
- zPos = mop.blockZ;
- }
+ public Pos3D() {
+ this(0, 0, 0);
+ }
- public Pos3D(double x, double y, double z)
- {
- xPos = x;
- yPos = y;
- zPos = z;
- }
-
- public Pos3D(Coord4D coord)
- {
- xPos = coord.xCoord;
- yPos = coord.yCoord;
- zPos = coord.zCoord;
- }
+ public Pos3D(Vec3 vec) {
+ xPos = vec.xCoord;
+ yPos = vec.yCoord;
+ zPos = vec.zCoord;
+ }
- /**
- * Creates a Pos3D with an entity's posX, posY, and posZ values.
- * @param entity - entity to create the Pos3D from
- */
- public Pos3D(Entity entity)
- {
- this(entity.posX, entity.posY, entity.posZ);
- }
+ public Pos3D(MovingObjectPosition mop) {
+ xPos = mop.blockX;
+ yPos = mop.blockY;
+ zPos = mop.blockZ;
+ }
- /**
- * Creates a Pos3D with a TileEntity's xCoord, yCoord and zCoord values.
- * @param tileEntity - TileEntity to create the Pos3D from
- */
- public Pos3D(TileEntity tileEntity)
- {
- this(tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord);
- }
-
- /**
- * Returns a new Pos3D from a tag compound.
- * @param tag - tag compound to read from
- * @return the Pos3D from the tag compound
- */
- public static Pos3D read(NBTTagCompound tag)
- {
+ public Pos3D(double x, double y, double z) {
+ xPos = x;
+ yPos = y;
+ zPos = z;
+ }
+
+ public Pos3D(Coord4D coord) {
+ xPos = coord.xCoord;
+ yPos = coord.yCoord;
+ zPos = coord.zCoord;
+ }
+
+ /**
+ * Creates a Pos3D with an entity's posX, posY, and posZ values.
+ * @param entity - entity to create the Pos3D from
+ */
+ public Pos3D(Entity entity) {
+ this(entity.posX, entity.posY, entity.posZ);
+ }
+
+ /**
+ * Creates a Pos3D with a TileEntity's xCoord, yCoord and zCoord values.
+ * @param tileEntity - TileEntity to create the Pos3D from
+ */
+ public Pos3D(TileEntity tileEntity) {
+ this(tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord);
+ }
+
+ /**
+ * Returns a new Pos3D from a tag compound.
+ * @param tag - tag compound to read from
+ * @return the Pos3D from the tag compound
+ */
+ public static Pos3D read(NBTTagCompound tag) {
return new Pos3D(tag.getDouble("x"), tag.getDouble("y"), tag.getDouble("z"));
}
-
+
/**
- * Writes this Pos3D's data to an NBTTagCompound.
- * @param nbtTags - tag compound to write to
- * @return the tag compound with this Pos3D's data
- */
- public NBTTagCompound write(NBTTagCompound nbtTags)
- {
- nbtTags.setDouble("x", xPos);
- nbtTags.setDouble("y", yPos);
- nbtTags.setDouble("z", zPos);
+ * Writes this Pos3D's data to an NBTTagCompound.
+ * @param nbtTags - tag compound to write to
+ * @return the tag compound with this Pos3D's data
+ */
+ public NBTTagCompound write(NBTTagCompound nbtTags) {
+ nbtTags.setDouble("x", xPos);
+ nbtTags.setDouble("y", yPos);
+ nbtTags.setDouble("z", zPos);
- return nbtTags;
- }
+ return nbtTags;
+ }
- /**
- * Creates and returns a Pos3D with values representing the difference between this and the Pos3D in the parameters.
- * @param pos - Pos3D to subtract
- * @return difference of the two Pos3Ds
- */
- public Pos3D diff(Pos3D pos)
- {
- return new Pos3D(xPos-pos.xPos, yPos-pos.yPos, zPos-pos.zPos);
- }
+ /**
+ * Creates and returns a Pos3D with values representing the difference between this
+ * and the Pos3D in the parameters.
+ * @param pos - Pos3D to subtract
+ * @return difference of the two Pos3Ds
+ */
+ public Pos3D diff(Pos3D pos) {
+ return new Pos3D(xPos - pos.xPos, yPos - pos.yPos, zPos - pos.zPos);
+ }
- /**
- * Creates a new Pos3D from the motion of an entity.
- * @param entity
- * @return Pos3D representing the motion of the given entity
- */
- public static Pos3D fromMotion(Entity entity)
- {
- return new Pos3D(entity.motionX, entity.motionY, entity.motionZ);
- }
+ /**
+ * Creates a new Pos3D from the motion of an entity.
+ * @param entity
+ * @return Pos3D representing the motion of the given entity
+ */
+ public static Pos3D fromMotion(Entity entity) {
+ return new Pos3D(entity.motionX, entity.motionY, entity.motionZ);
+ }
/**
* Creates a new Coord4D representing this Pos3D in the provided dimension.
* @param dimensionId - the dimension this Pos3D is in
* @return Coord4D representing this Pos3D
*/
- public Coord4D getCoord(int dimensionId)
- {
- return new Coord4D((int)xPos, (int)yPos, (int)zPos, dimensionId);
+ public Coord4D getCoord(int dimensionId) {
+ return new Coord4D((int) xPos, (int) yPos, (int) zPos, dimensionId);
}
- /**
- * Centres a block-derived Pos3D
- */
- public Pos3D centre()
- {
- return translate(0.5, 0.5, 0.5);
- }
+ /**
+ * Centres a block-derived Pos3D
+ */
+ public Pos3D centre() {
+ return translate(0.5, 0.5, 0.5);
+ }
- /**
- * Translates this Pos3D by the defined values.
- * @param x - amount to translate on the x axis
- * @param y - amount to translate on the y axis
- * @param z - amount to translate on the z axis
- * @return the translated Pos3D
- */
- public Pos3D translate(double x, double y, double z)
- {
- xPos += x;
- yPos += y;
- zPos += z;
+ /**
+ * Translates this Pos3D by the defined values.
+ * @param x - amount to translate on the x axis
+ * @param y - amount to translate on the y axis
+ * @param z - amount to translate on the z axis
+ * @return the translated Pos3D
+ */
+ public Pos3D translate(double x, double y, double z) {
+ xPos += x;
+ yPos += y;
+ zPos += z;
- return this;
- }
+ return this;
+ }
- /**
- * Performs the same operation as translate(x, y, z), but with a Pos3D value instead.
- * @param pos - Pos3D value to translate by
- * @return translated Pos3D
- */
- public Pos3D translate(Pos3D pos)
- {
- return translate(pos.xPos, pos.yPos, pos.zPos);
- }
+ /**
+ * Performs the same operation as translate(x, y, z), but with a Pos3D value instead.
+ * @param pos - Pos3D value to translate by
+ * @return translated Pos3D
+ */
+ public Pos3D translate(Pos3D pos) {
+ return translate(pos.xPos, pos.yPos, pos.zPos);
+ }
- /**
- * Performs the same operation as translate(x, y, z), but by a set amount in a ForgeDirection
- */
- public Pos3D translate(ForgeDirection direction, double amount)
- {
- return translate(direction.offsetX * amount, direction.offsetY * amount, direction.offsetZ * amount);
- }
+ /**
+ * Performs the same operation as translate(x, y, z), but by a set amount in a
+ * ForgeDirection
+ */
+ public Pos3D translate(ForgeDirection direction, double amount) {
+ return translate(
+ direction.offsetX * amount,
+ direction.offsetY * amount,
+ direction.offsetZ * amount
+ );
+ }
- /**
- * Performs the same operation as translate(x, y, z), but by a set amount in a ForgeDirection
- */
- public Pos3D translateExcludingSide(ForgeDirection direction, double amount)
- {
- if(direction.offsetX == 0) xPos += amount;
- if(direction.offsetY == 0) yPos += amount;
- if(direction.offsetZ == 0) zPos += amount;
+ /**
+ * Performs the same operation as translate(x, y, z), but by a set amount in a
+ * ForgeDirection
+ */
+ public Pos3D translateExcludingSide(ForgeDirection direction, double amount) {
+ if (direction.offsetX == 0)
+ xPos += amount;
+ if (direction.offsetY == 0)
+ yPos += amount;
+ if (direction.offsetZ == 0)
+ zPos += amount;
- return this;
- }
+ return this;
+ }
- /**
- * Returns the distance between this and the defined Pos3D.
- * @param pos - the Pos3D to find the distance to
- * @return the distance between this and the defined Pos3D
- */
- public double distance(Pos3D pos)
- {
- double subX = xPos - pos.xPos;
- double subY = yPos - pos.yPos;
- double subZ = zPos - pos.zPos;
- return MathHelper.sqrt_double(subX * subX + subY * subY + subZ * subZ);
- }
+ /**
+ * Returns the distance between this and the defined Pos3D.
+ * @param pos - the Pos3D to find the distance to
+ * @return the distance between this and the defined Pos3D
+ */
+ public double distance(Pos3D pos) {
+ double subX = xPos - pos.xPos;
+ double subY = yPos - pos.yPos;
+ double subZ = zPos - pos.zPos;
+ return MathHelper.sqrt_double(subX * subX + subY * subY + subZ * subZ);
+ }
- /**
- * Rotates this Pos3D by the defined yaw value.
- * @param yaw - yaw to rotate by
- * @return rotated Pos3D
- */
- public Pos3D rotateYaw(double yaw)
- {
- double yawRadians = Math.toRadians(yaw);
+ /**
+ * Rotates this Pos3D by the defined yaw value.
+ * @param yaw - yaw to rotate by
+ * @return rotated Pos3D
+ */
+ public Pos3D rotateYaw(double yaw) {
+ double yawRadians = Math.toRadians(yaw);
- double x = xPos;
- double z = zPos;
+ double x = xPos;
+ double z = zPos;
- if(yaw != 0)
- {
- xPos = x * Math.cos(yawRadians) - z * Math.sin(yawRadians);
- zPos = z * Math.cos(yawRadians) + x * Math.sin(yawRadians);
- }
+ if (yaw != 0) {
+ xPos = x * Math.cos(yawRadians) - z * Math.sin(yawRadians);
+ zPos = z * Math.cos(yawRadians) + x * Math.sin(yawRadians);
+ }
- return this;
- }
-
- public Pos3D rotatePitch(double pitch)
- {
- double pitchRadians = Math.toRadians(pitch);
-
- double y = yPos;
- double z = zPos;
-
- if(pitch != 0)
- {
- yPos = y * Math.cos(pitchRadians) - z * Math.sin(pitchRadians);
- zPos = z * Math.cos(pitchRadians) + y * Math.sin(pitchRadians);
- }
-
- return this;
- }
-
- public Pos3D rotate(double yaw, double pitch)
- {
- return rotate(yaw, pitch, 0);
- }
+ return this;
+ }
- public Pos3D rotate(double yaw, double pitch, double roll)
- {
+ public Pos3D rotatePitch(double pitch) {
+ double pitchRadians = Math.toRadians(pitch);
+
+ double y = yPos;
+ double z = zPos;
+
+ if (pitch != 0) {
+ yPos = y * Math.cos(pitchRadians) - z * Math.sin(pitchRadians);
+ zPos = z * Math.cos(pitchRadians) + y * Math.sin(pitchRadians);
+ }
+
+ return this;
+ }
+
+ public Pos3D rotate(double yaw, double pitch) {
+ return rotate(yaw, pitch, 0);
+ }
+
+ public Pos3D rotate(double yaw, double pitch, double roll) {
double yawRadians = Math.toRadians(yaw);
double pitchRadians = Math.toRadians(pitch);
double rollRadians = Math.toRadians(roll);
@@ -244,215 +229,206 @@ public class Pos3D
double y = yPos;
double z = zPos;
- xPos = x * Math.cos(yawRadians) * Math.cos(pitchRadians) + z * (Math.cos(yawRadians) * Math.sin(pitchRadians) * Math.sin(rollRadians) - Math.sin(yawRadians) * Math.cos(rollRadians)) + y * (Math.cos(yawRadians) * Math.sin(pitchRadians) * Math.cos(rollRadians) + Math.sin(yawRadians) * Math.sin(rollRadians));
- zPos = x * Math.sin(yawRadians) * Math.cos(pitchRadians) + z * (Math.sin(yawRadians) * Math.sin(pitchRadians) * Math.sin(rollRadians) + Math.cos(yawRadians) * Math.cos(rollRadians)) + y * (Math.sin(yawRadians) * Math.sin(pitchRadians) * Math.cos(rollRadians) - Math.cos(yawRadians) * Math.sin(rollRadians));
- yPos = -x * Math.sin(pitchRadians) + z * Math.cos(pitchRadians) * Math.sin(rollRadians) + y * Math.cos(pitchRadians) * Math.cos(rollRadians);
-
+ xPos = x * Math.cos(yawRadians) * Math.cos(pitchRadians)
+ + z
+ * (Math.cos(yawRadians) * Math.sin(pitchRadians) * Math.sin(rollRadians)
+ - Math.sin(yawRadians) * Math.cos(rollRadians))
+ + y
+ * (Math.cos(yawRadians) * Math.sin(pitchRadians) * Math.cos(rollRadians)
+ + Math.sin(yawRadians) * Math.sin(rollRadians));
+ zPos = x * Math.sin(yawRadians) * Math.cos(pitchRadians)
+ + z
+ * (Math.sin(yawRadians) * Math.sin(pitchRadians) * Math.sin(rollRadians)
+ + Math.cos(yawRadians) * Math.cos(rollRadians))
+ + y
+ * (Math.sin(yawRadians) * Math.sin(pitchRadians) * Math.cos(rollRadians)
+ - Math.cos(yawRadians) * Math.sin(rollRadians));
+ yPos = -x * Math.sin(pitchRadians)
+ + z * Math.cos(pitchRadians) * Math.sin(rollRadians)
+ + y * Math.cos(pitchRadians) * Math.cos(rollRadians);
+
return this;
}
-
- public Pos3D multiply(Pos3D pos)
- {
- xPos *= pos.xPos;
- yPos *= pos.yPos;
- zPos *= pos.zPos;
-
- return this;
- }
- /**
- * Scales this Pos3D by the defined x, y, an z values.
- * @param x - x value to scale by
- * @param y - y value to scale by
- * @param z - z value to scale by
- * @return scaled Pos3D
- */
- public Pos3D scale(double x, double y, double z)
- {
- xPos *= x;
- yPos *= y;
- zPos *= z;
+ public Pos3D multiply(Pos3D pos) {
+ xPos *= pos.xPos;
+ yPos *= pos.yPos;
+ zPos *= pos.zPos;
- return this;
- }
+ return this;
+ }
- /**
- * Performs the same operation as scale(x, y, z), but with a value representing all three dimensions.
- * @param scale - value to scale by
- * @return scaled Pos3D
- */
- public Pos3D scale(double scale)
- {
- return scale(scale, scale, scale);
- }
-
- public Pos3D rotate(float angle, Pos3D axis)
- {
- return translateMatrix(getRotationMatrix(angle, axis), this);
- }
+ /**
+ * Scales this Pos3D by the defined x, y, an z values.
+ * @param x - x value to scale by
+ * @param y - y value to scale by
+ * @param z - z value to scale by
+ * @return scaled Pos3D
+ */
+ public Pos3D scale(double x, double y, double z) {
+ xPos *= x;
+ yPos *= y;
+ zPos *= z;
- public double[] getRotationMatrix(float angle)
- {
- double[] matrix = new double[16];
- Pos3D axis = clone().normalize();
-
- double x = axis.xPos;
- double y = axis.yPos;
- double z = axis.zPos;
-
- angle *= 0.0174532925D;
-
- float cos = (float)Math.cos(angle);
- float ocos = 1.0F - cos;
- float sin = (float)Math.sin(angle);
-
- matrix[0] = (x * x * ocos + cos);
- matrix[1] = (y * x * ocos + z * sin);
- matrix[2] = (x * z * ocos - y * sin);
- matrix[4] = (x * y * ocos - z * sin);
- matrix[5] = (y * y * ocos + cos);
- matrix[6] = (y * z * ocos + x * sin);
- matrix[8] = (x * z * ocos + y * sin);
- matrix[9] = (y * z * ocos - x * sin);
- matrix[10] = (z * z * ocos + cos);
- matrix[15] = 1.0F;
-
- return matrix;
- }
+ return this;
+ }
- public static Pos3D translateMatrix(double[] matrix, Pos3D translation)
- {
- double x = translation.xPos * matrix[0] + translation.yPos * matrix[1] + translation.zPos * matrix[2] + matrix[3];
- double y = translation.xPos * matrix[4] + translation.yPos * matrix[5] + translation.zPos * matrix[6] + matrix[7];
- double z = translation.xPos * matrix[8] + translation.yPos * matrix[9] + translation.zPos * matrix[10] + matrix[11];
-
- translation.xPos = x;
- translation.yPos = y;
- translation.zPos = z;
-
- return translation;
- }
+ /**
+ * Performs the same operation as scale(x, y, z), but with a value representing all
+ * three dimensions.
+ * @param scale - value to scale by
+ * @return scaled Pos3D
+ */
+ public Pos3D scale(double scale) {
+ return scale(scale, scale, scale);
+ }
- public static double[] getRotationMatrix(float angle, Pos3D axis)
- {
- return axis.getRotationMatrix(angle);
- }
-
- public double anglePreNorm(Pos3D pos2)
- {
- return Math.acos(dotProduct(pos2));
- }
+ public Pos3D rotate(float angle, Pos3D axis) {
+ return translateMatrix(getRotationMatrix(angle, axis), this);
+ }
- public static double anglePreNorm(Pos3D pos1, Pos3D pos2)
- {
- return Math.acos(pos1.clone().dotProduct(pos2));
- }
-
- public double dotProduct(Pos3D pos)
- {
- return xPos * pos.xPos + yPos * pos.yPos + zPos * pos.zPos;
- }
-
- public Pos3D crossProduct(Pos3D compare)
- {
- return clone().toCrossProduct(compare);
- }
-
- public Pos3D toCrossProduct(Pos3D compare)
- {
- double newX = yPos * compare.zPos - zPos * compare.yPos;
- double newY = zPos * compare.xPos - xPos * compare.zPos;
- double newZ = xPos * compare.yPos - yPos * compare.xPos;
-
- xPos = newX;
- yPos = newY;
- zPos = newZ;
-
- return this;
- }
+ public double[] getRotationMatrix(float angle) {
+ double[] matrix = new double[16];
+ Pos3D axis = clone().normalize();
- public Pos3D xCrossProduct()
- {
- return new Pos3D(0.0D, zPos, -yPos);
- }
+ double x = axis.xPos;
+ double y = axis.yPos;
+ double z = axis.zPos;
- public Pos3D zCrossProduct()
- {
- return new Pos3D(-yPos, xPos, 0.0D);
- }
-
- public Pos3D getPerpendicular()
- {
- if(zPos == 0)
- {
- return zCrossProduct();
- }
+ angle *= 0.0174532925D;
- return xCrossProduct();
- }
-
- public Pos3D floor()
- {
- return new Pos3D(Math.floor(xPos), Math.floor(yPos), Math.floor(zPos));
- }
+ float cos = (float) Math.cos(angle);
+ float ocos = 1.0F - cos;
+ float sin = (float) Math.sin(angle);
- public double getMagnitude()
- {
+ matrix[0] = (x * x * ocos + cos);
+ matrix[1] = (y * x * ocos + z * sin);
+ matrix[2] = (x * z * ocos - y * sin);
+ matrix[4] = (x * y * ocos - z * sin);
+ matrix[5] = (y * y * ocos + cos);
+ matrix[6] = (y * z * ocos + x * sin);
+ matrix[8] = (x * z * ocos + y * sin);
+ matrix[9] = (y * z * ocos - x * sin);
+ matrix[10] = (z * z * ocos + cos);
+ matrix[15] = 1.0F;
+
+ return matrix;
+ }
+
+ public static Pos3D translateMatrix(double[] matrix, Pos3D translation) {
+ double x = translation.xPos * matrix[0] + translation.yPos * matrix[1]
+ + translation.zPos * matrix[2] + matrix[3];
+ double y = translation.xPos * matrix[4] + translation.yPos * matrix[5]
+ + translation.zPos * matrix[6] + matrix[7];
+ double z = translation.xPos * matrix[8] + translation.yPos * matrix[9]
+ + translation.zPos * matrix[10] + matrix[11];
+
+ translation.xPos = x;
+ translation.yPos = y;
+ translation.zPos = z;
+
+ return translation;
+ }
+
+ public static double[] getRotationMatrix(float angle, Pos3D axis) {
+ return axis.getRotationMatrix(angle);
+ }
+
+ public double anglePreNorm(Pos3D pos2) {
+ return Math.acos(dotProduct(pos2));
+ }
+
+ public static double anglePreNorm(Pos3D pos1, Pos3D pos2) {
+ return Math.acos(pos1.clone().dotProduct(pos2));
+ }
+
+ public double dotProduct(Pos3D pos) {
+ return xPos * pos.xPos + yPos * pos.yPos + zPos * pos.zPos;
+ }
+
+ public Pos3D crossProduct(Pos3D compare) {
+ return clone().toCrossProduct(compare);
+ }
+
+ public Pos3D toCrossProduct(Pos3D compare) {
+ double newX = yPos * compare.zPos - zPos * compare.yPos;
+ double newY = zPos * compare.xPos - xPos * compare.zPos;
+ double newZ = xPos * compare.yPos - yPos * compare.xPos;
+
+ xPos = newX;
+ yPos = newY;
+ zPos = newZ;
+
+ return this;
+ }
+
+ public Pos3D xCrossProduct() {
+ return new Pos3D(0.0D, zPos, -yPos);
+ }
+
+ public Pos3D zCrossProduct() {
+ return new Pos3D(-yPos, xPos, 0.0D);
+ }
+
+ public Pos3D getPerpendicular() {
+ if (zPos == 0) {
+ return zCrossProduct();
+ }
+
+ return xCrossProduct();
+ }
+
+ public Pos3D floor() {
+ return new Pos3D(Math.floor(xPos), Math.floor(yPos), Math.floor(zPos));
+ }
+
+ public double getMagnitude() {
return Math.sqrt(xPos * xPos + yPos * yPos + zPos * zPos);
}
- public Pos3D normalize()
- {
+ public Pos3D normalize() {
double d = getMagnitude();
- if (d != 0)
- {
+ if (d != 0) {
this.scale(1 / d);
}
return this;
}
- public static AxisAlignedBB getAABB(Pos3D pos1, Pos3D pos2)
- {
- return AxisAlignedBB.getBoundingBox(
- Math.min(pos1.xPos, pos2.xPos),
- Math.min(pos1.yPos, pos2.yPos),
- Math.min(pos1.zPos, pos2.zPos),
- Math.max(pos1.xPos, pos2.xPos),
- Math.max(pos1.yPos, pos2.yPos),
- Math.max(pos1.zPos, pos2.zPos)
- );
- }
+ public static AxisAlignedBB getAABB(Pos3D pos1, Pos3D pos2) {
+ return AxisAlignedBB.getBoundingBox(
+ Math.min(pos1.xPos, pos2.xPos),
+ Math.min(pos1.yPos, pos2.yPos),
+ Math.min(pos1.zPos, pos2.zPos),
+ Math.max(pos1.xPos, pos2.xPos),
+ Math.max(pos1.yPos, pos2.yPos),
+ Math.max(pos1.zPos, pos2.zPos)
+ );
+ }
- @Override
- public Pos3D clone()
- {
- return new Pos3D(xPos, yPos, zPos);
- }
+ @Override
+ public Pos3D clone() {
+ return new Pos3D(xPos, yPos, zPos);
+ }
- @Override
- public String toString()
- {
- return "[Pos3D: " + xPos + ", " + yPos + ", " + zPos + "]";
- }
+ @Override
+ public String toString() {
+ return "[Pos3D: " + xPos + ", " + yPos + ", " + zPos + "]";
+ }
- @Override
- public boolean equals(Object obj)
- {
- return obj instanceof Pos3D &&
- ((Pos3D)obj).xPos == xPos &&
- ((Pos3D)obj).yPos == yPos &&
- ((Pos3D)obj).zPos == zPos;
- }
+ @Override
+ public boolean equals(Object obj) {
+ return obj instanceof Pos3D && ((Pos3D) obj).xPos == xPos
+ && ((Pos3D) obj).yPos == yPos && ((Pos3D) obj).zPos == zPos;
+ }
- @Override
- public int hashCode()
- {
- int code = 1;
- code = 31 * code + new Double(xPos).hashCode();
- code = 31 * code + new Double(yPos).hashCode();
- code = 31 * code + new Double(zPos).hashCode();
- return code;
- }
+ @Override
+ public int hashCode() {
+ int code = 1;
+ code = 31 * code + new Double(xPos).hashCode();
+ code = 31 * code + new Double(yPos).hashCode();
+ code = 31 * code + new Double(zPos).hashCode();
+ return code;
+ }
}
diff --git a/src/main/java/mekanism/api/Range4D.java b/src/main/java/mekanism/api/Range4D.java
index 40905a66d..274de560f 100644
--- a/src/main/java/mekanism/api/Range4D.java
+++ b/src/main/java/mekanism/api/Range4D.java
@@ -1,114 +1,107 @@
package mekanism.api;
-import net.minecraft.entity.player.EntityPlayer;
import cpw.mods.fml.common.FMLCommonHandler;
+import net.minecraft.entity.player.EntityPlayer;
-public class Range4D
-{
- public int dimensionId;
-
- public int xMin;
- public int yMin;
- public int zMin;
- public int xMax;
- public int yMax;
- public int zMax;
-
- public Range4D(int minX, int minY, int minZ, int maxX, int maxY, int maxZ, int dimension)
- {
- xMin = minX;
- yMin = minY;
- zMin = minZ;
- xMax = maxX;
- yMax = maxY;
- zMax = maxZ;
-
- dimensionId = dimension;
- }
-
- public Range4D(Chunk3D chunk)
- {
- xMin = chunk.xCoord*16;
- yMin = 0;
- zMin = chunk.zCoord*16;
- xMax = xMin+16;
- yMax = 255;
- zMax = zMin+16;
-
- dimensionId = chunk.dimensionId;
- }
-
- public Range4D(Coord4D coord)
- {
- xMin = coord.xCoord;
- yMin = coord.yCoord;
- zMin = coord.zCoord;
-
- xMax = coord.xCoord+1;
- yMax = coord.yCoord+1;
- zMax = coord.zCoord+1;
-
- dimensionId = coord.dimensionId;
- }
-
- public static Range4D getChunkRange(EntityPlayer player)
- {
- int radius = FMLCommonHandler.instance().getMinecraftServerInstance().getConfigurationManager().getViewDistance();
-
- return new Range4D(new Chunk3D(player)).expandChunks(radius);
- }
-
- public Range4D expandChunks(int chunks)
- {
- xMin -= chunks*16;
- xMax += chunks*16;
- zMin -= chunks*16;
- zMax += chunks*16;
-
- return this;
- }
-
- public boolean intersects(Range4D range)
- {
- return (xMax+1 - 1.E-05D > range.xMin) && (range.xMax+1 - 1.E-05D > xMin) && (yMax+1 - 1.E-05D > range.yMin) && (range.yMax+1 - 1.E-05D > yMin) && (zMax+1 - 1.E-05D > range.zMin) && (range.zMax+1 - 1.E-05D > zMin);
- }
-
- @Override
- public Range4D clone()
- {
- return new Range4D(xMin, yMin, zMin, xMax, yMax, zMax, dimensionId);
- }
+public class Range4D {
+ public int dimensionId;
- @Override
- public String toString()
- {
- return "[Range4D: " + xMin + ", " + yMin + ", " + zMin + ", " + xMax + ", " + yMax + ", " + zMax + ", dim=" + dimensionId + "]";
- }
+ public int xMin;
+ public int yMin;
+ public int zMin;
+ public int xMax;
+ public int yMax;
+ public int zMax;
- @Override
- public boolean equals(Object obj)
- {
- return obj instanceof Range4D &&
- ((Range4D)obj).xMin == xMin &&
- ((Range4D)obj).yMin == yMin &&
- ((Range4D)obj).zMin == zMin &&
- ((Range4D)obj).xMax == xMax &&
- ((Range4D)obj).yMax == yMax &&
- ((Range4D)obj).zMax == zMax &&
- ((Range4D)obj).dimensionId == dimensionId;
- }
+ public Range4D(
+ int minX, int minY, int minZ, int maxX, int maxY, int maxZ, int dimension
+ ) {
+ xMin = minX;
+ yMin = minY;
+ zMin = minZ;
+ xMax = maxX;
+ yMax = maxY;
+ zMax = maxZ;
- @Override
- public int hashCode()
- {
- int code = 1;
- code = 31 * code + xMin;
- code = 31 * code + yMin;
- code = 31 * code + zMin;
- code = 31 * code + xMax;
- code = 31 * code + yMax;
- code = 31 * code + zMax;
- code = 31 * code + dimensionId;
- return code;
- }
+ dimensionId = dimension;
+ }
+
+ public Range4D(Chunk3D chunk) {
+ xMin = chunk.xCoord * 16;
+ yMin = 0;
+ zMin = chunk.zCoord * 16;
+ xMax = xMin + 16;
+ yMax = 255;
+ zMax = zMin + 16;
+
+ dimensionId = chunk.dimensionId;
+ }
+
+ public Range4D(Coord4D coord) {
+ xMin = coord.xCoord;
+ yMin = coord.yCoord;
+ zMin = coord.zCoord;
+
+ xMax = coord.xCoord + 1;
+ yMax = coord.yCoord + 1;
+ zMax = coord.zCoord + 1;
+
+ dimensionId = coord.dimensionId;
+ }
+
+ public static Range4D getChunkRange(EntityPlayer player) {
+ int radius = FMLCommonHandler.instance()
+ .getMinecraftServerInstance()
+ .getConfigurationManager()
+ .getViewDistance();
+
+ return new Range4D(new Chunk3D(player)).expandChunks(radius);
+ }
+
+ public Range4D expandChunks(int chunks) {
+ xMin -= chunks * 16;
+ xMax += chunks * 16;
+ zMin -= chunks * 16;
+ zMax += chunks * 16;
+
+ return this;
+ }
+
+ public boolean intersects(Range4D range) {
+ return (xMax + 1 - 1.E-05D > range.xMin) && (range.xMax + 1 - 1.E-05D > xMin)
+ && (yMax + 1 - 1.E-05D > range.yMin) && (range.yMax + 1 - 1.E-05D > yMin)
+ && (zMax + 1 - 1.E-05D > range.zMin) && (range.zMax + 1 - 1.E-05D > zMin);
+ }
+
+ @Override
+ public Range4D clone() {
+ return new Range4D(xMin, yMin, zMin, xMax, yMax, zMax, dimensionId);
+ }
+
+ @Override
+ public String toString() {
+ return "[Range4D: " + xMin + ", " + yMin + ", " + zMin + ", " + xMax + ", " + yMax
+ + ", " + zMax + ", dim=" + dimensionId + "]";
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ return obj instanceof Range4D && ((Range4D) obj).xMin == xMin
+ && ((Range4D) obj).yMin == yMin && ((Range4D) obj).zMin == zMin
+ && ((Range4D) obj).xMax == xMax && ((Range4D) obj).yMax == yMax
+ && ((Range4D) obj).zMax == zMax && ((Range4D) obj).dimensionId == dimensionId;
+ }
+
+ @Override
+ public int hashCode() {
+ int code = 1;
+ code = 31 * code + xMin;
+ code = 31 * code + yMin;
+ code = 31 * code + zMin;
+ code = 31 * code + xMax;
+ code = 31 * code + yMax;
+ code = 31 * code + zMax;
+ code = 31 * code + dimensionId;
+ return code;
+ }
}
diff --git a/src/main/java/mekanism/api/TabProxy.java b/src/main/java/mekanism/api/TabProxy.java
index c562c0247..1d571050f 100644
--- a/src/main/java/mekanism/api/TabProxy.java
+++ b/src/main/java/mekanism/api/TabProxy.java
@@ -7,36 +7,32 @@ import net.minecraft.creativetab.CreativeTabs;
* @author AidanBrady
*
*/
-public final class TabProxy
-{
- /** The 'Mekanism' class where the tab instance is stored. */
- public static Class Mekanism;
+public final class TabProxy {
+ /** The 'Mekanism' class where the tab instance is stored. */
+ public static Class Mekanism;
- /**
- * Attempts to get the Mekanism creative tab instance from the 'Mekanism' class. Will return
- * the tab if the mod is loaded, but otherwise will return the defined 'preferred' creative tab. This way
- * you don't need to worry about NPEs!
- * @return Mekanism creative tab if can, otherwise preferred tab
- */
- public static CreativeTabs tabMekanism(CreativeTabs preferred)
- {
- try {
- if(Mekanism == null)
- {
- Mekanism = Class.forName("mekanism.common.Mekanism");
- }
+ /**
+ * Attempts to get the Mekanism creative tab instance from the 'Mekanism' class. Will
+ * return the tab if the mod is loaded, but otherwise will return the defined
+ * 'preferred' creative tab. This way you don't need to worry about NPEs!
+ * @return Mekanism creative tab if can, otherwise preferred tab
+ */
+ public static CreativeTabs tabMekanism(CreativeTabs preferred) {
+ try {
+ if (Mekanism == null) {
+ Mekanism = Class.forName("mekanism.common.Mekanism");
+ }
- Object ret = Mekanism.getField("tabMekanism").get(null);
+ Object ret = Mekanism.getField("tabMekanism").get(null);
- if(ret instanceof CreativeTabs)
- {
- return (CreativeTabs)ret;
- }
+ if (ret instanceof CreativeTabs) {
+ return (CreativeTabs) ret;
+ }
- return preferred;
- } catch(Exception e) {
- System.err.println("Error retrieving Mekanism creative tab.");
- return preferred;
- }
- }
+ return preferred;
+ } catch (Exception e) {
+ System.err.println("Error retrieving Mekanism creative tab.");
+ return preferred;
+ }
+ }
}
diff --git a/src/main/java/mekanism/api/energy/EnergizedItemManager.java b/src/main/java/mekanism/api/energy/EnergizedItemManager.java
index 165bdf608..060395c9b 100644
--- a/src/main/java/mekanism/api/energy/EnergizedItemManager.java
+++ b/src/main/java/mekanism/api/energy/EnergizedItemManager.java
@@ -2,59 +2,66 @@ package mekanism.api.energy;
import net.minecraft.item.ItemStack;
-public class EnergizedItemManager
-{
- /**
- * Discharges an IEnergizedItem with the defined amount of energy.
- * @param itemStack - ItemStack to discharge
- * @param amount - amount of energy to discharge from the item, usually the total amount of energy needed in a TileEntity
- * @return amount of energy discharged
- */
- public static double discharge(ItemStack itemStack, double amount)
- {
- if(itemStack != null)
- {
- if(itemStack.getItem() instanceof IEnergizedItem)
- {
- IEnergizedItem energizedItem = (IEnergizedItem)itemStack.getItem();
+public class EnergizedItemManager {
+ /**
+ * Discharges an IEnergizedItem with the defined amount of energy.
+ * @param itemStack - ItemStack to discharge
+ * @param amount - amount of energy to discharge from the item, usually the total
+ * amount of energy needed in a TileEntity
+ * @return amount of energy discharged
+ */
+ public static double discharge(ItemStack itemStack, double amount) {
+ if (itemStack != null) {
+ if (itemStack.getItem() instanceof IEnergizedItem) {
+ IEnergizedItem energizedItem = (IEnergizedItem) itemStack.getItem();
- if(energizedItem.canSend(itemStack))
- {
- double energyToUse = Math.min(energizedItem.getMaxTransfer(itemStack), Math.min(energizedItem.getEnergy(itemStack), amount));
- energizedItem.setEnergy(itemStack, energizedItem.getEnergy(itemStack) - energyToUse);
+ if (energizedItem.canSend(itemStack)) {
+ double energyToUse = Math.min(
+ energizedItem.getMaxTransfer(itemStack),
+ Math.min(energizedItem.getEnergy(itemStack), amount)
+ );
+ energizedItem.setEnergy(
+ itemStack, energizedItem.getEnergy(itemStack) - energyToUse
+ );
- return energyToUse;
- }
- }
- }
+ return energyToUse;
+ }
+ }
+ }
- return 0;
- }
+ return 0;
+ }
- /**
- * Charges an IEnergizedItem with the defined amount of energy.
- * @param itemStack - ItemStack to charge
- * @param amount - amount of energy to charge the item with, usually the total amount of energy stored in a TileEntity
- * @return amount of energy charged
- */
- public static double charge(ItemStack itemStack, double amount)
- {
- if(itemStack != null)
- {
- if(itemStack.getItem() instanceof IEnergizedItem)
- {
- IEnergizedItem energizedItem = (IEnergizedItem)itemStack.getItem();
+ /**
+ * Charges an IEnergizedItem with the defined amount of energy.
+ * @param itemStack - ItemStack to charge
+ * @param amount - amount of energy to charge the item with, usually the total amount
+ * of energy stored in a TileEntity
+ * @return amount of energy charged
+ */
+ public static double charge(ItemStack itemStack, double amount) {
+ if (itemStack != null) {
+ if (itemStack.getItem() instanceof IEnergizedItem) {
+ IEnergizedItem energizedItem = (IEnergizedItem) itemStack.getItem();
- if(energizedItem.canReceive(itemStack))
- {
- double energyToSend = Math.min(energizedItem.getMaxTransfer(itemStack), Math.min(energizedItem.getMaxEnergy(itemStack) - energizedItem.getEnergy(itemStack), amount));
- energizedItem.setEnergy(itemStack, energizedItem.getEnergy(itemStack) + energyToSend);
+ if (energizedItem.canReceive(itemStack)) {
+ double energyToSend = Math.min(
+ energizedItem.getMaxTransfer(itemStack),
+ Math.min(
+ energizedItem.getMaxEnergy(itemStack)
+ - energizedItem.getEnergy(itemStack),
+ amount
+ )
+ );
+ energizedItem.setEnergy(
+ itemStack, energizedItem.getEnergy(itemStack) + energyToSend
+ );
- return energyToSend;
- }
- }
- }
+ return energyToSend;
+ }
+ }
+ }
- return 0;
- }
+ return 0;
+ }
}
diff --git a/src/main/java/mekanism/api/energy/EnergyStack.java b/src/main/java/mekanism/api/energy/EnergyStack.java
index 3f5762186..ab6397c9e 100644
--- a/src/main/java/mekanism/api/energy/EnergyStack.java
+++ b/src/main/java/mekanism/api/energy/EnergyStack.java
@@ -3,12 +3,10 @@ package mekanism.api.energy;
/**
* Created by ben on 27/03/15.
*/
-public class EnergyStack
-{
- public double amount;
+public class EnergyStack {
+ public double amount;
- public EnergyStack(double newAmount)
- {
- amount = newAmount;
- }
+ public EnergyStack(double newAmount) {
+ amount = newAmount;
+ }
}
diff --git a/src/main/java/mekanism/api/energy/ICableOutputter.java b/src/main/java/mekanism/api/energy/ICableOutputter.java
index 015379c03..0252046e8 100644
--- a/src/main/java/mekanism/api/energy/ICableOutputter.java
+++ b/src/main/java/mekanism/api/energy/ICableOutputter.java
@@ -3,16 +3,16 @@ package mekanism.api.energy;
import net.minecraftforge.common.util.ForgeDirection;
/**
- * Implement this if your TileEntity is capable of outputting energy to cables, overriding Mekanism's default implementation.
+ * Implement this if your TileEntity is capable of outputting energy to cables, overriding
+ * Mekanism's default implementation.
* @author AidanBrady
*
*/
-public interface ICableOutputter
-{
- /**
- * Whether or not this block can output to a cable on a specific side.
- * @param side - side to check
- * @return if the block can output
- */
- public boolean canOutputTo(ForgeDirection side);
+public interface ICableOutputter {
+ /**
+ * Whether or not this block can output to a cable on a specific side.
+ * @param side - side to check
+ * @return if the block can output
+ */
+ public boolean canOutputTo(ForgeDirection side);
}
diff --git a/src/main/java/mekanism/api/energy/IEnergizedItem.java b/src/main/java/mekanism/api/energy/IEnergizedItem.java
index bcfb5ca29..ae93978d6 100644
--- a/src/main/java/mekanism/api/energy/IEnergizedItem.java
+++ b/src/main/java/mekanism/api/energy/IEnergizedItem.java
@@ -7,47 +7,46 @@ import net.minecraft.item.ItemStack;
* @author aidancbrady
*
*/
-public interface IEnergizedItem
-{
- /**
- * Gets and returns the amount of energy stored in this item.
- * @param itemStack - the ItemStack to check
- * @return energy stored
- */
- public double getEnergy(ItemStack itemStack);
+public interface IEnergizedItem {
+ /**
+ * Gets and returns the amount of energy stored in this item.
+ * @param itemStack - the ItemStack to check
+ * @return energy stored
+ */
+ public double getEnergy(ItemStack itemStack);
- /**
- * Sets this item's stored energy value to a new amount.
- * @param itemStack - the ItemStack who's energy value is to be change
- * @param amount - new amount of energy
- */
- public void setEnergy(ItemStack itemStack, double amount);
+ /**
+ * Sets this item's stored energy value to a new amount.
+ * @param itemStack - the ItemStack who's energy value is to be change
+ * @param amount - new amount of energy
+ */
+ public void setEnergy(ItemStack itemStack, double amount);
- /**
- * Gets and returns this item's maximum amount of energy that can be stored.
- * @param itemStack - the ItemStack to check
- * @return maximum energy
- */
- public double getMaxEnergy(ItemStack itemStack);
+ /**
+ * Gets and returns this item's maximum amount of energy that can be stored.
+ * @param itemStack - the ItemStack to check
+ * @return maximum energy
+ */
+ public double getMaxEnergy(ItemStack itemStack);
- /**
- * Gets and returns how much energy this item can transfer to and from charging slots.
- * @param itemStack - the ItemStack to check
- * @return transfer amount
- */
- public double getMaxTransfer(ItemStack itemStack);
+ /**
+ * Gets and returns how much energy this item can transfer to and from charging slots.
+ * @param itemStack - the ItemStack to check
+ * @return transfer amount
+ */
+ public double getMaxTransfer(ItemStack itemStack);
- /**
- * Gets and returns whether or not this item can receive energy from a charging slot.
- * @param itemStack - the ItemStack to check
- * @return if the item can receive energy
- */
- public boolean canReceive(ItemStack itemStack);
+ /**
+ * Gets and returns whether or not this item can receive energy from a charging slot.
+ * @param itemStack - the ItemStack to check
+ * @return if the item can receive energy
+ */
+ public boolean canReceive(ItemStack itemStack);
- /**
- * Gets and returns whether or not this item can send energy to a charging slot.
- * @param itemStack - the ItemStack to check
- * @return if the item can send energy
- */
- public boolean canSend(ItemStack itemStack);
+ /**
+ * Gets and returns whether or not this item can send energy to a charging slot.
+ * @param itemStack - the ItemStack to check
+ * @return if the item can send energy
+ */
+ public boolean canSend(ItemStack itemStack);
}
diff --git a/src/main/java/mekanism/api/energy/IStrictEnergyAcceptor.java b/src/main/java/mekanism/api/energy/IStrictEnergyAcceptor.java
index 53edc68e6..bdb7604bf 100644
--- a/src/main/java/mekanism/api/energy/IStrictEnergyAcceptor.java
+++ b/src/main/java/mekanism/api/energy/IStrictEnergyAcceptor.java
@@ -3,23 +3,23 @@ package mekanism.api.energy;
import net.minecraftforge.common.util.ForgeDirection;
/**
- * Implement this if your TileEntity can accept energy at a floating-point double value from Universal Cables.
+ * Implement this if your TileEntity can accept energy at a floating-point double value
+ * from Universal Cables.
* @author AidanBrady
*
*/
-public interface IStrictEnergyAcceptor extends IStrictEnergyStorage
-{
- /**
- * Transfer a certain amount of energy to this acceptor.
- * @param amount - amount to transfer
- * @return energy used
- */
- public double transferEnergyToAcceptor(ForgeDirection side, double amount);
+public interface IStrictEnergyAcceptor extends IStrictEnergyStorage {
+ /**
+ * Transfer a certain amount of energy to this acceptor.
+ * @param amount - amount to transfer
+ * @return energy used
+ */
+ public double transferEnergyToAcceptor(ForgeDirection side, double amount);
- /**
- * Whether or not this tile entity accepts energy from a certain side.
- * @param side - side to check
- * @return if tile entity accepts energy
- */
- public boolean canReceiveEnergy(ForgeDirection side);
+ /**
+ * Whether or not this tile entity accepts energy from a certain side.
+ * @param side - side to check
+ * @return if tile entity accepts energy
+ */
+ public boolean canReceiveEnergy(ForgeDirection side);
}
diff --git a/src/main/java/mekanism/api/energy/IStrictEnergyStorage.java b/src/main/java/mekanism/api/energy/IStrictEnergyStorage.java
index fd560fa18..7a6d8012c 100644
--- a/src/main/java/mekanism/api/energy/IStrictEnergyStorage.java
+++ b/src/main/java/mekanism/api/energy/IStrictEnergyStorage.java
@@ -1,27 +1,27 @@
package mekanism.api.energy;
/**
- * Mekanism-specific energy storage for TileEntities, already implemented in IStrictEnergyAcceptor.
+ * Mekanism-specific energy storage for TileEntities, already implemented in
+ * IStrictEnergyAcceptor.
* @author aidancbrady
*
*/
-public interface IStrictEnergyStorage
-{
- /**
- * Gets the amount of energy this TileEntity is currently storing.
- * @return stored energy
- */
- public double getEnergy();
+public interface IStrictEnergyStorage {
+ /**
+ * Gets the amount of energy this TileEntity is currently storing.
+ * @return stored energy
+ */
+ public double getEnergy();
- /**
- * Sets the amount of stored energy of this TileEntity to a new amount.
- * @param energy - new energy value
- */
- public void setEnergy(double energy);
+ /**
+ * Sets the amount of stored energy of this TileEntity to a new amount.
+ * @param energy - new energy value
+ */
+ public void setEnergy(double energy);
- /**
- * Gets the maximum amount of energy this TileEntity can store.
- * @return maximum energy
- */
- public double getMaxEnergy();
+ /**
+ * Gets the maximum amount of energy this TileEntity can store.
+ * @return maximum energy
+ */
+ public double getMaxEnergy();
}
diff --git a/src/main/java/mekanism/api/energy/package-info.java b/src/main/java/mekanism/api/energy/package-info.java
index 23773a37d..d69b94b65 100644
--- a/src/main/java/mekanism/api/energy/package-info.java
+++ b/src/main/java/mekanism/api/energy/package-info.java
@@ -1,4 +1,3 @@
@API(apiVersion = "9.0.0", owner = "Mekanism", provides = "MekanismAPI|energy")
package mekanism.api.energy;
import cpw.mods.fml.common.API;
-
diff --git a/src/main/java/mekanism/api/gas/Gas.java b/src/main/java/mekanism/api/gas/Gas.java
index f05be52c6..a9eeda4de 100644
--- a/src/main/java/mekanism/api/gas/Gas.java
+++ b/src/main/java/mekanism/api/gas/Gas.java
@@ -11,211 +11,190 @@ import net.minecraftforge.fluids.FluidRegistry;
* @author aidancbrady
*
*/
-public class Gas
-{
- private String name;
+public class Gas {
+ private String name;
- private String unlocalizedName;
+ private String unlocalizedName;
- private Fluid fluid;
+ private Fluid fluid;
- private IIcon icon;
+ private IIcon icon;
- private boolean visible = true;
+ private boolean visible = true;
- private boolean from_fluid = false;
+ private boolean from_fluid = false;
- /**
- * Creates a new Gas object with a defined name or key value.
- * @param s - name or key to associate this Gas with
- */
- public Gas(String s)
- {
- unlocalizedName = name = s;
- }
+ /**
+ * Creates a new Gas object with a defined name or key value.
+ * @param s - name or key to associate this Gas with
+ */
+ public Gas(String s) {
+ unlocalizedName = name = s;
+ }
- /**
- * Creates a new Gas object that corresponds to the given Fluid
- */
- public Gas(Fluid f)
- {
- unlocalizedName = name = f.getName();
- icon = f.getStillIcon();
- fluid = f;
- from_fluid = true;
- }
+ /**
+ * Creates a new Gas object that corresponds to the given Fluid
+ */
+ public Gas(Fluid f) {
+ unlocalizedName = name = f.getName();
+ icon = f.getStillIcon();
+ fluid = f;
+ from_fluid = true;
+ }
- /**
- * Gets the name (key) of this Gas. This is NOT a translated or localized display name.
- * @return this Gas's name or key
- */
- public String getName()
- {
- return name;
- }
+ /**
+ * Gets the name (key) of this Gas. This is NOT a translated or localized display
+ * name.
+ * @return this Gas's name or key
+ */
+ public String getName() {
+ return name;
+ }
- /**
- * Whether or not this is a visible gas.
- * @return if this gas is visible
- */
- public boolean isVisible()
- {
- return visible;
- }
+ /**
+ * Whether or not this is a visible gas.
+ * @return if this gas is visible
+ */
+ public boolean isVisible() {
+ return visible;
+ }
- /**
- * Sets this gas's "visible" state to a new value. Setting it to 'false' will treat this gas as an internal gas, and it will not be displayed or accessed by other mods.
- * @param v - new visible state
- * @return this Gas object
- */
- public Gas setVisible(boolean v)
- {
- visible = v;
+ /**
+ * Sets this gas's "visible" state to a new value. Setting it to 'false' will treat
+ * this gas as an internal gas, and it will not be displayed or accessed by other
+ * mods.
+ * @param v - new visible state
+ * @return this Gas object
+ */
+ public Gas setVisible(boolean v) {
+ visible = v;
- return this;
- }
+ return this;
+ }
- /**
- * Gets the unlocalized name of this Gas.
- * @return this Gas's unlocalized name
- */
- public String getUnlocalizedName()
- {
- return "gas." + unlocalizedName;
- }
+ /**
+ * Gets the unlocalized name of this Gas.
+ * @return this Gas's unlocalized name
+ */
+ public String getUnlocalizedName() {
+ return "gas." + unlocalizedName;
+ }
- /**
- * Translates this Gas's unlocalized name and returns it as localized.
- * @return this Gas's localized name
- */
- public String getLocalizedName()
- {
- return StatCollector.translateToLocal(getUnlocalizedName());
- }
+ /**
+ * Translates this Gas's unlocalized name and returns it as localized.
+ * @return this Gas's localized name
+ */
+ public String getLocalizedName() {
+ return StatCollector.translateToLocal(getUnlocalizedName());
+ }
- /**
- * Sets the unlocalized name of this Gas.
- * @param s - unlocalized name to set
- * @return this Gas object
- */
- public Gas setUnlocalizedName(String s)
- {
- unlocalizedName = s;
+ /**
+ * Sets the unlocalized name of this Gas.
+ * @param s - unlocalized name to set
+ * @return this Gas object
+ */
+ public Gas setUnlocalizedName(String s) {
+ unlocalizedName = s;
- return this;
- }
+ return this;
+ }
- /**
- * Gets the IIcon associated with this Gas.
- * @return associated IIcon
- */
- public IIcon getIcon()
- {
- if(from_fluid)
- {
- return this.getFluid().getIcon();
- }
-
- return icon;
- }
+ /**
+ * Gets the IIcon associated with this Gas.
+ * @return associated IIcon
+ */
+ public IIcon getIcon() {
+ if (from_fluid) {
+ return this.getFluid().getIcon();
+ }
- /**
- * Sets this gas's icon.
- * @param i - IIcon to associate with this Gas
- * @return this Gas object
- */
- public Gas setIcon(IIcon i)
- {
- icon = i;
+ return icon;
+ }
- if(hasFluid())
- {
- fluid.setIcons(getIcon());
- }
-
- from_fluid = false;
-
- return this;
- }
+ /**
+ * Sets this gas's icon.
+ * @param i - IIcon to associate with this Gas
+ * @return this Gas object
+ */
+ public Gas setIcon(IIcon i) {
+ icon = i;
- /**
- * Gets the ID associated with this gas.
- * @return the associated gas ID
- */
- public int getID()
- {
- return GasRegistry.getGasID(this);
- }
+ if (hasFluid()) {
+ fluid.setIcons(getIcon());
+ }
- /**
- * Writes this Gas to a defined tag compound.
- * @param nbtTags - tag compound to write this Gas to
- * @return the tag compound this gas was written to
- */
- public NBTTagCompound write(NBTTagCompound nbtTags)
- {
- nbtTags.setString("gasName", getName());
+ from_fluid = false;
- return nbtTags;
- }
+ return this;
+ }
- /**
- * Returns the Gas stored in the defined tag compound.
- * @param nbtTags - tag compound to get the Gas from
- * @return Gas stored in the tag compound
- */
- public static Gas readFromNBT(NBTTagCompound nbtTags)
- {
- if(nbtTags == null || nbtTags.hasNoTags())
- {
- return null;
- }
+ /**
+ * Gets the ID associated with this gas.
+ * @return the associated gas ID
+ */
+ public int getID() {
+ return GasRegistry.getGasID(this);
+ }
- return GasRegistry.getGas(nbtTags.getString("gasName"));
- }
+ /**
+ * Writes this Gas to a defined tag compound.
+ * @param nbtTags - tag compound to write this Gas to
+ * @return the tag compound this gas was written to
+ */
+ public NBTTagCompound write(NBTTagCompound nbtTags) {
+ nbtTags.setString("gasName", getName());
- /**
- * Whether or not this Gas has an associated fluid.
- * @return if this gas has a fluid
- */
- public boolean hasFluid()
- {
- return fluid != null;
- }
+ return nbtTags;
+ }
- /**
- * Gets the fluid associated with this Gas.
- * @return fluid associated with this gas
- */
- public Fluid getFluid()
- {
- return fluid;
- }
+ /**
+ * Returns the Gas stored in the defined tag compound.
+ * @param nbtTags - tag compound to get the Gas from
+ * @return Gas stored in the tag compound
+ */
+ public static Gas readFromNBT(NBTTagCompound nbtTags) {
+ if (nbtTags == null || nbtTags.hasNoTags()) {
+ return null;
+ }
- /**
- * Registers a new fluid out of this Gas or gets one from the FluidRegistry.
- * @return this Gas object
- */
- public Gas registerFluid()
- {
- if(fluid == null)
- {
- if(FluidRegistry.getFluid(getName()) == null)
- {
- fluid = new Fluid(getName()).setGaseous(true);
- FluidRegistry.registerFluid(fluid);
- }
- else {
- fluid = FluidRegistry.getFluid(getName());
- }
- }
+ return GasRegistry.getGas(nbtTags.getString("gasName"));
+ }
- return this;
- }
+ /**
+ * Whether or not this Gas has an associated fluid.
+ * @return if this gas has a fluid
+ */
+ public boolean hasFluid() {
+ return fluid != null;
+ }
- @Override
- public String toString()
- {
- return name;
- }
+ /**
+ * Gets the fluid associated with this Gas.
+ * @return fluid associated with this gas
+ */
+ public Fluid getFluid() {
+ return fluid;
+ }
+
+ /**
+ * Registers a new fluid out of this Gas or gets one from the FluidRegistry.
+ * @return this Gas object
+ */
+ public Gas registerFluid() {
+ if (fluid == null) {
+ if (FluidRegistry.getFluid(getName()) == null) {
+ fluid = new Fluid(getName()).setGaseous(true);
+ FluidRegistry.registerFluid(fluid);
+ } else {
+ fluid = FluidRegistry.getFluid(getName());
+ }
+ }
+
+ return this;
+ }
+
+ @Override
+ public String toString() {
+ return name;
+ }
}
diff --git a/src/main/java/mekanism/api/gas/GasNetwork.java b/src/main/java/mekanism/api/gas/GasNetwork.java
index 688c63bca..33588ce68 100644
--- a/src/main/java/mekanism/api/gas/GasNetwork.java
+++ b/src/main/java/mekanism/api/gas/GasNetwork.java
@@ -7,6 +7,9 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
+import com.google.common.collect.Lists;
+import cpw.mods.fml.common.FMLCommonHandler;
+import cpw.mods.fml.common.eventhandler.Event;
import mekanism.api.Coord4D;
import mekanism.api.transmitters.DynamicNetwork;
import mekanism.api.transmitters.IGridTransmitter;
@@ -14,352 +17,302 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.common.util.ForgeDirection;
-import com.google.common.collect.Lists;
-
-import cpw.mods.fml.common.FMLCommonHandler;
-import cpw.mods.fml.common.eventhandler.Event;
-
/**
- * A DynamicNetwork extension created specifically for the transfer of Gasses. By default this is server-only, but if ticked on
- * the client side and if it's posted events are handled properly, it has the capability to visually display gasses network-wide.
+ * A DynamicNetwork extension created specifically for the transfer of Gasses. By default
+ * this is server-only, but if ticked on the client side and if it's posted events are
+ * handled properly, it has the capability to visually display gasses network-wide.
* @author aidancbrady
*
*/
-public class GasNetwork extends DynamicNetwork
-{
- public int transferDelay = 0;
+public class GasNetwork extends DynamicNetwork {
+ public int transferDelay = 0;
- public boolean didTransfer;
- public boolean prevTransfer;
+ public boolean didTransfer;
+ public boolean prevTransfer;
- public float gasScale;
+ public float gasScale;
- public Gas refGas;
+ public Gas refGas;
- public GasStack buffer;
- public int prevStored;
+ public GasStack buffer;
+ public int prevStored;
- public int prevTransferAmount = 0;
+ public int prevTransferAmount = 0;
- public GasNetwork() {}
+ public GasNetwork() {}
- public GasNetwork(Collection networks)
- {
- for(GasNetwork net : networks)
- {
- if(net != null)
- {
- if(FMLCommonHandler.instance().getEffectiveSide().isClient())
- {
- if(net.refGas != null && net.gasScale > gasScale)
- {
- gasScale = net.gasScale;
- refGas = net.refGas;
- buffer = net.buffer;
+ public GasNetwork(Collection networks) {
+ for (GasNetwork net : networks) {
+ if (net != null) {
+ if (FMLCommonHandler.instance().getEffectiveSide().isClient()) {
+ if (net.refGas != null && net.gasScale > gasScale) {
+ gasScale = net.gasScale;
+ refGas = net.refGas;
+ buffer = net.buffer;
- net.gasScale = 0;
- net.refGas = null;
- net.buffer = null;
- }
- }
- else {
- if(net.buffer != null)
- {
- if(buffer == null)
- {
- buffer = net.buffer.copy();
- }
- else {
- if(buffer.isGasEqual(net.buffer))
- {
- buffer.amount += net.buffer.amount;
- }
- else if(net.buffer.amount > buffer.amount)
- {
- buffer = net.buffer.copy();
- }
+ net.gasScale = 0;
+ net.refGas = null;
+ net.buffer = null;
+ }
+ } else {
+ if (net.buffer != null) {
+ if (buffer == null) {
+ buffer = net.buffer.copy();
+ } else {
+ if (buffer.isGasEqual(net.buffer)) {
+ buffer.amount += net.buffer.amount;
+ } else if (net.buffer.amount > buffer.amount) {
+ buffer = net.buffer.copy();
+ }
+ }
- }
+ net.buffer = null;
+ }
+ }
- net.buffer = null;
- }
- }
+ adoptTransmittersAndAcceptorsFrom(net);
+ net.deregister();
+ }
+ }
- adoptTransmittersAndAcceptorsFrom(net);
- net.deregister();
- }
- }
+ gasScale = getScale();
- gasScale = getScale();
+ register();
+ }
- register();
- }
+ @Override
+ public void absorbBuffer(IGridTransmitter transmitter) {
+ Object b = transmitter.getBuffer();
- @Override
- public void absorbBuffer(IGridTransmitter transmitter)
- {
- Object b = transmitter.getBuffer();
-
- if(!(b instanceof GasStack) || ((GasStack)b).getGas() == null || ((GasStack)b).amount == 0)
- {
- return;
- }
+ if (!(b instanceof GasStack) || ((GasStack) b).getGas() == null
+ || ((GasStack) b).amount == 0) {
+ return;
+ }
- GasStack gas = (GasStack)b;
+ GasStack gas = (GasStack) b;
- if(buffer == null || buffer.getGas() == null || buffer.amount == 0)
- {
- buffer = gas.copy();
+ if (buffer == null || buffer.getGas() == null || buffer.amount == 0) {
+ buffer = gas.copy();
gas.amount = 0;
- return;
- }
+ return;
+ }
- //TODO better multiple buffer impl
- if(buffer.isGasEqual(gas))
- {
- buffer.amount += gas.amount;
- }
-
- gas.amount = 0;
- }
+ //TODO better multiple buffer impl
+ if (buffer.isGasEqual(gas)) {
+ buffer.amount += gas.amount;
+ }
- @Override
- public void clampBuffer()
- {
- if(buffer != null && buffer.amount > getCapacity())
- {
- buffer.amount = capacity;
- }
- }
+ gas.amount = 0;
+ }
- public int getGasNeeded()
- {
- return getCapacity()-(buffer != null ? buffer.amount : 0);
- }
+ @Override
+ public void clampBuffer() {
+ if (buffer != null && buffer.amount > getCapacity()) {
+ buffer.amount = capacity;
+ }
+ }
- public int tickEmit(GasStack stack)
- {
- List availableAcceptors = Lists.newArrayList();
+ public int getGasNeeded() {
+ return getCapacity() - (buffer != null ? buffer.amount : 0);
+ }
- availableAcceptors.addAll(getAcceptors(stack.getGas()));
+ public int tickEmit(GasStack stack) {
+ List availableAcceptors = Lists.newArrayList();
- Collections.shuffle(availableAcceptors);
+ availableAcceptors.addAll(getAcceptors(stack.getGas()));
- int toSend = stack.amount;
- int prevSending = toSend;
+ Collections.shuffle(availableAcceptors);
- if(!availableAcceptors.isEmpty())
- {
- int divider = availableAcceptors.size();
- int remaining = toSend % divider;
- int sending = (toSend-remaining)/divider;
+ int toSend = stack.amount;
+ int prevSending = toSend;
- for(IGasHandler acceptor : availableAcceptors)
- {
- int currentSending = sending;
- EnumSet sides = acceptorDirections.get(Coord4D.get((TileEntity)acceptor));
+ if (!availableAcceptors.isEmpty()) {
+ int divider = availableAcceptors.size();
+ int remaining = toSend % divider;
+ int sending = (toSend - remaining) / divider;
- if(remaining > 0)
- {
- currentSending++;
- remaining--;
- }
+ for (IGasHandler acceptor : availableAcceptors) {
+ int currentSending = sending;
+ EnumSet sides
+ = acceptorDirections.get(Coord4D.get((TileEntity) acceptor));
- for(ForgeDirection side : sides)
- {
- int prev = toSend;
+ if (remaining > 0) {
+ currentSending++;
+ remaining--;
+ }
- toSend -= acceptor.receiveGas(side, new GasStack(stack.getGas(), currentSending), true);
+ for (ForgeDirection side : sides) {
+ int prev = toSend;
- if(toSend < prev)
- {
- break;
- }
- }
- }
- }
+ toSend -= acceptor.receiveGas(
+ side, new GasStack(stack.getGas(), currentSending), true
+ );
- int sent = prevSending-toSend;
+ if (toSend < prev) {
+ break;
+ }
+ }
+ }
+ }
- if(sent > 0 && FMLCommonHandler.instance().getEffectiveSide().isServer())
- {
- didTransfer = true;
- transferDelay = 2;
- }
+ int sent = prevSending - toSend;
- return sent;
- }
+ if (sent > 0 && FMLCommonHandler.instance().getEffectiveSide().isServer()) {
+ didTransfer = true;
+ transferDelay = 2;
+ }
- public int emit(GasStack stack, boolean doTransfer)
- {
- if(buffer != null && buffer.getGas() != stack.getGas())
- {
- return 0;
- }
+ return sent;
+ }
- int toUse = Math.min(getGasNeeded(), stack.amount);
+ public int emit(GasStack stack, boolean doTransfer) {
+ if (buffer != null && buffer.getGas() != stack.getGas()) {
+ return 0;
+ }
- if(doTransfer)
- {
- if(buffer == null)
- {
- buffer = stack.copy();
- buffer.amount = toUse;
- }
- else {
- buffer.amount += toUse;
- }
- }
+ int toUse = Math.min(getGasNeeded(), stack.amount);
- return toUse;
- }
+ if (doTransfer) {
+ if (buffer == null) {
+ buffer = stack.copy();
+ buffer.amount = toUse;
+ } else {
+ buffer.amount += toUse;
+ }
+ }
- @Override
- public void onUpdate()
- {
- super.onUpdate();
+ return toUse;
+ }
- if(FMLCommonHandler.instance().getEffectiveSide().isServer())
- {
- prevTransferAmount = 0;
+ @Override
+ public void onUpdate() {
+ super.onUpdate();
- if(transferDelay == 0)
- {
- didTransfer = false;
- }
- else {
- transferDelay--;
- }
+ if (FMLCommonHandler.instance().getEffectiveSide().isServer()) {
+ prevTransferAmount = 0;
- int stored = buffer != null ? buffer.amount : 0;
+ if (transferDelay == 0) {
+ didTransfer = false;
+ } else {
+ transferDelay--;
+ }
- if(stored != prevStored)
- {
- needsUpdate = true;
- }
+ int stored = buffer != null ? buffer.amount : 0;
- prevStored = stored;
+ if (stored != prevStored) {
+ needsUpdate = true;
+ }
- if(didTransfer != prevTransfer || needsUpdate)
- {
- MinecraftForge.EVENT_BUS.post(new GasTransferEvent(this, buffer, didTransfer));
- needsUpdate = false;
- }
+ prevStored = stored;
- prevTransfer = didTransfer;
+ if (didTransfer != prevTransfer || needsUpdate) {
+ MinecraftForge.EVENT_BUS.post(
+ new GasTransferEvent(this, buffer, didTransfer)
+ );
+ needsUpdate = false;
+ }
- if(buffer != null)
- {
- prevTransferAmount = tickEmit(buffer);
- buffer.amount -= prevTransferAmount;
+ prevTransfer = didTransfer;
- if(buffer.amount <= 0)
- {
- buffer = null;
- }
- }
- }
- }
+ if (buffer != null) {
+ prevTransferAmount = tickEmit(buffer);
+ buffer.amount -= prevTransferAmount;
- @Override
- public void clientTick()
- {
- super.clientTick();
+ if (buffer.amount <= 0) {
+ buffer = null;
+ }
+ }
+ }
+ }
- gasScale = Math.max(gasScale, getScale());
+ @Override
+ public void clientTick() {
+ super.clientTick();
- if(didTransfer && gasScale < 1)
- {
- gasScale = Math.max(getScale(), Math.min(1, gasScale+0.02F));
- }
- else if(!didTransfer && gasScale > 0)
- {
- gasScale = Math.max(getScale(), Math.max(0, gasScale-0.02F));
+ gasScale = Math.max(gasScale, getScale());
- if(gasScale == 0)
- {
- buffer = null;
- }
- }
- }
+ if (didTransfer && gasScale < 1) {
+ gasScale = Math.max(getScale(), Math.min(1, gasScale + 0.02F));
+ } else if (!didTransfer && gasScale > 0) {
+ gasScale = Math.max(getScale(), Math.max(0, gasScale - 0.02F));
- @Override
- public Set getAcceptors(Object data)
- {
- Gas type = (Gas)data;
- Set toReturn = new HashSet();
-
- if(FMLCommonHandler.instance().getEffectiveSide().isClient())
- {
- return toReturn;
- }
+ if (gasScale == 0) {
+ buffer = null;
+ }
+ }
+ }
- for(Coord4D coord : possibleAcceptors.keySet())
- {
- EnumSet sides = acceptorDirections.get(coord);
- TileEntity tile = coord.getTileEntity(getWorld());
-
- if(!(tile instanceof IGasHandler) || sides == null || sides.isEmpty())
- {
- continue;
- }
-
- IGasHandler acceptor = (IGasHandler)tile;
+ @Override
+ public Set getAcceptors(Object data) {
+ Gas type = (Gas) data;
+ Set toReturn = new HashSet();
- for(ForgeDirection side : sides)
- {
- if(acceptor != null && acceptor.canReceiveGas(side, type))
- {
- toReturn.add(acceptor);
- break;
- }
- }
- }
+ if (FMLCommonHandler.instance().getEffectiveSide().isClient()) {
+ return toReturn;
+ }
- return toReturn;
- }
+ for (Coord4D coord : possibleAcceptors.keySet()) {
+ EnumSet sides = acceptorDirections.get(coord);
+ TileEntity tile = coord.getTileEntity(getWorld());
- public static class GasTransferEvent extends Event
- {
- public final GasNetwork gasNetwork;
+ if (!(tile instanceof IGasHandler) || sides == null || sides.isEmpty()) {
+ continue;
+ }
- public final GasStack transferType;
- public final boolean didTransfer;
+ IGasHandler acceptor = (IGasHandler) tile;
- public GasTransferEvent(GasNetwork network, GasStack type, boolean did)
- {
- gasNetwork = network;
- transferType = type;
- didTransfer = did;
- }
- }
+ for (ForgeDirection side : sides) {
+ if (acceptor != null && acceptor.canReceiveGas(side, type)) {
+ toReturn.add(acceptor);
+ break;
+ }
+ }
+ }
- public float getScale()
- {
- return Math.min(1, (buffer == null || getCapacity() == 0 ? 0 : (float)buffer.amount/getCapacity()));
- }
+ return toReturn;
+ }
- @Override
- public String toString()
- {
- return "[GasNetwork] " + transmitters.size() + " transmitters, " + possibleAcceptors.size() + " acceptors.";
- }
+ public static class GasTransferEvent extends Event {
+ public final GasNetwork gasNetwork;
- @Override
- public String getNeededInfo()
- {
- return Integer.toString(getGasNeeded());
- }
+ public final GasStack transferType;
+ public final boolean didTransfer;
- @Override
- public String getStoredInfo()
- {
- return buffer != null ? buffer.getGas().getLocalizedName() + " (" + buffer.amount + ")" : "None";
- }
+ public GasTransferEvent(GasNetwork network, GasStack type, boolean did) {
+ gasNetwork = network;
+ transferType = type;
+ didTransfer = did;
+ }
+ }
- @Override
- public String getFlowInfo()
- {
- return Integer.toString(prevTransferAmount) + "/t";
- }
+ public float getScale() {
+ return Math.min(
+ 1,
+ (buffer == null || getCapacity() == 0 ? 0
+ : (float) buffer.amount / getCapacity())
+ );
+ }
+
+ @Override
+ public String toString() {
+ return "[GasNetwork] " + transmitters.size() + " transmitters, "
+ + possibleAcceptors.size() + " acceptors.";
+ }
+
+ @Override
+ public String getNeededInfo() {
+ return Integer.toString(getGasNeeded());
+ }
+
+ @Override
+ public String getStoredInfo() {
+ return buffer != null
+ ? buffer.getGas().getLocalizedName() + " (" + buffer.amount + ")"
+ : "None";
+ }
+
+ @Override
+ public String getFlowInfo() {
+ return Integer.toString(prevTransferAmount) + "/t";
+ }
}
diff --git a/src/main/java/mekanism/api/gas/GasRegistry.java b/src/main/java/mekanism/api/gas/GasRegistry.java
index 25db9667e..7716ca585 100644
--- a/src/main/java/mekanism/api/gas/GasRegistry.java
+++ b/src/main/java/mekanism/api/gas/GasRegistry.java
@@ -5,109 +5,94 @@ import java.util.List;
import net.minecraftforge.fluids.Fluid;
-public class GasRegistry
-{
- private static ArrayList registeredGasses = new ArrayList();
+public class GasRegistry {
+ private static ArrayList registeredGasses = new ArrayList();
- /**
- * Register a new gas into GasRegistry.
- * @param gas - Gas to register
- * @return the gas that has been registered, pulled right out of GasRegistry
- */
- public static Gas register(Gas gas)
- {
- if(gas == null)
- {
- return null;
- }
+ /**
+ * Register a new gas into GasRegistry.
+ * @param gas - Gas to register
+ * @return the gas that has been registered, pulled right out of GasRegistry
+ */
+ public static Gas register(Gas gas) {
+ if (gas == null) {
+ return null;
+ }
- registeredGasses.add(gas);
+ registeredGasses.add(gas);
- return getGas(gas.getName());
- }
+ return getGas(gas.getName());
+ }
- /**
- * Gets the gas associated with the defined ID.
- * @param id - ID to check
- * @return gas associated with defined ID
- */
- public static Gas getGas(int id)
- {
- if(id == -1)
- {
- return null;
- }
+ /**
+ * Gets the gas associated with the defined ID.
+ * @param id - ID to check
+ * @return gas associated with defined ID
+ */
+ public static Gas getGas(int id) {
+ if (id == -1) {
+ return null;
+ }
- return registeredGasses.get(id);
- }
+ return registeredGasses.get(id);
+ }
- /**
- * Gets the gas associated with the defined fluid.
- * @param f - fluid to check
- * @return the gas associated with the fluid
- */
- public static Gas getGas(Fluid f)
- {
- for(Gas gas : getRegisteredGasses())
- {
- if(gas.hasFluid() && gas.getFluid() == f)
- {
- return gas;
- }
- }
+ /**
+ * Gets the gas associated with the defined fluid.
+ * @param f - fluid to check
+ * @return the gas associated with the fluid
+ */
+ public static Gas getGas(Fluid f) {
+ for (Gas gas : getRegisteredGasses()) {
+ if (gas.hasFluid() && gas.getFluid() == f) {
+ return gas;
+ }
+ }
- return null;
- }
+ return null;
+ }
- /**
- * Whether or not GasRegistry contains a gas with the specified name
- * @param name - name to check
- * @return if GasRegistry contains a gas with the defined name
- */
- public static boolean containsGas(String name)
- {
- return getGas(name) != null;
- }
+ /**
+ * Whether or not GasRegistry contains a gas with the specified name
+ * @param name - name to check
+ * @return if GasRegistry contains a gas with the defined name
+ */
+ public static boolean containsGas(String name) {
+ return getGas(name) != null;
+ }
- /**
- * Gets the list of all gasses registered in GasRegistry.
- * @return a cloned list of all registered gasses
- */
- public static List getRegisteredGasses()
- {
- return (List)registeredGasses.clone();
- }
+ /**
+ * Gets the list of all gasses registered in GasRegistry.
+ * @return a cloned list of all registered gasses
+ */
+ public static List getRegisteredGasses() {
+ return (List) registeredGasses.clone();
+ }
- /**
- * Gets the gas associated with the specified name.
- * @param name - name of the gas to get
- * @return gas associated with the name
- */
- public static Gas getGas(String name)
- {
- for(Gas gas : registeredGasses)
- {
- if(gas.getName().toLowerCase().equals(name.toLowerCase()))
- {
- return gas;
- }
- }
+ /**
+ * Gets the gas associated with the specified name.
+ * @param name - name of the gas to get
+ * @return gas associated with the name
+ */
+ public static Gas getGas(String name) {
+ for (Gas gas : registeredGasses) {
+ if (gas.getName().toLowerCase().equals(name.toLowerCase())) {
+ return gas;
+ }
+ }
- return null;
- }
+ return null;
+ }
- /**
- * Gets the gas ID of a specified gas.
- * @param gas - gas to get the ID from
- * @return gas ID
- */
- public static int getGasID(Gas gas)
- {
- if(gas == null || !containsGas(gas.getName()))
- {
- return -1;
- }
+ /**
+ * Gets the gas ID of a specified gas.
+ * @param gas - gas to get the ID from
+ * @return gas ID
+ */
+ public static int getGasID(Gas gas) {
+ if (gas == null || !containsGas(gas.getName())) {
+ return -1;
+ }
- return registeredGasses.indexOf(gas);
- }
+ return registeredGasses.indexOf(gas);
+ }
}
diff --git a/src/main/java/mekanism/api/gas/GasStack.java b/src/main/java/mekanism/api/gas/GasStack.java
index 05e5ae689..b4acb77e2 100644
--- a/src/main/java/mekanism/api/gas/GasStack.java
+++ b/src/main/java/mekanism/api/gas/GasStack.java
@@ -7,126 +7,114 @@ import net.minecraft.nbt.NBTTagCompound;
* @author aidancbrady
*
*/
-public class GasStack
-{
- private Gas type;
+public class GasStack {
+ private Gas type;
- public int amount;
+ public int amount;
- /**
- * Creates a new GasStack with a defined gas ID and quantity.
- * @param id - gas ID to associate this GasStack to, will perform a GasRegistry lookup in the constructor
- * @param quantity - amount of gas to be referenced in this GasStack
- */
- public GasStack(int id, int quantity)
- {
- type = GasRegistry.getGas(id);
- amount = quantity;
- }
+ /**
+ * Creates a new GasStack with a defined gas ID and quantity.
+ * @param id - gas ID to associate this GasStack to, will perform a GasRegistry lookup
+ * in the constructor
+ * @param quantity - amount of gas to be referenced in this GasStack
+ */
+ public GasStack(int id, int quantity) {
+ type = GasRegistry.getGas(id);
+ amount = quantity;
+ }
- /**
- * Creates a new GasStack with a defined Gas type and quantity.
- * @param gas - gas type of the stack
- * @param quantity - amount of gas to be referenced in this GasStack
- */
- public GasStack(Gas gas, int quantity)
- {
- type = gas;
- amount = quantity;
- }
+ /**
+ * Creates a new GasStack with a defined Gas type and quantity.
+ * @param gas - gas type of the stack
+ * @param quantity - amount of gas to be referenced in this GasStack
+ */
+ public GasStack(Gas gas, int quantity) {
+ type = gas;
+ amount = quantity;
+ }
- private GasStack() {}
+ private GasStack() {}
- /**
- * Gets the Gas type of this GasStack.
- * @return this GasStack's Gas type
- */
- public Gas getGas()
- {
- return type;
- }
-
- public GasStack withAmount(int newAmount)
- {
- amount = newAmount;
-
- return this;
- }
+ /**
+ * Gets the Gas type of this GasStack.
+ * @return this GasStack's Gas type
+ */
+ public Gas getGas() {
+ return type;
+ }
- /**
- * Writes this GasStack to a defined tag compound.
- * @param nbtTags - tag compound to write to
- * @return tag compound with this GasStack's data
- */
- public NBTTagCompound write(NBTTagCompound nbtTags)
- {
- type.write(nbtTags);
- nbtTags.setInteger("amount", amount);
+ public GasStack withAmount(int newAmount) {
+ amount = newAmount;
- return nbtTags;
- }
+ return this;
+ }
- /**
- * Reads this GasStack's data from a defined tag compound.
- * @param nbtTags - tag compound to read from
- */
- public void read(NBTTagCompound nbtTags)
- {
- type = Gas.readFromNBT(nbtTags);
- amount = nbtTags.getInteger("amount");
- }
+ /**
+ * Writes this GasStack to a defined tag compound.
+ * @param nbtTags - tag compound to write to
+ * @return tag compound with this GasStack's data
+ */
+ public NBTTagCompound write(NBTTagCompound nbtTags) {
+ type.write(nbtTags);
+ nbtTags.setInteger("amount", amount);
- /**
- * Returns the GasStack stored in the defined tag compound, or null if it doesn't exist.
- * @param nbtTags - tag compound to read from
- * @return GasStack stored in the tag compound
- */
- public static GasStack readFromNBT(NBTTagCompound nbtTags)
- {
- if(nbtTags == null || nbtTags.hasNoTags())
- {
- return null;
- }
+ return nbtTags;
+ }
- GasStack stack = new GasStack();
- stack.read(nbtTags);
+ /**
+ * Reads this GasStack's data from a defined tag compound.
+ * @param nbtTags - tag compound to read from
+ */
+ public void read(NBTTagCompound nbtTags) {
+ type = Gas.readFromNBT(nbtTags);
+ amount = nbtTags.getInteger("amount");
+ }
- if(stack.getGas() == null || stack.amount <= 0)
- {
- return null;
- }
+ /**
+ * Returns the GasStack stored in the defined tag compound, or null if it doesn't
+ * exist.
+ * @param nbtTags - tag compound to read from
+ * @return GasStack stored in the tag compound
+ */
+ public static GasStack readFromNBT(NBTTagCompound nbtTags) {
+ if (nbtTags == null || nbtTags.hasNoTags()) {
+ return null;
+ }
- return stack;
- }
+ GasStack stack = new GasStack();
+ stack.read(nbtTags);
- /**
- * Returns a copied form of this GasStack.
- * @return copied GasStack
- */
- public GasStack copy()
- {
- return new GasStack(type, amount);
- }
+ if (stack.getGas() == null || stack.amount <= 0) {
+ return null;
+ }
- /**
- * Whether or not this GasStack's gas type is equal to the other defined GasStack.
- * @param stack - GasStack to check
- * @return if the GasStacks contain the same gas type
- */
- public boolean isGasEqual(GasStack stack)
- {
- return stack != null && getGas() == stack.getGas();
- }
+ return stack;
+ }
- @Override
- public String toString()
- {
- return "[" + type + ", " + amount + "]";
- }
+ /**
+ * Returns a copied form of this GasStack.
+ * @return copied GasStack
+ */
+ public GasStack copy() {
+ return new GasStack(type, amount);
+ }
- @Override
- public int hashCode()
- {
- return type == null ? 0 : type.getID();
- }
+ /**
+ * Whether or not this GasStack's gas type is equal to the other defined GasStack.
+ * @param stack - GasStack to check
+ * @return if the GasStacks contain the same gas type
+ */
+ public boolean isGasEqual(GasStack stack) {
+ return stack != null && getGas() == stack.getGas();
+ }
+
+ @Override
+ public String toString() {
+ return "[" + type + ", " + amount + "]";
+ }
+
+ @Override
+ public int hashCode() {
+ return type == null ? 0 : type.getID();
+ }
}
diff --git a/src/main/java/mekanism/api/gas/GasTank.java b/src/main/java/mekanism/api/gas/GasTank.java
index a5d4c20b3..13396cd6f 100644
--- a/src/main/java/mekanism/api/gas/GasTank.java
+++ b/src/main/java/mekanism/api/gas/GasTank.java
@@ -3,250 +3,225 @@ package mekanism.api.gas;
import net.minecraft.nbt.NBTTagCompound;
/**
- * An optional way of managing and/or storing gasses. Would be very useful in TileEntity and Entity gas storage.
+ * An optional way of managing and/or storing gasses. Would be very useful in TileEntity
+ * and Entity gas storage.
* @author aidancbrady
*
*/
-public class GasTank
-{
- public GasStack stored;
+public class GasTank {
+ public GasStack stored;
- private int maxGas;
+ private int maxGas;
- private GasTank() {}
+ private GasTank() {}
- /**
- * Creates a tank with a defined capacity.
- * @param max - the maximum amount of gas this GasTank can hold
- */
- public GasTank(int max)
- {
- maxGas = max;
- }
+ /**
+ * Creates a tank with a defined capacity.
+ * @param max - the maximum amount of gas this GasTank can hold
+ */
+ public GasTank(int max) {
+ maxGas = max;
+ }
- /**
- * Sets this tank's GasStack value to a new value. Will cap the amount to this GasTank's capacity.
- * @param stack - value to set this tank's GasStack value to
- */
- public void setGas(GasStack stack)
- {
- stored = stack;
+ /**
+ * Sets this tank's GasStack value to a new value. Will cap the amount to this
+ * GasTank's capacity.
+ * @param stack - value to set this tank's GasStack value to
+ */
+ public void setGas(GasStack stack) {
+ stored = stack;
- if(stored != null)
- {
- stored.amount = Math.min(getMaxGas(), stored.amount);
- }
- }
+ if (stored != null) {
+ stored.amount = Math.min(getMaxGas(), stored.amount);
+ }
+ }
- /**
- * Draws a specified amount of gas out of this tank.
- * @param amount - amount to draw
- * @param doDraw - if the gas should actually be removed from this tank
- * @return gas taken from this GasTank as a GasStack value
- */
- public GasStack draw(int amount, boolean doDraw)
- {
- if(stored == null || amount <= 0)
- {
- return null;
- }
+ /**
+ * Draws a specified amount of gas out of this tank.
+ * @param amount - amount to draw
+ * @param doDraw - if the gas should actually be removed from this tank
+ * @return gas taken from this GasTank as a GasStack value
+ */
+ public GasStack draw(int amount, boolean doDraw) {
+ if (stored == null || amount <= 0) {
+ return null;
+ }
- GasStack ret = new GasStack(getGas().getGas(), Math.min(getStored(), amount));
+ GasStack ret = new GasStack(getGas().getGas(), Math.min(getStored(), amount));
- if(ret.amount > 0)
- {
- if(doDraw)
- {
- stored.amount -= ret.amount;
+ if (ret.amount > 0) {
+ if (doDraw) {
+ stored.amount -= ret.amount;
- if(stored.amount <= 0)
- {
- stored = null;
- }
- }
+ if (stored.amount <= 0) {
+ stored = null;
+ }
+ }
- return ret;
- }
+ return ret;
+ }
- return null;
- }
+ return null;
+ }
- /**
- * Adds a specified amount of gas to this tank.
- * @param amount - the GasStack for this tank to receive
- * @param doReceive - if the gas should actually be added to this tank
- * @return the amount of gas accepted by this tank
- */
- public int receive(GasStack amount, boolean doReceive)
- {
- if(amount == null || (stored != null && !(stored.amount != getMaxGas() && stored.isGasEqual(amount))))
- {
- return 0;
- }
+ /**
+ * Adds a specified amount of gas to this tank.
+ * @param amount - the GasStack for this tank to receive
+ * @param doReceive - if the gas should actually be added to this tank
+ * @return the amount of gas accepted by this tank
+ */
+ public int receive(GasStack amount, boolean doReceive) {
+ if (amount == null
+ || (stored != null
+ && !(stored.amount != getMaxGas() && stored.isGasEqual(amount)))) {
+ return 0;
+ }
- int toFill = Math.min(getMaxGas()-getStored(), amount.amount);
+ int toFill = Math.min(getMaxGas() - getStored(), amount.amount);
- if(doReceive)
- {
- if(stored == null)
- {
- stored = amount.copy().withAmount(getStored()+toFill);
- }
- else {
- stored.amount = Math.min(getMaxGas(), getStored()+amount.amount);
- }
- }
+ if (doReceive) {
+ if (stored == null) {
+ stored = amount.copy().withAmount(getStored() + toFill);
+ } else {
+ stored.amount = Math.min(getMaxGas(), getStored() + amount.amount);
+ }
+ }
- return toFill;
- }
+ return toFill;
+ }
- /**
- * If this GasTank can receive the specified type of gas. Will return false if this tank does not need anymore gas.
- * @param gas - gas to check
- * @return if this GasTank can accept the defined gas
- */
- public boolean canReceive(Gas gas)
- {
- if(getNeeded() == 0 || stored != null && (gas != null && gas != stored.getGas()))
- {
- return false;
- }
+ /**
+ * If this GasTank can receive the specified type of gas. Will return false if this
+ * tank does not need anymore gas.
+ * @param gas - gas to check
+ * @return if this GasTank can accept the defined gas
+ */
+ public boolean canReceive(Gas gas) {
+ if (getNeeded() == 0
+ || stored != null && (gas != null && gas != stored.getGas())) {
+ return false;
+ }
- return true;
- }
+ return true;
+ }
- /**
- * If this GasTank can receive the specified type of gas. Will return TRUE if this tank does not need anymore gas.
- * @param gas - gas to check
- * @return if this GasTank can accept the defined gas
- */
- public boolean canReceiveType(Gas gas)
- {
- if(stored != null && (gas != null && gas != stored.getGas()))
- {
- return false;
- }
+ /**
+ * If this GasTank can receive the specified type of gas. Will return TRUE if this
+ * tank does not need anymore gas.
+ * @param gas - gas to check
+ * @return if this GasTank can accept the defined gas
+ */
+ public boolean canReceiveType(Gas gas) {
+ if (stored != null && (gas != null && gas != stored.getGas())) {
+ return false;
+ }
- return true;
- }
+ return true;
+ }
- /**
- * If this GasTank can be drawn of the specified type of gas. Will return false if this tank does not contain any gas.
- * @param gas - gas to check
- * @return if this GasTank can be drawn of the defined gas
- */
- public boolean canDraw(Gas gas)
- {
- if(stored == null || (gas != null && gas != stored.getGas()))
- {
- return false;
- }
+ /**
+ * If this GasTank can be drawn of the specified type of gas. Will return false if
+ * this tank does not contain any gas.
+ * @param gas - gas to check
+ * @return if this GasTank can be drawn of the defined gas
+ */
+ public boolean canDraw(Gas gas) {
+ if (stored == null || (gas != null && gas != stored.getGas())) {
+ return false;
+ }
- return true;
- }
+ return true;
+ }
- /**
- * Gets the amount of gas needed by this GasTank.
- * @return
- */
- public int getNeeded()
- {
- return getMaxGas()-getStored();
- }
+ /**
+ * Gets the amount of gas needed by this GasTank.
+ * @return
+ */
+ public int getNeeded() {
+ return getMaxGas() - getStored();
+ }
- /**
- * Gets the maximum amount of gas this tank can hold.
- * @return - max gas
- */
- public int getMaxGas()
- {
- return maxGas;
- }
+ /**
+ * Gets the maximum amount of gas this tank can hold.
+ * @return - max gas
+ */
+ public int getMaxGas() {
+ return maxGas;
+ }
- /**
- * Sets the maximum amount of gas this tank can hold
- */
- public void setMaxGas(int capacity)
- {
- maxGas = capacity;
- }
+ /**
+ * Sets the maximum amount of gas this tank can hold
+ */
+ public void setMaxGas(int capacity) {
+ maxGas = capacity;
+ }
- /**
- * Gets the GasStack held by this GasTank.
- * @return - GasStakc held by this tank
- */
- public GasStack getGas()
- {
- return stored;
- }
-
- /**
- * Gets the type of gas currently stored in this GasTank.
- * @return gas type contained
- */
- public Gas getGasType()
- {
- return stored != null ? stored.getGas() : null;
- }
+ /**
+ * Gets the GasStack held by this GasTank.
+ * @return - GasStakc held by this tank
+ */
+ public GasStack getGas() {
+ return stored;
+ }
- /**
- * Gets the amount of gas stored by this GasTank.
- * @return amount of gas stored
- */
- public int getStored()
- {
- return stored != null ? stored.amount : 0;
- }
+ /**
+ * Gets the type of gas currently stored in this GasTank.
+ * @return gas type contained
+ */
+ public Gas getGasType() {
+ return stored != null ? stored.getGas() : null;
+ }
- /**
- * Writes this tank to a defined tag compound.
- * @param nbtTags - tag compound to write to
- * @return tag compound with this tank's data
- */
- public NBTTagCompound write(NBTTagCompound nbtTags)
- {
- if(stored != null && stored.getGas() != null)
- {
- nbtTags.setTag("stored", stored.write(new NBTTagCompound()));
- }
+ /**
+ * Gets the amount of gas stored by this GasTank.
+ * @return amount of gas stored
+ */
+ public int getStored() {
+ return stored != null ? stored.amount : 0;
+ }
- nbtTags.setInteger("maxGas", maxGas);
+ /**
+ * Writes this tank to a defined tag compound.
+ * @param nbtTags - tag compound to write to
+ * @return tag compound with this tank's data
+ */
+ public NBTTagCompound write(NBTTagCompound nbtTags) {
+ if (stored != null && stored.getGas() != null) {
+ nbtTags.setTag("stored", stored.write(new NBTTagCompound()));
+ }
- return nbtTags;
- }
+ nbtTags.setInteger("maxGas", maxGas);
- /**
- * Reads this tank's data from a defined tag compound.
- * @param nbtTags - tag compound to read from
- */
- public void read(NBTTagCompound nbtTags)
- {
- if(nbtTags.hasKey("stored"))
- {
- stored = GasStack.readFromNBT(nbtTags.getCompoundTag("stored"));
- }
+ return nbtTags;
+ }
- if(nbtTags.hasKey("maxGas") && nbtTags.getInteger("maxGas") != 0)
- {
- maxGas = nbtTags.getInteger("maxGas");
- }
- }
+ /**
+ * Reads this tank's data from a defined tag compound.
+ * @param nbtTags - tag compound to read from
+ */
+ public void read(NBTTagCompound nbtTags) {
+ if (nbtTags.hasKey("stored")) {
+ stored = GasStack.readFromNBT(nbtTags.getCompoundTag("stored"));
+ }
- /**
- * Returns the tank stored in the defined tag compound, or null if it doesn't exist.
- * @param nbtTags - tag compound to read from
- * @return tank stored in the tag compound
- */
- public static GasTank readFromNBT(NBTTagCompound nbtTags)
- {
- if(nbtTags == null || nbtTags.hasNoTags())
- {
- return null;
- }
+ if (nbtTags.hasKey("maxGas") && nbtTags.getInteger("maxGas") != 0) {
+ maxGas = nbtTags.getInteger("maxGas");
+ }
+ }
- GasTank tank = new GasTank();
- tank.read(nbtTags);
+ /**
+ * Returns the tank stored in the defined tag compound, or null if it doesn't exist.
+ * @param nbtTags - tag compound to read from
+ * @return tank stored in the tag compound
+ */
+ public static GasTank readFromNBT(NBTTagCompound nbtTags) {
+ if (nbtTags == null || nbtTags.hasNoTags()) {
+ return null;
+ }
- return tank;
- }
+ GasTank tank = new GasTank();
+ tank.read(nbtTags);
+
+ return tank;
+ }
}
diff --git a/src/main/java/mekanism/api/gas/GasTransmission.java b/src/main/java/mekanism/api/gas/GasTransmission.java
index ef6cc4d3b..f2fdfe7c4 100644
--- a/src/main/java/mekanism/api/gas/GasTransmission.java
+++ b/src/main/java/mekanism/api/gas/GasTransmission.java
@@ -18,169 +18,176 @@ import net.minecraftforge.common.util.ForgeDirection;
* @author AidanBrady
*
*/
-public final class GasTransmission
-{
- public static IGasHandler[] getConnectedAcceptors(TileEntity tileEntity, Collection sides)
- {
- IGasHandler[] acceptors = new IGasHandler[] {null, null, null, null, null, null};
+public final class GasTransmission {
+ public static IGasHandler[] getConnectedAcceptors(
+ TileEntity tileEntity, Collection sides
+ ) {
+ IGasHandler[] acceptors
+ = new IGasHandler[] { null, null, null, null, null, null };
- for(ForgeDirection orientation : sides)
- {
- TileEntity acceptor = Coord4D.get(tileEntity).getFromSide(orientation).getTileEntity(tileEntity.getWorldObj());
+ for (ForgeDirection orientation : sides) {
+ TileEntity acceptor = Coord4D.get(tileEntity)
+ .getFromSide(orientation)
+ .getTileEntity(tileEntity.getWorldObj());
- if(acceptor instanceof IGasHandler)
- {
- acceptors[orientation.ordinal()] = (IGasHandler)acceptor;
- }
- }
+ if (acceptor instanceof IGasHandler) {
+ acceptors[orientation.ordinal()] = (IGasHandler) acceptor;
+ }
+ }
- return acceptors;
- }
-
- /**
- * Gets all the acceptors around a tile entity.
- * @param tileEntity - center tile entity
- * @return array of IGasAcceptors
- */
- public static IGasHandler[] getConnectedAcceptors(TileEntity tileEntity)
- {
- return getConnectedAcceptors(tileEntity, Arrays.asList(ForgeDirection.VALID_DIRECTIONS));
- }
+ return acceptors;
+ }
- /**
- * Gets all the tube connections around a tile entity.
- * @param tileEntity - center tile entity
- * @return array of ITubeConnections
- */
- public static ITubeConnection[] getConnections(TileEntity tileEntity)
- {
- ITubeConnection[] connections = new ITubeConnection[] {null, null, null, null, null, null};
+ /**
+ * Gets all the acceptors around a tile entity.
+ * @param tileEntity - center tile entity
+ * @return array of IGasAcceptors
+ */
+ public static IGasHandler[] getConnectedAcceptors(TileEntity tileEntity) {
+ return getConnectedAcceptors(
+ tileEntity, Arrays.asList(ForgeDirection.VALID_DIRECTIONS)
+ );
+ }
- for(ForgeDirection orientation : ForgeDirection.VALID_DIRECTIONS)
- {
- TileEntity connection = Coord4D.get(tileEntity).getFromSide(orientation).getTileEntity(tileEntity.getWorldObj());
+ /**
+ * Gets all the tube connections around a tile entity.
+ * @param tileEntity - center tile entity
+ * @return array of ITubeConnections
+ */
+ public static ITubeConnection[] getConnections(TileEntity tileEntity) {
+ ITubeConnection[] connections
+ = new ITubeConnection[] { null, null, null, null, null, null };
- if(canConnect(connection, orientation))
- {
- connections[orientation.ordinal()] = (ITubeConnection)connection;
- }
- }
+ for (ForgeDirection orientation : ForgeDirection.VALID_DIRECTIONS) {
+ TileEntity connection = Coord4D.get(tileEntity)
+ .getFromSide(orientation)
+ .getTileEntity(tileEntity.getWorldObj());
- return connections;
- }
+ if (canConnect(connection, orientation)) {
+ connections[orientation.ordinal()] = (ITubeConnection) connection;
+ }
+ }
- /**
- * Whether or not a TileEntity can connect to a specified tile on a specified side.
- * @param tileEntity - TileEntity to attempt connection to
- * @param side - side to attempt connection on
- * @return if this tile and side are connectable
- */
- public static boolean canConnect(TileEntity tileEntity, ForgeDirection side)
- {
- if(tileEntity instanceof ITubeConnection && (!(tileEntity instanceof ITransmitterTile) || TransmissionType.checkTransmissionType(((ITransmitterTile)tileEntity).getTransmitter(), TransmissionType.GAS)))
- {
- if(((ITubeConnection)tileEntity).canTubeConnect(side.getOpposite()))
- {
- return true;
- }
- }
+ return connections;
+ }
- return false;
- }
+ /**
+ * Whether or not a TileEntity can connect to a specified tile on a specified side.
+ * @param tileEntity - TileEntity to attempt connection to
+ * @param side - side to attempt connection on
+ * @return if this tile and side are connectable
+ */
+ public static boolean canConnect(TileEntity tileEntity, ForgeDirection side) {
+ if (tileEntity instanceof ITubeConnection
+ && (!(tileEntity instanceof ITransmitterTile)
+ || TransmissionType.checkTransmissionType(
+ ((ITransmitterTile) tileEntity).getTransmitter(), TransmissionType.GAS
+ ))) {
+ if (((ITubeConnection) tileEntity).canTubeConnect(side.getOpposite())) {
+ return true;
+ }
+ }
- /**
- * Removes a specified amount of gas from an IGasItem.
- * @param itemStack - ItemStack of the IGasItem
- * @param type - type of gas to remove from the IGasItem, null if it doesn't matter
- * @param amount - amount of gas to remove from the ItemStack
- * @return the GasStack removed by the IGasItem
- */
- public static GasStack removeGas(ItemStack itemStack, Gas type, int amount)
- {
- if(itemStack != null && itemStack.getItem() instanceof IGasItem)
- {
- IGasItem item = (IGasItem)itemStack.getItem();
+ return false;
+ }
- if(type != null && item.getGas(itemStack) != null && item.getGas(itemStack).getGas() != type || !item.canProvideGas(itemStack, type))
- {
- return null;
- }
+ /**
+ * Removes a specified amount of gas from an IGasItem.
+ * @param itemStack - ItemStack of the IGasItem
+ * @param type - type of gas to remove from the IGasItem, null if it doesn't matter
+ * @param amount - amount of gas to remove from the ItemStack
+ * @return the GasStack removed by the IGasItem
+ */
+ public static GasStack removeGas(ItemStack itemStack, Gas type, int amount) {
+ if (itemStack != null && itemStack.getItem() instanceof IGasItem) {
+ IGasItem item = (IGasItem) itemStack.getItem();
- return item.removeGas(itemStack, amount);
- }
+ if (type != null && item.getGas(itemStack) != null
+ && item.getGas(itemStack).getGas() != type
+ || !item.canProvideGas(itemStack, type)) {
+ return null;
+ }
- return null;
- }
+ return item.removeGas(itemStack, amount);
+ }
- /**
- * Adds a specified amount of gas to an IGasItem.
- * @param itemStack - ItemStack of the IGasItem
- * @param stack - stack to add to the IGasItem
- * @return amount of gas accepted by the IGasItem
- */
- public static int addGas(ItemStack itemStack, GasStack stack)
- {
- if(itemStack != null && itemStack.getItem() instanceof IGasItem && ((IGasItem)itemStack.getItem()).canReceiveGas(itemStack, stack.getGas()))
- {
- return ((IGasItem)itemStack.getItem()).addGas(itemStack, stack.copy());
- }
+ return null;
+ }
- return 0;
- }
-
- /**
- * Emits gas from a central block by splitting the received stack among the sides given.
- * @param stack - the stack to output
- * @param from - the TileEntity to output from
- * @param sides - the list of sides to output from
- * @return the amount of gas emitted
- */
- public static int emit(GasStack stack, TileEntity from, Collection sides)
- {
- if(stack == null)
- {
- return 0;
- }
-
- List availableAcceptors = new ArrayList();
- IGasHandler[] possibleAcceptors = getConnectedAcceptors(from, sides);
-
- for(int i = 0; i < possibleAcceptors.length; i++)
- {
- IGasHandler handler = possibleAcceptors[i];
-
- if(handler != null && handler.canReceiveGas(ForgeDirection.getOrientation(i).getOpposite(), stack.getGas()))
- {
- availableAcceptors.add(handler);
- }
- }
+ /**
+ * Adds a specified amount of gas to an IGasItem.
+ * @param itemStack - ItemStack of the IGasItem
+ * @param stack - stack to add to the IGasItem
+ * @return amount of gas accepted by the IGasItem
+ */
+ public static int addGas(ItemStack itemStack, GasStack stack) {
+ if (itemStack != null && itemStack.getItem() instanceof IGasItem
+ && ((IGasItem) itemStack.getItem())
+ .canReceiveGas(itemStack, stack.getGas())) {
+ return ((IGasItem) itemStack.getItem()).addGas(itemStack, stack.copy());
+ }
- Collections.shuffle(availableAcceptors);
+ return 0;
+ }
- int toSend = stack.amount;
- int prevSending = toSend;
+ /**
+ * Emits gas from a central block by splitting the received stack among the sides
+ * given.
+ * @param stack - the stack to output
+ * @param from - the TileEntity to output from
+ * @param sides - the list of sides to output from
+ * @return the amount of gas emitted
+ */
+ public static int
+ emit(GasStack stack, TileEntity from, Collection sides) {
+ if (stack == null) {
+ return 0;
+ }
- if(!availableAcceptors.isEmpty())
- {
- int divider = availableAcceptors.size();
- int remaining = toSend % divider;
- int sending = (toSend-remaining)/divider;
+ List availableAcceptors = new ArrayList();
+ IGasHandler[] possibleAcceptors = getConnectedAcceptors(from, sides);
- for(IGasHandler acceptor : availableAcceptors)
- {
- int currentSending = sending;
+ for (int i = 0; i < possibleAcceptors.length; i++) {
+ IGasHandler handler = possibleAcceptors[i];
- if(remaining > 0)
- {
- currentSending++;
- remaining--;
- }
-
- ForgeDirection dir = ForgeDirection.getOrientation(Arrays.asList(possibleAcceptors).indexOf(acceptor)).getOpposite();
- toSend -= acceptor.receiveGas(dir, new GasStack(stack.getGas(), currentSending), true);
- }
- }
+ if (handler != null
+ && handler.canReceiveGas(
+ ForgeDirection.getOrientation(i).getOpposite(), stack.getGas()
+ )) {
+ availableAcceptors.add(handler);
+ }
+ }
- return prevSending-toSend;
- }
+ Collections.shuffle(availableAcceptors);
+
+ int toSend = stack.amount;
+ int prevSending = toSend;
+
+ if (!availableAcceptors.isEmpty()) {
+ int divider = availableAcceptors.size();
+ int remaining = toSend % divider;
+ int sending = (toSend - remaining) / divider;
+
+ for (IGasHandler acceptor : availableAcceptors) {
+ int currentSending = sending;
+
+ if (remaining > 0) {
+ currentSending++;
+ remaining--;
+ }
+
+ ForgeDirection dir
+ = ForgeDirection
+ .getOrientation(
+ Arrays.asList(possibleAcceptors).indexOf(acceptor)
+ )
+ .getOpposite();
+ toSend -= acceptor.receiveGas(
+ dir, new GasStack(stack.getGas(), currentSending), true
+ );
+ }
+ }
+
+ return prevSending - toSend;
+ }
}
diff --git a/src/main/java/mekanism/api/gas/IGasHandler.java b/src/main/java/mekanism/api/gas/IGasHandler.java
index e06952317..c07265708 100644
--- a/src/main/java/mekanism/api/gas/IGasHandler.java
+++ b/src/main/java/mekanism/api/gas/IGasHandler.java
@@ -7,41 +7,40 @@ import net.minecraftforge.common.util.ForgeDirection;
* @author AidanBrady
*
*/
-public interface IGasHandler
-{
- /**
- * Transfer a certain amount of gas to this block.
- * @param stack - gas to add
- * @return gas added
- */
- public int receiveGas(ForgeDirection side, GasStack stack, boolean doTransfer);
+public interface IGasHandler {
+ /**
+ * Transfer a certain amount of gas to this block.
+ * @param stack - gas to add
+ * @return gas added
+ */
+ public int receiveGas(ForgeDirection side, GasStack stack, boolean doTransfer);
- @Deprecated
- public int receiveGas(ForgeDirection side, GasStack stack);
+ @Deprecated
+ public int receiveGas(ForgeDirection side, GasStack stack);
- /**
- * Draws a certain amount of gas from this block.
- * @param amount - amount to draw
- * @return gas drawn
- */
- public GasStack drawGas(ForgeDirection side, int amount, boolean doTransfer);
+ /**
+ * Draws a certain amount of gas from this block.
+ * @param amount - amount to draw
+ * @return gas drawn
+ */
+ public GasStack drawGas(ForgeDirection side, int amount, boolean doTransfer);
- @Deprecated
- public GasStack drawGas(ForgeDirection side, int amount);
+ @Deprecated
+ public GasStack drawGas(ForgeDirection side, int amount);
- /**
- * Whether or not this block can accept gas from a certain side.
- * @param side - side to check
- * @param type - type of gas to check
- * @return if block accepts gas
- */
- public boolean canReceiveGas(ForgeDirection side, Gas type);
+ /**
+ * Whether or not this block can accept gas from a certain side.
+ * @param side - side to check
+ * @param type - type of gas to check
+ * @return if block accepts gas
+ */
+ public boolean canReceiveGas(ForgeDirection side, Gas type);
- /**
- * Whether or not this block can be drawn of gas from a certain side.
- * @param side - side to check
- * @param type - type of gas to check
- * @return if block can be drawn of gas
- */
- public boolean canDrawGas(ForgeDirection side, Gas type);
+ /**
+ * Whether or not this block can be drawn of gas from a certain side.
+ * @param side - side to check
+ * @param type - type of gas to check
+ * @return if block can be drawn of gas
+ */
+ public boolean canDrawGas(ForgeDirection side, Gas type);
}
diff --git a/src/main/java/mekanism/api/gas/IGasItem.java b/src/main/java/mekanism/api/gas/IGasItem.java
index 04231cd81..759b5c0e4 100644
--- a/src/main/java/mekanism/api/gas/IGasItem.java
+++ b/src/main/java/mekanism/api/gas/IGasItem.java
@@ -7,69 +7,68 @@ import net.minecraft.item.ItemStack;
* @author AidanBrady
*
*/
-public interface IGasItem
-{
- /**
- * Gets the rate of transfer this item can handle.
- * @return
- */
- public int getRate(ItemStack itemstack);
+public interface IGasItem {
+ /**
+ * Gets the rate of transfer this item can handle.
+ * @return
+ */
+ public int getRate(ItemStack itemstack);
- /**
- * Adds a defined amount of a certain gas to an item.
- * @param itemstack - the itemstack to add gas to
- * @param type - the type of gas to add
- * @param amount - the amount of gas to add
- * @return the gas that was accepted by the item
- */
- public int addGas(ItemStack itemstack, GasStack stack);
+ /**
+ * Adds a defined amount of a certain gas to an item.
+ * @param itemstack - the itemstack to add gas to
+ * @param type - the type of gas to add
+ * @param amount - the amount of gas to add
+ * @return the gas that was accepted by the item
+ */
+ public int addGas(ItemStack itemstack, GasStack stack);
- /**
- * Removes the defined amount of a certain gas from the item.
- * @param itemstack - the itemstack to remove gas from
- * @param type - the type of gas to remove
- * @param amount - the amount of gas to remove
- * @return the gas that was removed by the item
- */
- public GasStack removeGas(ItemStack itemstack, int amount);
+ /**
+ * Removes the defined amount of a certain gas from the item.
+ * @param itemstack - the itemstack to remove gas from
+ * @param type - the type of gas to remove
+ * @param amount - the amount of gas to remove
+ * @return the gas that was removed by the item
+ */
+ public GasStack removeGas(ItemStack itemstack, int amount);
- /**
- * Whether or not this storage tank be given a specific gas.
- * @param itemstack - the itemstack to check
- * @param type - the type of gas the tank can possibly receive
- * @return if the item be charged
- */
- public boolean canReceiveGas(ItemStack itemstack, Gas type);
+ /**
+ * Whether or not this storage tank be given a specific gas.
+ * @param itemstack - the itemstack to check
+ * @param type - the type of gas the tank can possibly receive
+ * @return if the item be charged
+ */
+ public boolean canReceiveGas(ItemStack itemstack, Gas type);
- /**
- * Whether or not this item can give a gas receiver a certain type of gas.
- * @param itemstack - the itemstack to check
- * @param type - the type of gas the tank can provide
- * @return if the item can provide gas
- */
- public boolean canProvideGas(ItemStack itemstack, Gas type);
+ /**
+ * Whether or not this item can give a gas receiver a certain type of gas.
+ * @param itemstack - the itemstack to check
+ * @param type - the type of gas the tank can provide
+ * @return if the item can provide gas
+ */
+ public boolean canProvideGas(ItemStack itemstack, Gas type);
- /**
- * Get the gas of a declared type.
- * @param type - type of gas
- * @param data - ItemStack parameter if necessary
- * @return gas stored
- */
- public GasStack getGas(ItemStack itemstack);
+ /**
+ * Get the gas of a declared type.
+ * @param type - type of gas
+ * @param data - ItemStack parameter if necessary
+ * @return gas stored
+ */
+ public GasStack getGas(ItemStack itemstack);
- /**
- * Set the gas of a declared type to a new amount;
- * @param type - type of gas
- * @param data - ItemStack parameter if necessary
- * @param amount - amount to store
- */
- public void setGas(ItemStack itemstack, GasStack stack);
+ /**
+ * Set the gas of a declared type to a new amount;
+ * @param type - type of gas
+ * @param data - ItemStack parameter if necessary
+ * @param amount - amount to store
+ */
+ public void setGas(ItemStack itemstack, GasStack stack);
- /**
- * Gets the maximum amount of gas this tile entity can store.
- * @param type - type of gas
- * @param data - ItemStack parameter if necessary
- * @return maximum gas
- */
- public int getMaxGas(ItemStack itemstack);
+ /**
+ * Gets the maximum amount of gas this tile entity can store.
+ * @param type - type of gas
+ * @param data - ItemStack parameter if necessary
+ * @return maximum gas
+ */
+ public int getMaxGas(ItemStack itemstack);
}
diff --git a/src/main/java/mekanism/api/gas/IGasTransmitter.java b/src/main/java/mekanism/api/gas/IGasTransmitter.java
index 2785ac1c8..053b19379 100644
--- a/src/main/java/mekanism/api/gas/IGasTransmitter.java
+++ b/src/main/java/mekanism/api/gas/IGasTransmitter.java
@@ -3,7 +3,6 @@ package mekanism.api.gas;
import mekanism.api.transmitters.IGridTransmitter;
import net.minecraft.tileentity.TileEntity;
-public interface IGasTransmitter extends IGridTransmitter
-{
- public boolean canTransferGasToTube(TileEntity tile);
+public interface IGasTransmitter extends IGridTransmitter {
+ public boolean canTransferGasToTube(TileEntity tile);
}
diff --git a/src/main/java/mekanism/api/gas/ITubeConnection.java b/src/main/java/mekanism/api/gas/ITubeConnection.java
index b669fedda..9dbc9bd98 100644
--- a/src/main/java/mekanism/api/gas/ITubeConnection.java
+++ b/src/main/java/mekanism/api/gas/ITubeConnection.java
@@ -7,12 +7,11 @@ import net.minecraftforge.common.util.ForgeDirection;
* @author AidanBrady
*
*/
-public interface ITubeConnection
-{
- /**
- * Whether or not a tube can connect to a certain orientation.
- * @param side - orientation to check
- * @return if a tube can connect
- */
- public boolean canTubeConnect(ForgeDirection side);
+public interface ITubeConnection {
+ /**
+ * Whether or not a tube can connect to a certain orientation.
+ * @param side - orientation to check
+ * @return if a tube can connect
+ */
+ public boolean canTubeConnect(ForgeDirection side);
}
diff --git a/src/main/java/mekanism/api/gas/OreGas.java b/src/main/java/mekanism/api/gas/OreGas.java
index 316169c2a..7c5f8bd9c 100644
--- a/src/main/java/mekanism/api/gas/OreGas.java
+++ b/src/main/java/mekanism/api/gas/OreGas.java
@@ -2,37 +2,31 @@ package mekanism.api.gas;
import net.minecraft.util.StatCollector;
-public class OreGas extends Gas
-{
- private String oreName;
- private OreGas cleanGas;
+public class OreGas extends Gas {
+ private String oreName;
+ private OreGas cleanGas;
- public OreGas(String s, String name)
- {
- super(s);
+ public OreGas(String s, String name) {
+ super(s);
- oreName = name;
- }
+ oreName = name;
+ }
- public boolean isClean()
- {
- return getCleanGas() == null;
- }
+ public boolean isClean() {
+ return getCleanGas() == null;
+ }
- public OreGas getCleanGas()
- {
- return cleanGas;
- }
+ public OreGas getCleanGas() {
+ return cleanGas;
+ }
- public OreGas setCleanGas(OreGas gas)
- {
- cleanGas = gas;
+ public OreGas setCleanGas(OreGas gas) {
+ cleanGas = gas;
- return this;
- }
+ return this;
+ }
- public String getOreName()
- {
- return StatCollector.translateToLocal(oreName);
- }
+ public String getOreName() {
+ return StatCollector.translateToLocal(oreName);
+ }
}
diff --git a/src/main/java/mekanism/api/gas/package-info.java b/src/main/java/mekanism/api/gas/package-info.java
index f213e0553..5f8a67458 100644
--- a/src/main/java/mekanism/api/gas/package-info.java
+++ b/src/main/java/mekanism/api/gas/package-info.java
@@ -1,4 +1,3 @@
@API(apiVersion = "9.0.0", owner = "Mekanism", provides = "MekanismAPI|gas")
package mekanism.api.gas;
import cpw.mods.fml.common.API;
-
diff --git a/src/main/java/mekanism/api/infuse/InfuseObject.java b/src/main/java/mekanism/api/infuse/InfuseObject.java
index a86c02f1a..a48bb1bbb 100644
--- a/src/main/java/mekanism/api/infuse/InfuseObject.java
+++ b/src/main/java/mekanism/api/infuse/InfuseObject.java
@@ -1,21 +1,20 @@
package mekanism.api.infuse;
/**
- * InfuseObject - an object associated with an ItemStack that can modify a Metallurgic Infuser's internal infuse.
+ * InfuseObject - an object associated with an ItemStack that can modify a Metallurgic
+ * Infuser's internal infuse.
* @author AidanBrady
*
*/
-public class InfuseObject
-{
- /** The type of infuse this item stores */
- public InfuseType type;
+public class InfuseObject {
+ /** The type of infuse this item stores */
+ public InfuseType type;
- /** How much infuse this item stores */
- public int stored;
+ /** How much infuse this item stores */
+ public int stored;
- public InfuseObject(InfuseType infusion, int i)
- {
- type = infusion;
- stored = i;
- }
+ public InfuseObject(InfuseType infusion, int i) {
+ type = infusion;
+ stored = i;
+ }
}
diff --git a/src/main/java/mekanism/api/infuse/InfuseRegistry.java b/src/main/java/mekanism/api/infuse/InfuseRegistry.java
index 308b9c5be..70ded2e81 100644
--- a/src/main/java/mekanism/api/infuse/InfuseRegistry.java
+++ b/src/main/java/mekanism/api/infuse/InfuseRegistry.java
@@ -10,104 +10,95 @@ import net.minecraft.item.ItemStack;
* @author AidanBrady
*
*/
-public class InfuseRegistry
-{
- /** The (private) map of ItemStacks and their related InfuseObjects. */
- private static Map infuseObjects = new HashMap();
+public class InfuseRegistry {
+ /** The (private) map of ItemStacks and their related InfuseObjects. */
+ private static Map infuseObjects
+ = new HashMap();
- /** The (private) map of infuse names and their corresponding InfuseTypes. */
- private static Map infuseTypes = new HashMap();
+ /** The (private) map of infuse names and their corresponding InfuseTypes. */
+ private static Map infuseTypes
+ = new HashMap();
- /**
- * Registers an InfuseType into the registry. Call this in PreInit!
- * @param infuse
- */
- public static void registerInfuseType(InfuseType infuse)
- {
- if(infuseTypes.containsKey(infuse.name))
- {
- return;
- }
+ /**
+ * Registers an InfuseType into the registry. Call this in PreInit!
+ * @param infuse
+ */
+ public static void registerInfuseType(InfuseType infuse) {
+ if (infuseTypes.containsKey(infuse.name)) {
+ return;
+ }
- infuseTypes.put(infuse.name, infuse);
- }
+ infuseTypes.put(infuse.name, infuse);
+ }
- /**
- * Gets an InfuseType from it's name, or null if it doesn't exist.
- * @param name - the name of the InfuseType to get
- * @return the name's corresponding InfuseType
- */
- public static InfuseType get(String name)
- {
- if(name.equals("null"))
- {
- return null;
- }
+ /**
+ * Gets an InfuseType from it's name, or null if it doesn't exist.
+ * @param name - the name of the InfuseType to get
+ * @return the name's corresponding InfuseType
+ */
+ public static InfuseType get(String name) {
+ if (name.equals("null")) {
+ return null;
+ }
- return infuseTypes.get(name);
- }
+ return infuseTypes.get(name);
+ }
- /**
- * Whether or not the registry contains a correspondent InfuseType to a name.
- * @param name - the name to check
- * @return if the name has a coorespondent InfuseType
- */
- public static boolean contains(String name)
- {
- return get(name) != null;
- }
+ /**
+ * Whether or not the registry contains a correspondent InfuseType to a name.
+ * @param name - the name to check
+ * @return if the name has a coorespondent InfuseType
+ */
+ public static boolean contains(String name) {
+ return get(name) != null;
+ }
- /**
- * Registers a block or item that serves as an infuse object. An infuse object will store a certain type and amount of infuse,
- * and will deliver this amount to the Metallurgic Infuser's buffer of infuse. The item's stack size will be decremented when
- * it is placed in the Metallurgic Infuser's infuse slot, and the machine can accept the type and amount of infuse stored in the
- * object.
- * @param itemStack - stack the infuse object is linked to -- stack size is ignored
- * @param infuseObject - the infuse object with the type and amount data
- */
- public static void registerInfuseObject(ItemStack itemStack, InfuseObject infuseObject)
- {
- if(getObject(itemStack) != null)
- {
- return;
- }
+ /**
+ * Registers a block or item that serves as an infuse object. An infuse object will
+ * store a certain type and amount of infuse, and will deliver this amount to the
+ * Metallurgic Infuser's buffer of infuse. The item's stack size will be decremented
+ * when it is placed in the Metallurgic Infuser's infuse slot, and the machine can
+ * accept the type and amount of infuse stored in the object.
+ * @param itemStack - stack the infuse object is linked to -- stack size is ignored
+ * @param infuseObject - the infuse object with the type and amount data
+ */
+ public static void
+ registerInfuseObject(ItemStack itemStack, InfuseObject infuseObject) {
+ if (getObject(itemStack) != null) {
+ return;
+ }
- infuseObjects.put(itemStack, infuseObject);
- }
+ infuseObjects.put(itemStack, infuseObject);
+ }
- /**
- * Gets the InfuseObject data from an ItemStack.
- * @param itemStack - the ItemStack to check
- * @return the ItemStack's InfuseObject
- */
- public static InfuseObject getObject(ItemStack itemStack)
- {
- for(Map.Entry obj : infuseObjects.entrySet())
- {
- if(itemStack.isItemEqual(obj.getKey()))
- {
- return obj.getValue();
- }
- }
+ /**
+ * Gets the InfuseObject data from an ItemStack.
+ * @param itemStack - the ItemStack to check
+ * @return the ItemStack's InfuseObject
+ */
+ public static InfuseObject getObject(ItemStack itemStack) {
+ for (Map.Entry obj : infuseObjects.entrySet()) {
+ if (itemStack.isItemEqual(obj.getKey())) {
+ return obj.getValue();
+ }
+ }
- return null;
- }
+ return null;
+ }
- /**
- * Gets the private map for InfuseObjects.
- * @return private InfuseObject map
- */
- public static final Map getObjectMap()
- {
- return infuseObjects;
- }
+ /**
+ * Gets the private map for InfuseObjects.
+ * @return private InfuseObject map
+ */
+ public static final Map getObjectMap() {
+ return infuseObjects;
+ }
- /**
- * Gets the private map for InfuseTypes.
- * @return private InfuseType map
- */
- public static final Map getInfuseMap()
- {
- return infuseTypes;
- }
+ /**
+ * Gets the private map for InfuseTypes.
+ * @return private InfuseType map
+ */
+ public static final Map getInfuseMap() {
+ return infuseTypes;
+ }
}
diff --git a/src/main/java/mekanism/api/infuse/InfuseType.java b/src/main/java/mekanism/api/infuse/InfuseType.java
index 2ebd49161..12f10bb64 100644
--- a/src/main/java/mekanism/api/infuse/InfuseType.java
+++ b/src/main/java/mekanism/api/infuse/InfuseType.java
@@ -8,40 +8,35 @@ import net.minecraft.util.StatCollector;
* @author AidanBrady
*
*/
-public final class InfuseType
-{
- /** The name of this infusion */
- public String name;
+public final class InfuseType {
+ /** The name of this infusion */
+ public String name;
- /** This infuse GUI's icon */
- public IIcon icon;
-
- /** The location of this infuse GUI's icon */
- public String textureLocation;
+ /** This infuse GUI's icon */
+ public IIcon icon;
- /** The unlocalized name of this type. */
- public String unlocalizedName;
+ /** The location of this infuse GUI's icon */
+ public String textureLocation;
- public InfuseType(String s, String tex)
- {
- name = s;
- textureLocation = tex;
- }
-
- public void setIcon(IIcon i)
- {
- icon = i;
- }
+ /** The unlocalized name of this type. */
+ public String unlocalizedName;
- public InfuseType setUnlocalizedName(String name)
- {
- unlocalizedName = "infuse." + name;
+ public InfuseType(String s, String tex) {
+ name = s;
+ textureLocation = tex;
+ }
- return this;
- }
+ public void setIcon(IIcon i) {
+ icon = i;
+ }
- public String getLocalizedName()
- {
- return StatCollector.translateToLocal(unlocalizedName);
- }
+ public InfuseType setUnlocalizedName(String name) {
+ unlocalizedName = "infuse." + name;
+
+ return this;
+ }
+
+ public String getLocalizedName() {
+ return StatCollector.translateToLocal(unlocalizedName);
+ }
}
diff --git a/src/main/java/mekanism/api/infuse/package-info.java b/src/main/java/mekanism/api/infuse/package-info.java
index bcbb9a8b5..e234a2664 100644
--- a/src/main/java/mekanism/api/infuse/package-info.java
+++ b/src/main/java/mekanism/api/infuse/package-info.java
@@ -1,4 +1,3 @@
@API(apiVersion = "9.0.0", owner = "Mekanism", provides = "MekanismAPI|infuse")
package mekanism.api.infuse;
import cpw.mods.fml.common.API;
-
diff --git a/src/main/java/mekanism/api/lasers/ILaserReceptor.java b/src/main/java/mekanism/api/lasers/ILaserReceptor.java
index 641f3ca0c..84a8c9680 100644
--- a/src/main/java/mekanism/api/lasers/ILaserReceptor.java
+++ b/src/main/java/mekanism/api/lasers/ILaserReceptor.java
@@ -2,9 +2,8 @@ package mekanism.api.lasers;
import net.minecraftforge.common.util.ForgeDirection;
-public interface ILaserReceptor
-{
- public void receiveLaserEnergy(double energy, ForgeDirection side);
+public interface ILaserReceptor {
+ public void receiveLaserEnergy(double energy, ForgeDirection side);
- public boolean canLasersDig();
+ public boolean canLasersDig();
}
diff --git a/src/main/java/mekanism/api/lasers/package-info.java b/src/main/java/mekanism/api/lasers/package-info.java
index 2ba8eb0b5..e60163fd0 100644
--- a/src/main/java/mekanism/api/lasers/package-info.java
+++ b/src/main/java/mekanism/api/lasers/package-info.java
@@ -1,4 +1,3 @@
@API(apiVersion = "9.0.0", owner = "Mekanism", provides = "MekanismAPI|laser")
package mekanism.api.lasers;
import cpw.mods.fml.common.API;
-
diff --git a/src/main/java/mekanism/api/package-info.java b/src/main/java/mekanism/api/package-info.java
index c2aba662d..440cfcf98 100644
--- a/src/main/java/mekanism/api/package-info.java
+++ b/src/main/java/mekanism/api/package-info.java
@@ -1,4 +1,3 @@
@API(apiVersion = "9.0.0", owner = "Mekanism", provides = "MekanismAPI|core")
package mekanism.api;
import cpw.mods.fml.common.API;
-
diff --git a/src/main/java/mekanism/api/reactor/IFusionReactor.java b/src/main/java/mekanism/api/reactor/IFusionReactor.java
index da96a27c3..c18ef6510 100644
--- a/src/main/java/mekanism/api/reactor/IFusionReactor.java
+++ b/src/main/java/mekanism/api/reactor/IFusionReactor.java
@@ -5,61 +5,60 @@ import mekanism.api.gas.GasTank;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidTank;
-public interface IFusionReactor extends IHeatTransfer
-{
- public void addTemperatureFromEnergyInput(double energyAdded);
+public interface IFusionReactor extends IHeatTransfer {
+ public void addTemperatureFromEnergyInput(double energyAdded);
- public void simulate();
+ public void simulate();
- public FluidTank getWaterTank();
+ public FluidTank getWaterTank();
- public FluidTank getSteamTank();
+ public FluidTank getSteamTank();
- public GasTank getDeuteriumTank();
+ public GasTank getDeuteriumTank();
- public GasTank getTritiumTank();
+ public GasTank getTritiumTank();
- public GasTank getFuelTank();
+ public GasTank getFuelTank();
- public double getBufferedEnergy();
+ public double getBufferedEnergy();
- public void setBufferedEnergy(double energy);
+ public void setBufferedEnergy(double energy);
- public double getPlasmaTemp();
+ public double getPlasmaTemp();
- public void setPlasmaTemp(double temp);
+ public void setPlasmaTemp(double temp);
- public double getCaseTemp();
+ public double getCaseTemp();
- public void setCaseTemp(double temp);
+ public void setCaseTemp(double temp);
- public double getBufferSize();
+ public double getBufferSize();
- public void formMultiblock(boolean keepBurning);
+ public void formMultiblock(boolean keepBurning);
- public boolean isFormed();
+ public boolean isFormed();
- public void setInjectionRate(int rate);
+ public void setInjectionRate(int rate);
- public int getInjectionRate();
+ public int getInjectionRate();
- public boolean isBurning();
+ public boolean isBurning();
- public void setBurning(boolean burn);
+ public void setBurning(boolean burn);
- public int getMinInjectionRate(boolean active);
+ public int getMinInjectionRate(boolean active);
- public double getMaxPlasmaTemperature(boolean active);
+ public double getMaxPlasmaTemperature(boolean active);
- public double getMaxCasingTemperature(boolean active);
+ public double getMaxCasingTemperature(boolean active);
- public double getIgnitionTemperature(boolean active);
+ public double getIgnitionTemperature(boolean active);
- public double getPassiveGeneration(boolean active, boolean current);
+ public double getPassiveGeneration(boolean active, boolean current);
- public int getSteamPerTick(boolean current);
+ public int getSteamPerTick(boolean current);
- public void updateTemperatures();
-
- public ItemStack[] getInventory();
+ public void updateTemperatures();
+
+ public ItemStack[] getInventory();
}
diff --git a/src/main/java/mekanism/api/reactor/INeutronCapture.java b/src/main/java/mekanism/api/reactor/INeutronCapture.java
index 6171a7f74..e99ec18bc 100644
--- a/src/main/java/mekanism/api/reactor/INeutronCapture.java
+++ b/src/main/java/mekanism/api/reactor/INeutronCapture.java
@@ -1,6 +1,5 @@
package mekanism.api.reactor;
-public interface INeutronCapture extends IReactorBlock
-{
- public int absorbNeutrons(int neutrons);
+public interface INeutronCapture extends IReactorBlock {
+ public int absorbNeutrons(int neutrons);
}
diff --git a/src/main/java/mekanism/api/reactor/IReactorBlock.java b/src/main/java/mekanism/api/reactor/IReactorBlock.java
index b3b85188d..c5acb64b8 100644
--- a/src/main/java/mekanism/api/reactor/IReactorBlock.java
+++ b/src/main/java/mekanism/api/reactor/IReactorBlock.java
@@ -1,12 +1,9 @@
package mekanism.api.reactor;
+public interface IReactorBlock {
+ public boolean isFrame();
-public interface IReactorBlock
-{
- public boolean isFrame();
-
- public void setReactor(IFusionReactor reactor);
-
- public IFusionReactor getReactor();
+ public void setReactor(IFusionReactor reactor);
+ public IFusionReactor getReactor();
}
diff --git a/src/main/java/mekanism/api/reactor/package-info.java b/src/main/java/mekanism/api/reactor/package-info.java
index 57ad758fe..2abf09c8d 100644
--- a/src/main/java/mekanism/api/reactor/package-info.java
+++ b/src/main/java/mekanism/api/reactor/package-info.java
@@ -1,4 +1,3 @@
@API(apiVersion = "9.0.0", owner = "Mekanism", provides = "MekanismAPI|reactor")
package mekanism.api.reactor;
import cpw.mods.fml.common.API;
-
diff --git a/src/main/java/mekanism/api/recipe/RecipeHelper.java b/src/main/java/mekanism/api/recipe/RecipeHelper.java
index a125a8cbb..b293bec4a 100644
--- a/src/main/java/mekanism/api/recipe/RecipeHelper.java
+++ b/src/main/java/mekanism/api/recipe/RecipeHelper.java
@@ -14,305 +14,371 @@ import net.minecraftforge.fluids.FluidStack;
*
*/
@Deprecated
-public final class RecipeHelper
-{
- /**
- * Add an Enrichment Chamber recipe.
- * @param input - input ItemStack
- * @param output - output ItemStack
- */
- public static void addEnrichmentChamberRecipe(ItemStack input, ItemStack output)
- {
- try {
- Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler");
- Method m = recipeClass.getMethod("addEnrichmentChamberRecipe", ItemStack.class, ItemStack.class);
- m.invoke(null, input, output);
- } catch(Exception e) {
- System.err.println("Error while adding recipe: " + e.getMessage());
- }
- }
+public final class RecipeHelper {
+ /**
+ * Add an Enrichment Chamber recipe.
+ * @param input - input ItemStack
+ * @param output - output ItemStack
+ */
+ public static void addEnrichmentChamberRecipe(ItemStack input, ItemStack output) {
+ try {
+ Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler");
+ Method m = recipeClass.getMethod(
+ "addEnrichmentChamberRecipe", ItemStack.class, ItemStack.class
+ );
+ m.invoke(null, input, output);
+ } catch (Exception e) {
+ System.err.println("Error while adding recipe: " + e.getMessage());
+ }
+ }
- /**
- * Add an Osmium Compressor recipe.
- * @param input - input ItemStack
- * @param output - output ItemStack
- */
- public static void addOsmiumCompressorRecipe(ItemStack input, ItemStack output)
- {
- try {
- Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler");
- Method m = recipeClass.getMethod("addOsmiumCompressorRecipe", ItemStack.class, ItemStack.class);
- m.invoke(null, input, output);
- } catch(Exception e) {
- System.err.println("Error while adding recipe: " + e.getMessage());
- }
- }
+ /**
+ * Add an Osmium Compressor recipe.
+ * @param input - input ItemStack
+ * @param output - output ItemStack
+ */
+ public static void addOsmiumCompressorRecipe(ItemStack input, ItemStack output) {
+ try {
+ Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler");
+ Method m = recipeClass.getMethod(
+ "addOsmiumCompressorRecipe", ItemStack.class, ItemStack.class
+ );
+ m.invoke(null, input, output);
+ } catch (Exception e) {
+ System.err.println("Error while adding recipe: " + e.getMessage());
+ }
+ }
- /**
- * Add a Combiner recipe.
- * @param input - input ItemStack
- * @param output - output ItemStack
- */
- public static void addCombinerRecipe(ItemStack input, ItemStack output)
- {
- try {
- Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler");
- Method m = recipeClass.getMethod("addCombinerRecipe", ItemStack.class, ItemStack.class);
- m.invoke(null, input, output);
- } catch(Exception e) {
- System.err.println("Error while adding recipe: " + e.getMessage());
- }
- }
+ /**
+ * Add a Combiner recipe.
+ * @param input - input ItemStack
+ * @param output - output ItemStack
+ */
+ public static void addCombinerRecipe(ItemStack input, ItemStack output) {
+ try {
+ Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler");
+ Method m
+ = recipeClass
+ .getMethod("addCombinerRecipe", ItemStack.class, ItemStack.class);
+ m.invoke(null, input, output);
+ } catch (Exception e) {
+ System.err.println("Error while adding recipe: " + e.getMessage());
+ }
+ }
- /**
- * Add a Crusher recipe.
- * @param input - input ItemStack
- * @param output - output ItemStack
- */
- public static void addCrusherRecipe(ItemStack input, ItemStack output)
- {
- try {
- Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler");
- Method m = recipeClass.getMethod("addCrusherRecipe", ItemStack.class, ItemStack.class);
- m.invoke(null, input, output);
- } catch(Exception e) {
- System.err.println("Error while adding recipe: " + e.getMessage());
- }
- }
+ /**
+ * Add a Crusher recipe.
+ * @param input - input ItemStack
+ * @param output - output ItemStack
+ */
+ public static void addCrusherRecipe(ItemStack input, ItemStack output) {
+ try {
+ Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler");
+ Method m
+ = recipeClass
+ .getMethod("addCrusherRecipe", ItemStack.class, ItemStack.class);
+ m.invoke(null, input, output);
+ } catch (Exception e) {
+ System.err.println("Error while adding recipe: " + e.getMessage());
+ }
+ }
- /**
- * Add a Purification Chamber recipe.
- * @param input - input ItemStack
- * @param output - output ItemStack
- */
- public static void addPurificationChamberRecipe(ItemStack input, ItemStack output)
- {
- try {
- Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler");
- Method m = recipeClass.getMethod("addPurificationChamberRecipe", ItemStack.class, ItemStack.class);
- m.invoke(null, input, output);
- } catch(Exception e) {
- System.err.println("Error while adding recipe: " + e.getMessage());
- }
- }
+ /**
+ * Add a Purification Chamber recipe.
+ * @param input - input ItemStack
+ * @param output - output ItemStack
+ */
+ public static void addPurificationChamberRecipe(ItemStack input, ItemStack output) {
+ try {
+ Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler");
+ Method m = recipeClass.getMethod(
+ "addPurificationChamberRecipe", ItemStack.class, ItemStack.class
+ );
+ m.invoke(null, input, output);
+ } catch (Exception e) {
+ System.err.println("Error while adding recipe: " + e.getMessage());
+ }
+ }
- /**
- * Add a Chemical Oxidizer recipe.
- * @param input - input ItemStack
- * @param output - output GasStack
- */
- public static void addChemicalOxidizerRecipe(ItemStack input, GasStack output)
- {
- try {
- Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler");
- Method m = recipeClass.getMethod("addChemicalOxidizerRecipe", ItemStack.class, GasStack.class);
- m.invoke(null, input, output);
- } catch(Exception e) {
- System.err.println("Error while adding recipe: " + e.getMessage());
- }
- }
+ /**
+ * Add a Chemical Oxidizer recipe.
+ * @param input - input ItemStack
+ * @param output - output GasStack
+ */
+ public static void addChemicalOxidizerRecipe(ItemStack input, GasStack output) {
+ try {
+ Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler");
+ Method m = recipeClass.getMethod(
+ "addChemicalOxidizerRecipe", ItemStack.class, GasStack.class
+ );
+ m.invoke(null, input, output);
+ } catch (Exception e) {
+ System.err.println("Error while adding recipe: " + e.getMessage());
+ }
+ }
- /**
- * Add a Chemical Infuser recipe.
- * @param leftInput - left input GasStack
- * @param rightInput - right input GasStack
- * @param output - output GasStack
- */
- public static void addChemicalInfuserRecipe(GasStack leftInput, GasStack rightInput, GasStack output)
- {
- try {
- Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler");
- Method m = recipeClass.getMethod("addChemicalInfuserRecipe", GasStack.class, GasStack.class, GasStack.class);
- m.invoke(null, leftInput, rightInput, output);
- } catch(Exception e) {
- System.err.println("Error while adding recipe: " + e.getMessage());
- }
- }
+ /**
+ * Add a Chemical Infuser recipe.
+ * @param leftInput - left input GasStack
+ * @param rightInput - right input GasStack
+ * @param output - output GasStack
+ */
+ public static void
+ addChemicalInfuserRecipe(GasStack leftInput, GasStack rightInput, GasStack output) {
+ try {
+ Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler");
+ Method m = recipeClass.getMethod(
+ "addChemicalInfuserRecipe", GasStack.class, GasStack.class, GasStack.class
+ );
+ m.invoke(null, leftInput, rightInput, output);
+ } catch (Exception e) {
+ System.err.println("Error while adding recipe: " + e.getMessage());
+ }
+ }
- /**
- * Add a Precision Sawmill recipe.
- * @param input - input ItemStack
- * @param primaryOutput - guaranteed output
- * @param secondaryOutput - possible extra output
- * @param chance - probability of obtaining extra output
- */
- public static void addPrecisionSawmillRecipe(ItemStack input, ItemStack primaryOutput, ItemStack secondaryOutput, double chance)
- {
- try {
- Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler");
- Method m = recipeClass.getMethod("addPrecisionSawmillRecipe", ItemStack.class, ItemStack.class, ItemStack.class, Double.TYPE);
- m.invoke(null, input, primaryOutput, secondaryOutput, chance);
- } catch(Exception e) {
- System.err.println("Error while adding recipe: " + e.getMessage());
- }
- }
+ /**
+ * Add a Precision Sawmill recipe.
+ * @param input - input ItemStack
+ * @param primaryOutput - guaranteed output
+ * @param secondaryOutput - possible extra output
+ * @param chance - probability of obtaining extra output
+ */
+ public static void addPrecisionSawmillRecipe(
+ ItemStack input, ItemStack primaryOutput, ItemStack secondaryOutput, double chance
+ ) {
+ try {
+ Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler");
+ Method m = recipeClass.getMethod(
+ "addPrecisionSawmillRecipe",
+ ItemStack.class,
+ ItemStack.class,
+ ItemStack.class,
+ Double.TYPE
+ );
+ m.invoke(null, input, primaryOutput, secondaryOutput, chance);
+ } catch (Exception e) {
+ System.err.println("Error while adding recipe: " + e.getMessage());
+ }
+ }
- /**
- * Add a Precision Sawmill recipe with no chance output
- * @param input - input ItemStack
- * @param primaryOutput - guaranteed output
- */
- public static void addPrecisionSawmillRecipe(ItemStack input, ItemStack primaryOutput)
- {
- try {
- Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler");
- Method m = recipeClass.getMethod("addPrecisionSawmillRecipe", ItemStack.class, ItemStack.class);
- m.invoke(null, input, primaryOutput);
- } catch(Exception e) {
- System.err.println("Error while adding recipe: " + e.getMessage());
- }
- }
+ /**
+ * Add a Precision Sawmill recipe with no chance output
+ * @param input - input ItemStack
+ * @param primaryOutput - guaranteed output
+ */
+ public static void
+ addPrecisionSawmillRecipe(ItemStack input, ItemStack primaryOutput) {
+ try {
+ Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler");
+ Method m = recipeClass.getMethod(
+ "addPrecisionSawmillRecipe", ItemStack.class, ItemStack.class
+ );
+ m.invoke(null, input, primaryOutput);
+ } catch (Exception e) {
+ System.err.println("Error while adding recipe: " + e.getMessage());
+ }
+ }
- /**
- * Add a Chemical Injection Chamber recipe.
- * @param input - input AdvancedInput
- * @param output - output ItemStack
- */
- public static void addChemicalInjectionChamberRecipe(ItemStack input, String gasName, ItemStack output)
- {
- try {
- Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler");
- Method m = recipeClass.getMethod("addChemicalInjectionChamberRecipe", ItemStack.class, String.class, ItemStack.class);
- m.invoke(null, input, gasName, output);
- } catch(Exception e) {
- System.err.println("Error while adding recipe: " + e.getMessage());
- }
- }
+ /**
+ * Add a Chemical Injection Chamber recipe.
+ * @param input - input AdvancedInput
+ * @param output - output ItemStack
+ */
+ public static void
+ addChemicalInjectionChamberRecipe(ItemStack input, String gasName, ItemStack output) {
+ try {
+ Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler");
+ Method m = recipeClass.getMethod(
+ "addChemicalInjectionChamberRecipe",
+ ItemStack.class,
+ String.class,
+ ItemStack.class
+ );
+ m.invoke(null, input, gasName, output);
+ } catch (Exception e) {
+ System.err.println("Error while adding recipe: " + e.getMessage());
+ }
+ }
- /**
- * Add an Electrolytic Separator recipe.
- * @param input - input FluidStack
- * @param energy - required energy
- * @param leftOutput - left output GasStack
- * @param rightOutput - right output GasStack
- */
- public static void addElectrolyticSeparatorRecipe(FluidStack input, double energy, GasStack leftOutput, GasStack rightOutput)
- {
- try {
- Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler");
- Method m = recipeClass.getMethod("addElectrolyticSeparatorRecipe", FluidStack.class, Double.TYPE, GasStack.class, GasStack.class);
- m.invoke(null, input, energy, leftOutput, rightOutput);
- } catch(Exception e) {
- System.err.println("Error while adding recipe: " + e.getMessage());
- }
- }
+ /**
+ * Add an Electrolytic Separator recipe.
+ * @param input - input FluidStack
+ * @param energy - required energy
+ * @param leftOutput - left output GasStack
+ * @param rightOutput - right output GasStack
+ */
+ public static void addElectrolyticSeparatorRecipe(
+ FluidStack input, double energy, GasStack leftOutput, GasStack rightOutput
+ ) {
+ try {
+ Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler");
+ Method m = recipeClass.getMethod(
+ "addElectrolyticSeparatorRecipe",
+ FluidStack.class,
+ Double.TYPE,
+ GasStack.class,
+ GasStack.class
+ );
+ m.invoke(null, input, energy, leftOutput, rightOutput);
+ } catch (Exception e) {
+ System.err.println("Error while adding recipe: " + e.getMessage());
+ }
+ }
- /**
- * Add a Chemical Dissolution Chamber recipe.
- * @param input - input ItemStack
- * @param output - output GasStack
- */
- public static void addChemicalDissolutionChamberRecipe(ItemStack input, GasStack output)
- {
- try {
- Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler");
- Method m = recipeClass.getMethod("addChemicalDissolutionChamberRecipe", ItemStack.class, GasStack.class);
- m.invoke(null, input, output);
- } catch(Exception e) {
- System.err.println("Error while adding recipe: " + e.getMessage());
- }
- }
+ /**
+ * Add a Chemical Dissolution Chamber recipe.
+ * @param input - input ItemStack
+ * @param output - output GasStack
+ */
+ public static void
+ addChemicalDissolutionChamberRecipe(ItemStack input, GasStack output) {
+ try {
+ Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler");
+ Method m = recipeClass.getMethod(
+ "addChemicalDissolutionChamberRecipe", ItemStack.class, GasStack.class
+ );
+ m.invoke(null, input, output);
+ } catch (Exception e) {
+ System.err.println("Error while adding recipe: " + e.getMessage());
+ }
+ }
- /**
- * Add a Chemical Washer recipe.
- * @param input - input GasStack
- * @param output - output GasStack
- */
- public static void addChemicalWasherRecipe(GasStack input, GasStack output)
- {
- try {
- Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler");
- Method m = recipeClass.getMethod("addChemicalWasherRecipe", GasStack.class, GasStack.class);
- m.invoke(null, input, output);
- } catch(Exception e) {
- System.err.println("Error while adding recipe: " + e.getMessage());
- }
- }
+ /**
+ * Add a Chemical Washer recipe.
+ * @param input - input GasStack
+ * @param output - output GasStack
+ */
+ public static void addChemicalWasherRecipe(GasStack input, GasStack output) {
+ try {
+ Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler");
+ Method m = recipeClass.getMethod(
+ "addChemicalWasherRecipe", GasStack.class, GasStack.class
+ );
+ m.invoke(null, input, output);
+ } catch (Exception e) {
+ System.err.println("Error while adding recipe: " + e.getMessage());
+ }
+ }
- /**
- * Add a Chemical Crystallizer recipe.
- * @param input - input GasStack
- * @param output - output ItemStack
- */
- public static void addChemicalCrystallizerRecipe(GasStack input, ItemStack output)
- {
- try {
- Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler");
- Method m = recipeClass.getMethod("addChemicalCrystallizerRecipe", GasStack.class, ItemStack.class);
- m.invoke(null, input, output);
- } catch(Exception e) {
- System.err.println("Error while adding recipe: " + e.getMessage());
- }
- }
+ /**
+ * Add a Chemical Crystallizer recipe.
+ * @param input - input GasStack
+ * @param output - output ItemStack
+ */
+ public static void addChemicalCrystallizerRecipe(GasStack input, ItemStack output) {
+ try {
+ Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler");
+ Method m = recipeClass.getMethod(
+ "addChemicalCrystallizerRecipe", GasStack.class, ItemStack.class
+ );
+ m.invoke(null, input, output);
+ } catch (Exception e) {
+ System.err.println("Error while adding recipe: " + e.getMessage());
+ }
+ }
- /**
- * Add a Metallurgic Infuser recipe.
- * @param infuse - which Infuse to use
- * @param amount - how much Infuse to use
- * @param input - input ItemStack
- * @param output - output ItemStack
- */
- public static void addMetallurgicInfuserRecipe(InfuseType infuse, int amount, ItemStack input, ItemStack output)
- {
- try {
- Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler");
- Method m = recipeClass.getMethod("addMetallurgicInfuserRecipe", InfuseType.class, Integer.TYPE, ItemStack.class, ItemStack.class);
- m.invoke(null, infuse, amount, input, output);
- } catch(Exception e) {
- System.err.println("Error while adding recipe: " + e.getMessage());
- }
- }
+ /**
+ * Add a Metallurgic Infuser recipe.
+ * @param infuse - which Infuse to use
+ * @param amount - how much Infuse to use
+ * @param input - input ItemStack
+ * @param output - output ItemStack
+ */
+ public static void addMetallurgicInfuserRecipe(
+ InfuseType infuse, int amount, ItemStack input, ItemStack output
+ ) {
+ try {
+ Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler");
+ Method m = recipeClass.getMethod(
+ "addMetallurgicInfuserRecipe",
+ InfuseType.class,
+ Integer.TYPE,
+ ItemStack.class,
+ ItemStack.class
+ );
+ m.invoke(null, infuse, amount, input, output);
+ } catch (Exception e) {
+ System.err.println("Error while adding recipe: " + e.getMessage());
+ }
+ }
- /**
- * Add a Pressurized Reaction Chamber recipe.
- * @param inputSolid - input ItemStack
- * @param inputFluid - input FluidStack
- * @param inputGas - input GasStack
- * @param outputSolid - output ItemStack
- * @param outputGas - output GasStack
- * @param extraEnergy - extra energy needed by the recipe
- * @param ticks - amount of ticks it takes for this recipe to complete
- */
- public static void addPRCRecipe(ItemStack inputSolid, FluidStack inputFluid, GasStack inputGas, ItemStack outputSolid, GasStack outputGas, double extraEnergy, int ticks)
- {
- try {
- Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler");
- Method m = recipeClass.getMethod("addPRCRecipe", ItemStack.class, FluidStack.class, GasStack.class, ItemStack.class, GasStack.class, Double.TYPE, Integer.TYPE);
- m.invoke(null, inputSolid, inputFluid, inputGas, outputSolid, outputGas, extraEnergy, ticks);
- } catch(Exception e) {
- System.err.println("Error while adding recipe: " + e.getMessage());
- }
- }
-
- /**
- * Add a Thermal Evaporation Plant recipe.
- * @param input - input GasStack
- * @param output - output GasStack
- */
- public static void addThermalEvaporationRecipe(FluidStack input, FluidStack output)
- {
- try {
- Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler");
- Method m = recipeClass.getMethod("addThermalEvaporationRecipe", FluidStack.class, FluidStack.class);
- m.invoke(null, input, output);
- } catch(Exception e) {
- System.err.println("Error while adding recipe: " + e.getMessage());
- }
- }
-
- /**
- * Add a Solar Neutron Activator recipe.
- * @param input - input GasStack
- * @param output - output GasStack
- */
- public static void addSolarNeutronRecipe(GasStack input, GasStack output)
- {
- try {
- Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler");
- Method m = recipeClass.getMethod("addSolarNeutronRecipe", GasStack.class, GasStack.class);
- m.invoke(null, input, output);
- } catch(Exception e) {
- System.err.println("Error while adding recipe: " + e.getMessage());
- }
- }
+ /**
+ * Add a Pressurized Reaction Chamber recipe.
+ * @param inputSolid - input ItemStack
+ * @param inputFluid - input FluidStack
+ * @param inputGas - input GasStack
+ * @param outputSolid - output ItemStack
+ * @param outputGas - output GasStack
+ * @param extraEnergy - extra energy needed by the recipe
+ * @param ticks - amount of ticks it takes for this recipe to complete
+ */
+ public static void addPRCRecipe(
+ ItemStack inputSolid,
+ FluidStack inputFluid,
+ GasStack inputGas,
+ ItemStack outputSolid,
+ GasStack outputGas,
+ double extraEnergy,
+ int ticks
+ ) {
+ try {
+ Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler");
+ Method m = recipeClass.getMethod(
+ "addPRCRecipe",
+ ItemStack.class,
+ FluidStack.class,
+ GasStack.class,
+ ItemStack.class,
+ GasStack.class,
+ Double.TYPE,
+ Integer.TYPE
+ );
+ m.invoke(
+ null,
+ inputSolid,
+ inputFluid,
+ inputGas,
+ outputSolid,
+ outputGas,
+ extraEnergy,
+ ticks
+ );
+ } catch (Exception e) {
+ System.err.println("Error while adding recipe: " + e.getMessage());
+ }
+ }
+
+ /**
+ * Add a Thermal Evaporation Plant recipe.
+ * @param input - input GasStack
+ * @param output - output GasStack
+ */
+ public static void addThermalEvaporationRecipe(FluidStack input, FluidStack output) {
+ try {
+ Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler");
+ Method m = recipeClass.getMethod(
+ "addThermalEvaporationRecipe", FluidStack.class, FluidStack.class
+ );
+ m.invoke(null, input, output);
+ } catch (Exception e) {
+ System.err.println("Error while adding recipe: " + e.getMessage());
+ }
+ }
+
+ /**
+ * Add a Solar Neutron Activator recipe.
+ * @param input - input GasStack
+ * @param output - output GasStack
+ */
+ public static void addSolarNeutronRecipe(GasStack input, GasStack output) {
+ try {
+ Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler");
+ Method m
+ = recipeClass
+ .getMethod("addSolarNeutronRecipe", GasStack.class, GasStack.class);
+ m.invoke(null, input, output);
+ } catch (Exception e) {
+ System.err.println("Error while adding recipe: " + e.getMessage());
+ }
+ }
}
diff --git a/src/main/java/mekanism/api/recipe/package-info.java b/src/main/java/mekanism/api/recipe/package-info.java
index 5e5b595be..9178afa62 100644
--- a/src/main/java/mekanism/api/recipe/package-info.java
+++ b/src/main/java/mekanism/api/recipe/package-info.java
@@ -1,4 +1,3 @@
@API(apiVersion = "9.0.0", owner = "Mekanism", provides = "MekanismAPI|recipe")
package mekanism.api.recipe;
import cpw.mods.fml.common.API;
-
diff --git a/src/main/java/mekanism/api/transmitters/DynamicNetwork.java b/src/main/java/mekanism/api/transmitters/DynamicNetwork.java
index 1bf01a879..45d20d4bf 100644
--- a/src/main/java/mekanism/api/transmitters/DynamicNetwork.java
+++ b/src/main/java/mekanism/api/transmitters/DynamicNetwork.java
@@ -8,6 +8,11 @@ import java.util.LinkedHashSet;
import java.util.Map.Entry;
import java.util.Set;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
+import cpw.mods.fml.common.FMLCommonHandler;
+import cpw.mods.fml.common.eventhandler.Event;
import mekanism.api.Coord4D;
import mekanism.api.IClientTicker;
import mekanism.api.Range4D;
@@ -17,142 +22,119 @@ import net.minecraft.world.World;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.common.util.ForgeDirection;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
+public abstract class DynamicNetwork>
+ implements IClientTicker, INetworkDataHandler {
+ public LinkedHashSet> transmitters = Sets.newLinkedHashSet();
+ public LinkedHashSet> transmittersToAdd
+ = Sets.newLinkedHashSet();
+ public LinkedHashSet> transmittersAdded
+ = Sets.newLinkedHashSet();
-import cpw.mods.fml.common.FMLCommonHandler;
-import cpw.mods.fml.common.eventhandler.Event;
+ public HashMap possibleAcceptors = new HashMap();
+ public HashMap> acceptorDirections
+ = new HashMap>();
+ public HashMap, EnumSet> changedAcceptors
+ = Maps.newHashMap();
-public abstract class DynamicNetwork> implements IClientTicker, INetworkDataHandler
-{
- public LinkedHashSet> transmitters = Sets.newLinkedHashSet();
- public LinkedHashSet> transmittersToAdd = Sets.newLinkedHashSet();
- public LinkedHashSet> transmittersAdded = Sets.newLinkedHashSet();
+ private Set updateQueue = new LinkedHashSet();
- public HashMap possibleAcceptors = new HashMap();
- public HashMap> acceptorDirections = new HashMap>();
- public HashMap, EnumSet> changedAcceptors = Maps.newHashMap();
+ protected Range4D packetRange = null;
- private Set updateQueue = new LinkedHashSet();
+ protected int capacity = 0;
+ protected double meanCapacity = 0;
- protected Range4D packetRange = null;
+ protected boolean needsUpdate = false;
+ protected int updateDelay = 0;
- protected int capacity = 0;
- protected double meanCapacity = 0;
+ protected boolean firstUpdate = true;
+ protected World worldObj = null;
- protected boolean needsUpdate = false;
- protected int updateDelay = 0;
+ public void addNewTransmitters(Collection> newTransmitters) {
+ transmittersToAdd.addAll(newTransmitters);
+ }
- protected boolean firstUpdate = true;
- protected World worldObj = null;
+ public void commit() {
+ if (!transmittersToAdd.isEmpty()) {
+ for (IGridTransmitter transmitter : transmittersToAdd) {
+ if (transmitter.isValid()) {
+ if (worldObj == null) {
+ worldObj = transmitter.world();
+ }
- public void addNewTransmitters(Collection> newTransmitters)
- {
- transmittersToAdd.addAll(newTransmitters);
- }
+ for (ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) {
+ updateTransmitterOnSide(transmitter, side);
+ }
- public void commit()
- {
- if(!transmittersToAdd.isEmpty())
- {
- for(IGridTransmitter transmitter : transmittersToAdd)
- {
- if(transmitter.isValid())
- {
- if(worldObj == null)
- {
- worldObj = transmitter.world();
- }
+ transmitter.setTransmitterNetwork((N) this);
+ absorbBuffer(transmitter);
+ transmitters.add(transmitter);
+ }
+ }
- for(ForgeDirection side : ForgeDirection.VALID_DIRECTIONS)
- {
- updateTransmitterOnSide(transmitter, side);
- }
-
- transmitter.setTransmitterNetwork((N)this);
- absorbBuffer(transmitter);
- transmitters.add(transmitter);
- }
- }
-
- updateCapacity();
- clampBuffer();
- queueClientUpdate(Lists.newArrayList(transmittersToAdd));
- transmittersToAdd.clear();
- }
+ updateCapacity();
+ clampBuffer();
+ queueClientUpdate(Lists.newArrayList(transmittersToAdd));
+ transmittersToAdd.clear();
+ }
- if(!changedAcceptors.isEmpty())
- {
- for(Entry, EnumSet> entry : changedAcceptors.entrySet())
- {
- IGridTransmitter transmitter = entry.getKey();
-
- if(transmitter.isValid())
- {
- EnumSet directionsChanged = entry.getValue();
+ if (!changedAcceptors.isEmpty()) {
+ for (Entry, EnumSet> entry :
+ changedAcceptors.entrySet()) {
+ IGridTransmitter transmitter = entry.getKey();
- for(ForgeDirection side : directionsChanged)
- {
- updateTransmitterOnSide(transmitter, side);
- }
- }
- }
-
- changedAcceptors.clear();
- }
- }
+ if (transmitter.isValid()) {
+ EnumSet directionsChanged = entry.getValue();
- public void updateTransmitterOnSide(IGridTransmitter transmitter, ForgeDirection side)
- {
- A acceptor = transmitter.getAcceptor(side);
- Coord4D acceptorCoord = transmitter.coord().getFromSide(side);
- EnumSet directions = acceptorDirections.get(acceptorCoord);
+ for (ForgeDirection side : directionsChanged) {
+ updateTransmitterOnSide(transmitter, side);
+ }
+ }
+ }
- if(acceptor != null)
- {
- possibleAcceptors.put(acceptorCoord, acceptor);
+ changedAcceptors.clear();
+ }
+ }
- if(directions != null)
- {
- directions.add(side.getOpposite());
- }
- else {
- acceptorDirections.put(acceptorCoord, EnumSet.of(side.getOpposite()));
- }
- }
- else {
- if(directions != null)
- {
- directions.remove(side.getOpposite());
+ public void
+ updateTransmitterOnSide(IGridTransmitter transmitter, ForgeDirection side) {
+ A acceptor = transmitter.getAcceptor(side);
+ Coord4D acceptorCoord = transmitter.coord().getFromSide(side);
+ EnumSet directions = acceptorDirections.get(acceptorCoord);
- if(directions.isEmpty())
- {
- possibleAcceptors.remove(acceptorCoord);
- acceptorDirections.remove(acceptorCoord);
- }
- }
- else {
- possibleAcceptors.remove(acceptorCoord);
- acceptorDirections.remove(acceptorCoord);
- }
- }
+ if (acceptor != null) {
+ possibleAcceptors.put(acceptorCoord, acceptor);
- }
+ if (directions != null) {
+ directions.add(side.getOpposite());
+ } else {
+ acceptorDirections.put(acceptorCoord, EnumSet.of(side.getOpposite()));
+ }
+ } else {
+ if (directions != null) {
+ directions.remove(side.getOpposite());
- public abstract void absorbBuffer(IGridTransmitter transmitter);
+ if (directions.isEmpty()) {
+ possibleAcceptors.remove(acceptorCoord);
+ acceptorDirections.remove(acceptorCoord);
+ }
+ } else {
+ possibleAcceptors.remove(acceptorCoord);
+ acceptorDirections.remove(acceptorCoord);
+ }
+ }
+ }
- public abstract void clampBuffer();
+ public abstract void absorbBuffer(IGridTransmitter transmitter);
- public void invalidate()
- {
+ public abstract void clampBuffer();
+
+ public void invalidate() {
//Remove invalid transmitters first for share calculations
- for(Iterator> iter = transmitters.iterator(); iter.hasNext();)
- {
+ for (Iterator> iter = transmitters.iterator();
+ iter.hasNext();) {
IGridTransmitter transmitter = iter.next();
- if(!transmitter.isValid())
- {
+ if (!transmitter.isValid()) {
iter.remove();
continue;
}
@@ -162,302 +144,268 @@ public abstract class DynamicNetwork> implemen
clampBuffer();
//Update all shares
- for(IGridTransmitter transmitter : transmitters)
- {
+ for (IGridTransmitter transmitter : transmitters) {
transmitter.updateShare();
}
//Now invalidate the transmitters
- for(IGridTransmitter transmitter : transmitters)
- {
- invalidateTransmitter(transmitter);
- }
-
- transmitters.clear();
- deregister();
- }
+ for (IGridTransmitter transmitter : transmitters) {
+ invalidateTransmitter(transmitter);
+ }
- public void invalidateTransmitter(IGridTransmitter transmitter)
- {
- if(!worldObj.isRemote && transmitter.isValid())
- {
- transmitter.takeShare();
- transmitter.setTransmitterNetwork(null);
- TransmitterNetworkRegistry.registerOrphanTransmitter(transmitter);
- }
- }
+ transmitters.clear();
+ deregister();
+ }
- public void acceptorChanged(IGridTransmitter transmitter, ForgeDirection side)
- {
- EnumSet directions = changedAcceptors.get(transmitter);
-
- if(directions != null)
- {
- directions.add(side);
- }
- else {
- changedAcceptors.put(transmitter, EnumSet.of(side));
- }
-
- TransmitterNetworkRegistry.registerChangedNetwork(this);
- }
+ public void invalidateTransmitter(IGridTransmitter transmitter) {
+ if (!worldObj.isRemote && transmitter.isValid()) {
+ transmitter.takeShare();
+ transmitter.setTransmitterNetwork(null);
+ TransmitterNetworkRegistry.registerOrphanTransmitter(transmitter);
+ }
+ }
- public void adoptTransmittersAndAcceptorsFrom(N net)
- {
- for(IGridTransmitter transmitter : net.transmitters)
- {
- transmitter.setTransmitterNetwork((N)this);
- transmitters.add(transmitter);
- transmittersAdded.add(transmitter);
- }
-
- possibleAcceptors.putAll(net.possibleAcceptors);
-
- for(Entry> entry : net.acceptorDirections.entrySet())
- {
- Coord4D coord = entry.getKey();
-
- if(acceptorDirections.containsKey(coord))
- {
- acceptorDirections.get(coord).addAll(entry.getValue());
- }
- else {
- acceptorDirections.put(coord, entry.getValue());
- }
- }
+ public void acceptorChanged(IGridTransmitter transmitter, ForgeDirection side) {
+ EnumSet directions = changedAcceptors.get(transmitter);
- }
+ if (directions != null) {
+ directions.add(side);
+ } else {
+ changedAcceptors.put(transmitter, EnumSet.of(side));
+ }
- public Range4D getPacketRange()
- {
- if(packetRange == null)
- {
- return genPacketRange();
- }
-
- return packetRange;
- }
-
- protected Range4D genPacketRange()
- {
- if(getSize() == 0)
- {
- deregister();
- return null;
- }
+ TransmitterNetworkRegistry.registerChangedNetwork(this);
+ }
- IGridTransmitter initTransmitter = transmitters.iterator().next();
- Coord4D initCoord = initTransmitter.coord();
-
- int minX = initCoord.xCoord;
- int minY = initCoord.yCoord;
- int minZ = initCoord.zCoord;
- int maxX = initCoord.xCoord;
- int maxY = initCoord.yCoord;
- int maxZ = initCoord.zCoord;
-
- for(IGridTransmitter transmitter : transmitters)
- {
- Coord4D coord = transmitter.coord();
-
- if(coord.xCoord < minX) minX = coord.xCoord;
- if(coord.yCoord < minY) minY = coord.yCoord;
- if(coord.zCoord < minZ) minZ = coord.zCoord;
- if(coord.xCoord > maxX) maxX = coord.xCoord;
- if(coord.yCoord > maxY) maxY = coord.yCoord;
- if(coord.zCoord > maxZ) maxZ = coord.zCoord;
- }
-
- return new Range4D(minX, minY, minZ, maxX, maxY, maxZ, initTransmitter.world().provider.dimensionId);
- }
+ public void adoptTransmittersAndAcceptorsFrom(N net) {
+ for (IGridTransmitter transmitter : net.transmitters) {
+ transmitter.setTransmitterNetwork((N) this);
+ transmitters.add(transmitter);
+ transmittersAdded.add(transmitter);
+ }
- public void register()
- {
- if(FMLCommonHandler.instance().getEffectiveSide().isServer())
- {
- TransmitterNetworkRegistry.getInstance().registerNetwork(this);
- }
- else {
- MinecraftForge.EVENT_BUS.post(new ClientTickUpdate(this, (byte)1));
- }
- }
+ possibleAcceptors.putAll(net.possibleAcceptors);
- public void deregister()
- {
- transmitters.clear();
+ for (Entry> entry :
+ net.acceptorDirections.entrySet()) {
+ Coord4D coord = entry.getKey();
- if(FMLCommonHandler.instance().getEffectiveSide().isServer())
- {
- TransmitterNetworkRegistry.getInstance().removeNetwork(this);
- }
- else {
- MinecraftForge.EVENT_BUS.post(new ClientTickUpdate(this, (byte)0));
- }
- }
+ if (acceptorDirections.containsKey(coord)) {
+ acceptorDirections.get(coord).addAll(entry.getValue());
+ } else {
+ acceptorDirections.put(coord, entry.getValue());
+ }
+ }
+ }
- public int getSize()
- {
- return transmitters.size();
- }
+ public Range4D getPacketRange() {
+ if (packetRange == null) {
+ return genPacketRange();
+ }
- public int getAcceptorSize()
- {
- return possibleAcceptors.size();
- }
+ return packetRange;
+ }
- public synchronized void updateCapacity()
- {
- updateMeanCapacity();
- capacity = (int)meanCapacity * transmitters.size();
- }
+ protected Range4D genPacketRange() {
+ if (getSize() == 0) {
+ deregister();
+ return null;
+ }
+
+ IGridTransmitter initTransmitter = transmitters.iterator().next();
+ Coord4D initCoord = initTransmitter.coord();
+
+ int minX = initCoord.xCoord;
+ int minY = initCoord.yCoord;
+ int minZ = initCoord.zCoord;
+ int maxX = initCoord.xCoord;
+ int maxY = initCoord.yCoord;
+ int maxZ = initCoord.zCoord;
+
+ for (IGridTransmitter transmitter : transmitters) {
+ Coord4D coord = transmitter.coord();
+
+ if (coord.xCoord < minX)
+ minX = coord.xCoord;
+ if (coord.yCoord < minY)
+ minY = coord.yCoord;
+ if (coord.zCoord < minZ)
+ minZ = coord.zCoord;
+ if (coord.xCoord > maxX)
+ maxX = coord.xCoord;
+ if (coord.yCoord > maxY)
+ maxY = coord.yCoord;
+ if (coord.zCoord > maxZ)
+ maxZ = coord.zCoord;
+ }
+
+ return new Range4D(
+ minX,
+ minY,
+ minZ,
+ maxX,
+ maxY,
+ maxZ,
+ initTransmitter.world().provider.dimensionId
+ );
+ }
+
+ public void register() {
+ if (FMLCommonHandler.instance().getEffectiveSide().isServer()) {
+ TransmitterNetworkRegistry.getInstance().registerNetwork(this);
+ } else {
+ MinecraftForge.EVENT_BUS.post(new ClientTickUpdate(this, (byte) 1));
+ }
+ }
+
+ public void deregister() {
+ transmitters.clear();
+
+ if (FMLCommonHandler.instance().getEffectiveSide().isServer()) {
+ TransmitterNetworkRegistry.getInstance().removeNetwork(this);
+ } else {
+ MinecraftForge.EVENT_BUS.post(new ClientTickUpdate(this, (byte) 0));
+ }
+ }
+
+ public int getSize() {
+ return transmitters.size();
+ }
+
+ public int getAcceptorSize() {
+ return possibleAcceptors.size();
+ }
+
+ public synchronized void updateCapacity() {
+ updateMeanCapacity();
+ capacity = (int) meanCapacity * transmitters.size();
+ }
/**
* Override this if things can have variable capacity along the network.
* @return An 'average' value of capacity. Calculate it how you will.
*/
- protected synchronized void updateMeanCapacity()
- {
- if(transmitters.size() > 0)
- {
- meanCapacity = transmitters.iterator().next().getCapacity();
- }
- else {
- meanCapacity = 0;
- }
- }
-
- public int getCapacity()
- {
- return capacity;
+ protected synchronized void updateMeanCapacity() {
+ if (transmitters.size() > 0) {
+ meanCapacity = transmitters.iterator().next().getCapacity();
+ } else {
+ meanCapacity = 0;
+ }
}
- public World getWorld()
- {
- return worldObj;
- }
+ public int getCapacity() {
+ return capacity;
+ }
- public abstract Set getAcceptors(Object data);
+ public World getWorld() {
+ return worldObj;
+ }
- public void tick()
- {
- onUpdate();
- }
+ public abstract Set getAcceptors(Object data);
- public void onUpdate()
- {
- if(FMLCommonHandler.instance().getEffectiveSide().isServer())
- {
- Iterator i = updateQueue.iterator();
+ public void tick() {
+ onUpdate();
+ }
- try {
- while(i.hasNext())
- {
- DelayQueue q = i.next();
+ public void onUpdate() {
+ if (FMLCommonHandler.instance().getEffectiveSide().isServer()) {
+ Iterator i = updateQueue.iterator();
- if(q.delay > 0)
- {
- q.delay--;
- }
- else {
- transmittersAdded.addAll(transmitters);
- updateDelay = 1;
- i.remove();
- }
- }
- } catch(Exception e) {}
+ try {
+ while (i.hasNext()) {
+ DelayQueue q = i.next();
- if(updateDelay > 0)
- {
- updateDelay--;
+ if (q.delay > 0) {
+ q.delay--;
+ } else {
+ transmittersAdded.addAll(transmitters);
+ updateDelay = 1;
+ i.remove();
+ }
+ }
+ } catch (Exception e) {}
- if(updateDelay == 0)
- {
- MinecraftForge.EVENT_BUS.post(new TransmittersAddedEvent(this, firstUpdate, (Collection)transmittersAdded));
- firstUpdate = false;
- transmittersAdded.clear();
- needsUpdate = true;
- }
- }
- }
- }
+ if (updateDelay > 0) {
+ updateDelay--;
- @Override
- public boolean needsTicks()
- {
- return getSize() > 0;
- }
+ if (updateDelay == 0) {
+ MinecraftForge.EVENT_BUS.post(new TransmittersAddedEvent(
+ this, firstUpdate, (Collection) transmittersAdded
+ ));
+ firstUpdate = false;
+ transmittersAdded.clear();
+ needsUpdate = true;
+ }
+ }
+ }
+ }
- @Override
- public void clientTick() {}
+ @Override
+ public boolean needsTicks() {
+ return getSize() > 0;
+ }
- public void queueClientUpdate(Collection> newTransmitters)
- {
- transmittersAdded.addAll(newTransmitters);
- updateDelay = 3;
- }
+ @Override
+ public void clientTick() {}
- public static class TransmittersAddedEvent extends Event
- {
- public DynamicNetwork network;
- public boolean newNetwork;
- public Collection newTransmitters;
+ public void queueClientUpdate(Collection> newTransmitters) {
+ transmittersAdded.addAll(newTransmitters);
+ updateDelay = 3;
+ }
- public TransmittersAddedEvent(DynamicNetwork net, boolean newNet, Collection added)
- {
- network = net;
- newNetwork = newNet;
- newTransmitters = added;
- }
- }
+ public static class TransmittersAddedEvent extends Event {
+ public DynamicNetwork network;
+ public boolean newNetwork;
+ public Collection newTransmitters;
- public static class ClientTickUpdate extends Event
- {
- public DynamicNetwork network;
- public byte operation; /*0 remove, 1 add*/
+ public TransmittersAddedEvent(
+ DynamicNetwork net, boolean newNet, Collection added
+ ) {
+ network = net;
+ newNetwork = newNet;
+ newTransmitters = added;
+ }
+ }
- public ClientTickUpdate(DynamicNetwork net, byte b)
- {
- network = net;
- operation = b;
- }
- }
+ public static class ClientTickUpdate extends Event {
+ public DynamicNetwork network;
+ public byte operation; /*0 remove, 1 add*/
- public static class NetworkClientRequest extends Event
- {
- public TileEntity tileEntity;
+ public ClientTickUpdate(DynamicNetwork net, byte b) {
+ network = net;
+ operation = b;
+ }
+ }
- public NetworkClientRequest(TileEntity tile)
- {
- tileEntity = tile;
- }
- }
+ public static class NetworkClientRequest extends Event {
+ public TileEntity tileEntity;
- public void addUpdate(EntityPlayer player)
- {
- updateQueue.add(new DelayQueue(player));
- }
+ public NetworkClientRequest(TileEntity tile) {
+ tileEntity = tile;
+ }
+ }
- public static class DelayQueue
- {
- public EntityPlayer player;
- public int delay;
+ public void addUpdate(EntityPlayer player) {
+ updateQueue.add(new DelayQueue(player));
+ }
- public DelayQueue(EntityPlayer p)
- {
- player = p;
- delay = 5;
- }
+ public static class DelayQueue {
+ public EntityPlayer player;
+ public int delay;
- @Override
- public int hashCode()
- {
- return player.hashCode();
- }
+ public DelayQueue(EntityPlayer p) {
+ player = p;
+ delay = 5;
+ }
- @Override
- public boolean equals(Object o)
- {
- return o instanceof DelayQueue && ((DelayQueue)o).player.equals(this.player);
- }
- }
+ @Override
+ public int hashCode() {
+ return player.hashCode();
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ return o instanceof DelayQueue && ((DelayQueue) o).player.equals(this.player);
+ }
+ }
}
diff --git a/src/main/java/mekanism/api/transmitters/IBlockableConnection.java b/src/main/java/mekanism/api/transmitters/IBlockableConnection.java
index f6811fbec..41a329e43 100644
--- a/src/main/java/mekanism/api/transmitters/IBlockableConnection.java
+++ b/src/main/java/mekanism/api/transmitters/IBlockableConnection.java
@@ -2,9 +2,8 @@ package mekanism.api.transmitters;
import net.minecraftforge.common.util.ForgeDirection;
-public interface IBlockableConnection
-{
- public boolean canConnectMutual(ForgeDirection side);
-
- public boolean canConnect(ForgeDirection side);
+public interface IBlockableConnection {
+ public boolean canConnectMutual(ForgeDirection side);
+
+ public boolean canConnect(ForgeDirection side);
}
diff --git a/src/main/java/mekanism/api/transmitters/IGridTransmitter.java b/src/main/java/mekanism/api/transmitters/IGridTransmitter.java
index c0ea3d5fd..629e76604 100644
--- a/src/main/java/mekanism/api/transmitters/IGridTransmitter.java
+++ b/src/main/java/mekanism/api/transmitters/IGridTransmitter.java
@@ -6,59 +6,59 @@ import mekanism.api.Coord4D;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
-public interface IGridTransmitter> extends ITransmitter
-{
- public boolean hasTransmitterNetwork();
+public interface IGridTransmitter>
+ extends ITransmitter {
+ public boolean hasTransmitterNetwork();
- /**
- * Gets the network currently in use by this transmitter segment.
- * @return network this transmitter is using
- */
- public N getTransmitterNetwork();
+ /**
+ * Gets the network currently in use by this transmitter segment.
+ * @return network this transmitter is using
+ */
+ public N getTransmitterNetwork();
- /**
- * Sets this transmitter segment's network to a new value.
- * @param network - network to set to
- */
- public void setTransmitterNetwork(N network);
+ /**
+ * Sets this transmitter segment's network to a new value.
+ * @param network - network to set to
+ */
+ public void setTransmitterNetwork(N network);
- public int getTransmitterNetworkSize();
+ public int getTransmitterNetworkSize();
- public int getTransmitterNetworkAcceptorSize();
+ public int getTransmitterNetworkAcceptorSize();
- public String getTransmitterNetworkNeeded();
+ public String getTransmitterNetworkNeeded();
- public String getTransmitterNetworkFlow();
+ public String getTransmitterNetworkFlow();
- public String getTransmitterNetworkBuffer();
+ public String getTransmitterNetworkBuffer();
- public double getTransmitterNetworkCapacity();
+ public double getTransmitterNetworkCapacity();
- public int getCapacity();
+ public int getCapacity();
- public World world();
-
- public Coord4D coord();
+ public World world();
- public Coord4D getAdjacentConnectableTransmitterCoord(ForgeDirection side);
+ public Coord4D coord();
- public A getAcceptor(ForgeDirection side);
+ public Coord4D getAdjacentConnectableTransmitterCoord(ForgeDirection side);
- public boolean isValid();
+ public A getAcceptor(ForgeDirection side);
- public boolean isOrphan();
+ public boolean isValid();
- public void setOrphan(boolean orphaned);
+ public boolean isOrphan();
- public N createEmptyNetwork();
+ public void setOrphan(boolean orphaned);
- public N mergeNetworks(Collection toMerge);
+ public N createEmptyNetwork();
- public N getExternalNetwork(Coord4D from);
+ public N mergeNetworks(Collection toMerge);
- public void takeShare();
+ public N getExternalNetwork(Coord4D from);
+
+ public void takeShare();
public void updateShare();
- public Object getBuffer();
+ public Object getBuffer();
}
diff --git a/src/main/java/mekanism/api/transmitters/INetworkDataHandler.java b/src/main/java/mekanism/api/transmitters/INetworkDataHandler.java
index 38cd63702..15c8a5ded 100644
--- a/src/main/java/mekanism/api/transmitters/INetworkDataHandler.java
+++ b/src/main/java/mekanism/api/transmitters/INetworkDataHandler.java
@@ -1,10 +1,9 @@
package mekanism.api.transmitters;
-public interface INetworkDataHandler
-{
- public String getNeededInfo();
+public interface INetworkDataHandler {
+ public String getNeededInfo();
- public String getStoredInfo();
+ public String getStoredInfo();
- public String getFlowInfo();
+ public String getFlowInfo();
}
diff --git a/src/main/java/mekanism/api/transmitters/ITransmitter.java b/src/main/java/mekanism/api/transmitters/ITransmitter.java
index cddc76a7a..674d297ee 100644
--- a/src/main/java/mekanism/api/transmitters/ITransmitter.java
+++ b/src/main/java/mekanism/api/transmitters/ITransmitter.java
@@ -1,11 +1,10 @@
package mekanism.api.transmitters;
-public interface ITransmitter
-{
- /**
- * Get the transmitter's transmission type
- *
- * @return TransmissionType this transmitter uses
- */
- public TransmissionType getTransmissionType();
+public interface ITransmitter {
+ /**
+ * Get the transmitter's transmission type
+ *
+ * @return TransmissionType this transmitter uses
+ */
+ public TransmissionType getTransmissionType();
}
diff --git a/src/main/java/mekanism/api/transmitters/ITransmitterTile.java b/src/main/java/mekanism/api/transmitters/ITransmitterTile.java
index 3940b71a6..e49363a14 100644
--- a/src/main/java/mekanism/api/transmitters/ITransmitterTile.java
+++ b/src/main/java/mekanism/api/transmitters/ITransmitterTile.java
@@ -1,6 +1,5 @@
package mekanism.api.transmitters;
-public interface ITransmitterTile>
-{
- public IGridTransmitter getTransmitter();
+public interface ITransmitterTile> {
+ public IGridTransmitter getTransmitter();
}
diff --git a/src/main/java/mekanism/api/transmitters/TransmissionType.java b/src/main/java/mekanism/api/transmitters/TransmissionType.java
index 8ea4b4311..e65326edc 100644
--- a/src/main/java/mekanism/api/transmitters/TransmissionType.java
+++ b/src/main/java/mekanism/api/transmitters/TransmissionType.java
@@ -4,76 +4,64 @@ import mekanism.api.gas.IGasTransmitter;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.StatCollector;
-public enum TransmissionType
-{
- ENERGY("EnergyNetwork", "Energy"),
- FLUID("FluidNetwork", "Fluids"),
- GAS("GasNetwork", "Gases"),
- ITEM("InventoryNetwork", "Items"),
- HEAT("HeatNetwork", "Heat");
-
- private String name;
- private String transmission;
-
- private TransmissionType(String n, String t)
- {
- name = n;
- transmission = t;
- }
-
- public String getName()
- {
- return name;
- }
-
- public String getTransmission()
- {
- return transmission;
- }
-
- public String localize()
- {
- return StatCollector.translateToLocal("transmission." + getTransmission());
- }
+public enum TransmissionType {
+ ENERGY("EnergyNetwork", "Energy"),
+ FLUID("FluidNetwork", "Fluids"),
+ GAS("GasNetwork", "Gases"),
+ ITEM("InventoryNetwork", "Items"),
+ HEAT("HeatNetwork", "Heat");
- public static boolean checkTransmissionType(ITransmitter sideTile, TransmissionType type)
- {
- return type.checkTransmissionType(sideTile);
- }
+ private String name;
+ private String transmission;
- public static boolean checkTransmissionType(TileEntity tile1, TransmissionType type)
- {
- return checkTransmissionType(tile1, type, null);
- }
+ private TransmissionType(String n, String t) {
+ name = n;
+ transmission = t;
+ }
- public static boolean checkTransmissionType(TileEntity tile1, TransmissionType type, TileEntity tile2)
- {
- return type.checkTransmissionType(tile1, tile2);
- }
+ public String getName() {
+ return name;
+ }
- public boolean checkTransmissionType(ITransmitter transmitter)
- {
- return transmitter.getTransmissionType() == this;
- }
+ public String getTransmission() {
+ return transmission;
+ }
- public boolean checkTransmissionType(TileEntity sideTile, TileEntity currentTile)
- {
- if(sideTile instanceof ITransmitter)
- {
- if(((ITransmitter)sideTile).getTransmissionType() == this)
- {
- return true;
- }
- }
+ public String localize() {
+ return StatCollector.translateToLocal("transmission." + getTransmission());
+ }
- if(this == GAS && currentTile instanceof IGasTransmitter)
- {
- if(((IGasTransmitter)currentTile).canTransferGasToTube(sideTile))
- {
- return true;
- }
- }
+ public static boolean
+ checkTransmissionType(ITransmitter sideTile, TransmissionType type) {
+ return type.checkTransmissionType(sideTile);
+ }
- return false;
- }
+ public static boolean checkTransmissionType(TileEntity tile1, TransmissionType type) {
+ return checkTransmissionType(tile1, type, null);
+ }
+
+ public static boolean
+ checkTransmissionType(TileEntity tile1, TransmissionType type, TileEntity tile2) {
+ return type.checkTransmissionType(tile1, tile2);
+ }
+
+ public boolean checkTransmissionType(ITransmitter transmitter) {
+ return transmitter.getTransmissionType() == this;
+ }
+
+ public boolean checkTransmissionType(TileEntity sideTile, TileEntity currentTile) {
+ if (sideTile instanceof ITransmitter) {
+ if (((ITransmitter) sideTile).getTransmissionType() == this) {
+ return true;
+ }
+ }
+
+ if (this == GAS && currentTile instanceof IGasTransmitter) {
+ if (((IGasTransmitter) currentTile).canTransferGasToTube(sideTile)) {
+ return true;
+ }
+ }
+
+ return false;
+ }
}
\ No newline at end of file
diff --git a/src/main/java/mekanism/api/transmitters/TransmitterNetworkRegistry.java b/src/main/java/mekanism/api/transmitters/TransmitterNetworkRegistry.java
index 0f9c1c5fb..846dfbd05 100644
--- a/src/main/java/mekanism/api/transmitters/TransmitterNetworkRegistry.java
+++ b/src/main/java/mekanism/api/transmitters/TransmitterNetworkRegistry.java
@@ -3,287 +3,256 @@ package mekanism.api.transmitters;
import java.util.HashMap;
import java.util.HashSet;
-import mekanism.api.Coord4D;
-import mekanism.api.MekanismAPI;
-import net.minecraftforge.common.util.ForgeDirection;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
-
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.common.gameevent.TickEvent.Phase;
import cpw.mods.fml.common.gameevent.TickEvent.ServerTickEvent;
import cpw.mods.fml.relauncher.Side;
+import mekanism.api.Coord4D;
+import mekanism.api.MekanismAPI;
+import net.minecraftforge.common.util.ForgeDirection;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
-public class TransmitterNetworkRegistry
-{
- private static TransmitterNetworkRegistry INSTANCE = new TransmitterNetworkRegistry();
- private static boolean loaderRegistered = false;
+public class TransmitterNetworkRegistry {
+ private static TransmitterNetworkRegistry INSTANCE = new TransmitterNetworkRegistry();
+ private static boolean loaderRegistered = false;
- private HashSet networks = Sets.newHashSet();
- private HashSet networksToChange = Sets.newHashSet();
+ private HashSet networks = Sets.newHashSet();
+ private HashSet networksToChange = Sets.newHashSet();
- private HashSet invalidTransmitters = Sets.newHashSet();
- private HashMap orphanTransmitters = Maps.newHashMap();
+ private HashSet invalidTransmitters = Sets.newHashSet();
+ private HashMap orphanTransmitters = Maps.newHashMap();
- private Logger logger = LogManager.getLogger("MekanismTransmitters");
+ private Logger logger = LogManager.getLogger("MekanismTransmitters");
- public static void initiate()
- {
- if(!loaderRegistered)
- {
- loaderRegistered = true;
+ public static void initiate() {
+ if (!loaderRegistered) {
+ loaderRegistered = true;
- FMLCommonHandler.instance().bus().register(INSTANCE);
- }
- }
+ FMLCommonHandler.instance().bus().register(INSTANCE);
+ }
+ }
- public static void reset()
- {
- getInstance().networks.clear();
- getInstance().networksToChange.clear();
- getInstance().invalidTransmitters.clear();
- getInstance().orphanTransmitters.clear();
- }
+ public static void reset() {
+ getInstance().networks.clear();
+ getInstance().networksToChange.clear();
+ getInstance().invalidTransmitters.clear();
+ getInstance().orphanTransmitters.clear();
+ }
- public static void invalidateTransmitter(IGridTransmitter transmitter)
- {
- getInstance().invalidTransmitters.add(transmitter);
- }
+ public static void invalidateTransmitter(IGridTransmitter transmitter) {
+ getInstance().invalidTransmitters.add(transmitter);
+ }
- public static void registerOrphanTransmitter(IGridTransmitter transmitter)
- {
- getInstance().orphanTransmitters.put(transmitter.coord(), transmitter);
- }
+ public static void registerOrphanTransmitter(IGridTransmitter transmitter) {
+ getInstance().orphanTransmitters.put(transmitter.coord(), transmitter);
+ }
- public static void registerChangedNetwork(DynamicNetwork network)
- {
- getInstance().networksToChange.add(network);
- }
+ public static void registerChangedNetwork(DynamicNetwork network) {
+ getInstance().networksToChange.add(network);
+ }
- public static TransmitterNetworkRegistry getInstance()
- {
- return INSTANCE;
- }
+ public static TransmitterNetworkRegistry getInstance() {
+ return INSTANCE;
+ }
- public void registerNetwork(DynamicNetwork network)
- {
- networks.add(network);
- }
+ public void registerNetwork(DynamicNetwork network) {
+ networks.add(network);
+ }
- public void removeNetwork(DynamicNetwork network)
- {
- if(networks.contains(network))
- {
- networks.remove(network);
- }
- }
+ public void removeNetwork(DynamicNetwork network) {
+ if (networks.contains(network)) {
+ networks.remove(network);
+ }
+ }
- @SubscribeEvent
- public void onTick(ServerTickEvent event)
- {
- if(event.phase == Phase.END && event.side == Side.SERVER)
- {
- tickEnd();
- }
- }
+ @SubscribeEvent
+ public void onTick(ServerTickEvent event) {
+ if (event.phase == Phase.END && event.side == Side.SERVER) {
+ tickEnd();
+ }
+ }
- public void tickEnd()
- {
- removeInvalidTransmitters();
+ public void tickEnd() {
+ removeInvalidTransmitters();
- assignOrphans();
+ assignOrphans();
- commitChanges();
+ commitChanges();
- for(DynamicNetwork net : networks)
- {
- net.tick();
- }
- }
+ for (DynamicNetwork net : networks) {
+ net.tick();
+ }
+ }
- public void removeInvalidTransmitters()
- {
- if(MekanismAPI.debug && !invalidTransmitters.isEmpty())
- {
- logger.info("Dealing with " + invalidTransmitters.size() + " invalid Transmitters");
- }
-
- for(IGridTransmitter invalid : invalidTransmitters)
- {
- if(!(invalid.isOrphan() && invalid.isValid()))
- {
- DynamicNetwork n = invalid.getTransmitterNetwork();
-
- if(n != null)
- {
- n.invalidate();
- }
- }
- }
-
- invalidTransmitters.clear();
- }
+ public void removeInvalidTransmitters() {
+ if (MekanismAPI.debug && !invalidTransmitters.isEmpty()) {
+ logger.info(
+ "Dealing with " + invalidTransmitters.size() + " invalid Transmitters"
+ );
+ }
- public void assignOrphans()
- {
- if(MekanismAPI.debug && !orphanTransmitters.isEmpty())
- {
- logger.info("Dealing with " + orphanTransmitters.size() + " orphan Transmitters");
- }
-
- for(IGridTransmitter orphanTransmitter : orphanTransmitters.values())
- {
- DynamicNetwork network = getNetworkFromOrphan(orphanTransmitter);
-
- if(network != null)
- {
- networksToChange.add(network);
- network.register();
- }
- }
-
- orphanTransmitters.clear();
- }
+ for (IGridTransmitter invalid : invalidTransmitters) {
+ if (!(invalid.isOrphan() && invalid.isValid())) {
+ DynamicNetwork n = invalid.getTransmitterNetwork();
- public > DynamicNetwork getNetworkFromOrphan(IGridTransmitter startOrphan)
- {
- if(startOrphan.isValid() && startOrphan.isOrphan())
- {
- OrphanPathFinder finder = new OrphanPathFinder(startOrphan);
- finder.start();
- N network;
-
- switch(finder.networksFound.size())
- {
- case 0:
- if(MekanismAPI.debug)
- {
- logger.info("No networks found. Creating new network for " + finder.connectedTransmitters.size() + " transmitters");
- }
-
- network = startOrphan.createEmptyNetwork();
-
- break;
- case 1:
- if(MekanismAPI.debug)
- {
- logger.info("Adding " + finder.connectedTransmitters.size() + " transmitters to single found network");
- }
-
- network = finder.networksFound.iterator().next();
-
- break;
- default:
- if(MekanismAPI.debug)
- {
- logger.info("Merging " + finder.networksFound.size() + " networks with " + finder.connectedTransmitters.size() + " new transmitters");
- }
-
- network = startOrphan.mergeNetworks(finder.networksFound);
- }
-
- network.addNewTransmitters(finder.connectedTransmitters);
-
- return network;
- }
-
- return null;
- }
+ if (n != null) {
+ n.invalidate();
+ }
+ }
+ }
- public void commitChanges()
- {
- for(DynamicNetwork network : networksToChange)
- {
- network.commit();
- }
-
- networksToChange.clear();
- }
+ invalidTransmitters.clear();
+ }
- @Override
- public String toString()
- {
- return "Network Registry:\n" + networks;
- }
+ public void assignOrphans() {
+ if (MekanismAPI.debug && !orphanTransmitters.isEmpty()) {
+ logger.info(
+ "Dealing with " + orphanTransmitters.size() + " orphan Transmitters"
+ );
+ }
- public String[] toStrings()
- {
- String[] strings = new String[networks.size()];
- int i = 0;
+ for (IGridTransmitter orphanTransmitter : orphanTransmitters.values()) {
+ DynamicNetwork network = getNetworkFromOrphan(orphanTransmitter);
- for(DynamicNetwork network : networks)
- {
- strings[i++] = network.toString();
- }
+ if (network != null) {
+ networksToChange.add(network);
+ network.register();
+ }
+ }
- return strings;
- }
+ orphanTransmitters.clear();
+ }
- public class OrphanPathFinder>
- {
- public IGridTransmitter startPoint;
+ public > DynamicNetwork
+ getNetworkFromOrphan(IGridTransmitter startOrphan) {
+ if (startOrphan.isValid() && startOrphan.isOrphan()) {
+ OrphanPathFinder finder = new OrphanPathFinder(startOrphan);
+ finder.start();
+ N network;
- public HashSet iterated = Sets.newHashSet();
+ switch (finder.networksFound.size()) {
+ case 0:
+ if (MekanismAPI.debug) {
+ logger.info(
+ "No networks found. Creating new network for "
+ + finder.connectedTransmitters.size() + " transmitters"
+ );
+ }
- public HashSet> connectedTransmitters = Sets.newHashSet();
- public HashSet networksFound = Sets.newHashSet();
+ network = startOrphan.createEmptyNetwork();
- public OrphanPathFinder(IGridTransmitter start)
- {
- startPoint = start;
- }
+ break;
+ case 1:
+ if (MekanismAPI.debug) {
+ logger.info(
+ "Adding " + finder.connectedTransmitters.size()
+ + " transmitters to single found network"
+ );
+ }
- public void start()
- {
- iterate(startPoint.coord(), ForgeDirection.UNKNOWN);
- }
+ network = finder.networksFound.iterator().next();
- public void iterate(Coord4D from, ForgeDirection fromDirection)
- {
- if(iterated.contains(from))
- {
- return;
- }
+ break;
+ default:
+ if (MekanismAPI.debug) {
+ logger.info(
+ "Merging " + finder.networksFound.size() + " networks with "
+ + finder.connectedTransmitters.size() + " new transmitters"
+ );
+ }
- iterated.add(from);
-
- if(orphanTransmitters.containsKey(from))
- {
- IGridTransmitter transmitter = orphanTransmitters.get(from);
-
- if(transmitter.isValid() && transmitter.isOrphan())
- {
- connectedTransmitters.add(transmitter);
- transmitter.setOrphan(false);
-
- for(ForgeDirection direction : ForgeDirection.VALID_DIRECTIONS)
- {
- if(direction != fromDirection)
- {
- Coord4D directionCoord = transmitter.getAdjacentConnectableTransmitterCoord(direction);
-
- if(!(directionCoord == null || iterated.contains(directionCoord)))
- {
- iterate(directionCoord, direction.getOpposite());
- }
- }
- }
- }
- }
- else {
- addNetworkToIterated(from);
- }
- }
+ network = startOrphan.mergeNetworks(finder.networksFound);
+ }
- public void addNetworkToIterated(Coord4D from)
- {
- N net = startPoint.getExternalNetwork(from);
- if(net != null) networksFound.add(net);
- }
- }
+ network.addNewTransmitters(finder.connectedTransmitters);
+
+ return network;
+ }
+
+ return null;
+ }
+
+ public void commitChanges() {
+ for (DynamicNetwork network : networksToChange) {
+ network.commit();
+ }
+
+ networksToChange.clear();
+ }
+
+ @Override
+ public String toString() {
+ return "Network Registry:\n" + networks;
+ }
+
+ public String[] toStrings() {
+ String[] strings = new String[networks.size()];
+ int i = 0;
+
+ for (DynamicNetwork network : networks) {
+ strings[i++] = network.toString();
+ }
+
+ return strings;
+ }
+
+ public class OrphanPathFinder> {
+ public IGridTransmitter startPoint;
+
+ public HashSet iterated = Sets.newHashSet();
+
+ public HashSet> connectedTransmitters = Sets.newHashSet();
+ public HashSet networksFound = Sets.newHashSet();
+
+ public OrphanPathFinder(IGridTransmitter start) {
+ startPoint = start;
+ }
+
+ public void start() {
+ iterate(startPoint.coord(), ForgeDirection.UNKNOWN);
+ }
+
+ public void iterate(Coord4D from, ForgeDirection fromDirection) {
+ if (iterated.contains(from)) {
+ return;
+ }
+
+ iterated.add(from);
+
+ if (orphanTransmitters.containsKey(from)) {
+ IGridTransmitter transmitter = orphanTransmitters.get(from);
+
+ if (transmitter.isValid() && transmitter.isOrphan()) {
+ connectedTransmitters.add(transmitter);
+ transmitter.setOrphan(false);
+
+ for (ForgeDirection direction : ForgeDirection.VALID_DIRECTIONS) {
+ if (direction != fromDirection) {
+ Coord4D directionCoord
+ = transmitter.getAdjacentConnectableTransmitterCoord(
+ direction
+ );
+
+ if (!(directionCoord == null
+ || iterated.contains(directionCoord))) {
+ iterate(directionCoord, direction.getOpposite());
+ }
+ }
+ }
+ }
+ } else {
+ addNetworkToIterated(from);
+ }
+ }
+
+ public void addNetworkToIterated(Coord4D from) {
+ N net = startPoint.getExternalNetwork(from);
+ if (net != null)
+ networksFound.add(net);
+ }
+ }
}
diff --git a/src/main/java/mekanism/api/transmitters/package-info.java b/src/main/java/mekanism/api/transmitters/package-info.java
index fe5e7cc61..6a44948bd 100644
--- a/src/main/java/mekanism/api/transmitters/package-info.java
+++ b/src/main/java/mekanism/api/transmitters/package-info.java
@@ -1,4 +1,3 @@
@API(apiVersion = "9.0.0", owner = "Mekanism", provides = "MekanismAPI|transmitter")
package mekanism.api.transmitters;
import cpw.mods.fml.common.API;
-
diff --git a/src/main/java/mekanism/api/util/BlockInfo.java b/src/main/java/mekanism/api/util/BlockInfo.java
index 2cb40d7df..b026db3e9 100644
--- a/src/main/java/mekanism/api/util/BlockInfo.java
+++ b/src/main/java/mekanism/api/util/BlockInfo.java
@@ -3,36 +3,32 @@ package mekanism.api.util;
import net.minecraft.block.Block;
import net.minecraft.item.ItemStack;
-public class BlockInfo
-{
- public Block block;
- public int meta;
+public class BlockInfo {
+ public Block block;
+ public int meta;
- public BlockInfo(Block b, int j)
- {
- block = b;
- meta = j;
- }
+ public BlockInfo(Block b, int j) {
+ block = b;
+ meta = j;
+ }
- public static BlockInfo get(ItemStack stack)
- {
- return new BlockInfo(Block.getBlockFromItem(stack.getItem()), stack.getItemDamage());
- }
+ public static BlockInfo get(ItemStack stack) {
+ return new BlockInfo(
+ Block.getBlockFromItem(stack.getItem()), stack.getItemDamage()
+ );
+ }
- @Override
- public boolean equals(Object obj)
- {
- return obj instanceof BlockInfo &&
- ((BlockInfo)obj).block == block &&
- ((BlockInfo)obj).meta == meta;
- }
+ @Override
+ public boolean equals(Object obj) {
+ return obj instanceof BlockInfo && ((BlockInfo) obj).block == block
+ && ((BlockInfo) obj).meta == meta;
+ }
- @Override
- public int hashCode()
- {
- int code = 1;
- code = 31 * code + block.getUnlocalizedName().hashCode();
- code = 31 * code + meta;
- return code;
- }
+ @Override
+ public int hashCode() {
+ int code = 1;
+ code = 31 * code + block.getUnlocalizedName().hashCode();
+ code = 31 * code + meta;
+ return code;
+ }
}
\ No newline at end of file
diff --git a/src/main/java/mekanism/api/util/ItemInfo.java b/src/main/java/mekanism/api/util/ItemInfo.java
index f27065b66..b3c971da3 100644
--- a/src/main/java/mekanism/api/util/ItemInfo.java
+++ b/src/main/java/mekanism/api/util/ItemInfo.java
@@ -3,36 +3,30 @@ package mekanism.api.util;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
-public class ItemInfo
-{
- public Item item;
- public int meta;
+public class ItemInfo {
+ public Item item;
+ public int meta;
- public ItemInfo(Item i, int j)
- {
- item = i;
- meta = j;
- }
+ public ItemInfo(Item i, int j) {
+ item = i;
+ meta = j;
+ }
- public static ItemInfo get(ItemStack stack)
- {
- return new ItemInfo(stack.getItem(), stack.getItemDamage());
- }
+ public static ItemInfo get(ItemStack stack) {
+ return new ItemInfo(stack.getItem(), stack.getItemDamage());
+ }
- @Override
- public boolean equals(Object obj)
- {
- return obj instanceof ItemInfo &&
- ((ItemInfo)obj).item == item &&
- ((ItemInfo)obj).meta == meta;
- }
+ @Override
+ public boolean equals(Object obj) {
+ return obj instanceof ItemInfo && ((ItemInfo) obj).item == item
+ && ((ItemInfo) obj).meta == meta;
+ }
- @Override
- public int hashCode()
- {
- int code = 1;
- code = 31 * code + System.identityHashCode(item);
- code = 7 * code + meta;
- return code;
- }
+ @Override
+ public int hashCode() {
+ int code = 1;
+ code = 31 * code + System.identityHashCode(item);
+ code = 7 * code + meta;
+ return code;
+ }
}
diff --git a/src/main/java/mekanism/api/util/ListUtils.java b/src/main/java/mekanism/api/util/ListUtils.java
index e20807c53..23b1faee5 100644
--- a/src/main/java/mekanism/api/util/ListUtils.java
+++ b/src/main/java/mekanism/api/util/ListUtils.java
@@ -5,278 +5,235 @@ import java.util.Arrays;
import java.util.List;
import java.util.Set;
-public class ListUtils
-{
- public static List inverse(List list)
- {
- List toReturn = new ArrayList();
+public class ListUtils {
+ public static List inverse(List list) {
+ List toReturn = new ArrayList();
- for(int i = list.size() - 1; i >= 0; i--)
- {
- toReturn.add(list.get(i));
- }
+ for (int i = list.size() - 1; i >= 0; i--) {
+ toReturn.add(list.get(i));
+ }
- return toReturn;
- }
+ return toReturn;
+ }
- public static List cap(List list, int cap)
- {
- List toReturn = new ArrayList();
+ public static List cap(List list, int cap) {
+ List toReturn = new ArrayList();
- if(list.size() <= cap)
- {
- toReturn = copy(list);
- }
- else {
- int count = 0;
+ if (list.size() <= cap) {
+ toReturn = copy(list);
+ } else {
+ int count = 0;
- for(V obj : list)
- {
- count++;
+ for (V obj : list) {
+ count++;
- toReturn.add(obj);
+ toReturn.add(obj);
- if(count == cap)
- {
- break;
- }
- }
- }
+ if (count == cap) {
+ break;
+ }
+ }
+ }
- return toReturn;
- }
+ return toReturn;
+ }
- public static List copy(List list)
- {
- List toReturn = new ArrayList();
+ public static List copy(List list) {
+ List toReturn = new ArrayList();
- for(V obj : list)
- {
- toReturn.add(obj);
- }
+ for (V obj : list) {
+ toReturn.add(obj);
+ }
- return toReturn;
- }
+ return toReturn;
+ }
- public static List merge(List listOne, List listTwo)
- {
- List newList = new ArrayList();
+ public static List merge(List listOne, List listTwo) {
+ List newList = new ArrayList();
- for(V obj : listOne)
- {
- newList.add(obj);
- }
+ for (V obj : listOne) {
+ newList.add(obj);
+ }
- for(V obj : listTwo)
- {
- newList.add(obj);
- }
+ for (V obj : listTwo) {
+ newList.add(obj);
+ }
- return newList;
- }
+ return newList;
+ }
- public static List capRemains(List list, int cap)
- {
- List toReturn = new ArrayList();
+ public static List capRemains(List list, int cap) {
+ List toReturn = new ArrayList();
- if(list.size() <= cap)
- {
- return toReturn;
- }
- else {
- List inverse = inverse(list);
+ if (list.size() <= cap) {
+ return toReturn;
+ } else {
+ List inverse = inverse(list);
- int iterNeeded = list.size() - cap;
- int count = 0;
+ int iterNeeded = list.size() - cap;
+ int count = 0;
- for(V obj : list)
- {
- count++;
+ for (V obj : list) {
+ count++;
- toReturn.add(obj);
+ toReturn.add(obj);
- if(count == iterNeeded)
- {
- break;
- }
- }
+ if (count == iterNeeded) {
+ break;
+ }
+ }
- return toReturn;
- }
- }
+ return toReturn;
+ }
+ }
- public static ArrayList> split(List list, int divide)
- {
- int remain = list.size() % divide;
- int size = (list.size() - remain) / divide;
+ public static ArrayList> split(List list, int divide) {
+ int remain = list.size() % divide;
+ int size = (list.size() - remain) / divide;
- ArrayList> toReturn = new ArrayList>();
+ ArrayList> toReturn = new ArrayList>();
- for(int i = 0; i < divide; i++)
- {
- toReturn.add(i, new ArrayList());
- }
+ for (int i = 0; i < divide; i++) {
+ toReturn.add(i, new ArrayList());
+ }
- for(List iterSet : toReturn)
- {
- List