diff options
| author | Bass <tudurap.com@gmail.com> | 2019-08-29 04:30:29 +0100 |
|---|---|---|
| committer | Bass <tudurap.com@gmail.com> | 2019-08-29 04:30:29 +0100 |
| commit | 6e7457be9ad03722cd431a2d946173824a275dcd (patch) | |
| tree | 892f94c337fb40f1154f8653b6161304f7371723 /src/main/java/com | |
| parent | 9c0b78d8016f735dd0dd2716de3312d9ad50dc6c (diff) | |
| download | GT5-Unofficial-6e7457be9ad03722cd431a2d946173824a275dcd.tar.gz GT5-Unofficial-6e7457be9ad03722cd431a2d946173824a275dcd.tar.bz2 GT5-Unofficial-6e7457be9ad03722cd431a2d946173824a275dcd.zip | |
This is only a test
Diffstat (limited to 'src/main/java/com')
3 files changed, 32 insertions, 29 deletions
diff --git a/src/main/java/com/github/technus/tectech/mechanics/data/RendererMessage.java b/src/main/java/com/github/technus/tectech/mechanics/data/RendererMessage.java index 449b68a846..514b8b88ad 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/data/RendererMessage.java +++ b/src/main/java/com/github/technus/tectech/mechanics/data/RendererMessage.java @@ -69,6 +69,7 @@ public class RendererMessage implements IMessage { } private static void thaumLightning(int tX, int tY, int tZ, int tXN, int tYN, int tZN, int wID) { + //This is enough to check for thaum, since it only ever matters for client side effects (Tested not to crash) if (Loader.isModLoaded("Thaumcraft")) { World world = DimensionManager.getWorld(wID); FXLightningBolt bolt = new FXLightningBolt(world, tX + 0.5F, tY + 0.5F, tZ + 0.5F, tX + tXN + 0.5F, tY + tYN + 0.5F, tZ + tZN + 0.5F, world.rand.nextLong(), 6, 0.5F, 8); @@ -78,4 +79,4 @@ public class RendererMessage implements IMessage { bolt.finalizeBolt(); } } -} +}
\ No newline at end of file diff --git a/src/main/java/com/github/technus/tectech/mechanics/data/ThaumSpark.java b/src/main/java/com/github/technus/tectech/mechanics/data/ThaumSpark.java index 59462679de..99f3696aa9 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/data/ThaumSpark.java +++ b/src/main/java/com/github/technus/tectech/mechanics/data/ThaumSpark.java @@ -4,6 +4,7 @@ import java.io.Serializable; import java.util.Objects;
public class ThaumSpark implements Serializable {
+ //This works regardless of if TC is loaded
private static final long serialVersionUID = -7037856938316679566L;
public int x, y, z, wID;
public byte xR, yR, zR;
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ElementalContainer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ElementalContainer.java index c96cb91f45..d2ff8555a4 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ElementalContainer.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ElementalContainer.java @@ -221,34 +221,35 @@ public abstract class GT_MetaTileEntity_Hatch_ElementalContainer extends GT_Meta @Override public String[] getInfoData() { - if (TecTech.configTecTech.EASY_SCAN) { - if (id > 0) { - if (content == null || content.size() == 0) { - return new String[]{StatCollector.translateToLocal("tt.keyword.ID") + ": " + EnumChatFormatting.AQUA + id, StatCollector.translateToLocal("tt.keyphrase.No_Stacks")}; - } else { - String[] lines = content.getElementalInfo(); - String[] output = new String[lines.length + 1]; - output[0] = StatCollector.translateToLocal("tt.keyword.ID") + ": " + EnumChatFormatting.AQUA + id; - System.arraycopy(lines, 0, output, 1, lines.length); - return output; - } - } - if (content == null || content.size() == 0) { - return new String[]{StatCollector.translateToLocal("tt.keyphrase.No_Stacks")}; - } - return content.getElementalInfo(); - } else { - if (id > 0) { - if (content == null || content.size() == 0) { - return new String[]{StatCollector.translateToLocal("tt.keyword.ID") + ": " + EnumChatFormatting.AQUA + id, StatCollector.translateToLocal("tt.keyphrase.No_Stacks")}; - } - return new String[]{StatCollector.translateToLocal("tt.keyword.ID") + ": " + EnumChatFormatting.AQUA + id, StatCollector.translateToLocal("tt.keyphrase.Contains_EM")}; - } - if (content == null || content.size() == 0) { - return new String[]{StatCollector.translateToLocal("tt.keyphrase.No_Stacks")}; - } - return new String[]{StatCollector.translateToLocal("tt.keyphrase.Contains_EM")}; - } + return new String[]{StatCollector.translateToLocal("tt.keyword.ID")}; + //if (TecTech.configTecTech.EASY_SCAN) { + // if (id > 0) { + // if (content == null || content.size() == 0) { + // return new String[]{StatCollector.translateToLocal("tt.keyword.ID") + ": " + EnumChatFormatting.AQUA + id, StatCollector.translateToLocal("tt.keyphrase.No_Stacks")}; + // } else { + // String[] lines = content.getElementalInfo(); + // String[] output = new String[lines.length + 1]; + // output[0] = StatCollector.translateToLocal("tt.keyword.ID") + ": " + EnumChatFormatting.AQUA + id; + // System.arraycopy(lines, 0, output, 1, lines.length); + // return output; + // } + // } + // if (content == null || content.size() == 0) { + // return new String[]{StatCollector.translateToLocal("tt.keyphrase.No_Stacks")}; + // } + // return content.getElementalInfo(); + //} else { + // if (id > 0) { + // if (content == null || content.size() == 0) { + // return new String[]{StatCollector.translateToLocal("tt.keyword.ID") + ": " + EnumChatFormatting.AQUA + id, StatCollector.translateToLocal("tt.keyphrase.No_Stacks")}; + // } + // return new String[]{StatCollector.translateToLocal("tt.keyword.ID") + ": " + EnumChatFormatting.AQUA + id, StatCollector.translateToLocal("tt.keyphrase.Contains_EM")}; + // } + // if (content == null || content.size() == 0) { + // return new String[]{StatCollector.translateToLocal("tt.keyphrase.No_Stacks")}; + // } + // return new String[]{StatCollector.translateToLocal("tt.keyphrase.Contains_EM")}; + //} } public void updateSlots() { |