diff options
Diffstat (limited to 'src/main/java/gregtech')
18 files changed, 481 insertions, 292 deletions
diff --git a/src/main/java/gregtech/api/GregTech_API.java b/src/main/java/gregtech/api/GregTech_API.java index 648c30d930..9b039409dc 100644 --- a/src/main/java/gregtech/api/GregTech_API.java +++ b/src/main/java/gregtech/api/GregTech_API.java @@ -175,7 +175,8 @@ public class GregTech_API { /** * The Advanced Redstone Frequencies */ - public static final Map<String, Map<Integer, Map<Long, Byte>>> sAdvancedWirelessRedstone = new ConcurrentHashMap<>(); + public static final Map<String, Map<Integer, Map<Long, Byte>>> sAdvancedWirelessRedstone = + new ConcurrentHashMap<>(); /** * The IDSU Frequencies diff --git a/src/main/java/gregtech/api/metatileentity/CoverableTileEntity.java b/src/main/java/gregtech/api/metatileentity/CoverableTileEntity.java index d3a96efffe..9df38b2725 100644 --- a/src/main/java/gregtech/api/metatileentity/CoverableTileEntity.java +++ b/src/main/java/gregtech/api/metatileentity/CoverableTileEntity.java @@ -423,8 +423,14 @@ public abstract class CoverableTileEntity extends BaseTileEntity implements ICov byte aCoverSide, int aCoverID, ISerializableObject aCoverData, EntityPlayerMP aPlayer) { if ((aCoverSide >= 0 && aCoverSide < 6)) { GT_CoverBehaviorBase<?> behaviorBase = getCoverBehaviorAtSideNew(aCoverSide); - behaviorBase.preDataChanged(aCoverSide, getCoverIDAtSide(aCoverSide), aCoverID, getComplexCoverDataAtSide(aCoverSide), aCoverData, this); - + behaviorBase.preDataChanged( + aCoverSide, + getCoverIDAtSide(aCoverSide), + aCoverID, + getComplexCoverDataAtSide(aCoverSide), + aCoverData, + this); + setCoverIDAtSideNoUpdate(aCoverSide, aCoverID); setCoverDataAtSide(aCoverSide, aCoverData); if (isClientSide()) { diff --git a/src/main/java/gregtech/api/util/GT_CoverBehaviorBase.java b/src/main/java/gregtech/api/util/GT_CoverBehaviorBase.java index 47cb866653..1092a24307 100644 --- a/src/main/java/gregtech/api/util/GT_CoverBehaviorBase.java +++ b/src/main/java/gregtech/api/util/GT_CoverBehaviorBase.java @@ -134,8 +134,14 @@ public abstract class GT_CoverBehaviorBase<T extends ISerializableObject> { * Called before receiving data from network. Use {@link ICoverable#isClientSide()} to determine the side. */ public final void preDataChanged( - byte aSide, int aCoverID, int aNewCoverId, ISerializableObject aCoverVariable, ISerializableObject aNewCoverVariable, ICoverable aTileEntity) { - preDataChangedImpl(aSide, aCoverID, aNewCoverId, forceCast(aCoverVariable), forceCast(aNewCoverVariable), aTileEntity); + byte aSide, + int aCoverID, + int aNewCoverId, + ISerializableObject aCoverVariable, + ISerializableObject aNewCoverVariable, + ICoverable aTileEntity) { + preDataChangedImpl( + aSide, aCoverID, aNewCoverId, forceCast(aCoverVariable), forceCast(aNewCoverVariable), aTileEntity); } /** @@ -233,7 +239,8 @@ public abstract class GT_CoverBehaviorBase<T extends ISerializableObject> { * Called upon Base TE being destroyed (once getDrops is called), * thus getting called only when destroyed in survival. */ - public final void onBaseTEDestroyed(byte aSide, int aCoverID, ISerializableObject aCoverVariable, ICoverable aTileEntity) { + public final void onBaseTEDestroyed( + byte aSide, int aCoverID, ISerializableObject aCoverVariable, ICoverable aTileEntity) { onBaseTEDestroyedImpl(aSide, aCoverID, forceCast(aCoverVariable), aTileEntity); } @@ -425,7 +432,7 @@ public abstract class GT_CoverBehaviorBase<T extends ISerializableObject> { } protected void onDataChangedImpl(byte aSide, int aCoverID, T aCoverVariable, ICoverable aTileEntity) {} - + protected void preDataChangedImpl( byte aSide, int aCoverID, int aNewCoverId, T aCoverVariable, T aNewCoverVariable, ICoverable aTileEntity) {} diff --git a/src/main/java/gregtech/api/util/GT_Utility.java b/src/main/java/gregtech/api/util/GT_Utility.java index f7fd9ce914..4371658b3a 100644 --- a/src/main/java/gregtech/api/util/GT_Utility.java +++ b/src/main/java/gregtech/api/util/GT_Utility.java @@ -4256,11 +4256,11 @@ public class GT_Utility { public static byte convertRatioToRedstone(long used, long max, int threshold, boolean inverted) { byte signal; - if (used <= 0) { // Empty + if (used <= 0) { // Empty signal = 0; - } else if (used >= max) { // Full + } else if (used >= max) { // Full signal = 15; - } else { // Range 1-14 + } else { // Range 1-14 signal = (byte) (1 + (14 * used) / max); } diff --git a/src/main/java/gregtech/common/covers/GT_Cover_ItemMeter.java b/src/main/java/gregtech/common/covers/GT_Cover_ItemMeter.java index abecb00c35..c894857b32 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_ItemMeter.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_ItemMeter.java @@ -73,8 +73,9 @@ public class GT_Cover_ItemMeter extends GT_CoverBehaviorBase<GT_Cover_ItemMeter. byte aSide, int aCoverID, ItemMeterData aCoverVariable, ICoverable aTileEntity, long aTimer) { return false; } - - public static byte computeSignalBasedOnItems(ICoverable tileEntity, boolean inverted, int threshold, int slot, int side) { + + public static byte computeSignalBasedOnItems( + ICoverable tileEntity, boolean inverted, int threshold, int slot, int side) { long max = 0; long used = 0; IMetaTileEntity mte = ((IGregTechTileEntity) tileEntity).getMetaTileEntity(); @@ -99,7 +100,7 @@ public class GT_Cover_ItemMeter extends GT_CoverBehaviorBase<GT_Cover_ItemMeter. } } - return GT_Utility.convertRatioToRedstone(used, max, threshold, inverted); + return GT_Utility.convertRatioToRedstone(used, max, threshold, inverted); } @Override @@ -110,7 +111,8 @@ public class GT_Cover_ItemMeter extends GT_CoverBehaviorBase<GT_Cover_ItemMeter. ItemMeterData aCoverVariable, ICoverable aTileEntity, long aTimer) { - byte signal = computeSignalBasedOnItems(aTileEntity, aCoverVariable.inverted, aCoverVariable.threshold, aCoverVariable.slot, aSide); + byte signal = computeSignalBasedOnItems( + aTileEntity, aCoverVariable.inverted, aCoverVariable.threshold, aCoverVariable.slot, aSide); aTileEntity.setOutputRedstoneSignal(aSide, signal); return aCoverVariable; diff --git a/src/main/java/gregtech/common/covers/GT_Cover_NeedMaintainance.java b/src/main/java/gregtech/common/covers/GT_Cover_NeedMaintainance.java index 85c98f15a7..2ea5a2c951 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_NeedMaintainance.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_NeedMaintainance.java @@ -33,11 +33,10 @@ public class GT_Cover_NeedMaintainance extends GT_CoverBehavior { } public static boolean isRotor(ItemStack rotor) { - return (rotor != null && - rotor.getItem() instanceof GT_MetaGenerated_Tool && - rotor.getItemDamage() >= 170 && - rotor.getItemDamage() <= 176 - ); + return (rotor != null + && rotor.getItem() instanceof GT_MetaGenerated_Tool + && rotor.getItemDamage() >= 170 + && rotor.getItemDamage() <= 176); } @Override diff --git a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneReceiverBase.java b/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneReceiverBase.java index bf56270267..233be511a3 100644 --- a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneReceiverBase.java +++ b/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneReceiverBase.java @@ -8,6 +8,8 @@ import gregtech.api.interfaces.tileentity.ICoverable; import gregtech.api.util.GT_Utility; import gregtech.api.util.ISerializableObject; import io.netty.buffer.ByteBuf; +import java.util.UUID; +import javax.annotation.Nonnull; import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -15,10 +17,8 @@ import net.minecraft.nbt.NBTBase; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; -import javax.annotation.Nonnull; -import java.util.UUID; - -public abstract class GT_Cover_AdvancedRedstoneReceiverBase extends GT_Cover_AdvancedWirelessRedstoneBase<GT_Cover_AdvancedRedstoneReceiverBase.ReceiverData> { +public abstract class GT_Cover_AdvancedRedstoneReceiverBase + extends GT_Cover_AdvancedWirelessRedstoneBase<GT_Cover_AdvancedRedstoneReceiverBase.ReceiverData> { public GT_Cover_AdvancedRedstoneReceiverBase(ITexture coverTexture) { super(ReceiverData.class, coverTexture); @@ -37,10 +37,14 @@ public abstract class GT_Cover_AdvancedRedstoneReceiverBase extends GT_Cover_Adv /** * GUI Stuff */ - @Override - public Object getClientGUIImpl(byte aSide, int aCoverID, ReceiverData aCoverVariable, ICoverable aTileEntity, - EntityPlayer aPlayer, World aWorld) { + public Object getClientGUIImpl( + byte aSide, + int aCoverID, + ReceiverData aCoverVariable, + ICoverable aTileEntity, + EntityPlayer aPlayer, + World aWorld) { return new ReceiverGUI(aSide, aCoverID, aCoverVariable, aTileEntity); } @@ -114,26 +118,53 @@ public abstract class GT_Cover_AdvancedRedstoneReceiverBase extends GT_Cover_Adv public ReceiverGUI(byte aSide, int aCoverID, ReceiverData aCoverVariable, ICoverable aTileEntity) { super(aSide, aCoverID, aCoverVariable, aTileEntity); - new GT_GuiIconButton(this, gateModeButtonIdStart + 0, startX + spaceX * 0, startY + spaceY * 2, GT_GuiIcon.AND_GATE) - .setTooltipText(GT_Utility.trans("006", "AND Gate")); - new GT_GuiIconButton(this, gateModeButtonIdStart + 1, startX + spaceX * 1, startY + spaceY * 2, GT_GuiIcon.NAND_GATE) - .setTooltipText(GT_Utility.trans("006", "NAND Gate")); - new GT_GuiIconButton(this, gateModeButtonIdStart + 2, startX + spaceX * 2, startY + spaceY * 2, GT_GuiIcon.OR_GATE) - .setTooltipText(GT_Utility.trans("006", "OR Gate")); - new GT_GuiIconButton(this, gateModeButtonIdStart + 3, startX + spaceX * 3, startY + spaceY * 2, GT_GuiIcon.NOR_GATE) + new GT_GuiIconButton( + this, + gateModeButtonIdStart + 0, + startX + spaceX * 0, + startY + spaceY * 2, + GT_GuiIcon.AND_GATE) + .setTooltipText(GT_Utility.trans("006", "AND Gate")); + new GT_GuiIconButton( + this, + gateModeButtonIdStart + 1, + startX + spaceX * 1, + startY + spaceY * 2, + GT_GuiIcon.NAND_GATE) + .setTooltipText(GT_Utility.trans("006", "NAND Gate")); + new GT_GuiIconButton( + this, + gateModeButtonIdStart + 2, + startX + spaceX * 2, + startY + spaceY * 2, + GT_GuiIcon.OR_GATE) + .setTooltipText(GT_Utility.trans("006", "OR Gate")); + new GT_GuiIconButton( + this, + gateModeButtonIdStart + 3, + startX + spaceX * 3, + startY + spaceY * 2, + GT_GuiIcon.NOR_GATE) .setTooltipText(GT_Utility.trans("006", "NOR Gate")); - new GT_GuiIconButton(this, gateModeButtonIdStart + 4, startX + spaceX * 4, startY + spaceY * 2, GT_GuiIcon.ANALOG_MODE) - .setTooltipText("ANALOG Mode", "Only use this mode with ONE transmitter in total,", "no logic involved"); + new GT_GuiIconButton( + this, + gateModeButtonIdStart + 4, + startX + spaceX * 4, + startY + spaceY * 2, + GT_GuiIcon.ANALOG_MODE) + .setTooltipText( + "ANALOG Mode", "Only use this mode with ONE transmitter in total,", "no logic involved"); } @Override public void drawExtras(int mouseX, int mouseY, float parTicks) { super.drawExtras(mouseX, mouseY, parTicks); - this.getFontRenderer().drawString( - GT_Utility.trans("601", "Gate Mode"), - startX + spaceX * 5, - 4 + startY + spaceY * 2, - textColor); + this.getFontRenderer() + .drawString( + GT_Utility.trans("601", "Gate Mode"), + startX + spaceX * 5, + 4 + startY + spaceY * 2, + textColor); } @Override diff --git a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneReceiverExternal.java b/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneReceiverExternal.java index 3f2db32f7f..56b7fadd24 100644 --- a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneReceiverExternal.java +++ b/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneReceiverExternal.java @@ -10,20 +10,29 @@ public class GT_Cover_AdvancedRedstoneReceiverExternal extends GT_Cover_Advanced } @Override - public ReceiverData doCoverThingsImpl(byte aSide, byte aInputRedstone, int aCoverID, ReceiverData aCoverVariable, ICoverable aTileEntity, long aTimer) { - aTileEntity.setOutputRedstoneSignal(aSide, - getSignalAt(aCoverVariable.getUuid(), aCoverVariable.getFrequency(), aCoverVariable.getGateMode())); + public ReceiverData doCoverThingsImpl( + byte aSide, + byte aInputRedstone, + int aCoverID, + ReceiverData aCoverVariable, + ICoverable aTileEntity, + long aTimer) { + aTileEntity.setOutputRedstoneSignal( + aSide, + getSignalAt(aCoverVariable.getUuid(), aCoverVariable.getFrequency(), aCoverVariable.getGateMode())); return aCoverVariable; } @Override - protected boolean isRedstoneSensitiveImpl(byte aSide, int aCoverID, ReceiverData aCoverVariable, ICoverable aTileEntity, long aTimer) { + protected boolean isRedstoneSensitiveImpl( + byte aSide, int aCoverID, ReceiverData aCoverVariable, ICoverable aTileEntity, long aTimer) { return false; } @Override - protected boolean manipulatesSidedRedstoneOutputImpl(byte aSide, int aCoverID, ReceiverData aCoverVariable, ICoverable aTileEntity) { + protected boolean manipulatesSidedRedstoneOutputImpl( + byte aSide, int aCoverID, ReceiverData aCoverVariable, ICoverable aTileEntity) { return true; } } diff --git a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneReceiverInternal.java b/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneReceiverInternal.java index a8fdf29249..c3537350a6 100644 --- a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneReceiverInternal.java +++ b/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneReceiverInternal.java @@ -1,6 +1,5 @@ package gregtech.common.covers.redstone; -import gregtech.api.GregTech_API; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.ICoverable; import gregtech.api.interfaces.tileentity.IMachineProgress; @@ -12,7 +11,13 @@ public class GT_Cover_AdvancedRedstoneReceiverInternal extends GT_Cover_Advanced } @Override - public ReceiverData doCoverThingsImpl(byte aSide, byte aInputRedstone, int aCoverID, ReceiverData aCoverVariable, ICoverable aTileEntity, long aTimer) { + public ReceiverData doCoverThingsImpl( + byte aSide, + byte aInputRedstone, + int aCoverID, + ReceiverData aCoverVariable, + ICoverable aTileEntity, + long aTimer) { if (aTileEntity instanceof IMachineProgress) { IMachineProgress machine = ((IMachineProgress) aTileEntity); if (getRedstoneInput(aSide, aInputRedstone, aCoverID, aCoverVariable, aTileEntity) > 0) { @@ -28,7 +33,8 @@ public class GT_Cover_AdvancedRedstoneReceiverInternal extends GT_Cover_Advanced } @Override - protected byte getRedstoneInputImpl(byte aSide, byte aInputRedstone, int aCoverID, ReceiverData aCoverVariable, ICoverable aTileEntity) { + protected byte getRedstoneInputImpl( + byte aSide, byte aInputRedstone, int aCoverID, ReceiverData aCoverVariable, ICoverable aTileEntity) { return getSignalAt(aCoverVariable.getUuid(), aCoverVariable.getFrequency(), aCoverVariable.getGateMode()); } } diff --git a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneTransmitterBase.java b/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneTransmitterBase.java index c71194682f..07592a00dc 100644 --- a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneTransmitterBase.java +++ b/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneTransmitterBase.java @@ -8,6 +8,9 @@ import gregtech.api.interfaces.tileentity.ICoverable; import gregtech.api.util.GT_Utility; import gregtech.api.util.ISerializableObject; import io.netty.buffer.ByteBuf; +import java.util.Objects; +import java.util.UUID; +import javax.annotation.Nonnull; import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -15,11 +18,9 @@ import net.minecraft.nbt.NBTBase; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; -import javax.annotation.Nonnull; -import java.util.Objects; -import java.util.UUID; - -public abstract class GT_Cover_AdvancedRedstoneTransmitterBase<T extends GT_Cover_AdvancedRedstoneTransmitterBase.TransmitterData> extends GT_Cover_AdvancedWirelessRedstoneBase<T> { +public abstract class GT_Cover_AdvancedRedstoneTransmitterBase< + T extends GT_Cover_AdvancedRedstoneTransmitterBase.TransmitterData> + extends GT_Cover_AdvancedWirelessRedstoneBase<T> { public GT_Cover_AdvancedRedstoneTransmitterBase(Class<T> typeToken, ITexture coverTexture) { super(typeToken, coverTexture); @@ -31,19 +32,28 @@ public abstract class GT_Cover_AdvancedRedstoneTransmitterBase<T extends GT_Cove } @Override - public boolean onCoverRemovalImpl(byte aSide, int aCoverID, TransmitterData aCoverVariable, ICoverable aTileEntity, - boolean aForced) { + public boolean onCoverRemovalImpl( + byte aSide, int aCoverID, TransmitterData aCoverVariable, ICoverable aTileEntity, boolean aForced) { unregisterSignal(aSide, aCoverVariable, aTileEntity); return true; } @Override - protected void onBaseTEDestroyedImpl(byte aSide, int aCoverID, TransmitterData aCoverVariable, ICoverable aTileEntity) { + protected void onBaseTEDestroyedImpl( + byte aSide, int aCoverID, TransmitterData aCoverVariable, ICoverable aTileEntity) { unregisterSignal(aSide, aCoverVariable, aTileEntity); } @Override - protected T onCoverScrewdriverClickImpl(byte aSide, int aCoverID, T aCoverVariable, ICoverable aTileEntity, EntityPlayer aPlayer, float aX, float aY, float aZ) { + protected T onCoverScrewdriverClickImpl( + byte aSide, + int aCoverID, + T aCoverVariable, + ICoverable aTileEntity, + EntityPlayer aPlayer, + float aX, + float aY, + float aZ) { aCoverVariable.invert = !aCoverVariable.invert; GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("055", aCoverVariable.invert ? "Inverted" : "Normal")); @@ -51,9 +61,10 @@ public abstract class GT_Cover_AdvancedRedstoneTransmitterBase<T extends GT_Cove } @Override - protected void preDataChangedImpl(byte aSide, int aCoverID, int aNewCoverId, T aCoverVariable, T aNewCoverVariable, ICoverable aTileEntity) { - if (aCoverVariable.frequency != aNewCoverVariable.frequency || - !Objects.equals(aCoverVariable.uuid, aNewCoverVariable.uuid)) { + protected void preDataChangedImpl( + byte aSide, int aCoverID, int aNewCoverId, T aCoverVariable, T aNewCoverVariable, ICoverable aTileEntity) { + if (aCoverVariable.frequency != aNewCoverVariable.frequency + || !Objects.equals(aCoverVariable.uuid, aNewCoverVariable.uuid)) { unregisterSignal(aSide, aCoverVariable, aTileEntity); } } @@ -116,10 +127,14 @@ public abstract class GT_Cover_AdvancedRedstoneTransmitterBase<T extends GT_Cove /** * GUI Stuff */ - @Override - public Object getClientGUIImpl(byte aSide, int aCoverID, TransmitterData aCoverVariable, ICoverable aTileEntity, - EntityPlayer aPlayer, World aWorld) { + public Object getClientGUIImpl( + byte aSide, + int aCoverID, + TransmitterData aCoverVariable, + ICoverable aTileEntity, + EntityPlayer aPlayer, + World aWorld) { return new TransmitterGUI<>(aSide, aCoverID, aCoverVariable, aTileEntity); } @@ -130,9 +145,18 @@ public abstract class GT_Cover_AdvancedRedstoneTransmitterBase<T extends GT_Cove private final String INVERTED = GT_Utility.trans("INVERTED", "Inverted"); private final String NORMAL = GT_Utility.trans("NORMAL", "Normal"); - public TransmitterGUI(byte aSide, int aCoverID, X aCoverVariable, ICoverable aTileEntity, int frequencyRow, int buttonRow) { + public TransmitterGUI( + byte aSide, int aCoverID, X aCoverVariable, ICoverable aTileEntity, int frequencyRow, int buttonRow) { super(aSide, aCoverID, aCoverVariable, aTileEntity, frequencyRow, buttonRow, true); - invertButton = new GT_GuiIconCheckButton(this, 1, startX + spaceX * 9, startY + spaceY * buttonRow, GT_GuiIcon.REDSTONE_ON, GT_GuiIcon.REDSTONE_OFF, INVERTED, NORMAL); + invertButton = new GT_GuiIconCheckButton( + this, + 1, + startX + spaceX * 9, + startY + spaceY * buttonRow, + GT_GuiIcon.REDSTONE_ON, + GT_GuiIcon.REDSTONE_OFF, + INVERTED, + NORMAL); } public TransmitterGUI(byte aSide, int aCoverID, X aCoverVariable, ICoverable aTileEntity) { @@ -142,11 +166,12 @@ public abstract class GT_Cover_AdvancedRedstoneTransmitterBase<T extends GT_Cove @Override public void drawExtras(int mouseX, int mouseY, float parTicks) { super.drawExtras(mouseX, mouseY, parTicks); - this.getFontRenderer().drawString( - coverVariable.invert ? INVERTED : NORMAL, - startX + spaceX * 10, - 4 + startY + spaceY * buttonRow, - textColor); + this.getFontRenderer() + .drawString( + coverVariable.invert ? INVERTED : NORMAL, + startX + spaceX * 10, + 4 + startY + spaceY * buttonRow, + textColor); } @Override diff --git a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneTransmitterExternal.java b/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneTransmitterExternal.java index 877cbab2d9..aaa526e565 100644 --- a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneTransmitterExternal.java +++ b/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneTransmitterExternal.java @@ -3,7 +3,8 @@ package gregtech.common.covers.redstone; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.ICoverable; -public class GT_Cover_AdvancedRedstoneTransmitterExternal extends GT_Cover_AdvancedRedstoneTransmitterBase<GT_Cover_AdvancedRedstoneTransmitterBase.TransmitterData> { +public class GT_Cover_AdvancedRedstoneTransmitterExternal + extends GT_Cover_AdvancedRedstoneTransmitterBase<GT_Cover_AdvancedRedstoneTransmitterBase.TransmitterData> { public GT_Cover_AdvancedRedstoneTransmitterExternal(ITexture coverTexture) { super(TransmitterData.class, coverTexture); @@ -20,8 +21,13 @@ public class GT_Cover_AdvancedRedstoneTransmitterExternal extends GT_Cover_Advan } @Override - public TransmitterData doCoverThingsImpl(byte aSide, byte aInputRedstone, int aCoverID, - TransmitterData aCoverVariable, ICoverable aTileEntity, long aTimer) { + public TransmitterData doCoverThingsImpl( + byte aSide, + byte aInputRedstone, + int aCoverID, + TransmitterData aCoverVariable, + ICoverable aTileEntity, + long aTimer) { byte outputRedstone = aInputRedstone; if (aCoverVariable.isInvert()) { if (outputRedstone > 0) outputRedstone = 0; @@ -35,7 +41,8 @@ public class GT_Cover_AdvancedRedstoneTransmitterExternal extends GT_Cover_Advan } @Override - public boolean letsRedstoneGoInImpl(byte aSide, int aCoverID, TransmitterData aCoverVariable, ICoverable aTileEntity) { + public boolean letsRedstoneGoInImpl( + byte aSide, int aCoverID, TransmitterData aCoverVariable, ICoverable aTileEntity) { return true; } } diff --git a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneTransmitterInternal.java b/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneTransmitterInternal.java index 9e6d1afd36..1d21b7060f 100644 --- a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneTransmitterInternal.java +++ b/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneTransmitterInternal.java @@ -3,7 +3,8 @@ package gregtech.common.covers.redstone; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.ICoverable; -public class GT_Cover_AdvancedRedstoneTransmitterInternal extends GT_Cover_AdvancedRedstoneTransmitterBase<GT_Cover_AdvancedRedstoneTransmitterBase.TransmitterData> { +public class GT_Cover_AdvancedRedstoneTransmitterInternal + extends GT_Cover_AdvancedRedstoneTransmitterBase<GT_Cover_AdvancedRedstoneTransmitterBase.TransmitterData> { public GT_Cover_AdvancedRedstoneTransmitterInternal(ITexture coverTexture) { super(TransmitterData.class, coverTexture); @@ -20,8 +21,13 @@ public class GT_Cover_AdvancedRedstoneTransmitterInternal extends GT_Cover_Advan } @Override - public TransmitterData doCoverThingsImpl(byte aSide, byte aInputRedstone, int aCoverID, - TransmitterData aCoverVariable, ICoverable aTileEntity, long aTimer) { + public TransmitterData doCoverThingsImpl( + byte aSide, + byte aInputRedstone, + int aCoverID, + TransmitterData aCoverVariable, + ICoverable aTileEntity, + long aTimer) { byte outputRedstone = aTileEntity.getOutputRedstoneSignal(aSide); if (aCoverVariable.isInvert()) { if (outputRedstone > 0) outputRedstone = 0; @@ -34,14 +40,14 @@ public class GT_Cover_AdvancedRedstoneTransmitterInternal extends GT_Cover_Advan } @Override - public boolean letsRedstoneGoOutImpl(byte aSide, int aCoverID, TransmitterData aCoverVariable, - ICoverable aTileEntity) { + public boolean letsRedstoneGoOutImpl( + byte aSide, int aCoverID, TransmitterData aCoverVariable, ICoverable aTileEntity) { return true; } @Override - protected boolean manipulatesSidedRedstoneOutputImpl(byte aSide, int aCoverID, TransmitterData aCoverVariable, - ICoverable aTileEntity) { + protected boolean manipulatesSidedRedstoneOutputImpl( + byte aSide, int aCoverID, TransmitterData aCoverVariable, ICoverable aTileEntity) { return true; } } diff --git a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedWirelessRedstoneBase.java b/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedWirelessRedstoneBase.java index 10885c8908..a3f37e5f28 100644 --- a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedWirelessRedstoneBase.java +++ b/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedWirelessRedstoneBase.java @@ -15,6 +15,12 @@ import gregtech.api.util.GT_CoverBehaviorBase; import gregtech.api.util.GT_Utility; import gregtech.api.util.ISerializableObject; import io.netty.buffer.ByteBuf; +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; +import java.util.concurrent.ConcurrentHashMap; +import java.util.stream.Collectors; +import javax.annotation.Nonnull; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.EntityPlayerMP; @@ -23,14 +29,9 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fluids.Fluid; -import javax.annotation.Nonnull; -import java.util.HashMap; -import java.util.Map; -import java.util.UUID; -import java.util.concurrent.ConcurrentHashMap; -import java.util.stream.Collectors; - -public abstract class GT_Cover_AdvancedWirelessRedstoneBase<T extends GT_Cover_AdvancedWirelessRedstoneBase.WirelessData> extends GT_CoverBehaviorBase<T> { +public abstract class GT_Cover_AdvancedWirelessRedstoneBase< + T extends GT_Cover_AdvancedWirelessRedstoneBase.WirelessData> + extends GT_CoverBehaviorBase<T> { public GT_Cover_AdvancedWirelessRedstoneBase(Class<T> typeToken, ITexture coverTexture) { super(typeToken, coverTexture); @@ -45,26 +46,38 @@ public abstract class GT_Cover_AdvancedWirelessRedstoneBase<T extends GT_Cover_A switch (mode) { case AND: - return (byte) (signals.values().stream() - .map(signal -> signal > 0) - .reduce(true, (signalA, signalB) -> signalA && signalB) ? 15 : 0); + return (byte) + (signals.values().stream() + .map(signal -> signal > 0) + .reduce(true, (signalA, signalB) -> signalA && signalB) + ? 15 + : 0); case NAND: - return (byte) (signals.values().stream() - .map(signal -> signal > 0) - .reduce(true, (signalA, signalB) -> signalA && signalB) ? 0 : 15); + return (byte) + (signals.values().stream() + .map(signal -> signal > 0) + .reduce(true, (signalA, signalB) -> signalA && signalB) + ? 0 + : 15); case OR: - return (byte) (signals.values().stream() - .map(signal -> signal > 0) - .reduce(false, (signalA, signalB) -> signalA || signalB) ? 15 : 0); + return (byte) + (signals.values().stream() + .map(signal -> signal > 0) + .reduce(false, (signalA, signalB) -> signalA || signalB) + ? 15 + : 0); case NOR: - return (byte) (signals.values().stream() - .map(signal -> signal > 0) - .reduce(false, (signalA, signalB) -> signalA || signalB) ? 0 : 15); + return (byte) + (signals.values().stream() + .map(signal -> signal > 0) + .reduce(false, (signalA, signalB) -> signalA || signalB) + ? 0 + : 15); case SINGLE_SOURCE: if (signals.values().isEmpty()) { return 0; } - + return (Byte) signals.values().toArray()[0]; default: return 0; @@ -81,7 +94,8 @@ public abstract class GT_Cover_AdvancedWirelessRedstoneBase<T extends GT_Cover_A } public static void setSignalAt(UUID uuid, int frequency, long hash, byte value) { - Map<Integer, Map<Long, Byte>> frequencies = GregTech_API.sAdvancedWirelessRedstone.computeIfAbsent(String.valueOf(uuid), k -> new ConcurrentHashMap<>()); + Map<Integer, Map<Long, Byte>> frequencies = GregTech_API.sAdvancedWirelessRedstone.computeIfAbsent( + String.valueOf(uuid), k -> new ConcurrentHashMap<>()); Map<Long, Byte> signals = frequencies.computeIfAbsent(frequency, k -> new ConcurrentHashMap<>()); signals.put(hash, value); } @@ -94,12 +108,10 @@ public abstract class GT_Cover_AdvancedWirelessRedstoneBase<T extends GT_Cover_A * side hashed into last 4 bytes */ public static long hashCoverCoords(ICoverable tile, byte side) { - return (((((long) - tile.getXCoord() << 20) + - tile.getZCoord() << 10) + - tile.getYCoord() << 10) + - tile.getWorld().provider.dimensionId << 4) + - side; + return (((((long) tile.getXCoord() << 20) + tile.getZCoord() << 10) + tile.getYCoord() << 10) + + tile.getWorld().provider.dimensionId + << 4) + + side; } @Override @@ -134,7 +146,8 @@ public abstract class GT_Cover_AdvancedWirelessRedstoneBase<T extends GT_Cover_A @Override public String getDescriptionImpl(byte aSide, int aCoverID, T aCoverVariable, ICoverable aTileEntity) { - return GT_Utility.trans("081", "Frequency: ") + aCoverVariable.frequency + ", Transmission: " + (aCoverVariable.uuid == null ? "Public" : "Private"); + return GT_Utility.trans("081", "Frequency: ") + aCoverVariable.frequency + ", Transmission: " + + (aCoverVariable.uuid == null ? "Public" : "Private"); } @Override @@ -142,8 +155,7 @@ public abstract class GT_Cover_AdvancedWirelessRedstoneBase<T extends GT_Cover_A return 5; } - - public static abstract class WirelessData implements ISerializableObject { + public abstract static class WirelessData implements ISerializableObject { protected int frequency; /** @@ -236,7 +248,14 @@ public abstract class GT_Cover_AdvancedWirelessRedstoneBase<T extends GT_Cover_A private static final String guiTexturePath = "gregtech:textures/gui/GuiCoverLong.png"; - public WirelessGUI(byte aSide, int aCoverID, X aCoverVariable, ICoverable aTileEntity, int frequencyRow, int buttonRow, boolean shiftPrivateLeft) { + public WirelessGUI( + byte aSide, + int aCoverID, + X aCoverVariable, + ICoverable aTileEntity, + int frequencyRow, + int buttonRow, + boolean shiftPrivateLeft) { super(aTileEntity, 250, 107, GT_Utility.intToStack(aCoverID)); this.mGUIbackgroundLocation = new ResourceLocation(guiTexturePath); this.side = aSide; @@ -246,8 +265,10 @@ public abstract class GT_Cover_AdvancedWirelessRedstoneBase<T extends GT_Cover_A this.buttonRow = buttonRow; this.privateExtraColumn = shiftPrivateLeft ? 1 : 5; - frequencyBox = new GT_GuiShortTextBox(this, 0, 1 + startX, 2 + startY + spaceY * frequencyRow, spaceX * 5 - 4, 12); - privateButton = new GT_GuiIconCheckButton(this, 0, startX, startY + spaceY * buttonRow, GT_GuiIcon.CHECKMARK, null); + frequencyBox = + new GT_GuiShortTextBox(this, 0, 1 + startX, 2 + startY + spaceY * frequencyRow, spaceX * 5 - 4, 12); + privateButton = + new GT_GuiIconCheckButton(this, 0, startX, startY + spaceY * buttonRow, GT_GuiIcon.CHECKMARK, null); } public WirelessGUI(byte aSide, int aCoverID, X aCoverVariable, ICoverable aTileEntity) { @@ -257,16 +278,18 @@ public abstract class GT_Cover_AdvancedWirelessRedstoneBase<T extends GT_Cover_A @Override public void drawExtras(int mouseX, int mouseY, float parTicks) { super.drawExtras(mouseX, mouseY, parTicks); - this.getFontRenderer().drawString( - GT_Utility.trans("246", "Frequency"), - startX + spaceX * 5, - 4 + startY + spaceY * frequencyRow, - textColor); - this.getFontRenderer().drawString( - GT_Utility.trans("601", "Use Private Frequency"), - startX + spaceX * privateExtraColumn, - 4 + startY + spaceY * buttonRow, - textColor); + this.getFontRenderer() + .drawString( + GT_Utility.trans("246", "Frequency"), + startX + spaceX * 5, + 4 + startY + spaceY * frequencyRow, + textColor); + this.getFontRenderer() + .drawString( + GT_Utility.trans("601", "Use Private Frequency"), + startX + spaceX * privateExtraColumn, + 4 + startY + spaceY * buttonRow, + textColor); } @Override @@ -275,8 +298,14 @@ public abstract class GT_Cover_AdvancedWirelessRedstoneBase<T extends GT_Cover_A frequencyBox.setFocused(true); } - protected void genericMouseWheel(GT_GuiIntegerTextBox box, int delta, int minValue, int maxValue, - int baseStep, int ctrlStep, int shiftStep) { + protected void genericMouseWheel( + GT_GuiIntegerTextBox box, + int delta, + int minValue, + int maxValue, + int baseStep, + int ctrlStep, + int shiftStep) { long step = Math.max(1, Math.abs(delta / 120)); step = (isShiftKeyDown() ? shiftStep : isCtrlKeyDown() ? ctrlStep : baseStep) * (delta > 0 ? step : -step); @@ -323,7 +352,9 @@ public abstract class GT_Cover_AdvancedWirelessRedstoneBase<T extends GT_Cover_A @Override public void buttonClicked(GuiButton btn) { if (btn == privateButton) { - coverVariable.uuid = coverVariable.uuid == null ? Minecraft.getMinecraft().thePlayer.getUniqueID() : null; + coverVariable.uuid = coverVariable.uuid == null + ? Minecraft.getMinecraft().thePlayer.getUniqueID() + : null; } GT_Values.NW.sendToServer(new GT_Packet_TileEntityCoverNew(side, coverID, coverVariable, tile)); @@ -359,14 +390,22 @@ public abstract class GT_Cover_AdvancedWirelessRedstoneBase<T extends GT_Cover_A private final Map<String, String> translation; private final Map<String, String> inverseTranslation; - public GT_GuiShortTextBox(IGuiScreen gui, int id, int x, int y, int width, int height, int min, int max, - Map<String, String> translate) { + public GT_GuiShortTextBox( + IGuiScreen gui, + int id, + int x, + int y, + int width, + int height, + int min, + int max, + Map<String, String> translate) { super(gui, id, x, y, width, height); this.min = min; this.max = max; this.translation = translate; - this.inverseTranslation = translate.entrySet().stream() - .collect(Collectors.toMap(Map.Entry::getValue, Map.Entry::getKey)); + this.inverseTranslation = + translate.entrySet().stream().collect(Collectors.toMap(Map.Entry::getValue, Map.Entry::getKey)); } public GT_GuiShortTextBox(IGuiScreen gui, int id, int x, int y, int width, int height, int min, int max) { diff --git a/src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessFluidDetector.java b/src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessFluidDetector.java index eed9923c58..2f4e57647d 100644 --- a/src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessFluidDetector.java +++ b/src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessFluidDetector.java @@ -8,16 +8,16 @@ import gregtech.api.util.GT_Utility; import gregtech.api.util.ISerializableObject; import gregtech.common.covers.GT_Cover_LiquidMeter; import io.netty.buffer.ByteBuf; +import java.util.UUID; +import javax.annotation.Nonnull; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.nbt.NBTBase; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; -import javax.annotation.Nonnull; -import java.util.UUID; - -public class GT_Cover_WirelessFluidDetector extends GT_Cover_AdvancedRedstoneTransmitterBase<GT_Cover_WirelessFluidDetector.FluidTransmitterData> { +public class GT_Cover_WirelessFluidDetector + extends GT_Cover_AdvancedRedstoneTransmitterBase<GT_Cover_WirelessFluidDetector.FluidTransmitterData> { public GT_Cover_WirelessFluidDetector(ITexture coverTexture) { super(FluidTransmitterData.class, coverTexture); @@ -34,9 +34,15 @@ public class GT_Cover_WirelessFluidDetector extends GT_Cover_AdvancedRedstoneTra } @Override - public FluidTransmitterData doCoverThingsImpl(byte aSide, byte aInputRedstone, int aCoverID, - FluidTransmitterData aCoverVariable, ICoverable aTileEntity, long aTimer) { - byte signal = GT_Cover_LiquidMeter.computeSignalBasedOnFluid(aTileEntity, aCoverVariable.invert, aCoverVariable.threshold); + public FluidTransmitterData doCoverThingsImpl( + byte aSide, + byte aInputRedstone, + int aCoverID, + FluidTransmitterData aCoverVariable, + ICoverable aTileEntity, + long aTimer) { + byte signal = GT_Cover_LiquidMeter.computeSignalBasedOnFluid( + aTileEntity, aCoverVariable.invert, aCoverVariable.threshold); long hash = hashCoverCoords(aTileEntity, aSide); setSignalAt(aCoverVariable.getUuid(), aCoverVariable.getFrequency(), hash, signal); @@ -44,14 +50,14 @@ public class GT_Cover_WirelessFluidDetector extends GT_Cover_AdvancedRedstoneTra } @Override - public boolean letsRedstoneGoOutImpl(byte aSide, int aCoverID, FluidTransmitterData aCoverVariable, - ICoverable aTileEntity) { + public boolean letsRedstoneGoOutImpl( + byte aSide, int aCoverID, FluidTransmitterData aCoverVariable, ICoverable aTileEntity) { return true; } @Override - protected boolean manipulatesSidedRedstoneOutputImpl(byte aSide, int aCoverID, FluidTransmitterData aCoverVariable, - ICoverable aTileEntity) { + protected boolean manipulatesSidedRedstoneOutputImpl( + byte aSide, int aCoverID, FluidTransmitterData aCoverVariable, ICoverable aTileEntity) { return true; } @@ -111,30 +117,32 @@ public class GT_Cover_WirelessFluidDetector extends GT_Cover_AdvancedRedstoneTra /** * GUI Stuff */ - @Override - public Object getClientGUIImpl(byte aSide, int aCoverID, FluidTransmitterData aCoverVariable, ICoverable aTileEntity, - EntityPlayer aPlayer, World aWorld) { + public Object getClientGUIImpl( + byte aSide, + int aCoverID, + FluidTransmitterData aCoverVariable, + ICoverable aTileEntity, + EntityPlayer aPlayer, + World aWorld) { return new FluidTransmitterGUI(aSide, aCoverID, aCoverVariable, aTileEntity); } private class FluidTransmitterGUI extends TransmitterGUI<FluidTransmitterData> { private final GT_GuiIntegerTextBox thresholdBox; - public FluidTransmitterGUI(byte aSide, int aCoverID, FluidTransmitterData aCoverVariable, ICoverable aTileEntity) { + public FluidTransmitterGUI( + byte aSide, int aCoverID, FluidTransmitterData aCoverVariable, ICoverable aTileEntity) { super(aSide, aCoverID, aCoverVariable, aTileEntity, 1, 2); - thresholdBox = new GT_GuiShortTextBox(this,1, 1 + startX, 2 + startY, spaceX * 5 - 4, 12); + thresholdBox = new GT_GuiShortTextBox(this, 1, 1 + startX, 2 + startY, spaceX * 5 - 4, 12); } @Override public void drawExtras(int mouseX, int mouseY, float parTicks) { super.drawExtras(mouseX, mouseY, parTicks); - this.getFontRenderer().drawString( - GT_Utility.trans("222", "Fluid Threshold"), - startX + spaceX * 5, - 4 + startY, - textColor); + this.getFontRenderer() + .drawString(GT_Utility.trans("222", "Fluid Threshold"), startX + spaceX * 5, 4 + startY, textColor); } @Override diff --git a/src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessItemDetector.java b/src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessItemDetector.java index b6970d89e0..2e632f5dd2 100644 --- a/src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessItemDetector.java +++ b/src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessItemDetector.java @@ -12,6 +12,9 @@ import gregtech.api.util.ISerializableObject; import gregtech.common.covers.GT_Cover_ItemMeter; import gregtech.common.tileentities.storage.GT_MetaTileEntity_DigitalChestBase; import io.netty.buffer.ByteBuf; +import java.util.Collections; +import java.util.UUID; +import javax.annotation.Nonnull; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; @@ -20,11 +23,8 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import javax.annotation.Nonnull; -import java.util.Collections; -import java.util.UUID; - -public class GT_Cover_WirelessItemDetector extends GT_Cover_AdvancedRedstoneTransmitterBase<GT_Cover_WirelessItemDetector.ItemTransmitterData> { +public class GT_Cover_WirelessItemDetector + extends GT_Cover_AdvancedRedstoneTransmitterBase<GT_Cover_WirelessItemDetector.ItemTransmitterData> { public GT_Cover_WirelessItemDetector(ITexture coverTexture) { super(ItemTransmitterData.class, coverTexture); @@ -41,8 +41,13 @@ public class GT_Cover_WirelessItemDetector extends GT_Cover_AdvancedRedstoneTran } @Override - public ItemTransmitterData doCoverThingsImpl(byte aSide, byte aInputRedstone, int aCoverID, - ItemTransmitterData aCoverVariable, ICoverable aTileEntity, long aTimer) { + public ItemTransmitterData doCoverThingsImpl( + byte aSide, + byte aInputRedstone, + int aCoverID, + ItemTransmitterData aCoverVariable, + ICoverable aTileEntity, + long aTimer) { byte signal = GT_Cover_ItemMeter.computeSignalBasedOnItems( aTileEntity, aCoverVariable.invert, aCoverVariable.threshold, aCoverVariable.slot, aSide); long hash = hashCoverCoords(aTileEntity, aSide); @@ -52,14 +57,14 @@ public class GT_Cover_WirelessItemDetector extends GT_Cover_AdvancedRedstoneTran } @Override - public boolean letsRedstoneGoOutImpl(byte aSide, int aCoverID, ItemTransmitterData aCoverVariable, - ICoverable aTileEntity) { + public boolean letsRedstoneGoOutImpl( + byte aSide, int aCoverID, ItemTransmitterData aCoverVariable, ICoverable aTileEntity) { return true; } @Override - protected boolean manipulatesSidedRedstoneOutputImpl(byte aSide, int aCoverID, ItemTransmitterData aCoverVariable, - ICoverable aTileEntity) { + protected boolean manipulatesSidedRedstoneOutputImpl( + byte aSide, int aCoverID, ItemTransmitterData aCoverVariable, ICoverable aTileEntity) { return true; } @@ -131,10 +136,14 @@ public class GT_Cover_WirelessItemDetector extends GT_Cover_AdvancedRedstoneTran /** * GUI Stuff */ - @Override - public Object getClientGUIImpl(byte aSide, int aCoverID, ItemTransmitterData aCoverVariable, ICoverable aTileEntity, - EntityPlayer aPlayer, World aWorld) { + public Object getClientGUIImpl( + byte aSide, + int aCoverID, + ItemTransmitterData aCoverVariable, + ICoverable aTileEntity, + EntityPlayer aPlayer, + World aWorld) { return new ItemTransmitterGUI(aSide, aCoverID, aCoverVariable, aTileEntity); } @@ -146,20 +155,34 @@ public class GT_Cover_WirelessItemDetector extends GT_Cover_AdvancedRedstoneTran private final int maxSlot; - public ItemTransmitterGUI(byte aSide, int aCoverID, ItemTransmitterData aCoverVariable, ICoverable aTileEntity) { + public ItemTransmitterGUI( + byte aSide, int aCoverID, ItemTransmitterData aCoverVariable, ICoverable aTileEntity) { super(aSide, aCoverID, aCoverVariable, aTileEntity, 0, 1); - if (tile instanceof TileEntity && !super.tile.isDead() && tile instanceof IGregTechTileEntity && - !(((IGregTechTileEntity) tile).getMetaTileEntity() instanceof GT_MetaTileEntity_DigitalChestBase)) { + if (tile instanceof TileEntity + && !super.tile.isDead() + && tile instanceof IGregTechTileEntity + && !(((IGregTechTileEntity) tile).getMetaTileEntity() + instanceof GT_MetaTileEntity_DigitalChestBase)) { maxSlot = tile.getSizeInventory() - 1; } else { maxSlot = -1; } - thresholdBox = new GT_GuiShortTextBox(this, 1, 1 + startX, 2 + startY + spaceY * 2, spaceX * 5 - 4, 12, 0, getMaxCount()); - slotBox = new GT_GuiShortTextBox(this, 2, 1 + startX, 2 + startY + spaceY * 3, spaceX * 4 - 8, 12, -1, maxSlot, + thresholdBox = new GT_GuiShortTextBox( + this, 1, 1 + startX, 2 + startY + spaceY * 2, spaceX * 5 - 4, 12, 0, getMaxCount()); + slotBox = new GT_GuiShortTextBox( + this, + 2, + 1 + startX, + 2 + startY + spaceY * 3, + spaceX * 4 - 8, + 12, + -1, + maxSlot, Collections.singletonMap("-1", "All")); - fakeItemSlot = new GT_GuiFakeItemButton(this, startX + spaceX * 4 - 1, startY + spaceY * 3, GT_GuiIcon.SLOT_GRAY); + fakeItemSlot = + new GT_GuiFakeItemButton(this, startX + spaceX * 4 - 1, startY + spaceY * 3, GT_GuiIcon.SLOT_GRAY); slotBox.setEnabled(maxSlot >= 0); fakeItemSlot.setMimicSlot(true); @@ -168,16 +191,18 @@ public class GT_Cover_WirelessItemDetector extends GT_Cover_AdvancedRedstoneTran @Override public void drawExtras(int mouseX, int mouseY, float parTicks) { super.drawExtras(mouseX, mouseY, parTicks); - this.getFontRenderer().drawString( - GT_Utility.trans("221", "Item Threshold"), - startX + spaceX * 5, - 4 + startY + spaceY * 2, - textColor); - this.getFontRenderer().drawString( - GT_Utility.trans("254", "Detect Slot"), - startX + spaceX * 5, - 4 + startY + spaceY * 3, - textColor); + this.getFontRenderer() + .drawString( + GT_Utility.trans("221", "Item Threshold"), + startX + spaceX * 5, + 4 + startY + spaceY * 2, + textColor); + this.getFontRenderer() + .drawString( + GT_Utility.trans("254", "Detect Slot"), + startX + spaceX * 5, + 4 + startY + spaceY * 3, + textColor); } @Override @@ -217,8 +242,10 @@ public class GT_Cover_WirelessItemDetector extends GT_Cover_AdvancedRedstoneTran resetTextBox(thresholdBox); resetTextBox(slotBox); - if (coverVariable.slot >= 0 && tile instanceof TileEntity && !tile.isDead() && - tile.getSizeInventory() >= coverVariable.slot) { + if (coverVariable.slot >= 0 + && tile instanceof TileEntity + && !tile.isDead() + && tile.getSizeInventory() >= coverVariable.slot) { ItemStack itemStack = tile.getStackInSlot(coverVariable.slot); fakeItemSlot.setItem(itemStack); } else { diff --git a/src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessMaintenanceDetector.java b/src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessMaintenanceDetector.java index 64ee1bb3bd..2505ce8d80 100644 --- a/src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessMaintenanceDetector.java +++ b/src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessMaintenanceDetector.java @@ -12,6 +12,8 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockB import gregtech.api.util.ISerializableObject; import gregtech.common.covers.GT_Cover_NeedMaintainance; import io.netty.buffer.ByteBuf; +import java.util.UUID; +import javax.annotation.Nonnull; import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -21,10 +23,9 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; -import javax.annotation.Nonnull; -import java.util.UUID; - -public class GT_Cover_WirelessMaintenanceDetector extends GT_Cover_AdvancedRedstoneTransmitterBase<GT_Cover_WirelessMaintenanceDetector.MaintenanceTransmitterData> { +public class GT_Cover_WirelessMaintenanceDetector + extends GT_Cover_AdvancedRedstoneTransmitterBase< + GT_Cover_WirelessMaintenanceDetector.MaintenanceTransmitterData> { public GT_Cover_WirelessMaintenanceDetector(ITexture coverTexture) { super(MaintenanceTransmitterData.class, coverTexture); @@ -40,7 +41,8 @@ public class GT_Cover_WirelessMaintenanceDetector extends GT_Cover_AdvancedRedst return createDataObject(); } - private static byte computeSignalBasedOnMaintenance(MaintenanceTransmitterData coverVariable, ICoverable tileEntity) { + private static byte computeSignalBasedOnMaintenance( + MaintenanceTransmitterData coverVariable, ICoverable tileEntity) { boolean signal = false; if (tileEntity instanceof IGregTechTileEntity) { @@ -73,8 +75,7 @@ public class GT_Cover_WirelessMaintenanceDetector extends GT_Cover_AdvancedRedst } else { long expectedDamage = Math.round(Math.min( (double) multiTE.mEUt / multiTE.damageFactorLow, - Math.pow(multiTE.mEUt, multiTE.damageFactorHigh) - )); + Math.pow(multiTE.mEUt, multiTE.damageFactorHigh))); signal = current + expectedDamage * 2 >= max; } } else { @@ -87,34 +88,40 @@ public class GT_Cover_WirelessMaintenanceDetector extends GT_Cover_AdvancedRedst if (coverVariable.invert) { signal = !signal; } - + return (byte) (signal ? 15 : 0); } @Override - public MaintenanceTransmitterData doCoverThingsImpl(byte aSide, byte aInputRedstone, int aCoverID, - MaintenanceTransmitterData aCoverVariable, ICoverable aTileEntity, long aTimer) { + public MaintenanceTransmitterData doCoverThingsImpl( + byte aSide, + byte aInputRedstone, + int aCoverID, + MaintenanceTransmitterData aCoverVariable, + ICoverable aTileEntity, + long aTimer) { byte signal = computeSignalBasedOnMaintenance(aCoverVariable, aTileEntity); long hash = hashCoverCoords(aTileEntity, aSide); setSignalAt(aCoverVariable.getUuid(), aCoverVariable.getFrequency(), hash, signal); - + return aCoverVariable; } @Override - public boolean letsRedstoneGoOutImpl(byte aSide, int aCoverID, MaintenanceTransmitterData aCoverVariable, - ICoverable aTileEntity) { + public boolean letsRedstoneGoOutImpl( + byte aSide, int aCoverID, MaintenanceTransmitterData aCoverVariable, ICoverable aTileEntity) { return true; } @Override - protected boolean manipulatesSidedRedstoneOutputImpl(byte aSide, int aCoverID, MaintenanceTransmitterData aCoverVariable, - ICoverable aTileEntity) { + protected boolean manipulatesSidedRedstoneOutputImpl( + byte aSide, int aCoverID, MaintenanceTransmitterData aCoverVariable, ICoverable aTileEntity) { return true; } @Override - public int getTickRateImpl(byte aSide, int aCoverID, MaintenanceTransmitterData aCoverVariable, ICoverable aTileEntity) { + public int getTickRateImpl( + byte aSide, int aCoverID, MaintenanceTransmitterData aCoverVariable, ICoverable aTileEntity) { return 60; } @@ -184,15 +191,19 @@ public class GT_Cover_WirelessMaintenanceDetector extends GT_Cover_AdvancedRedst /** * GUI Stuff */ - - private static final String[] extraTexts = new String[]{ - "No Issues", ">= 1 Issue", ">= 2 Issues", ">= 3 Issues", - ">= 4 Issues", ">= 5 Issues", "Rotor < 80%", "Rotor < 100%" + private static final String[] extraTexts = new String[] { + "No Issues", ">= 1 Issue", ">= 2 Issues", ">= 3 Issues", + ">= 4 Issues", ">= 5 Issues", "Rotor < 80%", "Rotor < 100%" }; @Override - public Object getClientGUIImpl(byte aSide, int aCoverID, MaintenanceTransmitterData aCoverVariable, ICoverable aTileEntity, - EntityPlayer aPlayer, World aWorld) { + public Object getClientGUIImpl( + byte aSide, + int aCoverID, + MaintenanceTransmitterData aCoverVariable, + ICoverable aTileEntity, + EntityPlayer aPlayer, + World aWorld) { return new MaintenanceTransmitterGUI(aSide, aCoverID, aCoverVariable, aTileEntity); } @@ -201,13 +212,20 @@ public class GT_Cover_WirelessMaintenanceDetector extends GT_Cover_AdvancedRedst private static final String guiTexturePath = "gregtech:textures/gui/GuiCoverBig.png"; private static final int maintenanceButtonIdStart = 2; - public MaintenanceTransmitterGUI(byte aSide, int aCoverID, MaintenanceTransmitterData aCoverVariable, ICoverable aTileEntity) { + public MaintenanceTransmitterGUI( + byte aSide, int aCoverID, MaintenanceTransmitterData aCoverVariable, ICoverable aTileEntity) { super(aSide, aCoverID, aCoverVariable, aTileEntity); this.mGUIbackgroundLocation = new ResourceLocation(guiTexturePath); this.gui_height = 143; for (int i = 0; i < 8; ++i) { - new GT_GuiIconCheckButton(this, maintenanceButtonIdStart + i, startX + spaceX * (i % 2 == 0 ? 0 : 6), startY + spaceY * (2 + i / 2), GT_GuiIcon.CHECKMARK, null); + new GT_GuiIconCheckButton( + this, + maintenanceButtonIdStart + i, + startX + spaceX * (i % 2 == 0 ? 0 : 6), + startY + spaceY * (2 + i / 2), + GT_GuiIcon.CHECKMARK, + null); } } @@ -215,11 +233,12 @@ public class GT_Cover_WirelessMaintenanceDetector extends GT_Cover_AdvancedRedst public void drawExtras(int mouseX, int mouseY, float parTicks) { super.drawExtras(mouseX, mouseY, parTicks); for (int i = 0; i < 8; ++i) { - this.getFontRenderer().drawString( - extraTexts[i], - startX + spaceX * (i % 2 == 0 ? 1 : 7), - 4 + startY + spaceY * (2 + i / 2), - textColor); + this.getFontRenderer() + .drawString( + extraTexts[i], + startX + spaceX * (i % 2 == 0 ? 1 : 7), + 4 + startY + spaceY * (2 + i / 2), + textColor); } } diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java index 49be6aa843..5ec670aea5 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java @@ -4719,7 +4719,7 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { ItemList.Cover_NeedsMaintainance.get(1L), TextureFactory.of(MACHINE_CASINGS[2][0], TextureFactory.of(OVERLAY_MAINTENANCE_DETECTOR)), new GT_Cover_NeedMaintainance(TextureFactory.of(OVERLAY_MAINTENANCE_DETECTOR))); - + GT_Values.RA.addAssemblerRecipe( new ItemStack[] { ItemList.Emitter_MV.get(1L), diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java index 881cbd41c4..a5d8469f8b 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java @@ -1,5 +1,7 @@ package gregtech.common.items; +import static gregtech.api.enums.Textures.BlockIcons.*; + import gregtech.api.GregTech_API; import gregtech.api.enums.Dyes; import gregtech.api.enums.GT_Values; @@ -39,8 +41,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.potion.Potion; import net.minecraft.world.World; -import static gregtech.api.enums.Textures.BlockIcons.*; - public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { public static GT_MetaGenerated_Item_02 INSTANCE; private static final String aTextCover = "Usable as Cover"; @@ -2306,98 +2306,97 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new GT_FoodStat(1, 0.1F, EnumAction.eat, null, false, true, false), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L))); - - ItemList.Cover_AdvancedRedstoneTransmitterExternal.set(addItem( - tLastID = 577, - "Advanced Redstone Transmitter (External)", - "Transfers Redstone signals wirelessly", - new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L), - new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 2L))); + tLastID = 577, + "Advanced Redstone Transmitter (External)", + "Transfers Redstone signals wirelessly", + new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L), + new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 2L))); ItemList.Cover_AdvancedRedstoneTransmitterInternal.set(addItem( - tLastID = 578, - "Advanced Redstone Transmitter (Internal)", - "Transfers Redstone signals wirelessly", - new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L), - new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 2L))); + tLastID = 578, + "Advanced Redstone Transmitter (Internal)", + "Transfers Redstone signals wirelessly", + new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L), + new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 2L))); ItemList.Cover_AdvancedRedstoneReceiverExternal.set(addItem( - tLastID = 579, - "Advanced Redstone Receiver (External)", - "Transfers Redstone signals wirelessly", - new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L), - new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 2L))); + tLastID = 579, + "Advanced Redstone Receiver (External)", + "Transfers Redstone signals wirelessly", + new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L), + new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 2L))); ItemList.Cover_AdvancedRedstoneReceiverInternal.set(addItem( - tLastID = 580, - "Advanced Redstone Receiver (Internal)", - "Transfers Redstone signals wirelessly", - new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L), - new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 2L))); + tLastID = 580, + "Advanced Redstone Receiver (Internal)", + "Transfers Redstone signals wirelessly", + new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L), + new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 2L))); ItemList.Cover_WirelessFluidDetector.set(addItem( - tLastID = 581, - "Wireless Fluid Detector Cover", - "Transfers Fluid Amount as Redstone wirelessly", - new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L), - new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 2L), - new TC_Aspects.TC_AspectStack(TC_Aspects.SENSUS, 2L), - new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L))); + tLastID = 581, + "Wireless Fluid Detector Cover", + "Transfers Fluid Amount as Redstone wirelessly", + new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L), + new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 2L), + new TC_Aspects.TC_AspectStack(TC_Aspects.SENSUS, 2L), + new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L))); ItemList.Cover_WirelessItemDetector.set(addItem( - tLastID = 582, - "Wireless Item Detector Cover", - "Transfers Item Amount as Redstone wirelessly", - new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L), - new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 2L), - new TC_Aspects.TC_AspectStack(TC_Aspects.SENSUS, 2L), - new TC_Aspects.TC_AspectStack(TC_Aspects.TERRA, 1L))); + tLastID = 582, + "Wireless Item Detector Cover", + "Transfers Item Amount as Redstone wirelessly", + new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L), + new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 2L), + new TC_Aspects.TC_AspectStack(TC_Aspects.SENSUS, 2L), + new TC_Aspects.TC_AspectStack(TC_Aspects.TERRA, 1L))); ItemList.Cover_WirelessNeedsMaintainance.set(addItem( - tLastID = 583, - "Wireless Needs Maintenance Cover", - "Transfers Maintenance Issues as Redstone wirelessly", - new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 4L), - new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 3L))); + tLastID = 583, + "Wireless Needs Maintenance Cover", + "Transfers Maintenance Issues as Redstone wirelessly", + new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 4L), + new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 3L))); GregTech_API.registerCover( - ItemList.Cover_AdvancedRedstoneTransmitterExternal.get(1L), - TextureFactory.of(MACHINE_CASINGS[2][0], TextureFactory.of(OVERLAY_ADVANCED_REDSTONE_TRANSMITTER)), - new GT_Cover_AdvancedRedstoneTransmitterExternal(TextureFactory.of(OVERLAY_ADVANCED_REDSTONE_TRANSMITTER))); + ItemList.Cover_AdvancedRedstoneTransmitterExternal.get(1L), + TextureFactory.of(MACHINE_CASINGS[2][0], TextureFactory.of(OVERLAY_ADVANCED_REDSTONE_TRANSMITTER)), + new GT_Cover_AdvancedRedstoneTransmitterExternal( + TextureFactory.of(OVERLAY_ADVANCED_REDSTONE_TRANSMITTER))); GregTech_API.registerCover( - ItemList.Cover_AdvancedRedstoneTransmitterInternal.get(1L), - TextureFactory.of(MACHINE_CASINGS[2][0], TextureFactory.of(OVERLAY_ADVANCED_REDSTONE_TRANSMITTER)), - new GT_Cover_AdvancedRedstoneTransmitterInternal(TextureFactory.of(OVERLAY_ADVANCED_REDSTONE_TRANSMITTER))); + ItemList.Cover_AdvancedRedstoneTransmitterInternal.get(1L), + TextureFactory.of(MACHINE_CASINGS[2][0], TextureFactory.of(OVERLAY_ADVANCED_REDSTONE_TRANSMITTER)), + new GT_Cover_AdvancedRedstoneTransmitterInternal( + TextureFactory.of(OVERLAY_ADVANCED_REDSTONE_TRANSMITTER))); GregTech_API.registerCover( - ItemList.Cover_AdvancedRedstoneReceiverExternal.get(1L), - TextureFactory.of(MACHINE_CASINGS[2][0], TextureFactory.of(OVERLAY_ADVANCED_REDSTONE_RECEIVER)), - new GT_Cover_AdvancedRedstoneReceiverExternal(TextureFactory.of(OVERLAY_ADVANCED_REDSTONE_RECEIVER))); + ItemList.Cover_AdvancedRedstoneReceiverExternal.get(1L), + TextureFactory.of(MACHINE_CASINGS[2][0], TextureFactory.of(OVERLAY_ADVANCED_REDSTONE_RECEIVER)), + new GT_Cover_AdvancedRedstoneReceiverExternal(TextureFactory.of(OVERLAY_ADVANCED_REDSTONE_RECEIVER))); GregTech_API.registerCover( - ItemList.Cover_AdvancedRedstoneReceiverInternal.get(1L), - TextureFactory.of(MACHINE_CASINGS[2][0], TextureFactory.of(OVERLAY_ADVANCED_REDSTONE_RECEIVER)), - new GT_Cover_AdvancedRedstoneReceiverInternal(TextureFactory.of(OVERLAY_ADVANCED_REDSTONE_RECEIVER))); + ItemList.Cover_AdvancedRedstoneReceiverInternal.get(1L), + TextureFactory.of(MACHINE_CASINGS[2][0], TextureFactory.of(OVERLAY_ADVANCED_REDSTONE_RECEIVER)), + new GT_Cover_AdvancedRedstoneReceiverInternal(TextureFactory.of(OVERLAY_ADVANCED_REDSTONE_RECEIVER))); GregTech_API.registerCover( - ItemList.Cover_WirelessFluidDetector.get(1L), - TextureFactory.of(MACHINE_CASINGS[2][0], TextureFactory.of(OVERLAY_WIRELESS_FLUID_DETECTOR)), - new GT_Cover_WirelessFluidDetector(TextureFactory.of(OVERLAY_WIRELESS_FLUID_DETECTOR))); + ItemList.Cover_WirelessFluidDetector.get(1L), + TextureFactory.of(MACHINE_CASINGS[2][0], TextureFactory.of(OVERLAY_WIRELESS_FLUID_DETECTOR)), + new GT_Cover_WirelessFluidDetector(TextureFactory.of(OVERLAY_WIRELESS_FLUID_DETECTOR))); GregTech_API.registerCover( - ItemList.Cover_WirelessItemDetector.get(1L), - TextureFactory.of(MACHINE_CASINGS[2][0], TextureFactory.of(OVERLAY_WIRELESS_ITEM_DETECTOR)), - new GT_Cover_WirelessItemDetector(TextureFactory.of(OVERLAY_WIRELESS_ITEM_DETECTOR))); + ItemList.Cover_WirelessItemDetector.get(1L), + TextureFactory.of(MACHINE_CASINGS[2][0], TextureFactory.of(OVERLAY_WIRELESS_ITEM_DETECTOR)), + new GT_Cover_WirelessItemDetector(TextureFactory.of(OVERLAY_WIRELESS_ITEM_DETECTOR))); GregTech_API.registerCover( ItemList.Cover_WirelessNeedsMaintainance.get(1L), TextureFactory.of(MACHINE_CASINGS[2][0], TextureFactory.of(OVERLAY_WIRELESS_MAINTENANCE_DETECTOR)), new GT_Cover_WirelessMaintenanceDetector(TextureFactory.of(OVERLAY_WIRELESS_MAINTENANCE_DETECTOR))); - GT_Values.RA.addAssemblerRecipe( new ItemStack[] { - ItemList.Cover_RedstoneTransmitterExternal.get(1L), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Data, 1L), - GT_Utility.getIntegratedCircuit(1) + ItemList.Cover_RedstoneTransmitterExternal.get(1L), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Data, 1L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, ItemList.Cover_AdvancedRedstoneTransmitterExternal.get(1L), @@ -2406,9 +2405,9 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { GT_Values.RA.addAssemblerRecipe( new ItemStack[] { - ItemList.Cover_RedstoneReceiverExternal.get(1L), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Data, 1L), - GT_Utility.getIntegratedCircuit(1) + ItemList.Cover_RedstoneReceiverExternal.get(1L), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Data, 1L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, ItemList.Cover_AdvancedRedstoneReceiverExternal.get(1L), @@ -2417,9 +2416,9 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { GT_Values.RA.addAssemblerRecipe( new ItemStack[] { - ItemList.Cover_FluidDetector.get(1L), - ItemList.Emitter_EV.get(1L), - GT_Utility.getIntegratedCircuit(1) + ItemList.Cover_FluidDetector.get(1L), + ItemList.Emitter_EV.get(1L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, ItemList.Cover_WirelessFluidDetector.get(1L), @@ -2428,9 +2427,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { GT_Values.RA.addAssemblerRecipe( new ItemStack[] { - ItemList.Cover_ItemDetector.get(1L), - ItemList.Emitter_EV.get(1L), - GT_Utility.getIntegratedCircuit(1) + ItemList.Cover_ItemDetector.get(1L), ItemList.Emitter_EV.get(1L), GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, ItemList.Cover_WirelessItemDetector.get(1L), @@ -2439,9 +2436,9 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { GT_Values.RA.addAssemblerRecipe( new ItemStack[] { - ItemList.Cover_NeedsMaintainance.get(1L), - ItemList.Emitter_EV.get(1L), - GT_Utility.getIntegratedCircuit(1) + ItemList.Cover_NeedsMaintainance.get(1L), + ItemList.Emitter_EV.get(1L), + GT_Utility.getIntegratedCircuit(1) }, GT_Values.NF, ItemList.Cover_WirelessNeedsMaintainance.get(1L), |