aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common
diff options
context:
space:
mode:
authorMartin Robertz <dream-master@gmx.net>2022-10-01 12:37:34 +0200
committerMartin Robertz <dream-master@gmx.net>2022-10-01 12:37:34 +0200
commit0268d287a9d165899ff456b674d56ba10d382d81 (patch)
treeac8ba903ca3fba28e694566cb7a2d01c53963d8d /src/main/java/gregtech/common
parenta4a4a950d2870ababec7f67f9bed6e69750a6cc4 (diff)
downloadGT5-Unofficial-0268d287a9d165899ff456b674d56ba10d382d81.tar.gz
GT5-Unofficial-0268d287a9d165899ff456b674d56ba10d382d81.tar.bz2
GT5-Unofficial-0268d287a9d165899ff456b674d56ba10d382d81.zip
spotless
Diffstat (limited to 'src/main/java/gregtech/common')
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_ItemMeter.java10
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_NeedMaintainance.java9
-rw-r--r--src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneReceiverBase.java73
-rw-r--r--src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneReceiverExternal.java19
-rw-r--r--src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneReceiverInternal.java12
-rw-r--r--src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneTransmitterBase.java69
-rw-r--r--src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneTransmitterExternal.java15
-rw-r--r--src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneTransmitterInternal.java20
-rw-r--r--src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedWirelessRedstoneBase.java141
-rw-r--r--src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessFluidDetector.java50
-rw-r--r--src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessItemDetector.java91
-rw-r--r--src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessMaintenanceDetector.java77
-rw-r--r--src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java2
-rw-r--r--src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java151
14 files changed, 457 insertions, 282 deletions
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,
-