diff options
Diffstat (limited to 'src/main/java/gregtech/api/interfaces')
36 files changed, 984 insertions, 300 deletions
diff --git a/src/main/java/gregtech/api/interfaces/IBlockContainer.java b/src/main/java/gregtech/api/interfaces/IBlockContainer.java index 7949ae90ce..89bda5de12 100644 --- a/src/main/java/gregtech/api/interfaces/IBlockContainer.java +++ b/src/main/java/gregtech/api/interfaces/IBlockContainer.java @@ -4,5 +4,6 @@ import net.minecraft.block.Block; public interface IBlockContainer { Block getBlock(); + byte getMeta(); } diff --git a/src/main/java/gregtech/api/interfaces/IDebugableBlock.java b/src/main/java/gregtech/api/interfaces/IDebugableBlock.java index 35ca68336e..063f713fe4 100644 --- a/src/main/java/gregtech/api/interfaces/IDebugableBlock.java +++ b/src/main/java/gregtech/api/interfaces/IDebugableBlock.java @@ -1,8 +1,7 @@ package gregtech.api.interfaces; -import net.minecraft.entity.player.EntityPlayer; - import java.util.ArrayList; +import net.minecraft.entity.player.EntityPlayer; /** * You are allowed to include this File in your Download, as i will not change it. diff --git a/src/main/java/gregtech/api/interfaces/IGlobalWirelessEnergy.java b/src/main/java/gregtech/api/interfaces/IGlobalWirelessEnergy.java index cec499c5d3..cc825f9d1a 100644 --- a/src/main/java/gregtech/api/interfaces/IGlobalWirelessEnergy.java +++ b/src/main/java/gregtech/api/interfaces/IGlobalWirelessEnergy.java @@ -1,8 +1,5 @@ package gregtech.api.interfaces; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.world.World; - import java.io.File; import java.io.IOException; import java.math.BigInteger; @@ -13,6 +10,8 @@ import java.util.HashMap; import java.util.List; import java.util.UUID; import java.util.stream.Collectors; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.world.World; // If you are adding very late-game content feel free to tap into this interface. // The eventual goal is to bypass laser/dynamo stuff and have energy deposited directly from ultra-endgame @@ -50,22 +49,22 @@ public interface IGlobalWirelessEnergy { default void saveGlobalEnergyInfo(String world_name) { // Replace chars because of bug in forge that doesn't understand MC converts . to _ upon world creation. - world_name = world_name.replace('.','_'); + world_name = world_name.replace('.', '_'); createStorageIfNotExist(world_name); saveGlobalEnergyMap(world_name); saveGlobalEnergyName(world_name); saveGlobalEnergyTeam(world_name); - } default void saveGlobalEnergyMap(String world_name) { try { - List<String> lines = GlobalEnergy.entrySet() - .stream() - .map(entry -> entry.getKey() + ":" + entry.getValue()) - .collect(Collectors.toList()); + List<String> lines = GlobalEnergy.entrySet().stream() + .map(entry -> entry.getKey() + ":" + entry.getValue()) + .collect(Collectors.toList()); - Path path = Paths.get("./saves/" + world_name + "/" + GlobalEnergyFolderName + "/" + GlobalEnergyMapFileName + ".txt").toAbsolutePath(); + Path path = Paths.get("./saves/" + world_name + "/" + GlobalEnergyFolderName + "/" + GlobalEnergyMapFileName + + ".txt") + .toAbsolutePath(); Files.write(path, lines); } catch (IOException e) { @@ -75,12 +74,13 @@ public interface IGlobalWirelessEnergy { default void saveGlobalEnergyName(String world_name) { try { - List<String> lines = GlobalEnergyName.entrySet() - .stream() - .map(entry -> entry.getKey() + ":" + entry.getValue()) - .collect(Collectors.toList()); + List<String> lines = GlobalEnergyName.entrySet().stream() + .map(entry -> entry.getKey() + ":" + entry.getValue()) + .collect(Collectors.toList()); - Path path = Paths.get("./saves/" + world_name + "/" + GlobalEnergyFolderName + "/" + GlobalEnergyNameFileName + ".txt").toAbsolutePath(); + Path path = Paths.get("./saves/" + world_name + "/" + GlobalEnergyFolderName + "/" + + GlobalEnergyNameFileName + ".txt") + .toAbsolutePath(); Files.write(path, lines); } catch (IOException e) { @@ -90,12 +90,13 @@ public interface IGlobalWirelessEnergy { default void saveGlobalEnergyTeam(String world_name) { try { - List<String> lines = GlobalEnergyTeam.entrySet() - .stream() - .map(entry -> entry.getKey() + ":" + entry.getValue()) - .collect(Collectors.toList()); + List<String> lines = GlobalEnergyTeam.entrySet().stream() + .map(entry -> entry.getKey() + ":" + entry.getValue()) + .collect(Collectors.toList()); - Path path = Paths.get("./saves/" + world_name + "/" + GlobalEnergyFolderName + "/" + GlobalEnergyTeamFileName + ".txt").toAbsolutePath(); + Path path = Paths.get("./saves/" + world_name + "/" + GlobalEnergyFolderName + "/" + + GlobalEnergyTeamFileName + ".txt") + .toAbsolutePath(); Files.write(path, lines); } catch (IOException e) { @@ -107,7 +108,7 @@ public interface IGlobalWirelessEnergy { default void loadGlobalEnergyInfo(World world) { // Replace chars because of bug in forge that doesn't understand MC converts . to _ upon world creation. - String world_name = world.getWorldInfo().getWorldName().replace('.','_'); + String world_name = world.getWorldInfo().getWorldName().replace('.', '_'); PrivateGlobalEnergy.WorldName = world_name; createStorageIfNotExist(world_name); loadGlobalEnergyMap(world); @@ -117,10 +118,12 @@ public interface IGlobalWirelessEnergy { default void loadGlobalEnergyMap(World world) { try { - Path path = Paths.get("./saves/" + world.getWorldInfo().getWorldName() + "/" + GlobalEnergyFolderName + "/" + GlobalEnergyMapFileName + ".txt").toAbsolutePath(); + Path path = Paths.get("./saves/" + world.getWorldInfo().getWorldName() + "/" + GlobalEnergyFolderName + "/" + + GlobalEnergyMapFileName + ".txt") + .toAbsolutePath(); String[] data; - for(String line : Files.readAllLines(path)) { + for (String line : Files.readAllLines(path)) { data = line.split(":"); String UUID = data[0]; @@ -135,11 +138,12 @@ public interface IGlobalWirelessEnergy { default void loadGlobalEnergyName(World world) { try { - Path path = Paths.get("./saves/" + world.getWorldInfo().getWorldName() + "/" - + GlobalEnergyFolderName + "/" + GlobalEnergyNameFileName + ".txt").toAbsolutePath(); + Path path = Paths.get("./saves/" + world.getWorldInfo().getWorldName() + "/" + GlobalEnergyFolderName + "/" + + GlobalEnergyNameFileName + ".txt") + .toAbsolutePath(); String[] data; - for(String line : Files.readAllLines(path)) { + for (String line : Files.readAllLines(path)) { data = line.split(":"); GlobalEnergyName.put(data[0], data[1]); @@ -151,11 +155,12 @@ public interface IGlobalWirelessEnergy { default void loadGlobalEnergyTeam(World world) { try { - Path path = Paths.get("./saves/" + world.getWorldInfo().getWorldName() + "/" - + GlobalEnergyFolderName + "/" + GlobalEnergyTeamFileName + ".txt").toAbsolutePath(); + Path path = Paths.get("./saves/" + world.getWorldInfo().getWorldName() + "/" + GlobalEnergyFolderName + "/" + + GlobalEnergyTeamFileName + ".txt") + .toAbsolutePath(); String[] data; - for(String line : Files.readAllLines(path)) { + for (String line : Files.readAllLines(path)) { data = line.split(":"); GlobalEnergyName.put(data[0], data[1]); @@ -168,7 +173,8 @@ public interface IGlobalWirelessEnergy { // ------------------ default void createStorageIfNotExist(String world_name) { - Path folder_path = Paths.get("./saves/" + world_name + "/" + GlobalEnergyFolderName).toAbsolutePath(); + Path folder_path = Paths.get("./saves/" + world_name + "/" + GlobalEnergyFolderName) + .toAbsolutePath(); // Create folder for storing global energy network info. try { @@ -188,7 +194,6 @@ public interface IGlobalWirelessEnergy { } catch (IOException e) { e.printStackTrace(); } - } // Adds a user to the energy map if they do not already exist. Otherwise, do nothing. Will also check if the user @@ -299,7 +304,6 @@ public interface IGlobalWirelessEnergy { GlobalEnergyName.clear(); GlobalEnergyTeam.clear(); } - } class PrivateGlobalEnergy { diff --git a/src/main/java/gregtech/api/interfaces/IGuiIcon.java b/src/main/java/gregtech/api/interfaces/IGuiIcon.java index 2167270e6c..3204c35b4e 100644 --- a/src/main/java/gregtech/api/interfaces/IGuiIcon.java +++ b/src/main/java/gregtech/api/interfaces/IGuiIcon.java @@ -5,9 +5,14 @@ package gregtech.api.interfaces; */ public interface IGuiIcon { int getX(); + int getY(); + int getWidth(); + int getHeight(); + int getTexId(); + IGuiIcon getOverlay(); } diff --git a/src/main/java/gregtech/api/interfaces/IGuiScreen.java b/src/main/java/gregtech/api/interfaces/IGuiScreen.java index 5f1ae9cd2b..2f12781a77 100644 --- a/src/main/java/gregtech/api/interfaces/IGuiScreen.java +++ b/src/main/java/gregtech/api/interfaces/IGuiScreen.java @@ -5,12 +5,13 @@ import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.renderer.entity.RenderItem; - public interface IGuiScreen { interface IGuiElement { void onInit(); + default void onRemoved() {} + void draw(int mouseX, int mouseY, float parTicks); } @@ -19,18 +20,24 @@ public interface IGuiScreen { boolean removeToolTip(GT_GuiTooltip toolTip); GuiButton getSelectedButton(); + void clearSelectedButton(); + void buttonClicked(GuiButton button); int getGuiLeft(); + int getGuiTop(); int getXSize(); + int getYSize(); void addElement(IGuiElement element); + boolean removeElement(IGuiElement element); RenderItem getItemRenderer(); + FontRenderer getFontRenderer(); } diff --git a/src/main/java/gregtech/api/interfaces/IHatchElement.java b/src/main/java/gregtech/api/interfaces/IHatchElement.java index 22dbbdf013..e1f68963e0 100644 --- a/src/main/java/gregtech/api/interfaces/IHatchElement.java +++ b/src/main/java/gregtech/api/interfaces/IHatchElement.java @@ -6,7 +6,6 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.util.GT_StructureUtility; import gregtech.api.util.IGT_HatchAdder; - import java.util.Arrays; import java.util.Collections; import java.util.List; @@ -56,22 +55,23 @@ public interface IHatchElement<T> { default <T2 extends T> IStructureElement<T2> newAny(int aCasingIndex, int aDot) { if (aCasingIndex < 0 || aDot < 0) throw new IllegalArgumentException(); return GT_StructureUtility.<T2>buildHatchAdder() - .anyOf(this) - .casingIndex(aCasingIndex) - .dot(aDot) - .continueIfSuccess() - .build(); + .anyOf(this) + .casingIndex(aCasingIndex) + .dot(aDot) + .continueIfSuccess() + .build(); } - default <T2 extends T> IStructureElement<T2> newAny(int aCasingIndex, int aDot, BiPredicate<? super T2, ? super IGregTechTileEntity> aShouldSkip) { + default <T2 extends T> IStructureElement<T2> newAny( + int aCasingIndex, int aDot, BiPredicate<? super T2, ? super IGregTechTileEntity> aShouldSkip) { if (aCasingIndex < 0 || aDot < 0 || aShouldSkip == null) throw new IllegalArgumentException(); return GT_StructureUtility.<T2>buildHatchAdder() - .anyOf(this) - .casingIndex(aCasingIndex) - .dot(aDot) - .shouldSkip(aShouldSkip) - .continueIfSuccess() - .build(); + .anyOf(this) + .casingIndex(aCasingIndex) + .dot(aDot) + .shouldSkip(aShouldSkip) + .continueIfSuccess() + .build(); } default <T2 extends T> IHatchElement<T2> or(IHatchElement<? super T2> fallback) { @@ -93,9 +93,9 @@ class HatchElementEither<T> implements IHatchElement<T> { public List<? extends Class<? extends IMetaTileEntity>> mteClasses() { if (mMteClasses == null) mMteClasses = ImmutableList.<Class<? extends IMetaTileEntity>>builder() - .addAll(first.mteClasses()) - .addAll(second.mteClasses()) - .build(); + .addAll(first.mteClasses()) + .addAll(second.mteClasses()) + .build(); return mMteClasses; } @@ -106,8 +106,7 @@ class HatchElementEither<T> implements IHatchElement<T> { @Override public String name() { - if (name == null) - name = first.name() + " or " + second.name(); + if (name == null) name = first.name() + " or " + second.name(); return name; } @@ -124,7 +123,12 @@ class HatchElement<T> implements IHatchElement<T> { private final IHatchElement<? super T> mBacking; private final ToLongFunction<? super T> mCount; - public HatchElement(List<Class<? extends IMetaTileEntity>> aMteClasses, IGT_HatchAdder<? super T> aAdder, String aName, ToLongFunction<? super T> aCount, IHatchElement<? super T> aBacking) { + public HatchElement( + List<Class<? extends IMetaTileEntity>> aMteClasses, + IGT_HatchAdder<? super T> aAdder, + String aName, + ToLongFunction<? super T> aCount, + IHatchElement<? super T> aBacking) { this.mClasses = aMteClasses; this.mAdder = aAdder; this.mName = aName; diff --git a/src/main/java/gregtech/api/interfaces/IHeatingCoil.java b/src/main/java/gregtech/api/interfaces/IHeatingCoil.java index c8ceccf941..f30145165b 100644 --- a/src/main/java/gregtech/api/interfaces/IHeatingCoil.java +++ b/src/main/java/gregtech/api/interfaces/IHeatingCoil.java @@ -1,18 +1,18 @@ package gregtech.api.interfaces; import gregtech.api.enums.HeatingCoilLevel; -import net.minecraft.item.ItemStack; - import java.util.function.Consumer; +import net.minecraft.item.ItemStack; public interface IHeatingCoil { HeatingCoilLevel getCoilHeat(int meta); + default HeatingCoilLevel getCoilHeat(ItemStack stack) { return getCoilHeat(stack.getItemDamage()); } void setOnCoilCheck(Consumer<IHeatingCoil> callback); + Consumer<IHeatingCoil> getOnCoilCheck(); } - diff --git a/src/main/java/gregtech/api/interfaces/IIconContainer.java b/src/main/java/gregtech/api/interfaces/IIconContainer.java index 4682955603..8090ce7cb9 100644 --- a/src/main/java/gregtech/api/interfaces/IIconContainer.java +++ b/src/main/java/gregtech/api/interfaces/IIconContainer.java @@ -1,12 +1,12 @@ package gregtech.api.interfaces; +import static gregtech.api.enums.GT_Values.UNCOLORED_RBGA; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; -import static gregtech.api.enums.GT_Values.UNCOLORED_RBGA; - public interface IIconContainer { /** * @return A regular Icon. @@ -26,7 +26,8 @@ public interface IIconContainer { @SideOnly(Side.CLIENT) default int getIconPasses() { return 1; - }; + } + ; /** * @return the Default Texture File for this Icon. @@ -35,13 +36,12 @@ public interface IIconContainer { ResourceLocation getTextureFile(); @SideOnly(Side.CLIENT) - default public short[] getIconColor(int aRenderPass) { + public default short[] getIconColor(int aRenderPass) { return UNCOLORED_RBGA; } @SideOnly(Side.CLIENT) - default public boolean isUsingColorModulation(int aRenderPass) { + public default boolean isUsingColorModulation(int aRenderPass) { return aRenderPass == 0; } - } diff --git a/src/main/java/gregtech/api/interfaces/IItemBehaviour.java b/src/main/java/gregtech/api/interfaces/IItemBehaviour.java index 85916ae0d7..9a513c2af5 100644 --- a/src/main/java/gregtech/api/interfaces/IItemBehaviour.java +++ b/src/main/java/gregtech/api/interfaces/IItemBehaviour.java @@ -2,6 +2,7 @@ package gregtech.api.interfaces; import gregtech.api.enums.SubTag; import gregtech.api.items.GT_MetaBase_Item; +import java.util.List; import net.minecraft.dispenser.IBlockSource; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -11,14 +12,34 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import java.util.List; - public interface IItemBehaviour<E extends Item> { boolean onLeftClickEntity(E aItem, ItemStack aStack, EntityPlayer aPlayer, Entity aEntity); - boolean onItemUse(E aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ, int aSide, float hitX, float hitY, float hitZ); - - boolean onItemUseFirst(E aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ, int aSide, float hitX, float hitY, float hitZ); + boolean onItemUse( + E aItem, + ItemStack aStack, + EntityPlayer aPlayer, + World aWorld, + int aX, + int aY, + int aZ, + int aSide, + float hitX, + float hitY, + float hitZ); + + boolean onItemUseFirst( + E aItem, + ItemStack aStack, + EntityPlayer aPlayer, + World aWorld, + int aX, + int aY, + int aZ, + int aSide, + float hitX, + float hitY, + float hitZ); ItemStack onItemRightClick(E aItem, ItemStack aStack, World aWorld, EntityPlayer aPlayer); @@ -34,7 +55,9 @@ public interface IItemBehaviour<E extends Item> { boolean hasProjectile(GT_MetaBase_Item aItem, SubTag aProjectileType, ItemStack aStack); - EntityArrow getProjectile(E aItem, SubTag aProjectileType, ItemStack aStack, World aWorld, double aX, double aY, double aZ); + EntityArrow getProjectile( + E aItem, SubTag aProjectileType, ItemStack aStack, World aWorld, double aX, double aY, double aZ); - EntityArrow getProjectile(E aItem, SubTag aProjectileType, ItemStack aStack, World aWorld, EntityLivingBase aEntity, float aSpeed); + EntityArrow getProjectile( + E aItem, SubTag aProjectileType, ItemStack aStack, World aWorld, EntityLivingBase aEntity, float aSpeed); } diff --git a/src/main/java/gregtech/api/interfaces/INetworkUpdatableItem.java b/src/main/java/gregtech/api/interfaces/INetworkUpdatableItem.java index 2e102e937c..de251017a1 100644 --- a/src/main/java/gregtech/api/interfaces/INetworkUpdatableItem.java +++ b/src/main/java/gregtech/api/interfaces/INetworkUpdatableItem.java @@ -11,13 +11,13 @@ import net.minecraft.nbt.NBTTagCompound; * Usual NBT tag size limit applies. */ public interface INetworkUpdatableItem { - /** - * Receive update from client. Runs on server thread. - * @param stack Stack being updated - * @param player player holding the stack - * @param tag received data - * @return true if this stack should be kept inside the player inventory. - * false if this stack should vanish (i.e. slot content set to null) - */ - boolean receive(ItemStack stack, EntityPlayerMP player, NBTTagCompound tag); + /** + * Receive update from client. Runs on server thread. + * @param stack Stack being updated + * @param player player holding the stack + * @param tag received data + * @return true if this stack should be kept inside the player inventory. + * false if this stack should vanish (i.e. slot content set to null) + */ + boolean receive(ItemStack stack, EntityPlayerMP player, NBTTagCompound tag); } diff --git a/src/main/java/gregtech/api/interfaces/IProjectileItem.java b/src/main/java/gregtech/api/interfaces/IProjectileItem.java index 913339ef05..9441e2991b 100644 --- a/src/main/java/gregtech/api/interfaces/IProjectileItem.java +++ b/src/main/java/gregtech/api/interfaces/IProjectileItem.java @@ -20,5 +20,6 @@ public interface IProjectileItem { /** * @return an Arrow Entity to be spawned. If null then this is not an Arrow. Note: Other Projectiles still extend EntityArrow */ - EntityArrow getProjectile(SubTag aProjectileType, ItemStack aStack, World aWorld, EntityLivingBase aEntity, float aSpeed); + EntityArrow getProjectile( + SubTag aProjectileType, ItemStack aStack, World aWorld, EntityLivingBase aEntity, float aSpeed); } diff --git a/src/main/java/gregtech/api/interfaces/ITexture.java b/src/main/java/gregtech/api/interfaces/ITexture.java index b05f31d14f..e2445a8204 100644 --- a/src/main/java/gregtech/api/interfaces/ITexture.java +++ b/src/main/java/gregtech/api/interfaces/ITexture.java @@ -18,7 +18,7 @@ public interface ITexture { void renderZNeg(RenderBlocks aRenderer, Block aBlock, int aX, int aY, int aZ); boolean isValidTexture(); - + /** * @return {@code true} if this texture is from the old package */ diff --git a/src/main/java/gregtech/api/interfaces/IToolStats.java b/src/main/java/gregtech/api/interfaces/IToolStats.java index a96e12c1ce..b2e170445c 100644 --- a/src/main/java/gregtech/api/interfaces/IToolStats.java +++ b/src/main/java/gregtech/api/interfaces/IToolStats.java @@ -1,6 +1,7 @@ package gregtech.api.interfaces; import gregtech.api.items.GT_MetaGenerated_Tool; +import java.util.List; import net.minecraft.block.Block; import net.minecraft.enchantment.Enchantment; import net.minecraft.entity.Entity; @@ -11,8 +12,6 @@ import net.minecraft.util.DamageSource; import net.minecraft.world.World; import net.minecraftforge.event.world.BlockEvent; -import java.util.List; - /** * The Stats for GT Tools. Not including any Material Modifiers. * <p/> @@ -138,7 +137,18 @@ public interface IToolStats { * * @return the Amount of modified Items. */ - int convertBlockDrops(List<ItemStack> aDrops, ItemStack aStack, EntityPlayer aPlayer, Block aBlock, int aX, int aY, int aZ, byte aMetaData, int aFortune, boolean aSilkTouch, BlockEvent.HarvestDropsEvent aEvent); + int convertBlockDrops( + List<ItemStack> aDrops, + ItemStack aStack, + EntityPlayer aPlayer, + Block aBlock, + int aX, + int aY, + int aZ, + byte aMetaData, + int aFortune, + boolean aSilkTouch, + BlockEvent.HarvestDropsEvent aEvent); /** * @return Returns a broken Version of the Item. @@ -159,5 +169,6 @@ public interface IToolStats { short[] getRGBa(boolean aIsToolHead, ItemStack aStack); - float getMiningSpeed(Block aBlock, byte aMetaData, float aDefault, EntityPlayer aPlayer, World worldObj, int aX, int aY, int aZ); + float getMiningSpeed( + Block aBlock, byte aMetaData, float aDefault, EntityPlayer aPlayer, World worldObj, int aX, int aY, int aZ); } diff --git a/src/main/java/gregtech/api/interfaces/internal/IGT_Mod.java b/src/main/java/gregtech/api/interfaces/internal/IGT_Mod.java index 22947b746d..19e7a56aad 100644 --- a/src/main/java/gregtech/api/interfaces/internal/IGT_Mod.java +++ b/src/main/java/gregtech/api/interfaces/internal/IGT_Mod.java @@ -30,7 +30,7 @@ public interface IGT_Mod { */ EntityPlayer getThePlayer(); - //---------- Internal Usage Only ---------- + // ---------- Internal Usage Only ---------- /** * works only ClientSide otherwise returns 0 diff --git a/src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java b/src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java index add54205ee..d29dc96316 100644 --- a/src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java +++ b/src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java @@ -10,7 +10,13 @@ public interface IGT_RecipeAdder { * Does not work anymore! */ @Deprecated - boolean addFusionReactorRecipe(ItemStack aInput1, ItemStack aInput2, ItemStack aOutput1, int aFusionDurationInTicks, int aFusionEnergyPerTick, int aEnergyNeededForStartingFusion); + boolean addFusionReactorRecipe( + ItemStack aInput1, + ItemStack aInput2, + ItemStack aOutput1, + int aFusionDurationInTicks, + int aFusionEnergyPerTick, + int aEnergyNeededForStartingFusion); /** * Adds a FusionreactorRecipe @@ -23,9 +29,14 @@ public interface IGT_RecipeAdder { * @param aEnergyNeededForStartingFusion = EU needed for heating the Reactor up (must be >= 0) * @return true if the Recipe got added, otherwise false. */ - @Deprecated - boolean addFusionReactorRecipe(FluidStack aInput1, FluidStack aInput2, FluidStack aOutput1, int aFusionDurationInTicks, int aFusionEnergyPerTick, int aEnergyNeededForStartingFusion); + boolean addFusionReactorRecipe( + FluidStack aInput1, + FluidStack aInput2, + FluidStack aOutput1, + int aFusionDurationInTicks, + int aFusionEnergyPerTick, + int aEnergyNeededForStartingFusion); /** * Adds a Fusion Reactor Recipe @@ -37,7 +48,12 @@ public interface IGT_RecipeAdder { * @param aEnergyNeededForStartingFusion : EU needed to initialize the fusion reaction. (must be >= 0). * @return true if the recipe got added, otherwise false. */ - boolean addFusionReactorRecipe(FluidStack[] FluidInputArray, FluidStack[] FluidOutputArray, int aFusionDurationInTicks, int aFusionEnergyPerTick, int aEnergyNeededForStartingFusion); + boolean addFusionReactorRecipe( + FluidStack[] FluidInputArray, + FluidStack[] FluidOutputArray, + int aFusionDurationInTicks, + int aFusionEnergyPerTick, + int aEnergyNeededForStartingFusion); /** * Adds a Centrifuge Recipe @@ -49,9 +65,28 @@ public interface IGT_RecipeAdder { * @param aOutput4 can be null * @param aDuration must be > 0 */ - boolean addCentrifugeRecipe(ItemStack aInput1, int aInput2, ItemStack aOutput1, ItemStack aOutput2, ItemStack aOutput3, ItemStack aOutput4, ItemStack aOutput5, ItemStack aOutput6, int aDuration); - - boolean addCentrifugeRecipe(ItemStack aInput1, int aInput2, ItemStack aOutput1, ItemStack aOutput2, ItemStack aOutput3, ItemStack aOutput4, ItemStack aOutput5, ItemStack aOutput6, int aDuration, int aEUt); + boolean addCentrifugeRecipe( + ItemStack aInput1, + int aInput2, + ItemStack aOutput1, + ItemStack aOutput2, + ItemStack aOutput3, + ItemStack aOutput4, + ItemStack aOutput5, + ItemStack aOutput6, + int aDuration); + + boolean addCentrifugeRecipe( + ItemStack aInput1, + int aInput2, + ItemStack aOutput1, + ItemStack aOutput2, + ItemStack aOutput3, + ItemStack aOutput4, + ItemStack aOutput5, + ItemStack aOutput6, + int aDuration, + int aEUt); /** * Adds a Centrifuge Recipe @@ -63,9 +98,36 @@ public interface IGT_RecipeAdder { * @param aOutput4 can be null * @param aDuration must be > 0 */ - boolean addCentrifugeRecipe(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput, FluidStack aFluidOutput, ItemStack aOutput1, ItemStack aOutput2, ItemStack aOutput3, ItemStack aOutput4, ItemStack aOutput5, ItemStack aOutput6, int[] aChances, int aDuration, int aEUt); - - boolean addCentrifugeRecipe(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput, FluidStack aFluidOutput, ItemStack aOutput1, ItemStack aOutput2, ItemStack aOutput3, ItemStack aOutput4, ItemStack aOutput5, ItemStack aOutput6, int[] aChances, int aDuration, int aEUt, boolean aCleanroom); + boolean addCentrifugeRecipe( + ItemStack aInput1, + ItemStack aInput2, + FluidStack aFluidInput, + FluidStack aFluidOutput, + ItemStack aOutput1, + ItemStack aOutput2, + ItemStack aOutput3, + ItemStack aOutput4, + ItemStack aOutput5, + ItemStack aOutput6, + int[] aChances, + int aDuration, + int aEUt); + + boolean addCentrifugeRecipe( + ItemStack aInput1, + ItemStack aInput2, + FluidStack aFluidInput, + FluidStack aFluidOutput, + ItemStack aOutput1, + ItemStack aOutput2, + ItemStack aOutput3, + ItemStack aOutput4, + ItemStack aOutput5, + ItemStack aOutput6, + int[] aChances, + int aDuration, + int aEUt, + boolean aCleanroom); /** * @param aInput1 must be != null @@ -86,7 +148,17 @@ public interface IGT_RecipeAdder { * @param aDuration must be > 0 * @param aEUt should be > 0 */ - boolean addElectrolyzerRecipe(ItemStack aInput1, int aInput2, ItemStack aOutput1, ItemStack aOutput2, ItemStack aOutput3, ItemStack aOutput4, ItemStack aOutput5, ItemStack aOutput6, int aDuration, int aEUt); + boolean addElectrolyzerRecipe( + ItemStack aInput1, + int aInput2, + ItemStack aOutput1, + ItemStack aOutput2, + ItemStack aOutput3, + ItemStack aOutput4, + ItemStack aOutput5, + ItemStack aOutput6, + int aDuration, + int aEUt); /** * Adds a Electrolyzer Recipe @@ -99,7 +171,20 @@ public interface IGT_RecipeAdder { * @param aDuration must be > 0 * @param aEUt should be > 0 */ - boolean addElectrolyzerRecipe(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput, FluidStack aFluidOutput, ItemStack aOutput1, ItemStack aOutput2, ItemStack aOutput3, ItemStack aOutput4, ItemStack aOutput5, ItemStack aOutput6, int[] aChances, int aDuration, int aEUt); + boolean addElectrolyzerRecipe( + ItemStack aInput1, + ItemStack aInput2, + FluidStack aFluidInput, + FluidStack aFluidOutput, + ItemStack aOutput1, + ItemStack aOutput2, + ItemStack aOutput3, + ItemStack aOutput4, + ItemStack aOutput5, + ItemStack aOutput6, + int[] aChances, + int aDuration, + int aEUt); /** * Adds a Chemical Recipe @@ -121,7 +206,13 @@ public interface IGT_RecipeAdder { * @param aOutput must be != null * @param aDuration must be > 0 */ - boolean addChemicalRecipe(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput, FluidStack aFluidOutput, ItemStack aOutput, int aDuration); + boolean addChemicalRecipe( + ItemStack aInput1, + ItemStack aInput2, + FluidStack aFluidInput, + FluidStack aFluidOutput, + ItemStack aOutput, + int aDuration); /** * Adds a Chemical Recipe @@ -133,8 +224,15 @@ public interface IGT_RecipeAdder { * @param aOutput2 must be != null * @param aDuration must be > 0 */ - boolean addChemicalRecipeForBasicMachineOnly(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput, FluidStack aFluidOutput, ItemStack aOutput, ItemStack aOutput2, int aDuration, int aEUtick); - + boolean addChemicalRecipeForBasicMachineOnly( + ItemStack aInput1, + ItemStack aInput2, + FluidStack aFluidInput, + FluidStack aFluidOutput, + ItemStack aOutput, + ItemStack aOutput2, + int aDuration, + int aEUtick); /** * Adds a Chemical Recipe @@ -145,7 +243,14 @@ public interface IGT_RecipeAdder { * @param aOutput2 must be != null * @param aDuration must be > 0 */ - boolean addChemicalRecipe(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput, FluidStack aFluidOutput, ItemStack aOutput, ItemStack aOutput2, int aDuration); + boolean addChemicalRecipe( + ItemStack aInput1, + ItemStack aInput2, + FluidStack aFluidInput, + FluidStack aFluidOutput, + ItemStack aOutput, + ItemStack aOutput2, + int aDuration); /** * Adds Recipes for creating a radically polymerized polymer from a base Material (for example Ethylene -> Polyethylene) @@ -165,9 +270,25 @@ public interface IGT_RecipeAdder { * @param aDuration must be > 0 * @param aEUtick must be > 0 */ - boolean addChemicalRecipe(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput, FluidStack aFluidOutput, ItemStack aOutput, int aDuration, int aEUtick); - - boolean addChemicalRecipe(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput, FluidStack aFluidOutput, ItemStack aOutput, ItemStack aOutput2, int aDuration, int aEUtick, boolean aCleanroom); + boolean addChemicalRecipe( + ItemStack aInput1, + ItemStack aInput2, + FluidStack aFluidInput, + FluidStack aFluidOutput, + ItemStack aOutput, + int aDuration, + int aEUtick); + + boolean addChemicalRecipe( + ItemStack aInput1, + ItemStack aInput2, + FluidStack aFluidInput, + FluidStack aFluidOutput, + ItemStack aOutput, + ItemStack aOutput2, + int aDuration, + int aEUtick, + boolean aCleanroom); /** * Adds a Chemical Recipe @@ -179,7 +300,15 @@ public interface IGT_RecipeAdder { * @param aDuration must be > 0 * @param aEUtick must be > 0 */ - boolean addChemicalRecipe(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput, FluidStack aFluidOutput, ItemStack aOutput, ItemStack aOutput2, int aDuration, int aEUtick); + boolean addChemicalRecipe( + ItemStack aInput1, + ItemStack aInput2, + FluidStack aFluidInput, + FluidStack aFluidOutput, + ItemStack aOutput, + ItemStack aOutput2, + int aDuration, + int aEUtick); /** * Adds a Chemical Recipe that only exists in the Large Chemical Reactor @@ -194,9 +323,13 @@ public interface IGT_RecipeAdder { * <br>aOutputs and aFluidOutputs must contain at least one valid output. * */ - - boolean addMultiblockChemicalRecipe(ItemStack[] aInputs, FluidStack[] aFluidInputs, FluidStack[] aFluidOutputs, ItemStack[] aOutputs, int aDuration, int aEUtick); - + boolean addMultiblockChemicalRecipe( + ItemStack[] aInputs, + FluidStack[] aFluidInputs, + FluidStack[] aFluidOutputs, + ItemStack[] aOutputs, + int aDuration, + int aEUtick); /** * Adds a Blast Furnace Recipe @@ -210,7 +343,14 @@ public interface IGT_RecipeAdder { * @param aLevel should be > 0 is the minimum Heat Level needed for this Recipe */ @Deprecated - boolean addBlastRecipe(ItemStack aInput1, ItemStack aInput2, ItemStack aOutput1, ItemStack aOutput2, int aDuration, int aEUt, int aLevel); + boolean addBlastRecipe( + ItemStack aInput1, + ItemStack aInput2, + ItemStack aOutput1, + ItemStack aOutput2, + int aDuration, + int aEUt, + int aLevel); /** * Adds a Blast Furnace Recipe @@ -223,9 +363,31 @@ public interface IGT_RecipeAdder { * @param aEUt should be > 0 * @param aLevel should be > 0 is the minimum Heat Level needed for this Recipe */ - boolean addBlastRecipe(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput, FluidStack aFluidOutput, ItemStack aOutput1, ItemStack aOutput2, int aDuration, int aEUt, int aLevel); - - boolean addBlastRecipe(ItemStack aInput1, ItemStack aInput2, ItemStack aInput3, ItemStack aInput4, FluidStack aFluidInput, FluidStack aFluidOutput, ItemStack aOutput1, ItemStack aOutput2, ItemStack aOutput3, ItemStack aOutput4,int aDuration, int aEUt, int aLevel); + boolean addBlastRecipe( + ItemStack aInput1, + ItemStack aInput2, + FluidStack aFluidInput, + FluidStack aFluidOutput, + ItemStack aOutput1, + ItemStack aOutput2, + int aDuration, + int aEUt, + int aLevel); + + boolean addBlastRecipe( + ItemStack aInput1, + ItemStack aInput2, + ItemStack aInput3, + ItemStack aInput4, + FluidStack aFluidInput, + FluidStack aFluidOutput, + ItemStack aOutput1, + ItemStack aOutput2, + ItemStack aOutput3, + ItemStack aOutput4, + int aDuration, + int aEUt, + int aLevel); /** * Adds a Plasma Forge Recipe @@ -238,10 +400,22 @@ public interface IGT_RecipeAdder { * @param aEUt Should be > 0. EU/t. * @param coil_heat_level Should be > 0. Heat of the coils used. */ - boolean addPlasmaForgeRecipe(ItemStack[] ItemInputArray, FluidStack[] FluidInputArray, ItemStack[] OutputItemArray, FluidStack[] FluidOutputArray, int aDuration, int aEUt, int coil_heat_level); - - boolean addPrimitiveBlastRecipe(ItemStack aInput1, ItemStack aInput2, int aCoalAmount, ItemStack aOutput1, ItemStack aOutput2, int aDuration); + boolean addPlasmaForgeRecipe( + ItemStack[] ItemInputArray, + FluidStack[] FluidInputArray, + ItemStack[] OutputItemArray, + FluidStack[] FluidOutputArray, + int aDuration, + int aEUt, + int coil_heat_level); + boolean addPrimitiveBlastRecipe( + ItemStack aInput1, + ItemStack aInput2, + int aCoalAmount, + ItemStack aOutput1, + ItemStack aOutput2, + int aDuration); /** * Adds a Canning Machine Recipe @@ -251,7 +425,8 @@ public interface IGT_RecipeAdder { * @param aDuration must be > 0, 100 ticks is standard. * @param aEUt should be > 0, 1 EU/t is standard. */ - boolean addCannerRecipe(ItemStack aInput1, ItemStack aInput2, ItemStack aOutput1, ItemStack aOutput2, int aDuration, int aEUt); + boolean addCannerRecipe( + ItemStack aInput1, ItemStack aInput2, ItemStack aOutput1, ItemStack aOutput2, int aDuration, int aEUt); /** * Adds an Alloy Smelter Recipe @@ -264,8 +439,8 @@ public interface IGT_RecipeAdder { */ boolean addAlloySmelterRecipe(ItemStack aInput1, ItemStack aInput2, ItemStack aOutput1, int aDuration, int aEUt); - boolean addAlloySmelterRecipe(ItemStack aInput1, ItemStack aInput2, ItemStack aOutput1, int aDuration, int aEUt, boolean hidden); - + boolean addAlloySmelterRecipe( + ItemStack aInput1, ItemStack aInput2, ItemStack aOutput1, int aDuration, int aEUt, boolean hidden); /** * Adds a CNC-Machine Recipe @@ -297,7 +472,8 @@ public interface IGT_RecipeAdder { * @param aEUt should be > 0 * */ - boolean addAssemblerRecipe(ItemStack[] aInputs, FluidStack aFluidInput, ItemStack aOutput1, int aDuration, int aEUt); + boolean addAssemblerRecipe( + ItemStack[] aInputs, FluidStack aFluidInput, ItemStack aOutput1, int aDuration, int aEUt); /** * Adds an Assembler Recipe @@ -307,16 +483,43 @@ public interface IGT_RecipeAdder { * @param aDuration must be > 0 * @param aEUt should be > 0 */ - boolean addAssemblerRecipe(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput, ItemStack aOutput1, int aDuration, int aEUt); - - boolean addAssemblerRecipe(ItemStack aInput1, Object aOreDict, int aAmount, FluidStack aFluidInput, ItemStack aOutput1, int aDuration, int aEUt); - - boolean addAssemblerRecipe(ItemStack[] aInputs, Object aOreDict, int aAmount, FluidStack aFluidInput, ItemStack aOutput1, int aDuration, int aEUt); - - boolean addAssemblerRecipe(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput, ItemStack aOutput1, int aDuration, int aEUt, boolean aCleanroom); - - boolean addAssemblerRecipe(ItemStack[] aInputs, FluidStack aFluidInput, ItemStack aOutput1, int aDuration, int aEUt, boolean aCleanroom); - + boolean addAssemblerRecipe( + ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput, ItemStack aOutput1, int aDuration, int aEUt); + + boolean addAssemblerRecipe( + ItemStack aInput1, + Object aOreDict, + int aAmount, + FluidStack aFluidInput, + ItemStack aOutput1, + int aDuration, + int aEUt); + + boolean addAssemblerRecipe( + ItemStack[] aInputs, + Object aOreDict, + int aAmount, + FluidStack aFluidInput, + ItemStack aOutput1, + int aDuration, + int aEUt); + + boolean addAssemblerRecipe( + ItemStack aInput1, + ItemStack aInput2, + FluidStack aFluidInput, + ItemStack aOutput1, + int aDuration, + int aEUt, + boolean aCleanroom); + + boolean addAssemblerRecipe( + ItemStack[] aInputs, + FluidStack aFluidInput, + ItemStack aOutput1, + int aDuration, + int aEUt, + boolean aCleanroom); /** * Adds an Circuit Assembler Recipe @@ -327,9 +530,16 @@ public interface IGT_RecipeAdder { * @param aDuration must be > 0 * @param aEUt should be > 0 */ - boolean addCircuitAssemblerRecipe(ItemStack[] aInputs, FluidStack aFluidInput, ItemStack aOutput, int aDuration, int aEUt); + boolean addCircuitAssemblerRecipe( + ItemStack[] aInputs, FluidStack aFluidInput, ItemStack aOutput, int aDuration, int aEUt); - boolean addCircuitAssemblerRecipe(ItemStack[] aInputs, FluidStack aFluidInput, ItemStack aOutput, int aDuration, int aEUt, boolean aCleanroom); + boolean addCircuitAssemblerRecipe( + ItemStack[] aInputs, + FluidStack aFluidInput, + ItemStack aOutput, + int aDuration, + int aEUt, + boolean aCleanroom); /** * Adds an Assemblyline Recipe @@ -340,7 +550,14 @@ public interface IGT_RecipeAdder { * @param aDuration must be > 0 * @param aEUt should be > 0 */ - boolean addAssemblylineRecipe(ItemStack aResearchItem, int aResearchTime, ItemStack[] aInputs, FluidStack[] aFluidInputs, ItemStack aOutput1, int aDuration, int aEUt); + boolean addAssemblylineRecipe( + ItemStack aResearchItem, + int aResearchTime, + ItemStack[] aInputs, + FluidStack[] aFluidInputs, + ItemStack aOutput1, + int aDuration, + int aEUt); /** * Adds a Assemblyline Recipe @@ -349,7 +566,14 @@ public interface IGT_RecipeAdder { * ItemStack[] for multiple equivalent items; * {OreDict, amount} for oredict. */ - boolean addAssemblylineRecipe(ItemStack aResearchItem, int aResearchTime, Object[] aInputs, FluidStack[] aFluidInputs, ItemStack aOutput1, int aDuration, int aEUt); + boolean addAssemblylineRecipe( + ItemStack aResearchItem, + int aResearchTime, + Object[] aInputs, + FluidStack[] aFluidInputs, + ItemStack aOutput1, + int aDuration, + int aEUt); /** * Adds a Forge Hammer Recipe @@ -423,9 +647,24 @@ public interface IGT_RecipeAdder { * @param aEUt should be > 0 * @return */ - boolean addOreWasherRecipe(ItemStack aInput, ItemStack aOutput1, ItemStack aOutput2, ItemStack aOutput3, FluidStack aFluidInput, int aDuration, int aEUt); - - boolean addOreWasherRecipe(ItemStack aInput, ItemStack aOutput1, ItemStack aOutput2, ItemStack aOutput3, FluidStack aFluidInput, int[] aChances, int aDuration, int aEUt); + boolean addOreWasherRecipe( + ItemStack aInput, + ItemStack aOutput1, + ItemStack aOutput2, + ItemStack aOutput3, + FluidStack aFluidInput, + int aDuration, + int aEUt); + + boolean addOreWasherRecipe( + ItemStack aInput, + ItemStack aOutput1, + ItemStack aOutput2, + ItemStack aOutput3, + FluidStack aFluidInput, + int[] aChances, + int aDuration, + int aEUt); /** * Adds an Implosion Compressor Recipe @@ -447,7 +686,13 @@ public interface IGT_RecipeAdder { * @param aOutput3 can be null * @param aOutput4 can be null */ - boolean addGrinderRecipe(ItemStack aInput1, ItemStack aInput2, ItemStack aOutput1, ItemStack aOutput2, ItemStack aOutput3, ItemStack aOutput4); + boolean addGrinderRecipe( + ItemStack aInput1, + ItemStack aInput2, + ItemStack aOutput1, + ItemStack aOutput2, + ItemStack aOutput3, + ItemStack aOutput4); /** * Adds a Distillation Tower Recipe @@ -456,20 +701,44 @@ public interface IGT_RecipeAdder { * @param aOutputs must be != null 1-5 Fluids * @param aOutput2 can be null */ - boolean addDistillationTowerRecipe(FluidStack aInput, FluidStack[] aOutputs, ItemStack aOutput2, int aDuration, int aEUt); - boolean addDistillationTowerRecipe(FluidStack aInput, ItemStack[] aCircuit, FluidStack[] aOutputs, ItemStack aOutput2, int aDuration, int aEUt); + boolean addDistillationTowerRecipe( + FluidStack aInput, FluidStack[] aOutputs, ItemStack aOutput2, int aDuration, int aEUt); - boolean addSimpleArcFurnaceRecipe(ItemStack aInput, FluidStack aFluidInput, ItemStack[] aOutputs, int[] aChances, int aDuration, int aEUt); + boolean addDistillationTowerRecipe( + FluidStack aInput, + ItemStack[] aCircuit, + FluidStack[] aOutputs, + ItemStack aOutput2, + int aDuration, + int aEUt); - boolean addPlasmaArcFurnaceRecipe(ItemStack aInput, FluidStack aFluidInput, ItemStack[] aOutputs, int[] aChances, int aDuration, int aEUt); + boolean addSimpleArcFurnaceRecipe( + ItemStack aInput, FluidStack aFluidInput, ItemStack[] aOutputs, int[] aChances, int aDuration, int aEUt); - boolean addPlasmaArcFurnaceRecipe(ItemStack aInput, FluidStack aFluidInput, ItemStack[] aOutputs, FluidStack aFluidPutput, int[] aChances, int aDuration, int aEUt); + boolean addPlasmaArcFurnaceRecipe( + ItemStack aInput, FluidStack aFluidInput, ItemStack[] aOutputs, int[] aChances, int aDuration, int aEUt); + boolean addPlasmaArcFurnaceRecipe( + ItemStack aInput, + FluidStack aFluidInput, + ItemStack[] aOutputs, + FluidStack aFluidPutput, + int[] aChances, + int aDuration, + int aEUt); /** * Adds a Distillation Tower Recipe */ - boolean addDistillationRecipe(ItemStack aInput1, int aInput2, ItemStack aOutput1, ItemStack aOutput2, ItemStack aOutput3, ItemStack aOutput4, int aDuration, int aEUt); + boolean addDistillationRecipe( + ItemStack aInput1, + int aInput2, + ItemStack aOutput1, + ItemStack aOutput2, + ItemStack aOutput3, + ItemStack aOutput4, + int aDuration, + int aEUt); /** * Adds a Lathe Machine Recipe @@ -479,18 +748,28 @@ public interface IGT_RecipeAdder { /** * Adds a Cutter Recipe */ - boolean addCutterRecipe(ItemStack aInput, FluidStack aLubricant, ItemStack aOutput1, ItemStack aOutput2, int aDuration, int aEUt); + boolean addCutterRecipe( + ItemStack aInput, FluidStack aLubricant, ItemStack aOutput1, ItemStack aOutput2, int aDuration, int aEUt); /** * Adds Cutter Recipes with default Lubricants */ boolean addCutterRecipe(ItemStack aInput, ItemStack aOutput1, ItemStack aOutput2, int aDuration, int aEUt); - boolean addCutterRecipe(ItemStack aInput, ItemStack aOutput1, ItemStack aOutput2, int aDuration, int aEUt, boolean aCleanroom); + boolean addCutterRecipe( + ItemStack aInput, ItemStack aOutput1, ItemStack aOutput2, int aDuration, int aEUt, boolean aCleanroom); - boolean addCutterRecipe(ItemStack aInput, ItemStack aCircuit, ItemStack aOutput1, ItemStack aOutput2, int aDuration, int aEUt); + boolean addCutterRecipe( + ItemStack aInput, ItemStack aCircuit, ItemStack aOutput1, ItemStack aOutput2, int aDuration, int aEUt); - boolean addCutterRecipe(ItemStack aInput, ItemStack aCircuit, ItemStack aOutput1, ItemStack aOutput2, int aDuration, int aEUt, boolean aCleanroom); + boolean addCutterRecipe( + ItemStack aInput, + ItemStack aCircuit, + ItemStack aOutput1, + ItemStack aOutput2, + int aDuration, + int aEUt, + boolean aCleanroom); boolean addCutterRecipe(ItemStack[] aInputs, ItemStack[] aOutputs, int aDuration, int aEUt, int aSpecial); @@ -508,14 +787,23 @@ public interface IGT_RecipeAdder { * @param aEUt should be > 0 * @return */ - boolean addThermalCentrifugeRecipe(ItemStack aInput, ItemStack aOutput1, ItemStack aOutput2, ItemStack aOutput3, int aDuration, int aEUt); + boolean addThermalCentrifugeRecipe( + ItemStack aInput, ItemStack aOutput1, ItemStack aOutput2, ItemStack aOutput3, int aDuration, int aEUt); - boolean addThermalCentrifugeRecipe(ItemStack aInput, ItemStack aOutput1, ItemStack aOutput2, ItemStack aOutput3, int[] aChances, int aDuration, int aEUt); + boolean addThermalCentrifugeRecipe( + ItemStack aInput, + ItemStack aOutput1, + ItemStack aOutput2, + ItemStack aOutput3, + int[] aChances, + int aDuration, + int aEUt); /** * Adds an Unboxing Recipe */ - boolean addUnboxingRecipe(ItemStack aFullBox, ItemStack aContainedItem, ItemStack aEmptyBox, int aDuration, int aEUt); + boolean addUnboxingRecipe( + ItemStack aFullBox, ItemStack aContainedItem, ItemStack aEmptyBox, int aDuration, int aEUt); /** * Adds a Vacuum Freezer Recipe @@ -530,7 +818,13 @@ public interface IGT_RecipeAdder { boolean addVacuumFreezerRecipe(FluidStack aInput1, FluidStack aOutput1, int aDuration, int aEUt); - boolean addVacuumFreezerRecipe(ItemStack[] aItemInput, FluidStack[] aFluidInput, ItemStack[] aItemOutput, FluidStack[] aFluidOutput, int aDuration, int aEUt); + boolean addVacuumFreezerRecipe( + ItemStack[] aItemInput, + FluidStack[] aFluidInput, + ItemStack[] aItemOutput, + FluidStack[] aFluidOutput, + int aDuration, + int aEUt); /** * Adds a Fuel for My Generators @@ -552,9 +846,11 @@ public interface IGT_RecipeAdder { */ boolean addBrewingRecipe(ItemStack aIngredient, Fluid aInput, Fluid aOutput, boolean aHidden); - boolean addBrewingRecipe(ItemStack aIngredient, Fluid aInput, Fluid aOutput, int aDuration, int aEUt, boolean aHidden); + boolean addBrewingRecipe( + ItemStack aIngredient, Fluid aInput, Fluid aOutput, int aDuration, int aEUt, boolean aHidden); - boolean addBrewingRecipeCustom(ItemStack aIngredient, FluidStack aInput, FluidStack aOutput, int aDuration, int aEUt, boolean aHidden); + boolean addBrewingRecipeCustom( + ItemStack aIngredient, FluidStack aInput, FluidStack aOutput, int aDuration, int aEUt, boolean aHidden); /** * Adds a Recipe for the Fermenter @@ -571,14 +867,29 @@ public interface IGT_RecipeAdder { /** * Adds a Recipe for the Distillery */ + boolean addDistilleryRecipe( + ItemStack aCircuit, + FluidStack aInput, + FluidStack aOutput, + ItemStack aSolidOutput, + int aDuration, + int aEUt, + boolean aHidden); - boolean addDistilleryRecipe(ItemStack aCircuit, FluidStack aInput, FluidStack aOutput, ItemStack aSolidOutput, int aDuration, int aEUt, boolean aHidden); + boolean addDistilleryRecipe( + ItemStack aCircuit, FluidStack aInput, FluidStack aOutput, int aDuration, int aEUt, boolean aHidden); - boolean addDistilleryRecipe(ItemStack aCircuit, FluidStack aInput, FluidStack aOutput, int aDuration, int aEUt, boolean aHidden); + boolean addDistilleryRecipe( + int circuitConfig, + FluidStack aInput, + FluidStack aOutput, + ItemStack aSolidOutput, + int aDuration, + int aEUt, + boolean aHidden); - boolean addDistilleryRecipe(int circuitConfig, FluidStack aInput, FluidStack aOutput, ItemStack aSolidOutput, int aDuration, int aEUt, boolean aHidden); - - boolean addDistilleryRecipe(int aCircuit, FluidStack aInput, FluidStack aOutput, int aDuration, int aEUt, boolean aHidden); + boolean addDistilleryRecipe( + int aCircuit, FluidStack aInput, FluidStack aOutput, int aDuration, int aEUt, boolean aHidden); /** * Adds a Recipe for the Fluid Solidifier @@ -588,36 +899,75 @@ public interface IGT_RecipeAdder { /** * Adds a Recipe for Fluid Smelting */ - boolean addFluidSmelterRecipe(ItemStack aInput, ItemStack aRemains, FluidStack aOutput, int aChance, int aDuration, int aEUt); + boolean addFluidSmelterRecipe( + ItemStack aInput, ItemStack aRemains, FluidStack aOutput, int aChance, int aDuration, int aEUt); /** * Adds a Recipe for Fluid Smelting */ - boolean addFluidSmelterRecipe(ItemStack aInput, ItemStack aRemains, FluidStack aOutput, int aChance, int aDuration, int aEUt, boolean hidden); + boolean addFluidSmelterRecipe( + ItemStack aInput, + ItemStack aRemains, + FluidStack aOutput, + int aChance, + int aDuration, + int aEUt, + boolean hidden); /** * Adds a Recipe for Fluid Extraction */ - boolean addFluidExtractionRecipe(ItemStack aInput, ItemStack aRemains, FluidStack aOutput, int aChance, int aDuration, int aEUt); + boolean addFluidExtractionRecipe( + ItemStack aInput, ItemStack aRemains, FluidStack aOutput, int aChance, int aDuration, int aEUt); /** * Adds a Recipe for the Fluid Canner */ boolean addFluidCannerRecipe(ItemStack aInput, ItemStack aOutput, FluidStack aFluidInput, FluidStack aFluidOutput); - boolean addFluidCannerRecipe(ItemStack aInput, ItemStack aOutput, FluidStack aFluidInput, FluidStack aFluidOutput, int aDuration, int aEUt); + boolean addFluidCannerRecipe( + ItemStack aInput, + ItemStack aOutput, + FluidStack aFluidInput, + FluidStack aFluidOutput, + int aDuration, + int aEUt); /** * Adds a Recipe for the Chemical Bath */ - boolean addChemicalBathRecipe(ItemStack aInput, FluidStack aBathingFluid, ItemStack aOutput1, ItemStack aOutput2, ItemStack aOutput3, int[] aChances, int aDuration, int aEUt); - - boolean addChemicalBathRecipe(ItemStack aInput, FluidStack aBathingFluid, FluidStack aFluidOutput, ItemStack aOutput1, ItemStack aOutput2, ItemStack aOutput3, int[] aChances, int aDuration, int aEUt); + boolean addChemicalBathRecipe( + ItemStack aInput, + FluidStack aBathingFluid, + ItemStack aOutput1, + ItemStack aOutput2, + ItemStack aOutput3, + int[] aChances, + int aDuration, + int aEUt); + + boolean addChemicalBathRecipe( + ItemStack aInput, + FluidStack aBathingFluid, + FluidStack aFluidOutput, + ItemStack aOutput1, + ItemStack aOutput2, + ItemStack aOutput3, + int[] aChances, + int aDuration, + int aEUt); /** * Adds a Recipe for the Electromagnetic Separator */ - boolean addElectromagneticSeparatorRecipe(ItemStack aInput, ItemStack aOutput1, ItemStack aOutput2, ItemStack aOutput3, int[] aChances, int aDuration, int aEUt); + boolean addElectromagneticSeparatorRecipe( + ItemStack aInput, + ItemStack aOutput1, + ItemStack aOutput2, + ItemStack aOutput3, + int[] aChances, + int aDuration, + int aEUt); /** * Adds a Recipe for the Extractor @@ -627,55 +977,168 @@ public interface IGT_RecipeAdder { /** * Adds a Recipe for the Printer */ - boolean addPrinterRecipe(ItemStack aInput, FluidStack aFluid, ItemStack aSpecialSlot, ItemStack aOutput, int aDuration, int aEUt); + boolean addPrinterRecipe( + ItemStack aInput, FluidStack aFluid, ItemStack aSpecialSlot, ItemStack aOutput, int aDuration, int aEUt); /** * Adds a Recipe for the Autoclave */ - boolean addAutoclaveRecipe(ItemStack aInput, FluidStack aFluid, ItemStack aOutput, int aChance, int aDuration, int aEUt); - - boolean addAutoclaveRecipe(ItemStack aInput, FluidStack aFluid, ItemStack aOutput, int aChance, int aDuration, int aEUt, boolean aCleanroom); - - boolean addAutoclaveRecipe(ItemStack aInput, ItemStack aCircuit, FluidStack aFluid, ItemStack aOutput, int aChance, int aDuration, int aEUt, boolean aCleanroom); - - boolean addAutoclaveRecipe(ItemStack aInput, ItemStack aCircuit, FluidStack aFluidIn, FluidStack aFluidOut, ItemStack aOutput, int aChance, int aDuration, int aEUt, boolean aCleanroom); - - boolean addAutoclaveSpaceRecipe(ItemStack aInput, FluidStack aFluid, ItemStack aOutput, int aChance, int aDuration, int aEUt, boolean aCleanroom); - - boolean addAutoclaveSpaceRecipe(ItemStack aInput, ItemStack aCircuit, FluidStack aFluid, ItemStack aOutput, int aChance, int aDuration, int aEUt, boolean aCleanroom); - - - boolean addAutoclave4Recipe(ItemStack aInput, ItemStack aCircuit, FluidStack aFluidIn, FluidStack aFluidOut, ItemStack[] aOutputs, int[] aChances, int aDuration, int aEUt, boolean aCleanroom); + boolean addAutoclaveRecipe( + ItemStack aInput, FluidStack aFluid, ItemStack aOutput, int aChance, int aDuration, int aEUt); + + boolean addAutoclaveRecipe( + ItemStack aInput, + FluidStack aFluid, + ItemStack aOutput, + int aChance, + int aDuration, + int aEUt, + boolean aCleanroom); + + boolean addAutoclaveRecipe( + ItemStack aInput, + ItemStack aCircuit, + FluidStack aFluid, + ItemStack aOutput, + int aChance, + int aDuration, + int aEUt, + boolean aCleanroom); + + boolean addAutoclaveRecipe( + ItemStack aInput, + ItemStack aCircuit, + FluidStack aFluidIn, + FluidStack aFluidOut, + ItemStack aOutput, + int aChance, + int aDuration, + int aEUt, + boolean aCleanroom); + + boolean addAutoclaveSpaceRecipe( + ItemStack aInput, + FluidStack aFluid, + ItemStack aOutput, + int aChance, + int aDuration, + int aEUt, + boolean aCleanroom); + + boolean addAutoclaveSpaceRecipe( + ItemStack aInput, + ItemStack aCircuit, + FluidStack aFluid, + ItemStack aOutput, + int aChance, + int aDuration, + int aEUt, + boolean aCleanroom); + + boolean addAutoclave4Recipe( + ItemStack aInput, + ItemStack aCircuit, + FluidStack aFluidIn, + FluidStack aFluidOut, + ItemStack[] aOutputs, + int[] aChances, + int aDuration, + int aEUt, + boolean aCleanroom); /** * Adds a Recipe for the Mixer */ @Deprecated - boolean addMixerRecipe(ItemStack aInput1, ItemStack aInput2, ItemStack aInput3, ItemStack aInput4, FluidStack aFluidInput, FluidStack aFluidOutput, ItemStack aOutput, int aDuration, int aEUt); + boolean addMixerRecipe( + ItemStack aInput1, + ItemStack aInput2, + ItemStack aInput3, + ItemStack aInput4, + FluidStack aFluidInput, + FluidStack aFluidOutput, + ItemStack aOutput, + int aDuration, + int aEUt); @Deprecated - boolean addMixerRecipe(ItemStack aInput1, ItemStack aInput2, ItemStack aInput3, ItemStack aInput4, ItemStack aInput5, ItemStack aInput6, FluidStack aFluidInput, FluidStack aFluidOutput, ItemStack aOutput, int aDuration, int aEUt); + boolean addMixerRecipe( + ItemStack aInput1, + ItemStack aInput2, + ItemStack aInput3, + ItemStack aInput4, + ItemStack aInput5, + ItemStack aInput6, + FluidStack aFluidInput, + FluidStack aFluidOutput, + ItemStack aOutput, + int aDuration, + int aEUt); @Deprecated - boolean addMixerRecipe(ItemStack aInput1, ItemStack aInput2, ItemStack aInput3, ItemStack aInput4, ItemStack aInput5, ItemStack aInput6, ItemStack aInput7, ItemStack aInput8, ItemStack aInput9, FluidStack aFluidInput, FluidStack aFluidOutput, ItemStack aOutput, int aDuration, int aEUt); + boolean addMixerRecipe( + ItemStack aInput1, + ItemStack aInput2, + ItemStack aInput3, + ItemStack aInput4, + ItemStack aInput5, + ItemStack aInput6, + ItemStack aInput7, + ItemStack aInput8, + ItemStack aInput9, + FluidStack aFluidInput, + FluidStack aFluidOutput, + ItemStack aOutput, + int aDuration, + int aEUt); @Deprecated - boolean addMixerRecipe(ItemStack aInput1, ItemStack aInput2, ItemStack aInput3, ItemStack aInput4, ItemStack aInput5, ItemStack aInput6, ItemStack aInput7, ItemStack aInput8, ItemStack aInput9, FluidStack aFluidInput, FluidStack aFluidOutput, ItemStack aOutput1, ItemStack aOutput2, ItemStack aOutput3, ItemStack aOutput4, int aDuration, int aEUt); + boolean addMixerRecipe( + ItemStack aInput1, + ItemStack aInput2, + ItemStack aInput3, + ItemStack aInput4, + ItemStack aInput5, + ItemStack aInput6, + ItemStack aInput7, + ItemStack aInput8, + ItemStack aInput9, + FluidStack aFluidInput, + FluidStack aFluidOutput, + ItemStack aOutput1, + ItemStack aOutput2, + ItemStack aOutput3, + ItemStack aOutput4, + int aDuration, + int aEUt); // Use me only from now on! - boolean addMixerRecipe(ItemStack[] ItemInputArray, FluidStack[] FluidInputArray, ItemStack[] ItemOutputArray, FluidStack[] FluidOutputArray, int aDuration, int aEUt); + boolean addMixerRecipe( + ItemStack[] ItemInputArray, + FluidStack[] FluidInputArray, + ItemStack[] ItemOutputArray, + FluidStack[] FluidOutputArray, + int aDuration, + int aEUt); /** * Adds a Recipe for the Laser Engraver. */ @Deprecated - boolean addLaserEngraverRecipe(ItemStack aItemToEngrave, ItemStack aLens, ItemStack aEngravedItem, int aDuration, int aEUt); + boolean addLaserEngraverRecipe( + ItemStack aItemToEngrave, ItemStack aLens, ItemStack aEngravedItem, int aDuration, int aEUt); /** * Adds a Recipe for the Laser Engraver. */ @Deprecated - boolean addLaserEngraverRecipe(ItemStack aItemToEngrave, ItemStack aLens, ItemStack aEngravedItem, int aDuration, int aEUt, boolean aCleanroom); + boolean addLaserEngraverRecipe( + ItemStack aItemToEngrave, + ItemStack aLens, + ItemStack aEngravedItem, + int aDuration, + int aEUt, + boolean aCleanroom); /** * Adds a Generalised Laser Engraver Recipe. @@ -688,12 +1151,20 @@ public interface IGT_RecipeAdder { * @param aEUt Should be > 0. EU/t. * @param aCleanroom Boolean for usage of cleanroom in recipe. */ - boolean addLaserEngraverRecipe(ItemStack[] ItemInputArray, FluidStack[] FluidInputArray, ItemStack[] OutputItemArray, FluidStack[] FluidOutputArray, int aDuration, int aEUt, boolean aCleanroom); + boolean addLaserEngraverRecipe( + ItemStack[] ItemInputArray, + FluidStack[] FluidInputArray, + ItemStack[] OutputItemArray, + FluidStack[] FluidOutputArray, + int aDuration, + int aEUt, + boolean aCleanroom); /** * Adds a Recipe for the Forming Press */ - boolean addFormingPressRecipe(ItemStack aItemToImprint, ItemStack aForm, ItemStack aImprintedItem, int aDuration, int aEUt); + boolean addFormingPressRecipe( + ItemStack aItemToImprint, ItemStack aForm, ItemStack aImprintedItem, int aDuration, int aEUt); /** * Adds a Recipe for the Sifter. (up to 9 Outputs) @@ -708,8 +1179,8 @@ public interface IGT_RecipeAdder { /** * Adds a Recipe for the Arc Furnace. (up to 4 Outputs) */ - boolean addArcFurnaceRecipe(ItemStack aInput, ItemStack[] aOutputs, int[] aChances, int aDuration, int aEUt, boolean hidden); - + boolean addArcFurnaceRecipe( + ItemStack aInput, ItemStack[] aOutputs, int[] aChances, int aDuration, int aEUt, boolean hidden); /** * Adds a Recipe for the GT Pulveriser. (up to 4 Outputs) @@ -719,7 +1190,8 @@ public interface IGT_RecipeAdder { /** * Adds a Recipe for the GT Pulveriser. (up to 4 Outputs) */ - boolean addPulveriserRecipe(ItemStack aInput, ItemStack[] aOutputs, int[] aChances, int aDuration, int aEUt, boolean hidden); + boolean addPulveriserRecipe( + ItemStack aInput, ItemStack[] aOutputs, int[] aChances, int aDuration, int aEUt, boolean hidden); /** * Adds a Distillation Tower Recipe @@ -729,9 +1201,16 @@ public interface IGT_RecipeAdder { * @param aOutputs must be != null 1-5 Fluids * @param aOutput2 can be null */ - boolean addUniversalDistillationRecipe(FluidStack aInput, FluidStack[] aOutputs, ItemStack aOutput2, int aDuration, int aEUt); + boolean addUniversalDistillationRecipe( + FluidStack aInput, FluidStack[] aOutputs, ItemStack aOutput2, int aDuration, int aEUt); - boolean addUniversalDistillationRecipewithCircuit(FluidStack aInput, ItemStack[] aCircuit, FluidStack[] aOutputs, ItemStack aOutput2, int aDuration, int aEUt); + boolean addUniversalDistillationRecipewithCircuit( + FluidStack aInput, + ItemStack[] aCircuit, + FluidStack[] aOutputs, + ItemStack aOutput2, + int aDuration, + int aEUt); /** * Adds Pyrolyse Recipe @@ -743,7 +1222,14 @@ public interface IGT_RecipeAdder { * @param aDuration * @param aEUt */ - boolean addPyrolyseRecipe(ItemStack aInput, FluidStack aFluidInput, int intCircuit, ItemStack aOutput, FluidStack aFluidOutput, int aDuration, int aEUt); + boolean addPyrolyseRecipe( + ItemStack aInput, + FluidStack aFluidInput, + int intCircuit, + ItemStack aOutput, + FluidStack aFluidOutput, + int aDuration, + int aEUt); /** * Adds Oil Cracking Recipe @@ -753,7 +1239,6 @@ public interface IGT_RecipeAdder { * @param aDuration * @param aEUt */ - @Deprecated boolean addCrackingRecipe(FluidStack aInput, FluidStack aOutput, int aDuration, int aEUt); @@ -767,8 +1252,8 @@ public interface IGT_RecipeAdder { * @param aDuration * @param aEUt */ - - boolean addCrackingRecipe(int circuitConfig, FluidStack aInput, FluidStack aInput2, FluidStack aOutput, int aDuration, int aEUt); + boolean addCrackingRecipe( + int circuitConfig, FluidStack aInput, FluidStack aInput2, FluidStack aOutput, int aDuration, int aEUt); /** * Adds a Sound to the Sonictron9001 @@ -780,5 +1265,14 @@ public interface IGT_RecipeAdder { */ boolean addSonictronSound(ItemStack aItemStack, String aSoundName); - boolean addChemicalBathRecipe(ItemStack aInput, FluidStack aBathingFluid, ItemStack aOutput1, ItemStack aOutput2, ItemStack aOutput3, FluidStack aFluidOutput, int[] aChances, int aDuration, int aEUt); + boolean addChemicalBathRecipe( + ItemStack aInput, + FluidStack aBathingFluid, + ItemStack aOutput1, + ItemStack aOutput2, + ItemStack aOutput3, + FluidStack aFluidOutput, + int[] aChances, + int aDuration, + int aEUt); } diff --git a/src/main/java/gregtech/api/interfaces/internal/IThaumcraftCompat.java b/src/main/java/gregtech/api/interfaces/internal/IThaumcraftCompat.java index 34de41f381..330b9326c2 100644 --- a/src/main/java/gregtech/api/interfaces/internal/IThaumcraftCompat.java +++ b/src/main/java/gregtech/api/interfaces/internal/IThaumcraftCompat.java @@ -2,14 +2,12 @@ package gregtech.api.interfaces.internal; import gregtech.api.enums.TC_Aspects; import gregtech.api.enums.TC_Aspects.TC_AspectStack; +import java.util.List; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; -import java.util.List; - public interface IThaumcraftCompat { - int - RESEARCH_TYPE_NORMAL = 0, + int RESEARCH_TYPE_NORMAL = 0, RESEARCH_TYPE_SECONDARY = 1, RESEARCH_TYPE_FREE = 2, RESEARCH_TYPE_HIDDEN = 4, @@ -21,8 +19,7 @@ public interface IThaumcraftCompat { /** * The Research Keys of GT */ - String - IRON_TO_STEEL = "GT_IRON_TO_STEEL", + String IRON_TO_STEEL = "GT_IRON_TO_STEEL", FILL_WATER_BUCKET = "GT_FILL_WATER_BUCKET", WOOD_TO_CHARCOAL = "GT_WOOD_TO_CHARCOAL", TRANSZINC = "GT_TRANSZINC", @@ -50,7 +47,26 @@ public interface IThaumcraftCompat { Object addCrucibleRecipe(String aResearch, Object aInput, ItemStack aOutput, List<TC_AspectStack> aAspects); - Object addInfusionRecipe(String aResearch, ItemStack aMainInput, ItemStack[] aSideInputs, ItemStack aOutput, int aInstability, List<TC_Aspects.TC_AspectStack> aAspects); + Object addInfusionRecipe( + String aResearch, + ItemStack aMainInput, + ItemStack[] aSideInputs, + ItemStack aOutput, + int aInstability, + List<TC_Aspects.TC_AspectStack> aAspects); - Object addResearch(String aResearch, String aName, String aText, String[] aParentResearches, String aCategory, ItemStack aIcon, int aComplexity, int aType, int aX, int aY, List<TC_AspectStack> aAspects, ItemStack[] aResearchTriggers, Object[] aPages); + Object addResearch( + String aResearch, + String aName, + String aText, + String[] aParentResearches, + String aCategory, + ItemStack aIcon, + int aComplexity, + int aType, + int aX, + int aY, + List<TC_AspectStack> aAspects, + ItemStack[] aResearchTriggers, + Object[] aPages); } diff --git a/src/main/java/gregtech/api/interfaces/internal/IUETileEntity.java b/src/main/java/gregtech/api/interfaces/internal/IUETileEntity.java index b62740f610..821aa35f50 100644 --- a/src/main/java/gregtech/api/interfaces/internal/IUETileEntity.java +++ b/src/main/java/gregtech/api/interfaces/internal/IUETileEntity.java @@ -1,6 +1,5 @@ package gregtech.api.interfaces.internal; - public interface IUETileEntity /*extends IElectrical*/ { // } diff --git a/src/main/java/gregtech/api/interfaces/metatileentity/IConfigurationCircuitSupport.java b/src/main/java/gregtech/api/interfaces/metatileentity/IConfigurationCircuitSupport.java index 7d6923e93f..59a70b450d 100644 --- a/src/main/java/gregtech/api/interfaces/metatileentity/IConfigurationCircuitSupport.java +++ b/src/main/java/gregtech/api/interfaces/metatileentity/IConfigurationCircuitSupport.java @@ -1,11 +1,9 @@ package gregtech.api.interfaces.metatileentity; +import gregtech.api.GregTech_API; import java.util.List; - import net.minecraft.item.ItemStack; -import gregtech.api.GregTech_API; - /** * Implement this interface if your metatileentity supports configuration circuits * to resolve recipe conflicts. @@ -23,7 +21,7 @@ public interface IConfigurationCircuitSupport { * This list is unmodifiable. Its elements are not supposed to be modified in any way! */ default List<ItemStack> getConfigurationCircuits() { - return GregTech_API.getConfigurationCircuitList(100); + return GregTech_API.getConfigurationCircuitList(100); } /** @@ -41,5 +39,6 @@ public interface IConfigurationCircuitSupport { } int getCircuitSlotX(); + int getCircuitSlotY(); } diff --git a/src/main/java/gregtech/api/interfaces/metatileentity/IConnectable.java b/src/main/java/gregtech/api/interfaces/metatileentity/IConnectable.java index cffcb4c4ab..84c991ade9 100644 --- a/src/main/java/gregtech/api/interfaces/metatileentity/IConnectable.java +++ b/src/main/java/gregtech/api/interfaces/metatileentity/IConnectable.java @@ -4,17 +4,17 @@ package gregtech.api.interfaces.metatileentity; * For pipes, wires, and other MetaTiles which need to be decided whether they should connect to the block at each side. */ public interface IConnectable { - int NO_CONNECTION = 0b00000000; - int CONNECTED_DOWN = 0b00000001; - int CONNECTED_UP = 0b00000010; - int CONNECTED_NORTH = 0b00000100; - int CONNECTED_SOUTH = 0b00001000; - int CONNECTED_WEST = 0b00010000; - int CONNECTED_EAST = 0b00100000; - int CONNECTED_ALL = 0b00111111; - int HAS_FRESHFOAM = 0b01000000; + int NO_CONNECTION = 0b00000000; + int CONNECTED_DOWN = 0b00000001; + int CONNECTED_UP = 0b00000010; + int CONNECTED_NORTH = 0b00000100; + int CONNECTED_SOUTH = 0b00001000; + int CONNECTED_WEST = 0b00010000; + int CONNECTED_EAST = 0b00100000; + int CONNECTED_ALL = 0b00111111; + int HAS_FRESHFOAM = 0b01000000; int HAS_HARDENEDFOAM = 0b10000000; - int HAS_FOAM = 0b11000000; + int HAS_FOAM = 0b11000000; /** * Try to connect to the Block at the specified side diff --git a/src/main/java/gregtech/api/interfaces/metatileentity/IMachineCallback.java b/src/main/java/gregtech/api/interfaces/metatileentity/IMachineCallback.java index e9ca4125a2..a1c00ebc97 100644 --- a/src/main/java/gregtech/api/interfaces/metatileentity/IMachineCallback.java +++ b/src/main/java/gregtech/api/interfaces/metatileentity/IMachineCallback.java @@ -2,6 +2,8 @@ package gregtech.api.interfaces.metatileentity; public interface IMachineCallback<Machinetype extends IMetaTileEntity> { Machinetype getCallbackBase(); + void setCallbackBase(Machinetype callback); + Class<?> getType(); } diff --git a/src/main/java/gregtech/api/interfaces/metatileentity/IMetaTileEntity.java b/src/main/java/gregtech/api/interfaces/metatileentity/IMetaTileEntity.java index 65848fe96f..c9d23e1f71 100644 --- a/src/main/java/gregtech/api/interfaces/metatileentity/IMetaTileEntity.java +++ b/src/main/java/gregtech/api/interfaces/metatileentity/IMetaTileEntity.java @@ -9,6 +9,9 @@ import gregtech.api.interfaces.tileentity.IGregtechWailaProvider; import gregtech.api.interfaces.tileentity.IMachineBlockUpdateable; import gregtech.api.objects.GT_ItemStack; import gregtech.api.util.GT_Config; +import java.io.File; +import java.util.ArrayList; +import java.util.List; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.texture.IIconRegister; @@ -24,16 +27,18 @@ import net.minecraft.world.World; import net.minecraftforge.fluids.IFluidHandler; import net.minecraftforge.fluids.IFluidTank; -import java.io.File; -import java.util.ArrayList; -import java.util.List; - /** * Warning, this Interface has just been made to be able to add multiple kinds of MetaTileEntities (Cables, Pipes, Transformers, but not the regular Blocks) * <p/> * Don't implement this yourself and expect it to work. Extend @MetaTileEntity itself. */ -public interface IMetaTileEntity extends ISidedInventory, IFluidTank, IFluidHandler, IGearEnergyTileEntity, IMachineBlockUpdateable, IGregtechWailaProvider { +public interface IMetaTileEntity + extends ISidedInventory, + IFluidTank, + IFluidHandler, + IGearEnergyTileEntity, + IMachineBlockUpdateable, + IGregtechWailaProvider { /** * This determines the BaseMetaTileEntity belonging to this MetaTileEntity by using the Meta ID of the Block itself. * <p/> @@ -143,7 +148,8 @@ public interface IMetaTileEntity extends ISidedInventory, IFluidTank, IFluidHand /** * When a Player rightclicks the Facing with a soldering iron. */ - boolean onSolderingToolRightClick(byte aSide, byte aWrenchingSide, EntityPlayer aPlayer, float aX, float aY, float aZ); + boolean onSolderingToolRightClick( + byte aSide, byte aWrenchingSide, EntityPlayer aPlayer, float aX, float aY, float aZ); /** * Called right before this Machine explodes @@ -241,7 +247,8 @@ public interface IMetaTileEntity extends ISidedInventory, IFluidTank, IFluidHand * * @return */ - boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer, byte aSide, float aX, float aY, float aZ); + boolean onRightclick( + IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer, byte aSide, float aX, float aY, float aZ); /** * a Player leftclicks the Machine @@ -317,7 +324,8 @@ public interface IMetaTileEntity extends ISidedInventory, IFluidTank, IFluidHand /** * returns the DebugLog */ - ArrayList<String> getSpecialDebugInfo(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer, int aLogLevel, ArrayList<String> aList); + ArrayList<String> getSpecialDebugInfo( + IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer, int aLogLevel, ArrayList<String> aList); /** * get a small Description @@ -338,12 +346,18 @@ public interface IMetaTileEntity extends ISidedInventory, IFluidTank, IFluidHand * @param aActive if the Machine is currently active (use this instead of calling mBaseMetaTileEntity.mActive!!!). Note: In case of Pipes this means if this Side is connected to something or not. * @param aRedstone if the Machine is currently outputting a RedstoneSignal (use this instead of calling mBaseMetaTileEntity.mRedstone!!!) */ - ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone); + ITexture[] getTexture( + IGregTechTileEntity aBaseMetaTileEntity, + byte aSide, + byte aFacing, + byte aColorIndex, + boolean aActive, + boolean aRedstone); /** * The Textures used for the Item rendering. Return null if you want the regular 3D Block Rendering. */ - //public ITexture[] getItemTexture(ItemStack aStack); + // public ITexture[] getItemTexture(ItemStack aStack); /** * Register Icons here. This gets called when the Icons get initialized by the Base Block @@ -389,7 +403,14 @@ public interface IMetaTileEntity extends ISidedInventory, IFluidTank, IFluidHand boolean allowGeneralRedstoneOutput(); - void addCollisionBoxesToList(World aWorld, int aX, int aY, int aZ, AxisAlignedBB inputAABB, List<AxisAlignedBB> outputAABB, Entity collider); + void addCollisionBoxesToList( + World aWorld, + int aX, + int aY, + int aZ, + AxisAlignedBB inputAABB, + List<AxisAlignedBB> outputAABB, + Entity collider); AxisAlignedBB getCollisionBoundingBoxFromPool(World aWorld, int aX, int aY, int aZ); @@ -420,7 +441,7 @@ public interface IMetaTileEntity extends ISidedInventory, IFluidTank, IFluidHand * just return in should recurse since we are already in meta tile... */ @Override - default boolean isMachineBlockUpdateRecursive(){ + default boolean isMachineBlockUpdateRecursive() { return true; } @@ -433,5 +454,4 @@ public interface IMetaTileEntity extends ISidedInventory, IFluidTank, IFluidHand default void onRandomDisplayTick(IGregTechTileEntity aBaseMetaTileEntity) { /* do nothing */ } - } diff --git a/src/main/java/gregtech/api/interfaces/metatileentity/IMetaTileEntityCable.java b/src/main/java/gregtech/api/interfaces/metatileentity/IMetaTileEntityCable.java index 85237ac4f4..6b83ab4dba 100644 --- a/src/main/java/gregtech/api/interfaces/metatileentity/IMetaTileEntityCable.java +++ b/src/main/java/gregtech/api/interfaces/metatileentity/IMetaTileEntityCable.java @@ -1,13 +1,13 @@ package gregtech.api.interfaces.metatileentity; -import net.minecraft.tileentity.TileEntity; - import java.util.ArrayList; import java.util.HashSet; +import net.minecraft.tileentity.TileEntity; public interface IMetaTileEntityCable extends IMetaTileEntity { @Deprecated - long transferElectricity(byte aSide, long aVoltage, long aAmperage, ArrayList<TileEntity> aAlreadyPassedTileEntityList); + long transferElectricity( + byte aSide, long aVoltage, long aAmperage, ArrayList<TileEntity> aAlreadyPassedTileEntityList); default long transferElectricity(byte aSide, long aVoltage, long aAmperage, HashSet<TileEntity> aAlreadyPassedSet) { return transferElectricity(aSide, aVoltage, aAmperage, new ArrayList<>(aAlreadyPassedSet)); diff --git a/src/main/java/gregtech/api/interfaces/metatileentity/IMetaTileEntityItemPipe.java b/src/main/java/gregtech/api/interfaces/metatileentity/IMetaTileEntityItemPipe.java index 90933b501f..1b1ce36871 100644 --- a/src/main/java/gregtech/api/interfaces/metatileentity/IMetaTileEntityItemPipe.java +++ b/src/main/java/gregtech/api/interfaces/metatileentity/IMetaTileEntityItemPipe.java @@ -3,7 +3,6 @@ package gregtech.api.interfaces.metatileentity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.BaseMetaPipeEntity; import gregtech.api.util.GT_Utility; - import java.util.Map; public interface IMetaTileEntityItemPipe extends IMetaTileEntity { @@ -48,18 +47,30 @@ public interface IMetaTileEntityItemPipe extends IMetaTileEntity { /** * @return a List of connected Item Pipes */ - public static Map<IMetaTileEntityItemPipe, Long> scanPipes(IMetaTileEntityItemPipe aMetaTileEntity, Map<IMetaTileEntityItemPipe, Long> aMap, long aStep, boolean aSuckItems, boolean aIgnoreCapacity) { + public static Map<IMetaTileEntityItemPipe, Long> scanPipes( + IMetaTileEntityItemPipe aMetaTileEntity, + Map<IMetaTileEntityItemPipe, Long> aMap, + long aStep, + boolean aSuckItems, + boolean aIgnoreCapacity) { aStep += aMetaTileEntity.getStepSize(); if (aIgnoreCapacity || aMetaTileEntity.pipeCapacityCheck()) if (aMap.get(aMetaTileEntity) == null || aMap.get(aMetaTileEntity) > aStep) { IGregTechTileEntity aBaseMetaTileEntity = aMetaTileEntity.getBaseMetaTileEntity(); aMap.put(aMetaTileEntity, aStep); for (byte i = 0, j = 0; i < 6; i++) { - if (aMetaTileEntity instanceof IConnectable && !((IConnectable) aMetaTileEntity).isConnectedAtSide(i)) - continue; + if (aMetaTileEntity instanceof IConnectable + && !((IConnectable) aMetaTileEntity).isConnectedAtSide(i)) continue; j = GT_Utility.getOppositeSide(i); if (aSuckItems) { - if (aBaseMetaTileEntity.getCoverBehaviorAtSideNew(i).letsItemsIn(i, aBaseMetaTileEntity.getCoverIDAtSide(i), aBaseMetaTileEntity.getComplexCoverDataAtSide(i), -2, aBaseMetaTileEntity)) { + if (aBaseMetaTileEntity + .getCoverBehaviorAtSideNew(i) + .letsItemsIn( + i, + aBaseMetaTileEntity.getCoverIDAtSide(i), + aBaseMetaTileEntity.getComplexCoverDataAtSide(i), + -2, + aBaseMetaTileEntity)) { IGregTechTileEntity tItemPipe = aBaseMetaTileEntity.getIGregTechTileEntityAtSide(i); if (aBaseMetaTileEntity.getColorization() >= 0) { byte tColor = tItemPipe.getColorization(); @@ -69,13 +80,33 @@ public interface IMetaTileEntityItemPipe extends IMetaTileEntity { } if (tItemPipe instanceof BaseMetaPipeEntity) { IMetaTileEntity tMetaTileEntity = tItemPipe.getMetaTileEntity(); - if (tMetaTileEntity instanceof IMetaTileEntityItemPipe && tItemPipe.getCoverBehaviorAtSideNew(j).letsItemsOut(j, tItemPipe.getCoverIDAtSide(j), tItemPipe.getComplexCoverDataAtSide(j), -2, tItemPipe)) { - scanPipes((IMetaTileEntityItemPipe) tMetaTileEntity, aMap, aStep, aSuckItems, aIgnoreCapacity); + if (tMetaTileEntity instanceof IMetaTileEntityItemPipe + && tItemPipe + .getCoverBehaviorAtSideNew(j) + .letsItemsOut( + j, + tItemPipe.getCoverIDAtSide(j), + tItemPipe.getComplexCoverDataAtSide(j), + -2, + tItemPipe)) { + scanPipes( + (IMetaTileEntityItemPipe) tMetaTileEntity, + aMap, + aStep, + aSuckItems, + aIgnoreCapacity); } } } } else { - if (aBaseMetaTileEntity.getCoverBehaviorAtSideNew(i).letsItemsOut(i, aBaseMetaTileEntity.getCoverIDAtSide(i), aBaseMetaTileEntity.getComplexCoverDataAtSide(i), -2, aBaseMetaTileEntity)) { + if (aBaseMetaTileEntity + .getCoverBehaviorAtSideNew(i) + .letsItemsOut( + i, + aBaseMetaTileEntity.getCoverIDAtSide(i), + aBaseMetaTileEntity.getComplexCoverDataAtSide(i), + -2, + aBaseMetaTileEntity)) { IGregTechTileEntity tItemPipe = aBaseMetaTileEntity.getIGregTechTileEntityAtSide(i); if (tItemPipe != null) { if (aBaseMetaTileEntity.getColorization() >= 0) { @@ -86,8 +117,21 @@ public interface IMetaTileEntityItemPipe extends IMetaTileEntity { } if (tItemPipe instanceof BaseMetaPipeEntity) { IMetaTileEntity tMetaTileEntity = tItemPipe.getMetaTileEntity(); - if (tMetaTileEntity instanceof IMetaTileEntityItemPipe && tItemPipe.getCoverBehaviorAtSideNew(j).letsItemsIn(j, tItemPipe.getCoverIDAtSide(j), tItemPipe.getComplexCoverDataAtSide(j), -2, tItemPipe)) { - scanPipes((IMetaTileEntityItemPipe) tMetaTileEntity, aMap, aStep, aSuckItems, aIgnoreCapacity); + if (tMetaTileEntity instanceof IMetaTileEntityItemPipe + && tItemPipe + .getCoverBehaviorAtSideNew(j) + .letsItemsIn( + j, + tItemPipe.getCoverIDAtSide(j), + tItemPipe.getComplexCoverDataAtSide(j), + -2, + tItemPipe)) { + scanPipes( + (IMetaTileEntityItemPipe) tMetaTileEntity, + aMap, + aStep, + aSuckItems, + aIgnoreCapacity); } } } diff --git a/src/main/java/gregtech/api/interfaces/tileentity/IBasicEnergyContainer.java b/src/main/java/gregtech/api/interfaces/tileentity/IBasicEnergyContainer.java index ca3db3354e..7b0bc9c690 100644 --- a/src/main/java/gregtech/api/interfaces/tileentity/IBasicEnergyContainer.java +++ b/src/main/java/gregtech/api/interfaces/tileentity/IBasicEnergyContainer.java @@ -80,12 +80,16 @@ public interface IBasicEnergyContainer extends IEnergyConnected { /** * returns the amount of Steam contained in this Block, in EU units! */ - default long getStoredSteam() { return 0; } + default long getStoredSteam() { + return 0; + } /** * returns the amount of Steam containable in this Block, in EU units! */ - default long getSteamCapacity() { return 0; } + default long getSteamCapacity() { + return 0; + } /** * Increases stored Energy. Energy Base Value is in EU, even though it's Steam! @@ -96,5 +100,7 @@ public interface IBasicEnergyContainer extends IEnergyConnected { * <p/> * And yes, you can't directly decrease the Steam of a Machine. That is done by decreaseStoredEnergyUnits */ - default boolean increaseStoredSteam(long aEnergy, boolean aIgnoreTooMuchEnergy) { return false; } + default boolean increaseStoredSteam(long aEnergy, boolean aIgnoreTooMuchEnergy) { + return false; + } } diff --git a/src/main/java/gregtech/api/interfaces/tileentity/ICoverable.java b/src/main/java/gregtech/api/interfaces/tileentity/ICoverable.java index e496479bed..6beb34a305 100644 --- a/src/main/java/gregtech/api/interfaces/tileentity/ICoverable.java +++ b/src/main/java/gregtech/api/interfaces/tileentity/ICoverable.java @@ -22,8 +22,11 @@ public interface ICoverable extends IRedstoneTileEntity, IHasInventory, IBasicEn } void setCoverIdAndDataAtSide(byte aSide, int aId, ISerializableObject aData); + void setCoverIDAtSide(byte aSide, int aID); + boolean setCoverIDAtSideNoUpdate(byte aSide, int aID); + void setCoverItemAtSide(byte aSide, ItemStack aCover); @Deprecated @@ -71,7 +74,8 @@ public interface ICoverable extends IRedstoneTileEntity, IHasInventory, IBasicEn * Receiving a packet with cover data. * @param aPlayer the player who made the change */ - default void receiveCoverData(byte aCoverSide, int aCoverID, ISerializableObject aCoverData, EntityPlayerMP aPlayer) { + default void receiveCoverData( + byte aCoverSide, int aCoverID, ISerializableObject aCoverData, EntityPlayerMP aPlayer) { if (aCoverData instanceof ISerializableObject.LegacyCoverData) receiveCoverData(aCoverSide, aCoverID, ((ISerializableObject.LegacyCoverData) aCoverData).get()); } diff --git a/src/main/java/gregtech/api/interfaces/tileentity/IDebugableTileEntity.java b/src/main/java/gregtech/api/interfaces/tileentity/IDebugableTileEntity.java index 0063eb57c6..4e3b03d970 100644 --- a/src/main/java/gregtech/api/interfaces/tileentity/IDebugableTileEntity.java +++ b/src/main/java/gregtech/api/interfaces/tileentity/IDebugableTileEntity.java @@ -1,8 +1,7 @@ package gregtech.api.interfaces.tileentity; -import net.minecraft.entity.player.EntityPlayer; - import java.util.ArrayList; +import net.minecraft.entity.player.EntityPlayer; public interface IDebugableTileEntity { /** diff --git a/src/main/java/gregtech/api/interfaces/tileentity/IEnergyConnected.java b/src/main/java/gregtech/api/interfaces/tileentity/IEnergyConnected.java index 702f19a89d..c1ecc2b153 100644 --- a/src/main/java/gregtech/api/interfaces/tileentity/IEnergyConnected.java +++ b/src/main/java/gregtech/api/interfaces/tileentity/IEnergyConnected.java @@ -63,15 +63,21 @@ public interface IEnergyConnected extends IColoredTileEntity, IHasWorldObjectAnd final byte tColor = ((IEnergyConnected) tTileEntity).getColorization(); if (tColor >= 0 && tColor != aEmitter.getColorization()) continue; } - rUsedAmperes += ((IEnergyConnected) tTileEntity).injectEnergyUnits(j, aVoltage, aAmperage - rUsedAmperes); + rUsedAmperes += ((IEnergyConnected) tTileEntity) + .injectEnergyUnits(j, aVoltage, aAmperage - rUsedAmperes); } else if (tTileEntity instanceof IEnergySink) { - if (((IEnergySink) tTileEntity).acceptsEnergyFrom((TileEntity) aEmitter, ForgeDirection.getOrientation(j))) { - while (aAmperage > rUsedAmperes && ((IEnergySink) tTileEntity).getDemandedEnergy() > 0 && ((IEnergySink) tTileEntity).injectEnergy(ForgeDirection.getOrientation(j), aVoltage, aVoltage) < aVoltage) - rUsedAmperes++; + if (((IEnergySink) tTileEntity) + .acceptsEnergyFrom((TileEntity) aEmitter, ForgeDirection.getOrientation(j))) { + while (aAmperage > rUsedAmperes + && ((IEnergySink) tTileEntity).getDemandedEnergy() > 0 + && ((IEnergySink) tTileEntity) + .injectEnergy(ForgeDirection.getOrientation(j), aVoltage, aVoltage) + < aVoltage) rUsedAmperes++; } } else if (GregTech_API.mOutputRF && tTileEntity instanceof IEnergyReceiver) { - final ForgeDirection tDirection = ForgeDirection.getOrientation(i).getOpposite(); + final ForgeDirection tDirection = + ForgeDirection.getOrientation(i).getOpposite(); final int rfOut = GT_Utility.safeInt(aVoltage * GregTech_API.mEUtoRF / 100); if (((IEnergyReceiver) tTileEntity).receiveEnergy(tDirection, rfOut, true) == rfOut) { ((IEnergyReceiver) tTileEntity).receiveEnergy(tDirection, rfOut, false); diff --git a/src/main/java/gregtech/api/interfaces/tileentity/IExperimentalEnergyTileEntity.java b/src/main/java/gregtech/api/interfaces/tileentity/IExperimentalEnergyTileEntity.java index 2a8172a775..936de80b3e 100644 --- a/src/main/java/gregtech/api/interfaces/tileentity/IExperimentalEnergyTileEntity.java +++ b/src/main/java/gregtech/api/interfaces/tileentity/IExperimentalEnergyTileEntity.java @@ -50,12 +50,16 @@ public interface IExperimentalEnergyTileEntity extends IColoredTileEntity, IHasW Class tClass = cofh.api.energy.IEnergyReceiver.class; tClass.getCanonicalName(); RF_ENERGY = true; - } catch (Throwable e) {/**/} + } catch (Throwable e) { + /**/ + } try { Class tClass = ic2.api.energy.tile.IEnergySink.class; tClass.getCanonicalName(); IC_ENERGY = true; - } catch (Throwable e) {/**/} + } catch (Throwable e) { + /**/ + } CHECK_ALL = false; } } @@ -65,7 +69,8 @@ public interface IExperimentalEnergyTileEntity extends IColoredTileEntity, IHasW * * @return the amount of used secondary value. */ - public static final long emitEnergyToNetwork(SubTag aEnergyType, long aPrimary, long aSecondary, IExperimentalEnergyTileEntity aEmitter) { + public static final long emitEnergyToNetwork( + SubTag aEnergyType, long aPrimary, long aSecondary, IExperimentalEnergyTileEntity aEmitter) { long rUsedSecondary = 0; checkAvailabilities(); for (byte i = 0, j = 0; i < 6 && aSecondary > rUsedSecondary; i++) @@ -77,14 +82,25 @@ public interface IExperimentalEnergyTileEntity extends IColoredTileEntity, IHasW byte tColor = ((IExperimentalEnergyTileEntity) tTileEntity).getColorization(); if (tColor >= 0 && tColor != aEmitter.getColorization()) continue; } - rUsedSecondary += ((IExperimentalEnergyTileEntity) tTileEntity).injectEnergy(aEnergyType, j, aPrimary, aSecondary - rUsedSecondary); - } else if (IC_ENERGY && aEnergyType == SubTag.ENERGY_ELECTRICITY && tTileEntity instanceof IEnergySink) { - if (((IEnergySink) tTileEntity).acceptsEnergyFrom((TileEntity) aEmitter, ForgeDirection.getOrientation(j))) { - while (aSecondary > rUsedSecondary && ((IEnergySink) tTileEntity).getDemandedEnergy() > 0 && ((IEnergySink) tTileEntity).injectEnergy(ForgeDirection.getOrientation(j), aPrimary, aPrimary) < aPrimary) - rUsedSecondary++; + rUsedSecondary += ((IExperimentalEnergyTileEntity) tTileEntity) + .injectEnergy(aEnergyType, j, aPrimary, aSecondary - rUsedSecondary); + } else if (IC_ENERGY + && aEnergyType == SubTag.ENERGY_ELECTRICITY + && tTileEntity instanceof IEnergySink) { + if (((IEnergySink) tTileEntity) + .acceptsEnergyFrom((TileEntity) aEmitter, ForgeDirection.getOrientation(j))) { + while (aSecondary > rUsedSecondary + && ((IEnergySink) tTileEntity).getDemandedEnergy() > 0 + && ((IEnergySink) tTileEntity) + .injectEnergy(ForgeDirection.getOrientation(j), aPrimary, aPrimary) + < aPrimary) rUsedSecondary++; } - } else if (RF_ENERGY && aEnergyType == SubTag.ENERGY_REDSTONE_FLUX && tTileEntity instanceof IEnergyReceiver && ((IEnergyReceiver) tTileEntity).canConnectEnergy(ForgeDirection.getOrientation(j))) { - rUsedSecondary += ((IEnergyReceiver) tTileEntity).receiveEnergy(ForgeDirection.getOrientation(j), (int) aSecondary, false); + } else if (RF_ENERGY + && aEnergyType == SubTag.ENERGY_REDSTONE_FLUX + && tTileEntity instanceof IEnergyReceiver + && ((IEnergyReceiver) tTileEntity).canConnectEnergy(ForgeDirection.getOrientation(j))) { + rUsedSecondary += ((IEnergyReceiver) tTileEntity) + .receiveEnergy(ForgeDirection.getOrientation(j), (int) aSecondary, false); } } return rUsedSecondary; diff --git a/src/main/java/gregtech/api/interfaces/tileentity/IGTEnet.java b/src/main/java/gregtech/api/interfaces/tileentity/IGTEnet.java index cd4810eba6..77b894fea7 100644 --- a/src/main/java/gregtech/api/interfaces/tileentity/IGTEnet.java +++ b/src/main/java/gregtech/api/interfaces/tileentity/IGTEnet.java @@ -5,16 +5,15 @@ public interface IGTEnet { /** * @return true if this Device consumes Energy at all */ - default boolean isEnetInput() { - return false; + default boolean isEnetInput() { + return false; } - + /** - * + * * @return true if this Device emits Energy at all */ - default boolean isEnetOutput() { + default boolean isEnetOutput() { return false; } - } diff --git a/src/main/java/gregtech/api/interfaces/tileentity/IGregTechTileEntity.java b/src/main/java/gregtech/api/interfaces/tileentity/IGregTechTileEntity.java index 94b93434e2..253deae29b 100644 --- a/src/main/java/gregtech/api/interfaces/tileentity/IGregTechTileEntity.java +++ b/src/main/java/gregtech/api/interfaces/tileentity/IGregTechTileEntity.java @@ -5,6 +5,9 @@ import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.interfaces.IDescribable; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.common.blocks.GT_Block_Machines; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -13,10 +16,6 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; import net.minecraftforge.fluids.IFluidHandler; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; - /** * A simple compound Interface for all my TileEntities. * <p/> @@ -24,7 +23,18 @@ import java.util.UUID; * <p/> * It can cause Problems to include this Interface! */ -public interface IGregTechTileEntity extends ITexturedTileEntity, IGearEnergyTileEntity, ICoverable, IFluidHandler, ITurnable, IGregTechDeviceInformation, IUpgradableMachine, IDigitalChest, IDescribable, IMachineBlockUpdateable, IGregtechWailaProvider { +public interface IGregTechTileEntity + extends ITexturedTileEntity, + IGearEnergyTileEntity, + ICoverable, + IFluidHandler, + ITurnable, + IGregTechDeviceInformation, + IUpgradableMachine, + IDigitalChest, + IDescribable, + IMachineBlockUpdateable, + IGregtechWailaProvider { /** * gets the Error displayed on the GUI */ @@ -133,7 +143,14 @@ public interface IGregTechTileEntity extends ITexturedTileEntity, IGearEnergyTil */ int getLightOpacity(); - void addCollisionBoxesToList(World aWorld, int aX, int aY, int aZ, AxisAlignedBB inputAABB, List<AxisAlignedBB> outputAABB, Entity collider); + void addCollisionBoxesToList( + World aWorld, + int aX, + int aY, + int aZ, + AxisAlignedBB inputAABB, + List<AxisAlignedBB> outputAABB, + Entity collider); AxisAlignedBB getCollisionBoundingBoxFromPool(World aWorld, int aX, int aY, int aZ); @@ -143,8 +160,8 @@ public interface IGregTechTileEntity extends ITexturedTileEntity, IGearEnergyTil * Checks validity of meta tile and delegates to it */ @Override - default void onMachineBlockUpdate(){ - if(!isDead() && getMetaTileEntity() != null && getMetaTileEntity().getBaseMetaTileEntity() == this){ + default void onMachineBlockUpdate() { + if (!isDead() && getMetaTileEntity() != null && getMetaTileEntity().getBaseMetaTileEntity() == this) { getMetaTileEntity().onMachineBlockUpdate(); } } @@ -154,12 +171,15 @@ public interface IGregTechTileEntity extends ITexturedTileEntity, IGearEnergyTil */ @Override default boolean isMachineBlockUpdateRecursive() { - return !isDead() && getMetaTileEntity() != null && - getMetaTileEntity().getBaseMetaTileEntity() == this && - getMetaTileEntity().isMachineBlockUpdateRecursive(); + return !isDead() + && getMetaTileEntity() != null + && getMetaTileEntity().getBaseMetaTileEntity() == this + && getMetaTileEntity().isMachineBlockUpdateRecursive(); } - default void setShutdownStatus(boolean newStatus) {return;} + default void setShutdownStatus(boolean newStatus) { + return; + } /** * A randomly called display update to be able to add particles or other items for display diff --git a/src/main/java/gregtech/api/interfaces/tileentity/IGregtechWailaProvider.java b/src/main/java/gregtech/api/interfaces/tileentity/IGregtechWailaProvider.java index ee3da0fa6f..a463cc91df 100644 --- a/src/main/java/gregtech/api/interfaces/tileentity/IGregtechWailaProvider.java +++ b/src/main/java/gregtech/api/interfaces/tileentity/IGregtechWailaProvider.java @@ -1,5 +1,6 @@ package gregtech.api.interfaces.tileentity; +import java.util.List; import mcp.mobius.waila.api.IWailaConfigHandler; import mcp.mobius.waila.api.IWailaDataAccessor; import net.minecraft.entity.player.EntityPlayerMP; @@ -8,10 +9,16 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import java.util.List; - public interface IGregtechWailaProvider { - default void getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) {} + default void getWailaBody( + ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) {} - default void getWailaNBTData(final EntityPlayerMP player, final TileEntity tile, final NBTTagCompound tag, final World world, int x, int y, int z) {} + default void getWailaNBTData( + final EntityPlayerMP player, + final TileEntity tile, + final NBTTagCompound tag, + final World world, + int x, + int y, + int z) {} } diff --git a/src/main/java/gregtech/api/interfaces/tileentity/IIC2Enet.java b/src/main/java/gregtech/api/interfaces/tileentity/IIC2Enet.java index ee3516dfac..2593f1f3b5 100644 --- a/src/main/java/gregtech/api/interfaces/tileentity/IIC2Enet.java +++ b/src/main/java/gregtech/api/interfaces/tileentity/IIC2Enet.java @@ -13,5 +13,4 @@ public interface IIC2Enet { * Update the ic2 enet */ void doEnetUpdate(); - } diff --git a/src/main/java/gregtech/api/interfaces/tileentity/IMachineBlockUpdateable.java b/src/main/java/gregtech/api/interfaces/tileentity/IMachineBlockUpdateable.java index 31590f3d57..b8ce51a212 100644 --- a/src/main/java/gregtech/api/interfaces/tileentity/IMachineBlockUpdateable.java +++ b/src/main/java/gregtech/api/interfaces/tileentity/IMachineBlockUpdateable.java @@ -17,7 +17,7 @@ public interface IMachineBlockUpdateable { /** * Should recurse? */ - default boolean isMachineBlockUpdateRecursive(){ + default boolean isMachineBlockUpdateRecursive() { return true; } } diff --git a/src/main/java/gregtech/api/interfaces/tileentity/IMachineProgress.java b/src/main/java/gregtech/api/interfaces/tileentity/IMachineProgress.java index 0c342b8cfc..54fa90218a 100644 --- a/src/main/java/gregtech/api/interfaces/tileentity/IMachineProgress.java +++ b/src/main/java/gregtech/api/interfaces/tileentity/IMachineProgress.java @@ -49,7 +49,9 @@ public interface IMachineProgress extends IHasWorldObjectAndCoords { * used to control Machines via Redstone Signal Strength by special Covers * In case of 0 the Machine is very likely doing nothing, or is just not being controlled at all. */ - default byte getWorkDataValue() { return 0; } + default byte getWorkDataValue() { + return 0; + } /** * used to control Machines via Redstone Signal Strength by special Covers @@ -73,5 +75,4 @@ public interface IMachineProgress extends IHasWorldObjectAndCoords { default boolean wasShutdown() { return false; } - } diff --git a/src/main/java/gregtech/api/interfaces/tileentity/ITurnable.java b/src/main/java/gregtech/api/interfaces/tileentity/ITurnable.java index 8c8ce443b0..e05fd44637 100644 --- a/src/main/java/gregtech/api/interfaces/tileentity/ITurnable.java +++ b/src/main/java/gregtech/api/interfaces/tileentity/ITurnable.java @@ -1,6 +1,5 @@ package gregtech.api.interfaces.tileentity; - import static gregtech.api.enums.GT_Values.ALL_VALID_SIDES; /** @@ -38,7 +37,7 @@ public interface ITurnable { */ default boolean[] getValidFacings() { final boolean[] validFacings = new boolean[6]; - for(byte facing : ALL_VALID_SIDES) { + for (byte facing : ALL_VALID_SIDES) { validFacings[facing] = isValidFacing(facing); } return validFacings; diff --git a/src/main/java/gregtech/api/interfaces/tileentity/IUpgradableMachine.java b/src/main/java/gregtech/api/interfaces/tileentity/IUpgradableMachine.java index 0d027f6e30..cc59a4af34 100644 --- a/src/main/java/gregtech/api/interfaces/tileentity/IUpgradableMachine.java +++ b/src/main/java/gregtech/api/interfaces/tileentity/IUpgradableMachine.java @@ -1,6 +1,5 @@ package gregtech.api.interfaces.tileentity; - /** * To access my Machines a bit easier */ |