From 2dcceaf0de0221b4c9dc38b8592b57ca7e7b0a24 Mon Sep 17 00:00:00 2001 From: Bass Date: Thu, 14 Feb 2019 17:30:19 +0000 Subject: Tesla Cover Work Lord forgive me for this is fucked --- src/main/resources/assets/tectech/lang/en_US.lang | 2 ++ src/main/resources/assets/tectech/lang/zh_CN.lang | 2 ++ 2 files changed, 4 insertions(+) (limited to 'src/main/resources/assets/tectech') diff --git a/src/main/resources/assets/tectech/lang/en_US.lang b/src/main/resources/assets/tectech/lang/en_US.lang index ccb17a8a0c..2c748a18d7 100644 --- a/src/main/resources/assets/tectech/lang/en_US.lang +++ b/src/main/resources/assets/tectech/lang/en_US.lang @@ -9,6 +9,8 @@ item.em.frontRotate.name=Front Rotation Scrench item.em.parametrizerMemoryCard.name=Parametrizer Memory Card item.em.EuMeterGT.name=GT EU meter +item.tm.teslaCoilCover.name=Tesla Coil Cover + death.attack.microwaving=%1$s was dehydrated by radiation. death.attack.microwaving.player=%1$s was dehydrated by radiation while fighting %2$s. diff --git a/src/main/resources/assets/tectech/lang/zh_CN.lang b/src/main/resources/assets/tectech/lang/zh_CN.lang index 5359f04e9b..47912d245d 100644 --- a/src/main/resources/assets/tectech/lang/zh_CN.lang +++ b/src/main/resources/assets/tectech/lang/zh_CN.lang @@ -6,6 +6,8 @@ item.em.definitionContainer.name=EM配方指引 item.em.debugBuilder.name=多方块机器蓝图 item.em.parametrizerMemoryCard.name=参量机记忆卡 +item.tm.teslaCoilCover.name=Tesla Coil Cover + death.attack.microwaving=%1$s 被辐射脱水 death.attack.microwaving.player=%1$s 在与 %2$s 战斗中被辐射脱水 -- cgit From ee4bd9f91d4b8f85b550730aa1e3c63d91b3be2f Mon Sep 17 00:00:00 2001 From: Bass Date: Sat, 16 Feb 2019 08:14:14 +0000 Subject: Tesla WIP Both types of tesla now map other teslas After talking to 0laf, I think a super high tier Tesla Cover for straight tower to machine transfers. --- .../technus/tectech/loader/thing/CoverLoader.java | 6 +- .../technus/tectech/loader/thing/ThingsLoader.java | 1 + .../tectech/thing/cover/GT_Cover_TM_TeslaCoil.java | 2 +- .../cover/GT_Cover_TM_TeslaCoil_Ultimate.java | 8 + .../tectech/thing/item/TeslaCoilCoverUltimate.java | 36 +++++ .../multi/GT_MetaTileEntity_TM_teslaCoil.java | 178 ++++++++++++--------- .../single/GT_MetaTileEntity_TeslaCoil.java | 122 +++++++------- src/main/resources/assets/tectech/lang/en_US.lang | 1 + src/main/resources/assets/tectech/lang/zh_CN.lang | 1 + 9 files changed, 210 insertions(+), 145 deletions(-) create mode 100644 src/main/java/com/github/technus/tectech/thing/cover/GT_Cover_TM_TeslaCoil_Ultimate.java create mode 100644 src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCoverUltimate.java (limited to 'src/main/resources/assets/tectech') diff --git a/src/main/java/com/github/technus/tectech/loader/thing/CoverLoader.java b/src/main/java/com/github/technus/tectech/loader/thing/CoverLoader.java index ca81427e03..e71489339e 100644 --- a/src/main/java/com/github/technus/tectech/loader/thing/CoverLoader.java +++ b/src/main/java/com/github/technus/tectech/loader/thing/CoverLoader.java @@ -3,15 +3,17 @@ package com.github.technus.tectech.loader.thing; import com.github.technus.tectech.TecTech; import com.github.technus.tectech.thing.cover.GT_Cover_TM_TeslaCoil; +import com.github.technus.tectech.thing.cover.GT_Cover_TM_TeslaCoil_Ultimate; import com.github.technus.tectech.thing.item.TeslaCoilCover; +import com.github.technus.tectech.thing.item.TeslaCoilCoverUltimate; import gregtech.api.GregTech_API; import gregtech.api.enums.Textures; import gregtech.api.objects.GT_RenderedTexture; import net.minecraft.item.ItemStack; - public class CoverLoader implements Runnable { public void run(){ - GregTech_API.registerCover(new ItemStack(TeslaCoilCover.INSTANCE, 1), new GT_RenderedTexture(Textures.BlockIcons.VENT_ADVANCED), new GT_Cover_TM_TeslaCoil()); + GregTech_API.registerCover(new ItemStack(TeslaCoilCover.INSTANCE, 1), new GT_RenderedTexture(Textures.BlockIcons.VENT_NORMAL), new GT_Cover_TM_TeslaCoil()); + GregTech_API.registerCover(new ItemStack(TeslaCoilCoverUltimate.INSTANCE, 1), new GT_RenderedTexture(Textures.BlockIcons.VENT_ADVANCED), new GT_Cover_TM_TeslaCoil_Ultimate()); TecTech.LOGGER.info("Cover functionality registered"); } } diff --git a/src/main/java/com/github/technus/tectech/loader/thing/ThingsLoader.java b/src/main/java/com/github/technus/tectech/loader/thing/ThingsLoader.java index e9967a3e62..6951ef6533 100644 --- a/src/main/java/com/github/technus/tectech/loader/thing/ThingsLoader.java +++ b/src/main/java/com/github/technus/tectech/loader/thing/ThingsLoader.java @@ -54,6 +54,7 @@ public class ThingsLoader implements Runnable { TecTech.LOGGER.info("Reactor Simulator registered"); TeslaCoilCover.run(); + TeslaCoilCoverUltimate.run(); TecTech.LOGGER.info("Covers Items registered"); ConstructableTriggerItem.run(); diff --git a/src/main/java/com/github/technus/tectech/thing/cover/GT_Cover_TM_TeslaCoil.java b/src/main/java/com/github/technus/tectech/thing/cover/GT_Cover_TM_TeslaCoil.java index e1e1b9d595..bfb4ae9208 100644 --- a/src/main/java/com/github/technus/tectech/thing/cover/GT_Cover_TM_TeslaCoil.java +++ b/src/main/java/com/github/technus/tectech/thing/cover/GT_Cover_TM_TeslaCoil.java @@ -1,6 +1,6 @@ package com.github.technus.tectech.thing.cover; -import gregtech.api.util.GT_CoverBehavior; + import gregtech.api.util.GT_CoverBehavior; public class GT_Cover_TM_TeslaCoil extends GT_CoverBehavior { public GT_Cover_TM_TeslaCoil() { diff --git a/src/main/java/com/github/technus/tectech/thing/cover/GT_Cover_TM_TeslaCoil_Ultimate.java b/src/main/java/com/github/technus/tectech/thing/cover/GT_Cover_TM_TeslaCoil_Ultimate.java new file mode 100644 index 0000000000..7ad6bc6f5f --- /dev/null +++ b/src/main/java/com/github/technus/tectech/thing/cover/GT_Cover_TM_TeslaCoil_Ultimate.java @@ -0,0 +1,8 @@ +package com.github.technus.tectech.thing.cover; + + import gregtech.api.util.GT_CoverBehavior; + +public class GT_Cover_TM_TeslaCoil_Ultimate extends GT_CoverBehavior { + public GT_Cover_TM_TeslaCoil_Ultimate() { + } +} \ No newline at end of file diff --git a/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCoverUltimate.java b/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCoverUltimate.java new file mode 100644 index 0000000000..115f3a34c6 --- /dev/null +++ b/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCoverUltimate.java @@ -0,0 +1,36 @@ +package com.github.technus.tectech.thing.item; + +import com.github.technus.tectech.CommonValues; +import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; + +import java.util.List; + +import static com.github.technus.tectech.Reference.MODID; + + +public final class TeslaCoilCoverUltimate extends Item { + public static TeslaCoilCoverUltimate INSTANCE; + + public TeslaCoilCoverUltimate() { + setUnlocalizedName("tm.teslaCoilCoverUltimate"); + setTextureName(MODID + ":itemParametrizerMemoryCardUnlocked"); + } + + @Override + public void addInformation(ItemStack aStack, EntityPlayer ep, List aList, boolean boo) { + aList.add(CommonValues.BASS_MARK); + aList.add("Tesla-Enables Machines! (BUT LOUDER!!)"); + aList.add(EnumChatFormatting.BLUE + "Use on a machine to apply Tesla capabilities"); + aList.add(EnumChatFormatting.BLUE + "Who the hell need cables anyway?"); + } + + public static void run() { + INSTANCE = new TeslaCoilCoverUltimate(); + System.out.print(INSTANCE.getUnlocalizedName()); + GameRegistry.registerItem(INSTANCE, INSTANCE.getUnlocalizedName()); + } +} diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java index bb7c815416..926c5e5d30 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java @@ -1,6 +1,7 @@ package com.github.technus.tectech.thing.metaTileEntity.multi; import com.github.technus.tectech.CommonValues; +import com.github.technus.tectech.thing.cover.GT_Cover_TM_TeslaCoil_Ultimate; import com.github.technus.tectech.thing.metaTileEntity.IConstructable; import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_Capacitor; import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_DynamoMulti; @@ -20,7 +21,7 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; -import java.util.ArrayList; +import java.util.*; import static com.github.technus.tectech.CommonValues.V; import static com.github.technus.tectech.Util.StructureBuilder; @@ -45,8 +46,7 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock private int scanTimeMin = 100; //Min scan time in ticks private int scanTimeTill = scanTimeMin; //Set default scan time - private ArrayList eTeslaList = new ArrayList<>(); //Makes a list of Smol Teslas - private ArrayList eTeslaTowerList = new ArrayList<>(); //Makes a list for BIGG Teslas + private Map eTeslaMap = new HashMap();//Tesla Map to map them tesla bois! private float histLow = 0.25F; //Power pass is disabled if power is under this fraction private float histHigh = 0.75F; //Power pass is enabled if power is over this fraction @@ -54,8 +54,11 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock private float histLowLimit = 0.05F; //How low can you configure it? private float histHighLimit = 0.95F; //How high can you configure it? - private int scanRadius = 64; //Radius for small to tower transfers - private int scanRadiusTower = scanRadius * 2; //Radius for tower to tower transfers + private int scanRadius = 64; //Tesla scan radius + + private int transferRadiusTower = 32; //Radius for tower to tower transfers + private int transferRadiusTransceiver = 16; //Radius for tower to transceiver transfers + private int transferRadiusCoverUltimate = 16; //Radius for tower to ultimate cover transfers private long outputVoltage = 512; //Tesla Voltage Output private long outputCurrent = 1; //Tesla Current Output @@ -68,12 +71,27 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock private long histLowParam = 0; private long histHighParam = 0; private long histScaleParam = 0; - private int scanRadiusParam = 0; - private int scanRadiusTowerParam = 0; + private int transferRadiusTowerParam = 0; + private int transferRadiusTransceiverParam = 0; + private int transferRadiusCoverUltimateParam = 0; private long outputVoltageParam = 0; private long outputCurrentParam = 0; private int scanTimeMinParam = 0; + static > SortedSet> entriesSortedByValues(Map map) { + SortedSet> sortedEntries = new TreeSet>( + new Comparator>() { + @Override + public int compare(Map.Entry e1, Map.Entry e2) { + int res = e1.getValue().compareTo(e2.getValue()); + return res != 0 ? res : 1; // Special fix to preserve items with equal values + } + } + ); + sortedEntries.addAll(map.entrySet()); + return sortedEntries; + } + //region structure private static final String[][] shape0 = new String[][]{//3 16 0 {"\u000F", "A . ",}, @@ -295,8 +313,9 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock histLowParam = 0; histHighParam = 0; histScaleParam = 0; - scanRadiusParam = 0; - scanRadiusTowerParam = 0; + transferRadiusTowerParam = 0; + transferRadiusTransceiverParam = 0; + transferRadiusCoverUltimateParam = 0; outputVoltageParam = 0; outputCurrentParam = 0; scanTimeMin = 0; @@ -344,55 +363,24 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock scanTime++; if (scanTime >= scanTimeTill) { scanTime = 0; - - scanRadius = 64; //TODO Generate depending on power stored - eTeslaList.clear(); - - if (parametrized && scanRadiusParam > 0 && scanRadiusParam < scanRadius) { - scanRadius = scanRadiusParam; - } + eTeslaMap.clear(); for (int xPosOffset = -scanRadius; xPosOffset <= scanRadius; xPosOffset++) { - for (int yPosOffset = -scanRadius; yPosOffset <= scanRadius; yPosOffset++) { - for (int zPosOffset = -scanRadius; zPosOffset <= scanRadius; zPosOffset++) { - if (xPosOffset == 0 && yPosOffset == 0 && zPosOffset == 0){ + for (int yPosOffset = -scanRadius; yPosOffset <= scanRadius; yPosOffset++) { + for (int zPosOffset = -scanRadius; zPosOffset <= scanRadius; zPosOffset++) { + if (xPosOffset == 0 && yPosOffset == 0 && zPosOffset == 0) { continue; } IGregTechTileEntity node = mte.getIGregTechTileEntityOffset(xPosOffset, yPosOffset, zPosOffset); - if (node == null) { - continue; - } - IMetaTileEntity nodeInside = node.getMetaTileEntity(); - if (nodeInside instanceof GT_MetaTileEntity_TeslaCoil){ - eTeslaList.add((GT_MetaTileEntity_TeslaCoil) nodeInside); - } - } - } - } - - scanRadiusTower = scanRadius * 2; - eTeslaTowerList.clear(); - - if (parametrized && scanRadiusTowerParam > 0 && scanRadiusTowerParam < scanRadiusTower) { - scanRadiusTower = scanRadiusTowerParam; - } - - for (int xPosOffset = -scanRadiusTower; xPosOffset <= scanRadiusTower; xPosOffset++) { - for (int yPosOffset = -scanRadiusTower; yPosOffset <= scanRadiusTower; yPosOffset++) { - for (int zPosOffset = -scanRadiusTower; zPosOffset <= scanRadiusTower; zPosOffset++) { - if (xPosOffset == 0 && yPosOffset == 0 && zPosOffset == 0){ + if (node == null) { continue; } - IGregTechTileEntity node = mte.getIGregTechTileEntityOffset(xPosOffset, yPosOffset, zPosOffset); - if (node == null) { - continue; - } - IMetaTileEntity nodeInside = node.getMetaTileEntity(); - if (nodeInside instanceof GT_MetaTileEntity_TM_teslaCoil && node.isActive()){ - eTeslaTowerList.add((GT_MetaTileEntity_TM_teslaCoil) nodeInside); - } - } - } + IMetaTileEntity nodeInside = node.getMetaTileEntity(); + if (nodeInside instanceof GT_MetaTileEntity_TeslaCoil || nodeInside instanceof GT_MetaTileEntity_TM_teslaCoil && node.isActive() || (node.getCoverBehaviorAtSide((byte) 1) instanceof GT_Cover_TM_TeslaCoil_Ultimate)) { + eTeslaMap.put(node, (int) Math.ceil(Math.sqrt(xPosOffset * xPosOffset + yPosOffset * yPosOffset + zPosOffset * zPosOffset))); + } + } + } } } @@ -402,50 +390,80 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock outputCurrent = 1;//TODO Generate depending on count of capacitors if (parametrized && outputVoltageParam > 0 && outputVoltage > outputVoltageParam){ - outputVoltage = outputVoltageParam;} + outputVoltage = outputVoltageParam; + } if (parametrized && outputCurrentParam > 0 && outputCurrent > outputCurrentParam){ - outputCurrent = outputCurrentParam;} + outputCurrent = outputCurrentParam; + } outputEuT = outputVoltage * outputCurrent; - long requestedSumEU = 0; + transferRadiusTower = 32; //TODO generate based on power stored + transferRadiusTransceiver = 16; //TODO generate based on power stored + transferRadiusCoverUltimate = 16; //TODO generate based on power stored - //Clean the Smol Tesla list - for (GT_MetaTileEntity_TeslaCoil Rx : eTeslaList.toArray(new GT_MetaTileEntity_TeslaCoil[eTeslaList.size()])) { - try { - requestedSumEU += Rx.maxEUStore() - Rx.getEUVar(); - } catch (Exception e) { - eTeslaList.remove(Rx); - } + if(parametrized && transferRadiusTowerParam > 0 && transferRadiusTowerParam < transferRadiusTower){ + transferRadiusTower = transferRadiusTowerParam; } - //Clean the large tesla list - for (GT_MetaTileEntity_TM_teslaCoil Rx : eTeslaTowerList.toArray(new GT_MetaTileEntity_TM_teslaCoil[eTeslaTowerList.size()])) { - try { - requestedSumEU += Rx.maxEUStore() - Rx.getEUVar(); - } catch (Exception e) { - eTeslaTowerList.remove(Rx); - } + if(parametrized && transferRadiusTransceiverParam > 0 && transferRadiusTransceiverParam < transferRadiusTransceiver){ + transferRadiusTransceiver = transferRadiusTransceiverParam; } - //Try to send EU to the smol teslas - for (GT_MetaTileEntity_TeslaCoil Rx : eTeslaList) { - if (!Rx.powerPassToggle) { - long euTran = outputVoltage; - if (Rx.getBaseMetaTileEntity().injectEnergyUnits((byte)6, euTran, 1L) > 0L) { - setEUVar(getEUVar() - euTran); + if(parametrized && transferRadiusCoverUltimateParam > 0 && transferRadiusCoverUltimateParam < transferRadiusCoverUltimate){ + transferRadiusCoverUltimate = transferRadiusCoverUltimateParam; + } + + //Clean the eTeslaMap + for (Map.Entry Rx : entriesSortedByValues(eTeslaMap)) { + IGregTechTileEntity node = Rx.getKey(); + if (node != null) { + IMetaTileEntity nodeInside = node.getMetaTileEntity(); + try { + if (nodeInside instanceof GT_MetaTileEntity_TM_teslaCoil && node.isActive()) { + GT_MetaTileEntity_TM_teslaCoil teslaTower = (GT_MetaTileEntity_TM_teslaCoil) nodeInside; + if (teslaTower.maxEUStore() > 0) { + continue; + } + } else if (nodeInside instanceof GT_MetaTileEntity_TeslaCoil) { + GT_MetaTileEntity_TeslaCoil teslaCoil = (GT_MetaTileEntity_TeslaCoil) nodeInside; + if (teslaCoil.getStoredEnergy()[1] > 0) { + continue; + } + } else if ((node.getCoverBehaviorAtSide((byte) 1) instanceof GT_Cover_TM_TeslaCoil_Ultimate) && node.getEUCapacity() > 0) { + continue; + } + } catch (Exception e) { } } + eTeslaMap.remove(Rx.getKey()); } - //Try to send EU to big teslas - for (GT_MetaTileEntity_TM_teslaCoil Rx : eTeslaTowerList) { - if (!Rx.powerPassToggle) { - long euTran = outputVoltage; - if (Rx.getEUVar() + euTran <= (Rx.maxEUStore()/2)) { + //Power transfer + for (Map.Entry Rx : entriesSortedByValues(eTeslaMap)) { + IGregTechTileEntity node = Rx.getKey(); + IMetaTileEntity nodeInside = node.getMetaTileEntity(); + long euTran = outputVoltage; + + if (nodeInside instanceof GT_MetaTileEntity_TM_teslaCoil && Rx.getValue() <= transferRadiusTower) { + GT_MetaTileEntity_TM_teslaCoil nodeTesla = (GT_MetaTileEntity_TM_teslaCoil) nodeInside; + if (!nodeTesla.powerPassToggle) { + if (nodeTesla.getEUVar() + euTran <= (nodeTesla.maxEUStore() / 2)) { + setEUVar(getEUVar() - euTran); + node.increaseStoredEnergyUnits(euTran, true); + } + } + } else if (nodeInside instanceof GT_MetaTileEntity_TeslaCoil && Rx.getValue() <= transferRadiusTransceiver) { + GT_MetaTileEntity_TeslaCoil nodeTesla = (GT_MetaTileEntity_TeslaCoil) nodeInside; + if (!nodeTesla.powerPassToggle) { + if (node.injectEnergyUnits((byte)6, euTran, 1L) > 0L) { + setEUVar(getEUVar() - euTran); + } + } + } else if ((node.getCoverBehaviorAtSide((byte) 1) instanceof GT_Cover_TM_TeslaCoil_Ultimate) && Rx.getValue() <= transferRadiusCoverUltimate){ + if (node.injectEnergyUnits((byte)6, euTran, 1L) > 0L) { setEUVar(getEUVar() - euTran); - Rx.getBaseMetaTileEntity().increaseStoredEnergyUnits(euTran, true); } } } diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TeslaCoil.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TeslaCoil.java index a8797682e6..906ce556f7 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TeslaCoil.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TeslaCoil.java @@ -25,27 +25,32 @@ public class GT_MetaTileEntity_TeslaCoil extends GT_MetaTileEntity_BasicBatteryB private int scanTimeMin = 100; //Min scan time in ticks private int scanTimeTill = scanTimeMin; //Set default scan time - private Map eTeslaTowerMap = new HashMap(); + private Map eTeslaMap = new HashMap();//Tesla Map to map them tesla bois! private int histSteps = 20; //Hysteresis Resolution private int histSettingLow = 3; private int histSettingHigh = 15; private int histLowLimit = 1; //How low can you configure it? - private int histHighLimit = histSteps-1; //How high can you configure it? + private int histHighLimit = histSteps - 1; //How high can you configure it? - private float histLow = (float)histSettingLow/histSteps; //Power pass is disabled if power is under this fraction - private float histHigh = (float)histSettingHigh/histSteps; //Power pass is enabled if power is over this fraction + private float histLow = (float) histSettingLow / histSteps; //Power pass is disabled if power is under this fraction + private float histHigh = (float) histSettingHigh / histSteps; //Power pass is enabled if power is over this fraction + + private int scanRadius = 32; //Tesla scan radius + + private int transferRadiusTower = 32; //Radius for transceiver to tower transfers + private int transferRadiusCover = 16; //Radius for transceiver to cover transfers - private int scanRadiusTower = 64; //Radius for tower to tower transfers private long outputVoltage = 512; //Tesla Voltage Output private long outputCurrent = 1; //Tesla Current Output private long outputEuT = outputVoltage * outputCurrent; //Tesla Power Output - static > SortedSet> entriesSortedByValues(Map map) { - SortedSet> sortedEntries = new TreeSet>( - new Comparator>() { - @Override public int compare(Map.Entry e1, Map.Entry e2) { + static > SortedSet> entriesSortedByValues(Map map) { + SortedSet> sortedEntries = new TreeSet>( + new Comparator>() { + @Override + public int compare(Map.Entry e1, Map.Entry e2) { int res = e1.getValue().compareTo(e2.getValue()); return res != 0 ? res : 1; // Special fix to preserve items with equal values } @@ -67,20 +72,20 @@ public class GT_MetaTileEntity_TeslaCoil extends GT_MetaTileEntity_BasicBatteryB public void onScrewdriverRightClick(byte aSide, EntityPlayer aPlayer, float aX, float aY, float aZ) { if (aPlayer.isSneaking()) { - if (histSettingHighhistLowLimit) { + if (histSettingLow > histLowLimit) { histSettingLow--; } else { - histSettingLow=histSettingHigh-1; + histSettingLow = histSettingHigh - 1; } - histLow = (float)histSettingLow/histSteps; + histLow = (float) histSettingLow / histSteps; PlayerChatHelper.SendInfo(aPlayer, "Hysteresis Low Changed to " + round(histLow * 100F) + "%"); } } @@ -101,10 +106,6 @@ public class GT_MetaTileEntity_TeslaCoil extends GT_MetaTileEntity_BasicBatteryB ItemStack[] var4 = this.mInventory; int var5 = var4.length; - if (aBaseMetaTileEntity.getCoverBehaviorAtSide((byte)1) instanceof GT_Cover_TM_TeslaCoil && scanTime == 0){ - System.out.println("I myself feel quite tesla enabled indeed!"); - } - for (int var6 = 0; var6 < var5; ++var6) { ItemStack tStack = var4[var6]; if (GT_ModHandler.isElectricItem(tStack, this.mTier)) { @@ -119,8 +120,7 @@ public class GT_MetaTileEntity_TeslaCoil extends GT_MetaTileEntity_BasicBatteryB long energyMax = getStoredEnergy()[1]; long energyStored = getStoredEnergy()[0]; - float energyFrac = (float)energyStored/energyMax; - //System.err.println(energyFrac); Debug energy fraction display + float energyFrac = (float) energyStored / energyMax; //ePowerPass hist toggle if (!powerPassToggle && energyFrac > histHigh) { @@ -133,14 +133,12 @@ public class GT_MetaTileEntity_TeslaCoil extends GT_MetaTileEntity_BasicBatteryB scanTime++; if (scanTime >= scanTimeTill) { scanTime = 0; + eTeslaMap.clear(); - scanRadiusTower = 64; //TODO Generate depending on power stored - eTeslaTowerMap.clear(); - - for (int xPosOffset = -scanRadiusTower; xPosOffset <= scanRadiusTower; xPosOffset++) { - for (int yPosOffset = -scanRadiusTower; yPosOffset <= scanRadiusTower; yPosOffset++) { - for (int zPosOffset = -scanRadiusTower; zPosOffset <= scanRadiusTower; zPosOffset++) { - if (xPosOffset == 0 && yPosOffset == 0 && zPosOffset == 0){ + for (int xPosOffset = -scanRadius; xPosOffset <= scanRadius; xPosOffset++) { + for (int yPosOffset = -scanRadius; yPosOffset <= scanRadius; yPosOffset++) { + for (int zPosOffset = -scanRadius; zPosOffset <= scanRadius; zPosOffset++) { + if (xPosOffset == 0 && yPosOffset == 0 && zPosOffset == 0) { continue; } IGregTechTileEntity node = mte.getIGregTechTileEntityOffset(xPosOffset, yPosOffset, zPosOffset); @@ -148,18 +146,14 @@ public class GT_MetaTileEntity_TeslaCoil extends GT_MetaTileEntity_BasicBatteryB continue; } IMetaTileEntity nodeInside = node.getMetaTileEntity(); - if (nodeInside instanceof GT_MetaTileEntity_TM_teslaCoil && node.isActive() || (node.getCoverBehaviorAtSide((byte)1) instanceof GT_Cover_TM_TeslaCoil)){ - eTeslaTowerMap.put(node,(int)Math.ceil(Math.sqrt(xPosOffset*xPosOffset + yPosOffset*yPosOffset + zPosOffset*zPosOffset))); + if (nodeInside instanceof GT_MetaTileEntity_TM_teslaCoil && node.isActive() || (node.getCoverBehaviorAtSide((byte) 1) instanceof GT_Cover_TM_TeslaCoil)) { + eTeslaMap.put(node, (int) Math.ceil(Math.sqrt(xPosOffset * xPosOffset + yPosOffset * yPosOffset + zPosOffset * zPosOffset))); } } } } } - for (Map.Entry Rx : entriesSortedByValues(eTeslaTowerMap)) { - System.out.println("yote @: " + Rx.getValue()); - } - //Stuff to do if ePowerPass if (powerPassToggle) { outputVoltage = 512;//TODO Set Depending On Tier @@ -167,41 +161,45 @@ public class GT_MetaTileEntity_TeslaCoil extends GT_MetaTileEntity_BasicBatteryB outputEuT = outputVoltage * outputCurrent; - long requestedSumEU = 0;//TODO Find a use for requestedSumEU + transferRadiusTower = 32; //TODO generate based on power stored + transferRadiusCover = 16; //TODO generate based on power stored - //Clean the node list SMALL INSTANCE REAPING DOESN'T WORK - for (Map.Entry Rx : entriesSortedByValues(eTeslaTowerMap)) { + //Clean the eTeslaMap + for (Map.Entry Rx : entriesSortedByValues(eTeslaMap)) { IGregTechTileEntity node = Rx.getKey(); - if (node == null) { - eTeslaTowerMap.remove(Rx.getKey()); - System.err.println("Dead Tesla Reaped!"); - continue; - } - IMetaTileEntity nodeInside = node.getMetaTileEntity(); - try { - if (nodeInside instanceof GT_MetaTileEntity_TM_teslaCoil && node.isActive()) { - GT_MetaTileEntity_TM_teslaCoil teslaTower = (GT_MetaTileEntity_TM_teslaCoil) nodeInside; - requestedSumEU += teslaTower.maxEUStore() - teslaTower.getEUVar(); - } else if ((node.getCoverBehaviorAtSide((byte) 1) instanceof GT_Cover_TM_TeslaCoil)) { - requestedSumEU += node.getEUCapacity() - node.getStoredEU(); - } else { - eTeslaTowerMap.remove(Rx.getKey()); - System.err.println("Dead Tesla Reaped!"); + if (node != null) { + IMetaTileEntity nodeInside = node.getMetaTileEntity(); + try { + if (nodeInside instanceof GT_MetaTileEntity_TM_teslaCoil && node.isActive()) { + GT_MetaTileEntity_TM_teslaCoil teslaTower = (GT_MetaTileEntity_TM_teslaCoil) nodeInside; + if (teslaTower.maxEUStore() > 0) { + continue; + } + } else if ((node.getCoverBehaviorAtSide((byte) 1) instanceof GT_Cover_TM_TeslaCoil) && node.getEUCapacity() > 0) { + continue; + } + } catch (Exception e) { } - } catch (Exception e) { - eTeslaTowerMap.remove(Rx.getKey()); - System.err.println("Dead Tesla Reaped!"); } + eTeslaMap.remove(Rx.getKey()); } - for (Map.Entry Rx : entriesSortedByValues(eTeslaTowerMap)) { - GT_MetaTileEntity_TM_teslaCoil nodeInside = (GT_MetaTileEntity_TM_teslaCoil) Rx.getKey().getMetaTileEntity(); - if (!nodeInside.powerPassToggle) { - long euTran = outputVoltage; - if (nodeInside.getEUVar() + euTran <= (nodeInside.maxEUStore() / 2)) { + //Power transfer + for (Map.Entry Rx : entriesSortedByValues(eTeslaMap)) { + IGregTechTileEntity node = Rx.getKey(); + IMetaTileEntity nodeInside = node.getMetaTileEntity(); + long euTran = outputVoltage; + if (nodeInside instanceof GT_MetaTileEntity_TM_teslaCoil && Rx.getValue() <= transferRadiusTower) { + GT_MetaTileEntity_TM_teslaCoil nodeTesla = (GT_MetaTileEntity_TM_teslaCoil) nodeInside; + if (!nodeTesla.powerPassToggle) { + if (nodeTesla.getEUVar() + euTran <= (nodeTesla.maxEUStore() / 2)) { + setEUVar(getEUVar() - euTran); + node.increaseStoredEnergyUnits(euTran, true); + } + } + } else if ((node.getCoverBehaviorAtSide((byte) 1) instanceof GT_Cover_TM_TeslaCoil) && Rx.getValue() <= transferRadiusCover){ + if (node.injectEnergyUnits((byte)6, euTran, 1L) > 0L) { setEUVar(getEUVar() - euTran); - nodeInside.getBaseMetaTileEntity().increaseStoredEnergyUnits(euTran, true); - System.err.println("Energy Sent!"); } } } diff --git a/src/main/resources/assets/tectech/lang/en_US.lang b/src/main/resources/assets/tectech/lang/en_US.lang index 2c748a18d7..f01a74a0a2 100644 --- a/src/main/resources/assets/tectech/lang/en_US.lang +++ b/src/main/resources/assets/tectech/lang/en_US.lang @@ -10,6 +10,7 @@ item.em.parametrizerMemoryCard.name=Parametrizer Memory Card item.em.EuMeterGT.name=GT EU meter item.tm.teslaCoilCover.name=Tesla Coil Cover +item.tm.teslaCoilCoverUltimate=Tesla Coil Cover Rich Edition death.attack.microwaving=%1$s was dehydrated by radiation. death.attack.microwaving.player=%1$s was dehydrated by radiation while fighting %2$s. diff --git a/src/main/resources/assets/tectech/lang/zh_CN.lang b/src/main/resources/assets/tectech/lang/zh_CN.lang index 47912d245d..52ae6c594d 100644 --- a/src/main/resources/assets/tectech/lang/zh_CN.lang +++ b/src/main/resources/assets/tectech/lang/zh_CN.lang @@ -7,6 +7,7 @@ item.em.debugBuilder.name=多方块机器蓝图 item.em.parametrizerMemoryCard.name=参量机记忆卡 item.tm.teslaCoilCover.name=Tesla Coil Cover +item.tm.teslaCoilCoverUltimate=Tesla Coil Cover Rich Edition death.attack.microwaving=%1$s 被辐射脱水 death.attack.microwaving.player=%1$s 在与 %2$s 战斗中被辐射脱水 -- cgit From 0dc8b541ed35b27736d8f62287b0b436f34dc255 Mon Sep 17 00:00:00 2001 From: Bass Date: Sat, 16 Feb 2019 11:19:07 +0000 Subject: Tesla WIP even more Some minor cleanups and fun feature additions :D --- .../tectech/thing/cover/GT_Cover_TM_TeslaCoil.java | 23 +++++++++++++++++++- .../cover/GT_Cover_TM_TeslaCoil_Ultimate.java | 25 ++++++++++++++++++++-- .../multi/GT_MetaTileEntity_TM_teslaCoil.java | 16 +++++--------- .../single/GT_MetaTileEntity_TeslaCoil.java | 10 ++++----- src/main/resources/assets/tectech/lang/en_US.lang | 2 +- src/main/resources/assets/tectech/lang/zh_CN.lang | 3 --- 6 files changed, 55 insertions(+), 24 deletions(-) (limited to 'src/main/resources/assets/tectech') diff --git a/src/main/java/com/github/technus/tectech/thing/cover/GT_Cover_TM_TeslaCoil.java b/src/main/java/com/github/technus/tectech/thing/cover/GT_Cover_TM_TeslaCoil.java index bfb4ae9208..6d7383fe49 100644 --- a/src/main/java/com/github/technus/tectech/thing/cover/GT_Cover_TM_TeslaCoil.java +++ b/src/main/java/com/github/technus/tectech/thing/cover/GT_Cover_TM_TeslaCoil.java @@ -1,8 +1,29 @@ package com.github.technus.tectech.thing.cover; - import gregtech.api.util.GT_CoverBehavior; +import gregtech.api.interfaces.tileentity.ICoverable; +import gregtech.api.util.GT_CoverBehavior; +import gregtech.api.util.GT_Utility; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; + +import static ic2.api.info.Info.DMG_ELECTRIC; public class GT_Cover_TM_TeslaCoil extends GT_CoverBehavior { public GT_Cover_TM_TeslaCoil() { } + + public String getDescription(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity) { + return "Do not attempt to use screwdriver!"; + } + + public boolean letsEnergyIn(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity) { + return true; + } + + public int onCoverScrewdriverclick(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity, EntityPlayer aPlayer, float aX, float aY, float aZ) { + if(aTileEntity.getStoredEU() > 0 && !GT_Utility.isWearingFullElectroHazmat(aPlayer)){ + aPlayer.attackEntityFrom(DMG_ELECTRIC, 20); + } + return aCoverVariable; + } } \ No newline at end of file diff --git a/src/main/java/com/github/technus/tectech/thing/cover/GT_Cover_TM_TeslaCoil_Ultimate.java b/src/main/java/com/github/technus/tectech/thing/cover/GT_Cover_TM_TeslaCoil_Ultimate.java index 7ad6bc6f5f..db7c751fc6 100644 --- a/src/main/java/com/github/technus/tectech/thing/cover/GT_Cover_TM_TeslaCoil_Ultimate.java +++ b/src/main/java/com/github/technus/tectech/thing/cover/GT_Cover_TM_TeslaCoil_Ultimate.java @@ -1,8 +1,29 @@ package com.github.technus.tectech.thing.cover; - import gregtech.api.util.GT_CoverBehavior; +import gregtech.api.interfaces.tileentity.ICoverable; +import net.minecraftforge.fluids.Fluid; -public class GT_Cover_TM_TeslaCoil_Ultimate extends GT_CoverBehavior { +public class GT_Cover_TM_TeslaCoil_Ultimate extends GT_Cover_TM_TeslaCoil { public GT_Cover_TM_TeslaCoil_Ultimate() { } + + public boolean letsEnergyOut(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity) { + return true; + } + + public boolean letsItemsIn(byte aSide, int aCoverID, int aCoverVariable, int aSlot, ICoverable aTileEntity) { + return true; + } + + public boolean letsItemsOut(byte aSide, int aCoverID, int aCoverVariable, int aSlot, ICoverable aTileEntity) { + return true; + } + + public boolean letsFluidIn(byte aSide, int aCoverID, int aCoverVariable, Fluid aFluid, ICoverable aTileEntity) { + return true; + } + + public boolean letsFluidOut(byte aSide, int aCoverID, int aCoverVariable, Fluid aFluid, ICoverable aTileEntity) { + return true; + } } \ No newline at end of file diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java index eca3dde6cb..7dc040b28a 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java @@ -31,10 +31,6 @@ import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.texture import static gregtech.api.GregTech_API.*; import static gregtech.api.enums.GT_Values.E; -/** - * Created by danie_000 on 17.12.2016. - * edited by Bass on like 2018-02-05 - */ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_MultiblockBase_EM implements IConstructable {//TODO Add capacitors private static Textures.BlockIcons.CustomIcon ScreenOFF; private static Textures.BlockIcons.CustomIcon ScreenON; @@ -55,7 +51,7 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock private float histLowLimit = 0.05F; //How low can you configure it? private float histHighLimit = 0.95F; //How high can you configure it? - private int scanRadius = 64; //Tesla scan radius + private int scanRadius = 32; //Tesla scan radius private int transferRadiusTower = 32; //Radius for tower to tower transfers private int transferRadiusTransceiver = 16; //Radius for tower to transceiver transfers @@ -63,7 +59,6 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock private long outputVoltage = 512; //Tesla Voltage Output private long outputCurrent = 1; //Tesla Current Output - private long outputEuT = outputVoltage * outputCurrent; //Tesla Power Output public boolean powerPassToggle = false; //Power Pass for public viewing @@ -384,8 +379,6 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock outputCurrent = outputCurrentParam; } - outputEuT = outputVoltage * outputCurrent; - transferRadiusTower = 32; //TODO generate based on power stored transferRadiusTransceiver = 16; //TODO generate based on power stored transferRadiusCoverUltimate = 16; //TODO generate based on power stored @@ -403,7 +396,7 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock } //Clean the eTeslaMap - for (Map.Entry Rx : entriesSortedByValues(eTeslaMap)) { + for (Map.Entry Rx : eTeslaMap.entrySet()) { IGregTechTileEntity node = Rx.getKey(); if (node != null) { IMetaTileEntity nodeInside = node.getMetaTileEntity(); @@ -424,6 +417,7 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock } catch (Exception e) { } } + System.out.println("Something just got purged!"); eTeslaMap.remove(Rx.getKey()); } @@ -448,8 +442,8 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock setEUVar(getEUVar() - euTran); } } - } else if ((node.getCoverBehaviorAtSide((byte) 1) instanceof GT_Cover_TM_TeslaCoil_Ultimate) && Rx.getValue() <= transferRadiusCoverUltimate){ - if (node.injectEnergyUnits((byte)6, euTran, 1L) > 0L) { + } else if ((node.getCoverBehaviorAtSide((byte)1) instanceof GT_Cover_TM_TeslaCoil_Ultimate) && Rx.getValue() <= transferRadiusCoverUltimate){ + if (node.injectEnergyUnits((byte)1, euTran, 1L) > 0L) { setEUVar(getEUVar() - euTran); } } diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TeslaCoil.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TeslaCoil.java index c556ca2ef6..dd99c0fd75 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TeslaCoil.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TeslaCoil.java @@ -44,7 +44,6 @@ public class GT_MetaTileEntity_TeslaCoil extends GT_MetaTileEntity_BasicBatteryB private long outputVoltage = 512; //Tesla Voltage Output private long outputCurrent = 1; //Tesla Current Output - private long outputEuT = outputVoltage * outputCurrent; //Tesla Power Output public GT_MetaTileEntity_TeslaCoil(int aID, String aName, String aNameRegional, int aTier, int aSlotCount) { @@ -145,13 +144,11 @@ public class GT_MetaTileEntity_TeslaCoil extends GT_MetaTileEntity_BasicBatteryB outputVoltage = 512;//TODO Set Depending On Tier outputCurrent = 1;//TODO Generate depending on count of batteries - outputEuT = outputVoltage * outputCurrent; - transferRadiusTower = 32; //TODO generate based on power stored transferRadiusCover = 16; //TODO generate based on power stored //Clean the eTeslaMap - for (Map.Entry Rx : entriesSortedByValues(eTeslaMap)) { + for (Map.Entry Rx : eTeslaMap.entrySet()) { IGregTechTileEntity node = Rx.getKey(); if (node != null) { IMetaTileEntity nodeInside = node.getMetaTileEntity(); @@ -167,6 +164,7 @@ public class GT_MetaTileEntity_TeslaCoil extends GT_MetaTileEntity_BasicBatteryB } catch (Exception e) { } } + System.out.println("Something just got purged!"); eTeslaMap.remove(Rx.getKey()); } @@ -183,8 +181,8 @@ public class GT_MetaTileEntity_TeslaCoil extends GT_MetaTileEntity_BasicBatteryB node.increaseStoredEnergyUnits(euTran, true); } } - } else if ((node.getCoverBehaviorAtSide((byte) 1) instanceof GT_Cover_TM_TeslaCoil) && Rx.getValue() <= transferRadiusCover){ - if (node.injectEnergyUnits((byte)6, euTran, 1L) > 0L) { + } else if ((node.getCoverBehaviorAtSide((byte)1) instanceof GT_Cover_TM_TeslaCoil) && Rx.getValue() <= transferRadiusCover){ + if (node.injectEnergyUnits((byte)1, euTran, 1L) > 0L) { setEUVar(getEUVar() - euTran); } } diff --git a/src/main/resources/assets/tectech/lang/en_US.lang b/src/main/resources/assets/tectech/lang/en_US.lang index f01a74a0a2..ac36e32772 100644 --- a/src/main/resources/assets/tectech/lang/en_US.lang +++ b/src/main/resources/assets/tectech/lang/en_US.lang @@ -10,7 +10,7 @@ item.em.parametrizerMemoryCard.name=Parametrizer Memory Card item.em.EuMeterGT.name=GT EU meter item.tm.teslaCoilCover.name=Tesla Coil Cover -item.tm.teslaCoilCoverUltimate=Tesla Coil Cover Rich Edition +item.tm.teslaCoilCoverUltimate.name=Tesla Coil Cover Rich Edition death.attack.microwaving=%1$s was dehydrated by radiation. death.attack.microwaving.player=%1$s was dehydrated by radiation while fighting %2$s. diff --git a/src/main/resources/assets/tectech/lang/zh_CN.lang b/src/main/resources/assets/tectech/lang/zh_CN.lang index 52ae6c594d..5359f04e9b 100644 --- a/src/main/resources/assets/tectech/lang/zh_CN.lang +++ b/src/main/resources/assets/tectech/lang/zh_CN.lang @@ -6,9 +6,6 @@ item.em.definitionContainer.name=EM配方指引 item.em.debugBuilder.name=多方块机器蓝图 item.em.parametrizerMemoryCard.name=参量机记忆卡 -item.tm.teslaCoilCover.name=Tesla Coil Cover -item.tm.teslaCoilCoverUltimate=Tesla Coil Cover Rich Edition - death.attack.microwaving=%1$s 被辐射脱水 death.attack.microwaving.player=%1$s 在与 %2$s 战斗中被辐射脱水 -- cgit From ca22cbad23ec40b5ad477260c201a1c842d17916 Mon Sep 17 00:00:00 2001 From: Bass Date: Mon, 18 Feb 2019 15:49:36 +0000 Subject: Tesla Capacitors Adding me some Tesla capacitors, additionally cleaned the Tesla covers to not require a bunch of trash. --- .../technus/tectech/loader/thing/ThingsLoader.java | 5 +++ .../tectech/thing/item/TeslaCoilCapacitor.java | 37 ++++++++++++++++++++++ .../technus/tectech/thing/item/TeslaCoilCover.java | 16 ---------- .../tectech/thing/item/TeslaCoilCoverUltimate.java | 1 - src/main/resources/assets/tectech/lang/en_US.lang | 11 +++++++ 5 files changed, 53 insertions(+), 17 deletions(-) create mode 100644 src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCapacitor.java (limited to 'src/main/resources/assets/tectech') diff --git a/src/main/java/com/github/technus/tectech/loader/thing/ThingsLoader.java b/src/main/java/com/github/technus/tectech/loader/thing/ThingsLoader.java index 6951ef6533..8381670a47 100644 --- a/src/main/java/com/github/technus/tectech/loader/thing/ThingsLoader.java +++ b/src/main/java/com/github/technus/tectech/loader/thing/ThingsLoader.java @@ -62,6 +62,11 @@ public class ThingsLoader implements Runnable { ParametrizerMemoryCard.run(); ElementalDefinitionScanStorage_EM.run(); EuMeterGT.run(); + + for(int i=1;i <= 8; i++){ + TeslaCoilCapacitor.run(i);//TODO Verify the category of capacitors! + } + TecTech.LOGGER.info("Useful Items registered"); ElementalDefinitionContainer_EM.run(); diff --git a/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCapacitor.java b/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCapacitor.java new file mode 100644 index 0000000000..1dbeab093f --- /dev/null +++ b/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCapacitor.java @@ -0,0 +1,37 @@ +package com.github.technus.tectech.thing.item; + +import com.github.technus.tectech.CommonValues; +import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; + +import java.util.List; + +import static com.github.technus.tectech.CommonValues.VN; +import static com.github.technus.tectech.Reference.MODID; + + +public final class TeslaCoilCapacitor extends Item { + public static TeslaCoilCapacitor INSTANCE; + + public TeslaCoilCapacitor(int capTier) { + setUnlocalizedName("tm.teslaCoilCapacitor_" + capTier); + setTextureName(MODID + ":itemParametrizerMemoryCardUnlocked"); + } + + @Override + public void addInformation(ItemStack aStack, EntityPlayer ep, List aList, boolean boo) { + aList.add(CommonValues.BASS_MARK); + aList.add("I IDENTIFY AS A: " + VN[Integer.parseInt(getUnlocalizedName(aStack).replaceAll("[^0-9]", ""))]); + aList.add("Stores energy for tesla towers!"); + aList.add(EnumChatFormatting.BLUE + "Insert into a Capacitor hatch of a Tesla Tower"); + aList.add(EnumChatFormatting.BLUE + "Capacitors are the same thing as batteries, right?"); + } + + public static void run(int capTier) { + INSTANCE = new TeslaCoilCapacitor(capTier); + GameRegistry.registerItem(INSTANCE, INSTANCE.getUnlocalizedName()); + } +} diff --git a/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCover.java b/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCover.java index abf1bd90a0..8f2dfc0951 100644 --- a/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCover.java +++ b/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCover.java @@ -1,30 +1,15 @@ package com.github.technus.tectech.thing.item; import com.github.technus.tectech.CommonValues; -import com.github.technus.tectech.Util; -import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_Param; -import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM; import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import gregtech.api.interfaces.metatileentity.IMetaTileEntity; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.IIcon; -import net.minecraft.world.World; import java.util.List; import static com.github.technus.tectech.Reference.MODID; -import static com.github.technus.tectech.thing.CustomItemList.parametrizerMemory; public final class TeslaCoilCover extends Item { @@ -45,7 +30,6 @@ public final class TeslaCoilCover extends Item { public static void run() { INSTANCE = new TeslaCoilCover(); - System.out.print(INSTANCE.getUnlocalizedName()); GameRegistry.registerItem(INSTANCE, INSTANCE.getUnlocalizedName()); } } diff --git a/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCoverUltimate.java b/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCoverUltimate.java index 115f3a34c6..ca6734f8d6 100644 --- a/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCoverUltimate.java +++ b/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCoverUltimate.java @@ -30,7 +30,6 @@ public final class TeslaCoilCoverUltimate extends Item { public static void run() { INSTANCE = new TeslaCoilCoverUltimate(); - System.out.print(INSTANCE.getUnlocalizedName()); GameRegistry.registerItem(INSTANCE, INSTANCE.getUnlocalizedName()); } } diff --git a/src/main/resources/assets/tectech/lang/en_US.lang b/src/main/resources/assets/tectech/lang/en_US.lang index ac36e32772..cf0db4b7bf 100644 --- a/src/main/resources/assets/tectech/lang/en_US.lang +++ b/src/main/resources/assets/tectech/lang/en_US.lang @@ -12,6 +12,17 @@ item.em.EuMeterGT.name=GT EU meter item.tm.teslaCoilCover.name=Tesla Coil Cover item.tm.teslaCoilCoverUltimate.name=Tesla Coil Cover Rich Edition +//TODO Improve names of everything involved with tesla + +item.tm.teslaCoilCapacitor_1.name=LV Tesla Capacitor +item.tm.teslaCoilCapacitor_2.name=MV Tesla Capacitor +item.tm.teslaCoilCapacitor_3.name=HV Tesla Capacitor +item.tm.teslaCoilCapacitor_4.name=EV Tesla Capacitor +item.tm.teslaCoilCapacitor_5.name=IV Tesla Capacitor +item.tm.teslaCoilCapacitor_6.name=LuV Tesla Capacitor +item.tm.teslaCoilCapacitor_7.name=ZPM Tesla Capacitor +item.tm.teslaCoilCapacitor_8.name=UV Tesla Capacitor + death.attack.microwaving=%1$s was dehydrated by radiation. death.attack.microwaving.player=%1$s was dehydrated by radiation while fighting %2$s. -- cgit From 1e002770e5333e1b90a05bf65c84f84bfdae118e Mon Sep 17 00:00:00 2001 From: basdxz Date: Fri, 8 Mar 2019 12:35:24 +0000 Subject: Tesla Capacitor Item Redone Tesla capacitors now use meta ids with different unlocalized names unlike before --- .../technus/tectech/loader/thing/ThingsLoader.java | 5 +- .../tectech/thing/item/TeslaCoilCapacitor.java | 98 ++++++++++++++++++++-- .../hatch/GT_MetaTileEntity_Hatch_Capacitor.java | 10 +-- src/main/resources/assets/tectech/lang/en_US.lang | 11 --- 4 files changed, 97 insertions(+), 27 deletions(-) (limited to 'src/main/resources/assets/tectech') diff --git a/src/main/java/com/github/technus/tectech/loader/thing/ThingsLoader.java b/src/main/java/com/github/technus/tectech/loader/thing/ThingsLoader.java index 8381670a47..a0ce184c4e 100644 --- a/src/main/java/com/github/technus/tectech/loader/thing/ThingsLoader.java +++ b/src/main/java/com/github/technus/tectech/loader/thing/ThingsLoader.java @@ -63,9 +63,8 @@ public class ThingsLoader implements Runnable { ElementalDefinitionScanStorage_EM.run(); EuMeterGT.run(); - for(int i=1;i <= 8; i++){ - TeslaCoilCapacitor.run(i);//TODO Verify the category of capacitors! - } + + TeslaCoilCapacitor.run(); TecTech.LOGGER.info("Useful Items registered"); diff --git a/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCapacitor.java b/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCapacitor.java index 1dbeab093f..1755ad05fb 100644 --- a/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCapacitor.java +++ b/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCapacitor.java @@ -2,10 +2,16 @@ package com.github.technus.tectech.thing.item; import com.github.technus.tectech.CommonValues; import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import gregtech.api.util.GT_LanguageManager; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.IIcon; import java.util.List; @@ -15,23 +21,103 @@ import static com.github.technus.tectech.Reference.MODID; public final class TeslaCoilCapacitor extends Item { public static TeslaCoilCapacitor INSTANCE; + public static IIcon LVicon, MVicon, HVicon, EVicon, IVicon, LuVicon, ZPMicon, UVicon; - public TeslaCoilCapacitor(int capTier) { - setUnlocalizedName("tm.teslaCoilCapacitor_" + capTier); + public TeslaCoilCapacitor() { + setUnlocalizedName("tm.teslaCoilCapacitor"); setTextureName(MODID + ":itemParametrizerMemoryCardUnlocked"); + + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "LV Tesla Capacitor"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "MV Tesla Capacitor"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "HV Tesla Capacitor"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "EV Tesla Capacitor"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "IV Tesla Capacitor"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "LuV Tesla Capacitor"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "ZPM Tesla Capacitor"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "UV Tesla Capacitor"); } @Override public void addInformation(ItemStack aStack, EntityPlayer ep, List aList, boolean boo) { aList.add(CommonValues.BASS_MARK); - aList.add("I IDENTIFY AS A: " + VN[Integer.parseInt(getUnlocalizedName(aStack).replaceAll("[^0-9]", ""))]); - aList.add("Stores energy for tesla towers!"); + switch (aStack.getItemDamage()) { + case 1://"MV" + aList.add("Stores energy for tesla towers! (MV)"); + break; + case 2://"HV" + aList.add("Stores energy for tesla towers! (HV)"); + break; + case 3://"EV" + aList.add("Stores energy for tesla towers! (EV)"); + break; + case 4://"IV" + aList.add("Stores energy for tesla towers! (IV)"); + break; + case 5://"LuV" + aList.add("Stores energy for tesla towers! (LuV)"); + break; + case 6://"ZPM" + aList.add("Stores energy for tesla towers! (ZPM)"); + break; + case 7://"UV" + aList.add("Stores energy for tesla towers! (UV)"); + break; + default://"LV" + aList.add("Stores energy for tesla towers! (LV)"); + break; + } aList.add(EnumChatFormatting.BLUE + "Insert into a Capacitor hatch of a Tesla Tower"); aList.add(EnumChatFormatting.BLUE + "Capacitors are the same thing as batteries, right?"); } - public static void run(int capTier) { - INSTANCE = new TeslaCoilCapacitor(capTier); + @Override + public String getUnlocalizedName(ItemStack aStack) { + return getUnlocalizedName() + "." + getDamage(aStack); + } + + public static void run() { + INSTANCE = new TeslaCoilCapacitor(); GameRegistry.registerItem(INSTANCE, INSTANCE.getUnlocalizedName()); } + + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister iconRegister) { + LVicon = itemIcon = iconRegister.registerIcon(getIconString()); + MVicon = iconRegister.registerIcon(MODID + ":itemParametrizerMemoryCardLocked"); + HVicon = iconRegister.registerIcon(MODID + ":itemParametrizerMemoryCardLocked"); + EVicon = iconRegister.registerIcon(MODID + ":itemParametrizerMemoryCardLocked"); + IVicon = iconRegister.registerIcon(MODID + ":itemParametrizerMemoryCardLocked"); + LuVicon = iconRegister.registerIcon(MODID + ":itemParametrizerMemoryCardLocked"); + ZPMicon = iconRegister.registerIcon(MODID + ":itemParametrizerMemoryCardLocked"); + UVicon = iconRegister.registerIcon(MODID + ":itemParametrizerMemoryCardLocked"); + } + + @Override + public IIcon getIconFromDamage(int damage) { + switch (damage) { + case 1: + return MVicon; + case 2: + return HVicon; + case 3: + return EVicon; + case 4: + return IVicon; + case 5: + return LuVicon; + case 6: + return ZPMicon; + case 7: + return UVicon; + default: + return LVicon; + } + } + + public void getSubItems(Item aItem, CreativeTabs par2CreativeTabs, List aList) { + for (int i = 0; i <= 7; i++) { + aList.add(new ItemStack(aItem, 1, i)); + } + } } diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Capacitor.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Capacitor.java index 2aae2b8c2b..61062f22ca 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Capacitor.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Capacitor.java @@ -102,20 +102,16 @@ public class GT_MetaTileEntity_Hatch_Capacitor extends GT_MetaTileEntity_Hatch { if (aBaseMetaTileEntity.isClientSide()) { return true; } - //if(aBaseMetaTileEntity.isActive()) - // aPlayer.addChatComponentMessage(new ChatComponentText("It is still active...")); - //else if(heat>0) - // aPlayer.addChatComponentMessage(new ChatComponentText("It is still warm...")); - //else aBaseMetaTileEntity.openGUI(aPlayer); return true; } @Override - public int getInventoryStackLimit() { - return 1; + public int getSizeInventory() {//HACK TO NOT DROP CONTENTS!!! + return energyStoredFrac >= 0.25 || getBaseMetaTileEntity().isActive() ? 0 : mInventory.length; } + @Override public String[] getDescription() { return new String[]{ diff --git a/src/main/resources/assets/tectech/lang/en_US.lang b/src/main/resources/assets/tectech/lang/en_US.lang index cf0db4b7bf..ac36e32772 100644 --- a/src/main/resources/assets/tectech/lang/en_US.lang +++ b/src/main/resources/assets/tectech/lang/en_US.lang @@ -12,17 +12,6 @@ item.em.EuMeterGT.name=GT EU meter item.tm.teslaCoilCover.name=Tesla Coil Cover item.tm.teslaCoilCoverUltimate.name=Tesla Coil Cover Rich Edition -//TODO Improve names of everything involved with tesla - -item.tm.teslaCoilCapacitor_1.name=LV Tesla Capacitor -item.tm.teslaCoilCapacitor_2.name=MV Tesla Capacitor -item.tm.teslaCoilCapacitor_3.name=HV Tesla Capacitor -item.tm.teslaCoilCapacitor_4.name=EV Tesla Capacitor -item.tm.teslaCoilCapacitor_5.name=IV Tesla Capacitor -item.tm.teslaCoilCapacitor_6.name=LuV Tesla Capacitor -item.tm.teslaCoilCapacitor_7.name=ZPM Tesla Capacitor -item.tm.teslaCoilCapacitor_8.name=UV Tesla Capacitor - death.attack.microwaving=%1$s was dehydrated by radiation. death.attack.microwaving.player=%1$s was dehydrated by radiation while fighting %2$s. -- cgit From 49f612485d2f4a61f182f9a264a891436bd1c71d Mon Sep 17 00:00:00 2001 From: Bass Date: Tue, 23 Jul 2019 00:35:00 +0100 Subject: Capacitor Textures --- .../technus/tectech/thing/item/TeslaCoilCapacitor.java | 10 +++++----- .../assets/tectech/textures/items/itemCapacitorEV.png | Bin 0 -> 575 bytes .../assets/tectech/textures/items/itemCapacitorHV.png | Bin 0 -> 581 bytes .../assets/tectech/textures/items/itemCapacitorIV.png | Bin 0 -> 583 bytes .../assets/tectech/textures/items/itemCapacitorLV.png | Bin 0 -> 577 bytes .../assets/tectech/textures/items/itemCapacitorMV.png | Bin 0 -> 561 bytes 6 files changed, 5 insertions(+), 5 deletions(-) create mode 100644 src/main/resources/assets/tectech/textures/items/itemCapacitorEV.png create mode 100644 src/main/resources/assets/tectech/textures/items/itemCapacitorHV.png create mode 100644 src/main/resources/assets/tectech/textures/items/itemCapacitorIV.png create mode 100644 src/main/resources/assets/tectech/textures/items/itemCapacitorLV.png create mode 100644 src/main/resources/assets/tectech/textures/items/itemCapacitorMV.png (limited to 'src/main/resources/assets/tectech') diff --git a/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCapacitor.java b/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCapacitor.java index e09fe79d6c..110c4f7aa7 100644 --- a/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCapacitor.java +++ b/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCapacitor.java @@ -24,7 +24,7 @@ public final class TeslaCoilCapacitor extends Item { public TeslaCoilCapacitor() { setUnlocalizedName("tm.teslaCoilCapacitor"); - setTextureName(MODID + ":itemParametrizerMemoryCardUnlocked"); + setTextureName(MODID + ":itemCapacitorLV"); GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "LV Tesla Capacitor"); GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "MV Tesla Capacitor"); @@ -74,10 +74,10 @@ public final class TeslaCoilCapacitor extends Item { @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister iconRegister) { LVicon = itemIcon = iconRegister.registerIcon(getIconString()); - MVicon = iconRegister.registerIcon(MODID + ":itemParametrizerMemoryCardLocked"); - HVicon = iconRegister.registerIcon(MODID + ":itemParametrizerMemoryCardLocked"); - EVicon = iconRegister.registerIcon(MODID + ":itemParametrizerMemoryCardLocked"); - IVicon = iconRegister.registerIcon(MODID + ":itemParametrizerMemoryCardLocked"); + MVicon = iconRegister.registerIcon(MODID + ":itemCapacitorMV"); + HVicon = iconRegister.registerIcon(MODID + ":itemCapacitorHV"); + EVicon = iconRegister.registerIcon(MODID + ":itemCapacitorEV"); + IVicon = iconRegister.registerIcon(MODID + ":itemCapacitorIV"); } @Override diff --git a/src/main/resources/assets/tectech/textures/items/itemCapacitorEV.png b/src/main/resources/assets/tectech/textures/items/itemCapacitorEV.png new file mode 100644 index 0000000000..124188d3bd Binary files /dev/null and b/src/main/resources/assets/tectech/textures/items/itemCapacitorEV.png differ diff --git a/src/main/resources/assets/tectech/textures/items/itemCapacitorHV.png b/src/main/resources/assets/tectech/textures/items/itemCapacitorHV.png new file mode 100644 index 0000000000..3500d8f6cb Binary files /dev/null and b/src/main/resources/assets/tectech/textures/items/itemCapacitorHV.png differ diff --git a/src/main/resources/assets/tectech/textures/items/itemCapacitorIV.png b/src/main/resources/assets/tectech/textures/items/itemCapacitorIV.png new file mode 100644 index 0000000000..028f8a467e Binary files /dev/null and b/src/main/resources/assets/tectech/textures/items/itemCapacitorIV.png differ diff --git a/src/main/resources/assets/tectech/textures/items/itemCapacitorLV.png b/src/main/resources/assets/tectech/textures/items/itemCapacitorLV.png new file mode 100644 index 0000000000..13d1d0667e Binary files /dev/null and b/src/main/resources/assets/tectech/textures/items/itemCapacitorLV.png differ diff --git a/src/main/resources/assets/tectech/textures/items/itemCapacitorMV.png b/src/main/resources/assets/tectech/textures/items/itemCapacitorMV.png new file mode 100644 index 0000000000..fc364e52c3 Binary files /dev/null and b/src/main/resources/assets/tectech/textures/items/itemCapacitorMV.png differ -- cgit From 52ad4cda52bdf86235d35efc02a523adbf6a2cb4 Mon Sep 17 00:00:00 2001 From: Bass Date: Tue, 23 Jul 2019 22:48:46 +0100 Subject: Tesla Cover Textures Better-ed --- .../technus/tectech/thing/item/TeslaCoilCover.java | 2 +- .../tectech/thing/item/TeslaCoilCoverUltimate.java | 2 +- .../gregtech/textures/blocks/iconsets/TESLA_COVER.png | Bin 766 -> 808 bytes .../textures/blocks/iconsets/TESLA_COVER_ULTIMATE.png | Bin 768 -> 799 bytes .../assets/tectech/textures/items/itemTeslaCover.png | Bin 0 -> 451 bytes .../tectech/textures/items/itemTeslaCoverUltimate.png | Bin 0 -> 472 bytes 6 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 src/main/resources/assets/tectech/textures/items/itemTeslaCover.png create mode 100644 src/main/resources/assets/tectech/textures/items/itemTeslaCoverUltimate.png (limited to 'src/main/resources/assets/tectech') diff --git a/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCover.java b/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCover.java index 8f2dfc0951..d789f9d7f5 100644 --- a/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCover.java +++ b/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCover.java @@ -17,7 +17,7 @@ public final class TeslaCoilCover extends Item { public TeslaCoilCover() { setUnlocalizedName("tm.teslaCoilCover"); - setTextureName(MODID + ":itemParametrizerMemoryCardUnlocked"); + setTextureName(MODID + ":itemTeslaCover"); } @Override diff --git a/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCoverUltimate.java b/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCoverUltimate.java index ca6734f8d6..a85a3b2f1a 100644 --- a/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCoverUltimate.java +++ b/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCoverUltimate.java @@ -17,7 +17,7 @@ public final class TeslaCoilCoverUltimate extends Item { public TeslaCoilCoverUltimate() { setUnlocalizedName("tm.teslaCoilCoverUltimate"); - setTextureName(MODID + ":itemParametrizerMemoryCardUnlocked"); + setTextureName(MODID + ":itemTeslaCoverUltimate"); } @Override diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/TESLA_COVER.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/TESLA_COVER.png index 48fd00be12..fc16be01b0 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/TESLA_COVER.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/TESLA_COVER.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/TESLA_COVER_ULTIMATE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/TESLA_COVER_ULTIMATE.png index 60a40684de..5acfa08654 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/TESLA_COVER_ULTIMATE.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/TESLA_COVER_ULTIMATE.png differ diff --git a/src/main/resources/assets/tectech/textures/items/itemTeslaCover.png b/src/main/resources/assets/tectech/textures/items/itemTeslaCover.png new file mode 100644 index 0000000000..f3688b33b8 Binary files /dev/null and b/src/main/resources/assets/tectech/textures/items/itemTeslaCover.png differ diff --git a/src/main/resources/assets/tectech/textures/items/itemTeslaCoverUltimate.png b/src/main/resources/assets/tectech/textures/items/itemTeslaCoverUltimate.png new file mode 100644 index 0000000000..e346fc2236 Binary files /dev/null and b/src/main/resources/assets/tectech/textures/items/itemTeslaCoverUltimate.png differ -- cgit From 32222a152686e1fb8ce65c9436b25640845080a8 Mon Sep 17 00:00:00 2001 From: Bass Date: Wed, 21 Aug 2019 12:30:22 +0100 Subject: Tesla Cover Item Refactor --- .../technus/tectech/loader/thing/CoverLoader.java | 7 ++- .../technus/tectech/loader/thing/ThingsLoader.java | 8 +--- .../technus/tectech/thing/CustomItemList.java | 2 +- .../tectech/thing/item/ParametrizerMemoryCard.java | 40 ++++++++-------- .../tectech/thing/item/TeslaCoilCapacitor.java | 8 +++- .../technus/tectech/thing/item/TeslaCoilCover.java | 53 +++++++++++++++++++++- .../tectech/thing/item/TeslaCoilCoverUltimate.java | 35 -------------- src/main/resources/assets/tectech/lang/en_US.lang | 3 -- 8 files changed, 81 insertions(+), 75 deletions(-) delete mode 100644 src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCoverUltimate.java (limited to 'src/main/resources/assets/tectech') diff --git a/src/main/java/com/github/technus/tectech/loader/thing/CoverLoader.java b/src/main/java/com/github/technus/tectech/loader/thing/CoverLoader.java index e87ac69f2a..d7e9a21a67 100644 --- a/src/main/java/com/github/technus/tectech/loader/thing/CoverLoader.java +++ b/src/main/java/com/github/technus/tectech/loader/thing/CoverLoader.java @@ -4,7 +4,6 @@ import com.github.technus.tectech.TecTech; import com.github.technus.tectech.thing.cover.GT_Cover_TM_TeslaCoil; import com.github.technus.tectech.thing.cover.GT_Cover_TM_TeslaCoil_Ultimate; import com.github.technus.tectech.thing.item.TeslaCoilCover; -import com.github.technus.tectech.thing.item.TeslaCoilCoverUltimate; import gregtech.api.GregTech_API; import gregtech.api.enums.Textures; import gregtech.api.interfaces.IIconContainer; @@ -14,12 +13,12 @@ import net.minecraft.item.ItemStack; public class CoverLoader implements Runnable { - public void run(){ + public void run() { final IIconContainer TESLA_OVERLAY = new Textures.BlockIcons.CustomIcon("iconsets/TESLA_OVERLAY"); final IIconContainer TESLA_OVERLAY_ULTIMATE = new Textures.BlockIcons.CustomIcon("iconsets/TESLA_OVERLAY_ULTIMATE"); - GregTech_API.registerCover(new ItemStack(TeslaCoilCover.INSTANCE, 1), new GT_RenderedTexture(TESLA_OVERLAY), new GT_Cover_TM_TeslaCoil()); - GregTech_API.registerCover(new ItemStack(TeslaCoilCoverUltimate.INSTANCE, 1), new GT_RenderedTexture(TESLA_OVERLAY_ULTIMATE), new GT_Cover_TM_TeslaCoil_Ultimate()); + GregTech_API.registerCover(new ItemStack(TeslaCoilCover.INSTANCE, 1, 0), new GT_RenderedTexture(TESLA_OVERLAY), new GT_Cover_TM_TeslaCoil()); + GregTech_API.registerCover(new ItemStack(TeslaCoilCover.INSTANCE, 1, 1), new GT_RenderedTexture(TESLA_OVERLAY_ULTIMATE), new GT_Cover_TM_TeslaCoil_Ultimate()); TecTech.LOGGER.info("Cover functionality registered"); } } diff --git a/src/main/java/com/github/technus/tectech/loader/thing/ThingsLoader.java b/src/main/java/com/github/technus/tectech/loader/thing/ThingsLoader.java index 13d8861d31..6a12c640f3 100644 --- a/src/main/java/com/github/technus/tectech/loader/thing/ThingsLoader.java +++ b/src/main/java/com/github/technus/tectech/loader/thing/ThingsLoader.java @@ -52,19 +52,13 @@ public class ThingsLoader implements Runnable { ReactorSimBlock.run(); TecTech.LOGGER.info("Reactor Simulator registered"); - TeslaCoilCover.run(); - TeslaCoilCoverUltimate.run(); - TecTech.LOGGER.info("Covers Items registered"); - ConstructableTriggerItem.run(); FrontRotationTriggerItem.run(); ParametrizerMemoryCard.run(); ElementalDefinitionScanStorage_EM.run(); EuMeterGT.run(); - - + TeslaCoilCover.run(); TeslaCoilCapacitor.run(); - TecTech.LOGGER.info("Useful Items registered"); ElementalDefinitionContainer_EM.run(); diff --git a/src/main/java/com/github/technus/tectech/thing/CustomItemList.java b/src/main/java/com/github/technus/tectech/thing/CustomItemList.java index fdbda7ecd5..8bbb8fd4ce 100644 --- a/src/main/java/com/github/technus/tectech/thing/CustomItemList.java +++ b/src/main/java/com/github/technus/tectech/thing/CustomItemList.java @@ -92,7 +92,7 @@ public enum CustomItemList implements IItemContainer { Machine_Multi_BHG, hint_0,hint_1,hint_2,hint_3,hint_4,hint_5,hint_6,hint_7,hint_8,hint_9,hint_10,hint_11, hint_general,hint_air,hint_noAir,hint_error, - scanContainer,parametrizerMemory, + scanContainer,parametrizerMemory,teslaCapacitor,teslaCoilCover, Machine_TeslaCoil_LV_1A, Machine_TeslaCoil_MV_1A, Machine_TeslaCoil_HV_1A, Machine_TeslaCoil_EV_1A, Machine_TeslaCoil_IV_1A, Machine_TeslaCoil_LV_4A, Machine_TeslaCoil_MV_4A, Machine_TeslaCoil_HV_4A, Machine_TeslaCoil_EV_4A, Machine_TeslaCoil_IV_4A, diff --git a/src/main/java/com/github/technus/tectech/thing/item/ParametrizerMemoryCard.java b/src/main/java/com/github/technus/tectech/thing/item/ParametrizerMemoryCard.java index dafc425163..611fba6376 100644 --- a/src/main/java/com/github/technus/tectech/thing/item/ParametrizerMemoryCard.java +++ b/src/main/java/com/github/technus/tectech/thing/item/ParametrizerMemoryCard.java @@ -31,11 +31,10 @@ import static com.github.technus.tectech.thing.CustomItemList.parametrizerMemory */ public final class ParametrizerMemoryCard extends Item { public static ParametrizerMemoryCard INSTANCE; - public static IIcon locked,unlocked; + private static IIcon locked, unlocked; private ParametrizerMemoryCard() { setMaxStackSize(1); - setHasSubtypes(true); setUnlocalizedName("em.parametrizerMemoryCard"); setTextureName(MODID + ":itemParametrizerMemoryCardUnlocked"); } @@ -66,13 +65,13 @@ public final class ParametrizerMemoryCard extends Item { tNBT.setDouble("value1D", parametrizer.value1D); } return true; - }else if(metaTE instanceof GT_MetaTileEntity_MultiblockBase_EM){ + } else if (metaTE instanceof GT_MetaTileEntity_MultiblockBase_EM) { GT_MetaTileEntity_MultiblockBase_EM base = (GT_MetaTileEntity_MultiblockBase_EM) metaTE; if (aStack.getTagCompound() == null) { aStack.setTagCompound(new NBTTagCompound()); } NBTTagCompound tNBT = aStack.getTagCompound(); - if(aStack.getItemDamage()== 1){ + if (aStack.getItemDamage() == 1) { base.parametrization.trySetParameters( tNBT.getInteger("param"), tNBT.getDouble("value0D"), @@ -90,9 +89,9 @@ public final class ParametrizerMemoryCard extends Item { public ItemStack onItemRightClick(ItemStack aStack, World aWorld, EntityPlayer aPlayer) { if (aPlayer instanceof EntityPlayerMP && aPlayer.isSneaking()) { aStack.stackSize = 1; - if(aStack.getItemDamage()==1) { + if (aStack.getItemDamage() == 1) { aStack.setItemDamage(0); - }else{ + } else { aStack.setItemDamage(1); } return aStack; @@ -106,23 +105,23 @@ public final class ParametrizerMemoryCard extends Item { aList.add(CommonValues.BASS_MARK); aList.add("Stores Parameters"); - if(aStack.getItemDamage()==1) { + if (aStack.getItemDamage() == 1) { aList.add(EnumChatFormatting.BLUE + "Use on Parametrizer/Controller to configure it"); - }else{ + } else { aList.add(EnumChatFormatting.BLUE + "Use on Parametrizer to store parameters"); } aList.add(EnumChatFormatting.BLUE + "Sneak right click to lock/unlock"); long temp; - if(tNBT!=null && tNBT.hasKey("param")) { - aList.add("Hatch ID: "+EnumChatFormatting.AQUA + tNBT.getInteger("param")); - temp=tNBT.getInteger("value0D"); - aList.add("Value 0D: "+EnumChatFormatting.AQUA + temp); - aList.add("Value 0B: "+EnumChatFormatting.AQUA + Util.longBitsToShortString(Double.doubleToLongBits(temp))); - temp=tNBT.getInteger("value1D"); - aList.add("Value 1D: "+EnumChatFormatting.AQUA + temp); - aList.add("Value 1B: "+EnumChatFormatting.AQUA + Util.longBitsToShortString(Double.doubleToLongBits(temp))); - aList.add("Uses Floats: "+(tNBT.getBoolean("usesFloats")?EnumChatFormatting.GREEN+"TRUE":EnumChatFormatting.RED+"FALSE")); + if (tNBT != null && tNBT.hasKey("param")) { + aList.add("Hatch ID: " + EnumChatFormatting.AQUA + tNBT.getInteger("param")); + temp = tNBT.getInteger("value0D"); + aList.add("Value 0D: " + EnumChatFormatting.AQUA + temp); + aList.add("Value 0B: " + EnumChatFormatting.AQUA + Util.longBitsToShortString(Double.doubleToLongBits(temp))); + temp = tNBT.getInteger("value1D"); + aList.add("Value 1D: " + EnumChatFormatting.AQUA + temp); + aList.add("Value 1B: " + EnumChatFormatting.AQUA + Util.longBitsToShortString(Double.doubleToLongBits(temp))); + aList.add("Uses Floats: " + (tNBT.getBoolean("usesFloats") ? EnumChatFormatting.GREEN + "TRUE" : EnumChatFormatting.RED + "FALSE")); } } @@ -136,17 +135,16 @@ public final class ParametrizerMemoryCard extends Item { @Override @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister iconRegister) { - locked =iconRegister.registerIcon(MODID + ":itemParametrizerMemoryCardLocked"); + locked = iconRegister.registerIcon(MODID + ":itemParametrizerMemoryCardLocked"); unlocked = itemIcon = iconRegister.registerIcon(getIconString()); } @Override public IIcon getIconFromDamage(int damage) { - if(damage==1) { + if (damage == 1) { return locked; - }else{ - return unlocked; } + return unlocked; } @Override diff --git a/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCapacitor.java b/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCapacitor.java index 22c6fe335b..13b7f311d2 100644 --- a/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCapacitor.java +++ b/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCapacitor.java @@ -17,6 +17,7 @@ import java.util.List; import static com.github.technus.tectech.CommonValues.V; import static com.github.technus.tectech.Reference.MODID; +import static com.github.technus.tectech.thing.CustomItemList.teslaCapacitor; public final class TeslaCoilCapacitor extends Item { @@ -24,6 +25,7 @@ public final class TeslaCoilCapacitor extends Item { private static IIcon LVicon, MVicon, HVicon, EVicon, IVicon; private TeslaCoilCapacitor() { + setHasSubtypes(true); setUnlocalizedName("tm.teslaCoilCapacitor"); setTextureName(MODID + ":itemCapacitorLV"); @@ -37,8 +39,8 @@ public final class TeslaCoilCapacitor extends Item { @Override public void addInformation(ItemStack aStack, EntityPlayer ep, List aList, boolean boo) { aList.add(CommonValues.BASS_MARK); - if (aStack.getItemDamage() >= 0 && aStack.getItemDamage() <= 4){ - aList.add("Stores " + V[aStack.getItemDamage()+1]*512 + " EU in a tesla tower at " + V[aStack.getItemDamage()+1] +" EU/t"); + if (aStack.getItemDamage() >= 0 && aStack.getItemDamage() <= 4) { + aList.add("Stores " + V[aStack.getItemDamage() + 1] * 512 + " EU in a tesla tower at " + V[aStack.getItemDamage() + 1] + " EU/t"); } else { aList.add("Yeet this broken item into some spicy water!"); } @@ -54,6 +56,7 @@ public final class TeslaCoilCapacitor extends Item { public static void run() { INSTANCE = new TeslaCoilCapacitor(); GameRegistry.registerItem(INSTANCE, INSTANCE.getUnlocalizedName()); + teslaCapacitor.set(INSTANCE); } @Override @@ -82,6 +85,7 @@ public final class TeslaCoilCapacitor extends Item { } } + @Override public void getSubItems(Item aItem, CreativeTabs par2CreativeTabs, List aList) { for (int i = 0; i <= 4; i++) { aList.add(new ItemStack(aItem, 1, i)); diff --git a/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCover.java b/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCover.java index 64ba2de78e..82f71ec9c6 100644 --- a/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCover.java +++ b/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCover.java @@ -2,34 +2,83 @@ package com.github.technus.tectech.thing.item; import com.github.technus.tectech.CommonValues; import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import gregtech.api.util.GT_LanguageManager; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.IIcon; import java.util.List; import static com.github.technus.tectech.Reference.MODID; +import static com.github.technus.tectech.thing.CustomItemList.teslaCoilCover; public final class TeslaCoilCover extends Item { public static TeslaCoilCover INSTANCE; + private static IIcon ultItemIcon; - public TeslaCoilCover() { + private TeslaCoilCover() { + setHasSubtypes(true); setUnlocalizedName("tm.teslaCoilCover"); setTextureName(MODID + ":itemTeslaCover"); + + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Tesla Coil Cover"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "Tesla Coil Cover Rich Edition"); } @Override public void addInformation(ItemStack aStack, EntityPlayer ep, List aList, boolean boo) { aList.add(CommonValues.BASS_MARK); - aList.add("Tesla-Enables Machines!"); + switch (aStack.getItemDamage()) { + case 0: + aList.add("Tesla-Enables Machines!"); + break; + case 1: + aList.add("Tesla-Enables Machines! (BUT LOUDER!!)"); + break; + default: + aList.add("Yeet this broken item into some spicy water!"); + break; + } aList.add(EnumChatFormatting.BLUE + "Use on top of a machine to enable Tesla capabilities"); aList.add(EnumChatFormatting.BLUE + "Who the hell uses cables anyway?"); } + @Override + public String getUnlocalizedName(ItemStack aStack) { + return getUnlocalizedName() + "." + getDamage(aStack); + } + public static void run() { INSTANCE = new TeslaCoilCover(); GameRegistry.registerItem(INSTANCE, INSTANCE.getUnlocalizedName()); + teslaCoilCover.set(INSTANCE); + } + + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister iconRegister) { + itemIcon = iconRegister.registerIcon(getIconString()); + ultItemIcon = iconRegister.registerIcon(MODID + ":itemTeslaCoverUltimate"); + } + + @Override + public IIcon getIconFromDamage(int damage) { + if (damage == 1) { + return ultItemIcon; + } + return itemIcon; + } + + @Override + public void getSubItems(Item aItem, CreativeTabs par2CreativeTabs, List aList) { + aList.add(new ItemStack(aItem, 1, 0)); + aList.add(new ItemStack(aItem, 1, 1)); } } diff --git a/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCoverUltimate.java b/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCoverUltimate.java deleted file mode 100644 index 71ef0bd0c8..0000000000 --- a/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCoverUltimate.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.github.technus.tectech.thing.item; - -import com.github.technus.tectech.CommonValues; -import cpw.mods.fml.common.registry.GameRegistry; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; - -import java.util.List; - -import static com.github.technus.tectech.Reference.MODID; - - -public final class TeslaCoilCoverUltimate extends Item { - public static TeslaCoilCoverUltimate INSTANCE; - - public TeslaCoilCoverUltimate() { - setUnlocalizedName("tm.teslaCoilCoverUltimate"); - setTextureName(MODID + ":itemTeslaCoverUltimate"); - } - - @Override - public void addInformation(ItemStack aStack, EntityPlayer ep, List aList, boolean boo) { - aList.add(CommonValues.BASS_MARK); - aList.add("Tesla-Enables Machines! (BUT LOUDER!!)"); - aList.add(EnumChatFormatting.BLUE + "Use on top of a machine to enable Tesla capabilities"); - aList.add(EnumChatFormatting.BLUE + "Who the hell uses cables anyway?"); - } - - public static void run() { - INSTANCE = new TeslaCoilCoverUltimate(); - GameRegistry.registerItem(INSTANCE, INSTANCE.getUnlocalizedName()); - } -} diff --git a/src/main/resources/assets/tectech/lang/en_US.lang b/src/main/resources/assets/tectech/lang/en_US.lang index e097c612ba..59a0d720de 100644 --- a/src/main/resources/assets/tectech/lang/en_US.lang +++ b/src/main/resources/assets/tectech/lang/en_US.lang @@ -9,9 +9,6 @@ item.em.frontRotate.name=Front Rotation Scrench item.em.parametrizerMemoryCard.name=Parametrizer Memory Card item.em.EuMeterGT.name=GT EU meter -item.tm.teslaCoilCover.name=Tesla Coil Cover -item.tm.teslaCoilCoverUltimate.name=Tesla Coil Cover Rich Edition - death.attack.microwaving=%1$s was dehydrated by radiation. death.attack.microwaving.player=%1$s was dehydrated by radiation while fighting %2$s. -- cgit From 2c6b970fec478026cbd6e70b6d4364134d17fdc4 Mon Sep 17 00:00:00 2001 From: Bass Date: Wed, 21 Aug 2019 16:41:27 +0100 Subject: Tesla Winding Components --- .../technus/tectech/loader/thing/ThingsLoader.java | 3 + .../technus/tectech/thing/CustomItemList.java | 2 +- .../tectech/thing/item/TeslaCoilComponent.java | 72 +++++++++++++++++++ .../multi/GT_MetaTileEntity_TM_teslaCoil.java | 79 ++++++++------------- .../tectech/textures/items/itemTeslaComponent.png | Bin 0 -> 482 bytes .../textures/items/itemTeslaComponentUltimate.png | Bin 0 -> 492 bytes 6 files changed, 107 insertions(+), 49 deletions(-) create mode 100644 src/main/java/com/github/technus/tectech/thing/item/TeslaCoilComponent.java create mode 100644 src/main/resources/assets/tectech/textures/items/itemTeslaComponent.png create mode 100644 src/main/resources/assets/tectech/textures/items/itemTeslaComponentUltimate.png (limited to 'src/main/resources/assets/tectech') diff --git a/src/main/java/com/github/technus/tectech/loader/thing/ThingsLoader.java b/src/main/java/com/github/technus/tectech/loader/thing/ThingsLoader.java index 6a12c640f3..6aa238df49 100644 --- a/src/main/java/com/github/technus/tectech/loader/thing/ThingsLoader.java +++ b/src/main/java/com/github/technus/tectech/loader/thing/ThingsLoader.java @@ -61,6 +61,9 @@ public class ThingsLoader implements Runnable { TeslaCoilCapacitor.run(); TecTech.LOGGER.info("Useful Items registered"); + TeslaCoilComponent.run(); + TecTech.LOGGER.info("Crafting Components registered"); + ElementalDefinitionContainer_EM.run(); DebugElementalInstanceContainer_EM.run(); TecTech.LOGGER.info("Debug Items registered"); diff --git a/src/main/java/com/github/technus/tectech/thing/CustomItemList.java b/src/main/java/com/github/technus/tectech/thing/CustomItemList.java index 8bbb8fd4ce..9ea92f507a 100644 --- a/src/main/java/com/github/technus/tectech/thing/CustomItemList.java +++ b/src/main/java/com/github/technus/tectech/thing/CustomItemList.java @@ -92,7 +92,7 @@ public enum CustomItemList implements IItemContainer { Machine_Multi_BHG, hint_0,hint_1,hint_2,hint_3,hint_4,hint_5,hint_6,hint_7,hint_8,hint_9,hint_10,hint_11, hint_general,hint_air,hint_noAir,hint_error, - scanContainer,parametrizerMemory,teslaCapacitor,teslaCoilCover, + scanContainer,parametrizerMemory,teslaCapacitor,teslaCoilCover,teslaComponent, Machine_TeslaCoil_LV_1A, Machine_TeslaCoil_MV_1A, Machine_TeslaCoil_HV_1A, Machine_TeslaCoil_EV_1A, Machine_TeslaCoil_IV_1A, Machine_TeslaCoil_LV_4A, Machine_TeslaCoil_MV_4A, Machine_TeslaCoil_HV_4A, Machine_TeslaCoil_EV_4A, Machine_TeslaCoil_IV_4A, diff --git a/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilComponent.java b/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilComponent.java new file mode 100644 index 0000000000..32b75ebce7 --- /dev/null +++ b/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilComponent.java @@ -0,0 +1,72 @@ +package com.github.technus.tectech.thing.item; + +import com.github.technus.tectech.CommonValues; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import gregtech.api.util.GT_LanguageManager; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.IIcon; + +import java.util.List; + +import static com.github.technus.tectech.Reference.MODID; +import static com.github.technus.tectech.thing.CustomItemList.teslaComponent; + + +public final class TeslaCoilComponent extends Item { + public static TeslaCoilComponent INSTANCE; + private static IIcon ultItemIcon; + + private TeslaCoilComponent() { + setHasSubtypes(true); + setUnlocalizedName("tm.itemTeslaComponent"); + setTextureName(MODID + ":itemTeslaComponent"); + + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Electrum Tesla Windings"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "Superconductive Tesla Windings"); + } + + @Override + public void addInformation(ItemStack aStack, EntityPlayer ep, List aList, boolean boo) { + aList.add(CommonValues.BASS_MARK); + aList.add(EnumChatFormatting.BLUE + "Tesla bois need these!"); + } + + @Override + public String getUnlocalizedName(ItemStack aStack) { + return getUnlocalizedName() + "." + getDamage(aStack); + } + + public static void run() { + INSTANCE = new TeslaCoilComponent(); + GameRegistry.registerItem(INSTANCE, INSTANCE.getUnlocalizedName()); + teslaComponent.set(INSTANCE); + } + + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister iconRegister) { + itemIcon = iconRegister.registerIcon(getIconString()); + ultItemIcon = iconRegister.registerIcon(MODID + ":itemTeslaComponentUltimate"); + } + + @Override + public IIcon getIconFromDamage(int damage) { + if (damage == 1) { + return ultItemIcon; + } + return itemIcon; + } + + @Override + public void getSubItems(Item aItem, CreativeTabs par2CreativeTabs, List aList) { + aList.add(new ItemStack(aItem, 1, 0)); + aList.add(new ItemStack(aItem, 1, 1)); + } +} diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java index 5a003f4eec..df8f44b133 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java @@ -420,7 +420,7 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock @Override public void construct(int stackSize, boolean hintsOnly) { - StructureBuilderExtreme(shape, blockType, blockMetas[(stackSize-1)%6], 3, 16, 0, getBaseMetaTileEntity(), this, hintsOnly); + StructureBuilderExtreme(shape, blockType, blockMetas[(stackSize - 1) % 6], 3, 16, 0, getBaseMetaTileEntity(), this, hintsOnly); } @Override @@ -440,14 +440,14 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock @Override public boolean checkRecipe_EM(ItemStack itemStack) { - if (!histHighSetting.getStatus(false).isOk|| - !histLowSetting.getStatus(false).isOk|| - !transferRadiusTowerSetting.getStatus(false).isOk|| - !transferRadiusTransceiverSetting.getStatus(false).isOk|| - !transferRadiusCoverUltimateSetting.getStatus(false).isOk|| - !outputVoltageSetting.getStatus(false).isOk|| - !outputCurrentSetting.getStatus(false).isOk|| - !scanTimeMinSetting.getStatus(false).isOk|| + if (!histHighSetting.getStatus(false).isOk || + !histLowSetting.getStatus(false).isOk || + !transferRadiusTowerSetting.getStatus(false).isOk || + !transferRadiusTransceiverSetting.getStatus(false).isOk || + !transferRadiusCoverUltimateSetting.getStatus(false).isOk || + !outputVoltageSetting.getStatus(false).isOk || + !outputCurrentSetting.getStatus(false).isOk || + !scanTimeMinSetting.getStatus(false).isOk || !overDriveSetting.getStatus(false).isOk ) return false; @@ -471,15 +471,15 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock energyCapacity = 0; outputCurrentMax = 0; - if(vTier < 0){ + if (vTier < 0) { //Returning true to allow for 'passive running' outputVoltageMax = 0; return true; - } else if (vTier > mTier && getEUVar() > 0){ + } else if (vTier > mTier && getEUVar() > 0) { explodeMultiblock(); } - outputVoltageMax = V[vTier+1]; + outputVoltageMax = V[vTier + 1]; for (GT_MetaTileEntity_Hatch_Capacitor cap : eCapacitorHatches) { if (!GT_MetaTileEntity_MultiBlockBase.isValidMetaTileEntity(cap)) { continue; @@ -487,7 +487,7 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock cap.getBaseMetaTileEntity().setActive(true); capacitorData = cap.getCapacitors(); if (capacitorData[0] < vTier) { - if(getEUVar() > 0 && capacitorData[0] != 0){ + if (getEUVar() > 0 && capacitorData[0] != 0) { cap.getBaseMetaTileEntity().setToFire(); } eCapacitorHatches.remove(cap); @@ -500,31 +500,14 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock } private void scanForTransmissionTargets(int[] coordsMin, int[] coordsMax) { - int xMin = coordsMin[0]; - int yMin = coordsMin[1]; - int zMin = coordsMin[2]; - - int xMax = coordsMax[0]; - int yMax = coordsMax[1]; - int zMax = coordsMax[2]; - - if (xMin > xMax) { - int xMax2 = xMin; - xMin = xMax; - xMax = xMax2; - } - - if (yMin > yMax) { - int yMax2 = yMin; - yMin = yMax; - yMax = yMax2; - } - - if (zMin > zMax) { - int zMax2 = zMin; - zMin = zMax; - zMax = zMax2; - } + //This makes sure the minimums are actually smaller than the maximums + int xMin = coordsMin[0] < coordsMax[0] ? coordsMin[0] : coordsMax[0]; + int yMin = coordsMin[1] < coordsMax[1] ? coordsMin[1] : coordsMax[1]; + int zMin = coordsMin[2] < coordsMax[2] ? coordsMin[2] : coordsMax[2]; + //And vice versa + int xMax = coordsMin[0] > coordsMax[0] ? coordsMin[0] : coordsMax[0]; + int yMax = coordsMin[1] > coordsMax[1] ? coordsMin[1] : coordsMax[1]; + int zMax = coordsMin[2] > coordsMax[2] ? coordsMin[2] : coordsMax[2]; for (int xPos = xMin; xPos <= xMax; xPos++) { for (int yPos = yMin; yPos <= yMax; yPos++) { @@ -547,13 +530,13 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock } private void thaumLightning(IGregTechTileEntity mte, IGregTechTileEntity node) { - byte xR = (byte)(node.getXCoord() - posTop[0]); - byte yR = (byte)(node.getYCoord() - posTop[1]); - byte zR = (byte)(node.getZCoord() - posTop[2]); + byte xR = (byte) (node.getXCoord() - posTop[0]); + byte yR = (byte) (node.getYCoord() - posTop[1]); + byte zR = (byte) (node.getZCoord() - posTop[2]); int wID = mte.getWorld().provider.dimensionId; - sparkList.add(new Util.thaumSpark(posTop[0],posTop[1],posTop[2],xR,yR,zR,wID)); + sparkList.add(new Util.thaumSpark(posTop[0], posTop[1], posTop[2], xR, yR, zR, wID)); } @Override @@ -605,23 +588,23 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock switch (scanTime) { case 0: scanTimeDisplay.updateStatus(); - scanForTransmissionTargets(scanPosOffsets[0],scanPosOffsets[1]); + scanForTransmissionTargets(scanPosOffsets[0], scanPosOffsets[1]); break; case 20: scanTimeDisplay.updateStatus(); - scanForTransmissionTargets(scanPosOffsets[2],scanPosOffsets[3]); + scanForTransmissionTargets(scanPosOffsets[2], scanPosOffsets[3]); break; case 40: scanTimeDisplay.updateStatus(); - scanForTransmissionTargets(scanPosOffsets[4],scanPosOffsets[5]); + scanForTransmissionTargets(scanPosOffsets[4], scanPosOffsets[5]); break; case 60: scanTimeDisplay.updateStatus(); - scanForTransmissionTargets(scanPosOffsets[6],scanPosOffsets[7]); + scanForTransmissionTargets(scanPosOffsets[6], scanPosOffsets[7]); break; case 80: scanTimeDisplay.updateStatus(); - scanForTransmissionTargets(scanPosOffsets[8],scanPosOffsets[9]); + scanForTransmissionTargets(scanPosOffsets[8], scanPosOffsets[9]); break; default: if (scanTime == (int) scanTimeMinSetting.get() - 1) { @@ -845,4 +828,4 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock } return false; } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/tectech/textures/items/itemTeslaComponent.png b/src/main/resources/assets/tectech/textures/items/itemTeslaComponent.png new file mode 100644 index 0000000000..77441e2b21 Binary files /dev/null and b/src/main/resources/assets/tectech/textures/items/itemTeslaComponent.png differ diff --git a/src/main/resources/assets/tectech/textures/items/itemTeslaComponentUltimate.png b/src/main/resources/assets/tectech/textures/items/itemTeslaComponentUltimate.png new file mode 100644 index 0000000000..8a19f7a142 Binary files /dev/null and b/src/main/resources/assets/tectech/textures/items/itemTeslaComponentUltimate.png differ -- cgit From 408d8112cc0fcf25ceec068c474e242f3f39ec28 Mon Sep 17 00:00:00 2001 From: Bass Date: Fri, 23 Aug 2019 21:54:11 +0100 Subject: Experimental Lang Stuff --- .../dreamcraft/NoDreamCraftMachineLoader.java | 100 +++++++++++++-------- .../openmodularturrets/TT_turret_loader.java | 2 +- .../definitions/dComplexAspectDefinition.java | 61 ++++++------- .../definitions/ePrimalAspectDefinition.java | 18 ++-- .../tectech/thing/item/TeslaCoilCapacitor.java | 7 -- .../tectech/thing/item/TeslaCoilComponent.java | 4 - .../technus/tectech/thing/item/TeslaCoilCover.java | 4 - .../single/GT_MetaTileEntity_TeslaCoil.java | 2 + src/main/resources/assets/tectech/lang/en_US.lang | 99 +++++++++++++++++++- 9 files changed, 202 insertions(+), 95 deletions(-) (limited to 'src/main/resources/assets/tectech') diff --git a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/NoDreamCraftMachineLoader.java b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/NoDreamCraftMachineLoader.java index 53a64a52ae..0570299f4e 100644 --- a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/NoDreamCraftMachineLoader.java +++ b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/NoDreamCraftMachineLoader.java @@ -13,6 +13,7 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicHull; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_TieredMachineBlock; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Transformer; import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.StatCollector; import java.lang.reflect.Constructor; import java.lang.reflect.Field; @@ -21,7 +22,7 @@ import java.lang.reflect.Method; import static gregtech.api.GregTech_API.METATILEENTITIES; public class NoDreamCraftMachineLoader implements Runnable { - public final static String imagination=EnumChatFormatting.RESET + + public final static String imagination = EnumChatFormatting.RESET + "You just need " + EnumChatFormatting.DARK_PURPLE + "I" + EnumChatFormatting.LIGHT_PURPLE + "m" + EnumChatFormatting.DARK_RED + @@ -41,69 +42,84 @@ public class NoDreamCraftMachineLoader implements Runnable { try { CustomItemList.WetTransformer_LV_ULV.set(new GT_MetaTileEntity_WetTransformer( 12000, "wettransformer.tier.00", "Ultra Low Voltage Power Transformer", 0, - "LV -> ULV (Use Soft Mallet to invert)").getStackForm(1L)); - }catch (IllegalArgumentException e){ + //LV -> ULV (Use Soft Mallet to invert) + StatCollector.translateToLocal("gt.blockmachines.wetransformer.tier.00.desc")).getStackForm(1L)); + } catch (IllegalArgumentException e) { System.out.println(METATILEENTITIES[12000].getClass().getCanonicalName()); TecTech.LOGGER.error(e); e.printStackTrace(); - throw new Error(METATILEENTITIES[12000].getClass().getCanonicalName(),e); + throw new Error(METATILEENTITIES[12000].getClass().getCanonicalName(), e); } CustomItemList.WetTransformer_MV_LV.set(new GT_MetaTileEntity_WetTransformer( 12001, "wetransformer.tier.01", "Low Voltage Power Transformer", 1, - "MV -> LV (Use Soft Mallet to invert)").getStackForm(1L)); + //MV -> LV (Use Soft Mallet to invert) + StatCollector.translateToLocal("gt.blockmachines.wetransformer.tier.01.desc")).getStackForm(1L)); CustomItemList.WetTransformer_HV_MV.set(new GT_MetaTileEntity_WetTransformer( 12002, "wettransformer.tier.02", "Medium Voltage Power Transformer", 2, - "HV -> MV (Use Soft Mallet to invert)").getStackForm(1L)); + //HV -> MV (Use Soft Mallet to invert) + StatCollector.translateToLocal("gt.blockmachines.wetransformer.tier.02.desc")).getStackForm(1L)); CustomItemList.WetTransformer_EV_HV.set(new GT_MetaTileEntity_WetTransformer( 12003, "wettransformer.tier.03", "High Voltage Power Transformer", 3, - "EV -> HV (Use Soft Mallet to invert)").getStackForm(1L)); + //EV -> HV (Use Soft Mallet to invert) + StatCollector.translateToLocal("gt.blockmachines.wetransformer.tier.03.desc")).getStackForm(1L)); CustomItemList.WetTransformer_IV_EV.set(new GT_MetaTileEntity_WetTransformer( 12004, "wettransformer.tier.04", "Extreme Power Transformer", 4, - "IV -> EV (Use Soft Mallet to invert)").getStackForm(1L)); + //IV -> EV (Use Soft Mallet to invert) + StatCollector.translateToLocal("gt.blockmachines.wetransformer.tier.04.desc")).getStackForm(1L)); CustomItemList.WetTransformer_LuV_IV.set(new GT_MetaTileEntity_WetTransformer( 12005, "wettransformer.tier.05", "Insane Power Transformer", 5, - "LuV -> IV (Use Soft Mallet to invert)").getStackForm(1L)); + //LuV -> IV (Use Soft Mallet to invert) + StatCollector.translateToLocal("gt.blockmachines.wetransformer.tier.05.desc")).getStackForm(1L)); CustomItemList.WetTransformer_ZPM_LuV.set(new GT_MetaTileEntity_WetTransformer( 12006, "wettransformer.tier.06", "Ludicrous Power Transformer", 6, - "ZPM -> LuV (Use Soft Mallet to invert)").getStackForm(1L)); + //ZPM -> LuV (Use Soft Mallet to invert) + StatCollector.translateToLocal("gt.blockmachines.wetransformer.tier.06.desc")).getStackForm(1L)); CustomItemList.WetTransformer_UV_ZPM.set(new GT_MetaTileEntity_WetTransformer( 12007, "wettransformer.tier.07", "ZPM Voltage Power Transformer", 7, - "UV -> ZPM (Use Soft Mallet to invert)").getStackForm(1L)); + //UV -> ZPM (Use Soft Mallet to invert) + StatCollector.translateToLocal("gt.blockmachines.wetransformer.tier.07.desc")).getStackForm(1L)); CustomItemList.WetTransformer_UHV_UV.set(new GT_MetaTileEntity_WetTransformer( 12008, "wettransformer.tier.08", "Ultimate Power Transformer", 8, - "UHV -> UV (Use Soft Mallet to invert)").getStackForm(1L)); + //UHV -> UV (Use Soft Mallet to invert) + StatCollector.translateToLocal("gt.blockmachines.wetransformer.tier.08.desc")).getStackForm(1L)); CustomItemList.WetTransformer_UEV_UHV.set(new GT_MetaTileEntity_WetTransformer( 12009, "wettransformer.tier.09", "Highly Ultimate Power Transformer", 9, - "UEV -> UHV (Use Soft Mallet to invert)").getStackForm(1L)); + //UEV -> UHV (Use Soft Mallet to invert) + StatCollector.translateToLocal("gt.blockmachines.wetransformer.tier.09.desc")).getStackForm(1L)); CustomItemList.WetTransformer_UIV_UEV.set(new GT_MetaTileEntity_WetTransformer( 12010, "wettransformer.tier.10", "Extremely Ultimate Power Transformer", 10, - "UIV -> UEV (Use Soft Mallet to invert)").getStackForm(1L)); + //UIV -> UEV (Use Soft Mallet to invert) + StatCollector.translateToLocal("gt.blockmachines.wetransformer.tier.10.desc")).getStackForm(1L)); CustomItemList.WetTransformer_UMV_UIV.set(new GT_MetaTileEntity_WetTransformer( 12011, "wettransformer.tier.11", "Insanely Ultimate Power Transformer", 11, - "UMV -> UIV (Use Soft Mallet to invert)").getStackForm(1L)); + //UMV -> UIV (Use Soft Mallet to invert) + StatCollector.translateToLocal("gt.blockmachines.wetransformer.tier.11.desc")).getStackForm(1L)); CustomItemList.WetTransformer_UXV_UMV.set(new GT_MetaTileEntity_WetTransformer( 12012, "wettransformer.tier.12", "Mega Ultimate Power Transformer", 12, - "UXV -> UMV (Use Soft Mallet to invert)").getStackForm(1L)); + //UXV -> UMV (Use Soft Mallet to invert) + StatCollector.translateToLocal("gt.blockmachines.wetransformer.tier.12.desc")).getStackForm(1L)); CustomItemList.WetTransformer_OPV_UXV.set(new GT_MetaTileEntity_WetTransformer( 12013, "wettransformer.tier.13", "Extended Mega Ultimate Power Transformer", 13, - "OPV -> UXV (Use Soft Mallet to invert)").getStackForm(1L)); + //OPV -> UXV (Use Soft Mallet to invert) + StatCollector.translateToLocal("gt.blockmachines.wetransformer.tier.13.desc")).getStackForm(1L)); CustomItemList.WetTransformer_MAXV_OPV.set(new GT_MetaTileEntity_WetTransformer( 12014, "wettransformer.tier.14", "Overpowered Power Transformer", 14, - "MAX -> OPV (Use Soft Mallet to invert)").getStackForm(1L)); + //MAX -> OPV (Use Soft Mallet to invert) + StatCollector.translateToLocal("gt.blockmachines.wetransformer.tier.14.desc")).getStackForm(1L)); try { MetaTileEntity temp; @@ -117,7 +133,7 @@ public class NoDreamCraftMachineLoader implements Runnable { } temp = new GT_MetaTileEntity_BasicHull( - 11230, "hull.tier.10", "UEV Machine Hull",10, + 11230, "hull.tier.10", "UEV Machine Hull", 10, imagination); Util.setTier(10, temp); if (GT_Values.GT.isClientSide()) { @@ -126,7 +142,7 @@ public class NoDreamCraftMachineLoader implements Runnable { CustomItemList.Hull_UEV.set(temp.getStackForm(1L)); temp = new GT_MetaTileEntity_BasicHull( - 11231, "hull.tier.11", "UIV Machine Hull",11, + 11231, "hull.tier.11", "UIV Machine Hull", 11, imagination); Util.setTier(11, temp); if (GT_Values.GT.isClientSide()) { @@ -135,7 +151,7 @@ public class NoDreamCraftMachineLoader implements Runnable { CustomItemList.Hull_UIV.set(temp.getStackForm(1L)); temp = new GT_MetaTileEntity_BasicHull( - 11232, "hull.tier.12", "UMV Machine Hull",12, + 11232, "hull.tier.12", "UMV Machine Hull", 12, imagination); Util.setTier(12, temp); if (GT_Values.GT.isClientSide()) { @@ -144,7 +160,7 @@ public class NoDreamCraftMachineLoader implements Runnable { CustomItemList.Hull_UMV.set(temp.getStackForm(1L)); temp = new GT_MetaTileEntity_BasicHull( - 11233, "hull.tier.13", "UXV Machine Hull",13, + 11233, "hull.tier.13", "UXV Machine Hull", 13, imagination); Util.setTier(13, temp); if (GT_Values.GT.isClientSide()) { @@ -153,7 +169,7 @@ public class NoDreamCraftMachineLoader implements Runnable { CustomItemList.Hull_UXV.set(temp.getStackForm(1L)); temp = new GT_MetaTileEntity_BasicHull( - 11234, "hull.tier.14", "OPV Machine Hull",14, + 11234, "hull.tier.14", "OPV Machine Hull", 14, imagination); Util.setTier(14, temp); if (GT_Values.GT.isClientSide()) { @@ -162,7 +178,7 @@ public class NoDreamCraftMachineLoader implements Runnable { CustomItemList.Hull_OPV.set(temp.getStackForm(1L)); temp = new GT_MetaTileEntity_BasicHull( - 11235, "hull.tier.15", "MAX Machine Hull",15, + 11235, "hull.tier.15", "MAX Machine Hull", 15, imagination); Util.setTier(15, temp); if (GT_Values.GT.isClientSide()) { @@ -173,12 +189,14 @@ public class NoDreamCraftMachineLoader implements Runnable { temp = new GT_MetaTileEntity_Transformer( 11220, "transformer.tier.09", "Highly Ultimate Transformer", 9, - "UEV -> UHV (Use Soft Mallet to invert)"); + //UEV -> UHV (Use Soft Mallet to invert) + StatCollector.translateToLocal("gt.blockmachines.transformer.tier.09.desc")); CustomItemList.Transformer_UEV_UHV.set(temp.getStackForm(1L)); temp = new GT_MetaTileEntity_Transformer( 11221, "transformer.tier.10", "Extremely Ultimate Transformer", 10, - "UIV -> UEV (Use Soft Mallet to invert)"); + //UIV -> UEV (Use Soft Mallet to invert) + StatCollector.translateToLocal("gt.blockmachines.transformer.tier.10.desc")); Util.setTier(10, temp); if (GT_Values.GT.isClientSide()) { field.set(temp, method.invoke(temp, iTexture)); @@ -187,7 +205,8 @@ public class NoDreamCraftMachineLoader implements Runnable { temp = new GT_MetaTileEntity_Transformer( 11222, "transformer.tier.11", "Insanely Ultimate Transformer", 11, - "UMV -> UIV (Use Soft Mallet to invert)"); + //UMV -> UIV (Use Soft Mallet to invert) + StatCollector.translateToLocal("gt.blockmachines.transformer.tier.11.desc")); Util.setTier(11, temp); if (GT_Values.GT.isClientSide()) { field.set(temp, method.invoke(temp, iTexture)); @@ -196,7 +215,8 @@ public class NoDreamCraftMachineLoader implements Runnable { temp = new GT_MetaTileEntity_Transformer( 11223, "transformer.tier.12", "Mega Ultimate Transformer", 12, - "UXV -> UMV (Use Soft Mallet to invert)"); + //UXV -> UMV (Use Soft Mallet to invert) + StatCollector.translateToLocal("gt.blockmachines.transformer.tier.12.desc")); Util.setTier(12, temp); if (GT_Values.GT.isClientSide()) { field.set(temp, method.invoke(temp, iTexture)); @@ -205,7 +225,8 @@ public class NoDreamCraftMachineLoader implements Runnable { temp = new GT_MetaTileEntity_Transformer( 11224, "transformer.tier.13", "Extended Mega Ultimate Transformer", 13, - "OPV -> UXV (Use Soft Mallet to invert)"); + //OPV -> UXV (Use Soft Mallet to invert) + StatCollector.translateToLocal("gt.blockmachines.transformer.tier.13.desc")); Util.setTier(13, temp); if (GT_Values.GT.isClientSide()) { field.set(temp, method.invoke(temp, iTexture)); @@ -214,7 +235,8 @@ public class NoDreamCraftMachineLoader implements Runnable { temp = new GT_MetaTileEntity_Transformer( 11225, "transformer.tier.14", "Overpowered Transformer", 14, - "MAX -> OPV (Use Soft Mallet to invert)"); + //MAX -> OPV (Use Soft Mallet to invert) + StatCollector.translateToLocal("gt.blockmachines.transformer.tier.14.desc")); Util.setTier(14, temp); if (GT_Values.GT.isClientSide()) { field.set(temp, method.invoke(temp, iTexture)); @@ -228,12 +250,14 @@ public class NoDreamCraftMachineLoader implements Runnable { temp = constructor.newInstance( 11989, "transformer.ha.tier.09", "Highly Ultimate Hi-Amp Transformer", 9, - "UEV -> UHV (Use Soft Mallet to invert)"); + //UEV -> UHV (Use Soft Mallet to invert + StatCollector.translateToLocal("gt.blockmachines.transformer.ha.tier.09.desc")); CustomItemList.Transformer_HA_UEV_UHV.set(temp.getStackForm(1)); temp = constructor.newInstance( 11910, "transformer.ha.tier.10", "Extremely Ultimate Hi-Amp Transformer", 10, - "UIV -> UEV (Use Soft Mallet to invert)"); + //UIV -> UEV (Use Soft Mallet to invert) + StatCollector.translateToLocal("gt.blockmachines.transformer.ha.tier.10.desc")); Util.setTier(10, temp); if (GT_Values.GT.isClientSide()) { field.set(temp, method.invoke(temp, iTexture)); @@ -242,7 +266,8 @@ public class NoDreamCraftMachineLoader implements Runnable { temp = constructor.newInstance( 11911, "transformer.ha.tier.11", "Insanely Ultimate Hi-Amp Transformer", 11, - "UMV -> UIV (Use Soft Mallet to invert)"); + //UMV -> UIV (Use Soft Mallet to invert) + StatCollector.translateToLocal("gt.blockmachines.transformer.ha.tier.11.desc")); Util.setTier(11, temp); if (GT_Values.GT.isClientSide()) { field.set(temp, method.invoke(temp, iTexture)); @@ -251,7 +276,8 @@ public class NoDreamCraftMachineLoader implements Runnable { temp = constructor.newInstance( 11912, "transformer.ha.tier.12", "Mega Ultimate Hi-Amp Transformer", 12, - "UXV -> UMV (Use Soft Mallet to invert)"); + //UXV -> UMV (Use Soft Mallet to invert) + StatCollector.translateToLocal("gt.blockmachines.transformer.ha.tier.12.desc")); Util.setTier(12, temp); if (GT_Values.GT.isClientSide()) { field.set(temp, method.invoke(temp, iTexture)); @@ -260,7 +286,8 @@ public class NoDreamCraftMachineLoader implements Runnable { temp = constructor.newInstance( 11913, "transformer.ha.tier.13", "Extended Mega Ultimate Hi-Amp Transformer", 13, - "OPV -> UXV (Use Soft Mallet to invert)"); + //OPV -> UXV (Use Soft Mallet to invert) + StatCollector.translateToLocal("gt.blockmachines.transformer.ha.tier.13.desc")); Util.setTier(13, temp); if (GT_Values.GT.isClientSide()) { field.set(temp, method.invoke(temp, iTexture)); @@ -269,7 +296,8 @@ public class NoDreamCraftMachineLoader implements Runnable { temp = constructor.newInstance( 11914, "transformer.ha.tier.14", "Overpowered Hi-Amp Transformer", 14, - "MAX -> OPV (Use Soft Mallet to invert)"); + //MAX -> OPV (Use Soft Mallet to invert) + StatCollector.translateToLocal("gt.blockmachines.transformer.ha.tier.14.desc")); Util.setTier(14, temp); if (GT_Values.GT.isClientSide()) { field.set(temp, method.invoke(temp, iTexture)); diff --git a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/TT_turret_loader.java b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/TT_turret_loader.java index d03f1bd1c6..d66232671a 100644 --- a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/TT_turret_loader.java +++ b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/TT_turret_loader.java @@ -14,7 +14,7 @@ import net.minecraftforge.client.MinecraftForgeClient; public class TT_turret_loader implements Runnable { @Override public void run() { - TurretHeadRenderEM turretHeadRenderEM=new TurretHeadRenderEM(); + TurretHeadRenderEM turretHeadRenderEM = new TurretHeadRenderEM(); ClientRegistry.bindTileEntitySpecialRenderer(TileTurretHeadEM.class, turretHeadRenderEM); MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(TurretHeadEM.INSTANCE), new TurretHeadItemRenderEM(turretHeadRenderEM, new TileTurretHeadEM())); diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/dComplexAspectDefinition.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/dComplexAspectDefinition.java index 059ac44da3..d6c4553ed5 100644 --- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/dComplexAspectDefinition.java +++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/dComplexAspectDefinition.java @@ -13,6 +13,7 @@ import com.github.technus.tectech.mechanics.elementalMatter.core.transformations import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.aOredictDequantizationInfo; import com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.eBosonDefinition; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.StatCollector; import java.util.ArrayList; @@ -58,12 +59,12 @@ public final class dComplexAspectDefinition extends cElementalDefinition impleme throw new tElementalException("Hadron Definition error"); } aspectStacks = aspects; - float mass=0; - for(cElementalDefinitionStack stack:aspects.values()){ - mass+=stack.getMass(); + float mass = 0; + for (cElementalDefinitionStack stack : aspects.values()) { + mass += stack.getMass(); } - this.mass=mass; - hash=super.hashCode(); + this.mass = mass; + hash = super.hashCode(); } //public but u can just try{}catch(){} the constructor it still calls this method @@ -75,18 +76,18 @@ public final class dComplexAspectDefinition extends cElementalDefinition impleme } amount += aspects.amount; } - return amount==2; + return amount == 2; } @Override public String getName() { - String name= AspectDefinitionCompat.aspectDefinitionCompat.getAspectTag(this); - if(name!=null){ - name=name.substring(0,1).toUpperCase()+name.substring(1); - }else{ - name=getSymbol(); + String name = AspectDefinitionCompat.aspectDefinitionCompat.getAspectTag(this); + if (name != null) { + name = name.substring(0, 1).toUpperCase() + name.substring(1); + } else { + name = getSymbol(); } - return "Aspect: "+name; + return StatCollector.translateToLocal("tt.keyword.Aspect") + ": " + name; } @Override @@ -195,7 +196,7 @@ public final class dComplexAspectDefinition extends cElementalDefinition impleme @Override public float getEnergyDiffBetweenStates(long currentEnergyLevel, long newEnergyLevel) { - return iElementalDefinition.DEFAULT_ENERGY_REQUIREMENT *(newEnergyLevel-currentEnergyLevel); + return iElementalDefinition.DEFAULT_ENERGY_REQUIREMENT * (newEnergyLevel - currentEnergyLevel); } @Override @@ -260,13 +261,13 @@ public final class dComplexAspectDefinition extends cElementalDefinition impleme public static void run() { try { - cElementalDefinition.addCreatorFromNBT(nbtType, dComplexAspectDefinition.class.getMethod("fromNBT", NBTTagCompound.class),(byte)-96); + cElementalDefinition.addCreatorFromNBT(nbtType, dComplexAspectDefinition.class.getMethod("fromNBT", NBTTagCompound.class), (byte) -96); } catch (Exception e) { if (DEBUG_MODE) { e.printStackTrace(); } } - if(DEBUG_MODE) { + if (DEBUG_MODE) { TecTech.LOGGER.info("Registered Elemental Matter Class: ComplexAspect " + nbtType + ' ' + -96); } } @@ -276,7 +277,7 @@ public final class dComplexAspectDefinition extends cElementalDefinition impleme return -96; } - public static byte getClassTypeStatic(){ + public static byte getClassTypeStatic() { return -96; } @@ -287,32 +288,32 @@ public final class dComplexAspectDefinition extends cElementalDefinition impleme @Override public void addScanShortSymbols(ArrayList lines, int capabilities, long energyLevel) { - if(Util.areBitsSet(SCAN_GET_NOMENCLATURE|SCAN_GET_CHARGE|SCAN_GET_MASS, capabilities)) { + if (Util.areBitsSet(SCAN_GET_NOMENCLATURE | SCAN_GET_CHARGE | SCAN_GET_MASS, capabilities)) { lines.add(getShortSymbol()); } } @Override public void addScanResults(ArrayList lines, int capabilities, long energyLevel) { - if(Util.areBitsSet(SCAN_GET_CLASS_TYPE, capabilities)) { - lines.add("CLASS = " + nbtType + ' ' + getClassType()); + if (Util.areBitsSet(SCAN_GET_CLASS_TYPE, capabilities)) { + lines.add(StatCollector.translateToLocal("tt.keyword.CLASS") + " = " + nbtType + ' ' + getClassType()); } - if(Util.areBitsSet(SCAN_GET_NOMENCLATURE|SCAN_GET_CHARGE|SCAN_GET_MASS, capabilities)) { - lines.add("NAME = "+getName()); + if (Util.areBitsSet(SCAN_GET_NOMENCLATURE | SCAN_GET_CHARGE | SCAN_GET_MASS, capabilities)) { + lines.add(StatCollector.translateToLocal("tt.keyword.NAME") + " = " + getName()); //lines.add("SYMBOL = "+getSymbol()); } - if(Util.areBitsSet(SCAN_GET_CHARGE,capabilities)) { - lines.add("CHARGE = " + getCharge() / 3f + " e"); + if (Util.areBitsSet(SCAN_GET_CHARGE, capabilities)) { + lines.add(StatCollector.translateToLocal("tt.keyword.CHARGE") + " = " + getCharge() / 3f + " e"); } - if(Util.areBitsSet(SCAN_GET_COLOR,capabilities)) { - lines.add(getColor() < 0 ? "COLORLESS" : "CARRIES COLOR"); + if (Util.areBitsSet(SCAN_GET_COLOR, capabilities)) { + lines.add(getColor() < 0 ? StatCollector.translateToLocal("tt.keyword.COLORLESS") : StatCollector.translateToLocal("tt.keyword.CARRIES_COLOR")); } - if(Util.areBitsSet(SCAN_GET_MASS,capabilities)) { - lines.add("MASS = " + getMass() + " eV/c\u00b2"); + if (Util.areBitsSet(SCAN_GET_MASS, capabilities)) { + lines.add(StatCollector.translateToLocal("tt.keyword.MASS") + " = " + getMass() + " eV/c\u00b2"); } - if(Util.areBitsSet(SCAN_GET_TIMESPAN_INFO, capabilities)){ - lines.add("LIFE TIME = "+getRawTimeSpan(energyLevel)+ " s"); - lines.add(" "+"At current energy level"); + if (Util.areBitsSet(SCAN_GET_TIMESPAN_INFO, capabilities)) { + lines.add(StatCollector.translateToLocal("tt.keyword.LIFE_TIME") + " = " + getRawTimeSpan(energyLevel) + " s"); + lines.add(" " + StatCollector.translateToLocal("tt.keyphrase.At_current_energy_level")); } } } diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/ePrimalAspectDefinition.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/ePrimalAspectDefinition.java index 7ca125cd5e..b31e7460c8 100644 --- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/ePrimalAspectDefinition.java +++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/ePrimalAspectDefinition.java @@ -1,6 +1,7 @@ package com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions; import com.github.technus.tectech.mechanics.elementalMatter.core.templates.cElementalPrimitive; +import net.minecraft.util.StatCollector; import static com.github.technus.tectech.mechanics.elementalMatter.core.cElementalDecay.noDecay; @@ -9,12 +10,12 @@ import static com.github.technus.tectech.mechanics.elementalMatter.core.cElement */ public final class ePrimalAspectDefinition extends cElementalPrimitive implements iElementalAspect { public static final ePrimalAspectDefinition - magic_air = new ePrimalAspectDefinition("Air", "a`", 1e1F, 35), - magic_earth = new ePrimalAspectDefinition("Earth", "e`", 1e9F, 34), - magic_fire = new ePrimalAspectDefinition("Fire", "f`", 1e3F, 33), - magic_water = new ePrimalAspectDefinition("Water", "w`", 1e7F, 32), - magic_order = new ePrimalAspectDefinition("Order", "o`", 1e5F, 30), - magic_entropy = new ePrimalAspectDefinition("Entropy", "e`", 1e5F, 31); + magic_air = new ePrimalAspectDefinition(StatCollector.translateToLocal("tt.keyword.Air"), "a`", 1e1F, 35), + magic_earth = new ePrimalAspectDefinition(StatCollector.translateToLocal("tt.keyword.Earth"), "e`", 1e9F, 34), + magic_fire = new ePrimalAspectDefinition(StatCollector.translateToLocal("tt.keyword.Fire"), "f`", 1e3F, 33), + magic_water = new ePrimalAspectDefinition(StatCollector.translateToLocal("tt.keyword.Water"), "w`", 1e7F, 32), + magic_order = new ePrimalAspectDefinition(StatCollector.translateToLocal("tt.keyword.Order"), "o`", 1e5F, 30), + magic_entropy = new ePrimalAspectDefinition(StatCollector.translateToLocal("tt.keyword.Entropy"), "e`", 1e5F, 31); private ePrimalAspectDefinition(String name, String symbol, float mass, int ID) { super(name, symbol, 0, mass, 0, -1, ID); @@ -31,7 +32,7 @@ public final class ePrimalAspectDefinition extends cElementalPrimitive implement @Override public String getName() { - return "Primal: " + name; + return StatCollector.translateToLocal("tt.keyword.Primal")+": " + name; } @Override @@ -43,5 +44,4 @@ public final class ePrimalAspectDefinition extends cElementalPrimitive implement public boolean isTimeSpanHalfLife() { return false; } -} - +} \ No newline at end of file diff --git a/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCapacitor.java b/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCapacitor.java index 13b7f311d2..557b356d52 100644 --- a/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCapacitor.java +++ b/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCapacitor.java @@ -4,7 +4,6 @@ import com.github.technus.tectech.CommonValues; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gregtech.api.util.GT_LanguageManager; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -28,12 +27,6 @@ public final class TeslaCoilCapacitor extends Item { setHasSubtypes(true); setUnlocalizedName("tm.teslaCoilCapacitor"); setTextureName(MODID + ":itemCapacitorLV"); - - GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "LV Tesla Capacitor"); - GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "MV Tesla Capacitor"); - GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "HV Tesla Capacitor"); - GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "EV Tesla Capacitor"); - GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "IV Tesla Capacitor"); } @Override diff --git a/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilComponent.java b/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilComponent.java index 32b75ebce7..cfd6b3b653 100644 --- a/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilComponent.java +++ b/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilComponent.java @@ -4,7 +4,6 @@ import com.github.technus.tectech.CommonValues; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gregtech.api.util.GT_LanguageManager; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -27,9 +26,6 @@ public final class TeslaCoilComponent extends Item { setHasSubtypes(true); setUnlocalizedName("tm.itemTeslaComponent"); setTextureName(MODID + ":itemTeslaComponent"); - - GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Electrum Tesla Windings"); - GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "Superconductive Tesla Windings"); } @Override diff --git a/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCover.java b/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCover.java index cacdda56e1..2a1fff39a3 100644 --- a/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCover.java +++ b/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCover.java @@ -4,7 +4,6 @@ import com.github.technus.tectech.CommonValues; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gregtech.api.util.GT_LanguageManager; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -27,9 +26,6 @@ public final class TeslaCoilCover extends Item { setHasSubtypes(true); setUnlocalizedName("tm.teslaCover"); setTextureName(MODID + ":itemTeslaCover"); - - GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Tesla Coil Cover"); - GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "Tesla Coil Cover Rich Edition"); } @Override diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TeslaCoil.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TeslaCoil.java index b144902824..41d32bdcf2 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TeslaCoil.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TeslaCoil.java @@ -17,6 +17,7 @@ import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicBatteryBuffer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.StatCollector; import org.apache.commons.lang3.ArrayUtils; import java.util.Arrays; @@ -79,6 +80,7 @@ public class GT_MetaTileEntity_TeslaCoil extends GT_MetaTileEntity_BasicBatteryB String[] jargon = new String[3]; jargon[0] = CommonValues.BASS_MARK; jargon[1] = "Your Tesla I/O machine of choice"; + jargon[1] = StatCollector.translateToLocal("desc.test"); jargon[2] = EnumChatFormatting.AQUA + "Lightning stoves for the rich"; String[] sDesc = super.getDescription(); sDesc = Arrays.copyOfRange(sDesc, 1, sDesc.length); diff --git a/src/main/resources/assets/tectech/lang/en_US.lang b/src/main/resources/assets/tectech/lang/en_US.lang index 59a0d720de..5f6af25f00 100644 --- a/src/main/resources/assets/tectech/lang/en_US.lang +++ b/src/main/resources/assets/tectech/lang/en_US.lang @@ -1,6 +1,9 @@ +#Creative Tab Name itemGroup.TecTech=TecTech Interdimensional +#Blocks tile.quantumGlass.name=Quantum Glass tile.quantumStuff.name=Quantum Stuff +#Items item.em.debugContainer.name=Debug EM Container item.em.definitionContainer.name=EM Recipe Hint item.em.definitionScanStorage.name=EM Scan Storage @@ -8,12 +11,100 @@ item.em.constructable.name=Multiblock Machine Blueprint item.em.frontRotate.name=Front Rotation Scrench item.em.parametrizerMemoryCard.name=Parametrizer Memory Card item.em.EuMeterGT.name=GT EU meter - +item.tm.teslaCover.0.name=Tesla Coil Cover +item.tm.teslaCover.1.name=Tesla Coil Cover Rich Edition +item.tm.teslaCoilCapacitor.0.name=LV Tesla Capacitor +item.tm.teslaCoilCapacitor.1.name=MV Tesla Capacitor +item.tm.teslaCoilCapacitor.2.name=HV Tesla Capacitor +item.tm.teslaCoilCapacitor.3.name=EV Tesla Capacitor +item.tm.teslaCoilCapacitor.4.name=IV Tesla Capacitor +item.tm.itemTeslaComponent.0.name=Electrum Tesla Windings +item.tm.itemTeslaComponent.1.name=Superconductive Tesla Windings +tile.turretHeadEM.name=Elemental Matter Turret +tile.turretBaseEM.name=Elemental Turret Base +#Death Messages death.attack.microwaving=%1$s was dehydrated by radiation. death.attack.microwaving.player=%1$s was dehydrated by radiation while fighting %2$s. - death.attack.elementalPollution=%1$s was vaping from the wrong hole. death.attack.elementalPollution.player=%1$s was vaping from the wrong hole while fighting %2$s. - death.attack.subspace=%1$s was N-th dimensionally displeased. -death.attack.subspace.player=%1$s N-th dimensionally displeased while fighting %2$s. \ No newline at end of file +death.attack.subspace.player=%1$s N-th dimensionally displeased while fighting %2$s. +#Machines +gt.blockmachines.wetransformer.tier.00.name=Ultra Low Voltage Power Transformer +gt.blockmachines.wetransformer.tier.00.desc=LV -> ULV (Use Soft Mallet to invert) +gt.blockmachines.wetransformer.tier.01.name=Low Voltage Power Transformer +gt.blockmachines.wetransformer.tier.01.desc=MV -> LV (Use Soft Mallet to invert) +gt.blockmachines.wetransformer.tier.02.name=Medium Voltage Power Transformer +gt.blockmachines.wetransformer.tier.02.desc=HV -> MV (Use Soft Mallet to invert) +gt.blockmachines.wetransformer.tier.03.name=High Voltage Power Transformer +gt.blockmachines.wetransformer.tier.03.desc=EV -> HV (Use Soft Mallet to invert) +gt.blockmachines.wetransformer.tier.04.name=Extreme Power Transformer +gt.blockmachines.wetransformer.tier.04.desc=IV -> EV (Use Soft Mallet to invert) +gt.blockmachines.wetransformer.tier.05.name=Insane Power Transformer +gt.blockmachines.wetransformer.tier.05.desc=LuV -> IV (Use Soft Mallet to invert) +gt.blockmachines.wetransformer.tier.06.name=Ludicrous Power Transformer +gt.blockmachines.wetransformer.tier.06.desc=ZPM -> LuV (Use Soft Mallet to invert) +gt.blockmachines.wetransformer.tier.07.name=ZPM Voltage Power Transformer +gt.blockmachines.wetransformer.tier.07.desc=UV -> ZPM (Use Soft Mallet to invert) +gt.blockmachines.wetransformer.tier.08.name=Ultimate Power Transformer +gt.blockmachines.wetransformer.tier.08.desc=UHV -> UV (Use Soft Mallet to invert) +gt.blockmachines.wetransformer.tier.09.name=Highly Ultimate Power Transformer +gt.blockmachines.wetransformer.tier.09.desc=UEV -> UHV (Use Soft Mallet to invert) +gt.blockmachines.wetransformer.tier.10.name=Extremely Ultimate Power Transformer +gt.blockmachines.wetransformer.tier.10.desc=UIV -> UEV (Use Soft Mallet to invert) +gt.blockmachines.wetransformer.tier.11.name=Insanely Ultimate Power Transformer +gt.blockmachines.wetransformer.tier.11.desc=UMV -> UIV (Use Soft Mallet to invert) +gt.blockmachines.wetransformer.tier.12.name=Mega Ultimate Power Transformer +gt.blockmachines.wetransformer.tier.12.desc=UXV -> UMV (Use Soft Mallet to invert) +gt.blockmachines.wetransformer.tier.13.name=Extended Mega Ultimate Power Transformer +gt.blockmachines.wetransformer.tier.13.desc=OPV -> UXV (Use Soft Mallet to invert) +gt.blockmachines.wetransformer.tier.14.name=Overpowered Power Transformer +gt.blockmachines.wetransformer.tier.14.desc=MAX -> OPV (Use Soft Mallet to invert) +#The rainbow 'You just gotta use your Imagination' bit isn't ever translated anyway +gt.blockmachines.hull.tier.10.name=UEV Machine Hull +gt.blockmachines.hull.tier.11.name=UIV Machine Hull +gt.blockmachines.hull.tier.12.name=UMV Machine Hull +gt.blockmachines.hull.tier.13.name=UXV Machine Hull +gt.blockmachines.hull.tier.14.name=OPV Machine Hull +gt.blockmachines.hull.tier.15.name=MAX Machine Hull +gt.blockmachines.transformer.tier.09.name=Highly Ultimate Transformer +gt.blockmachines.transformer.tier.09.desc=UEV -> UHV (Use Soft Mallet to invert) +gt.blockmachines.transformer.tier.10.name=Extremely Ultimate Transformer +gt.blockmachines.transformer.tier.10.desc=UIV -> UEV (Use Soft Mallet to invert) +gt.blockmachines.transformer.tier.11.name=Insanely Ultimate Transformer +gt.blockmachines.transformer.tier.11.desc=UMV -> UIV (Use Soft Mallet to invert) +gt.blockmachines.transformer.tier.12.name=Mega Ultimate Transformer +gt.blockmachines.transformer.tier.12.desc=UXV -> UMV (Use Soft Mallet to invert) +gt.blockmachines.transformer.tier.13.name=Extended Mega Ultimate Transformer +gt.blockmachines.transformer.tier.13.desc=OPV -> UXV (Use Soft Mallet to invert) +gt.blockmachines.transformer.tier.14.name=Overpowered Transformer +gt.blockmachines.transformer.tier.14.desc=MAX -> OPV (Use Soft Mallet to invert) +gt.blockmachines.transformer.ha.tier.09.name=Highly Ultimate Hi-Amp Transformer +gt.blockmachines.transformer.ha.tier.09.desc=UEV -> UHV (Use Soft Mallet to invert +gt.blockmachines.transformer.ha.tier.10.name=Extremely Ultimate Hi-Amp Transformer +gt.blockmachines.transformer.ha.tier.10.desc=UIV -> UEV (Use Soft Mallet to invert) +gt.blockmachines.transformer.ha.tier.11.name=Insanely Ultimate Hi-Amp Transformer +gt.blockmachines.transformer.ha.tier.11.desc=UMV -> UIV (Use Soft Mallet to invert) +gt.blockmachines.transformer.ha.tier.12.name=Mega Ultimate Hi-Amp Transformer +gt.blockmachines.transformer.ha.tier.12.desc=UXV -> UMV (Use Soft Mallet to invert) +gt.blockmachines.transformer.ha.tier.13.name=Extended Mega Ultimate Hi-Amp Transformer +gt.blockmachines.transformer.ha.tier.13.desc=OPV -> UXV (Use Soft Mallet to invert) +gt.blockmachines.transformer.ha.tier.14.name=Overpowered Hi-Amp Transformer +gt.blockmachines.transformer.ha.tier.14.desc=MAX -> OPV (Use Soft Mallet to invert) +#Thaumcraft compatibility +tt.keyword.Air=Air +tt.keyword.Earth=Earth +tt.keyword.Fire=Fire +tt.keyword.Water=Water +tt.keyword.Order=Order +tt.keyword.Entropy=Entropy +tt.keyword.Primal=Primal +tt.keyword.Aspect=Aspect +tt.keyword.CLASS=CLASS +tt.keyword.NAME=NAME +tt.keyword.CHARGE=CHARGE +tt.keyword.COLORLESS=COLORLESS +tt.keyword.CARRIES_COLOR=CARRIES COLOR +tt.keyword.MASS=MASS +tt.keyword.LIFE_TIME=LIFE TIME +tt.keyphrase.At_current_energy_level=At current energy level \ No newline at end of file -- cgit From db11db198e50876dfcf859baa9f8f3a99d03a41d Mon Sep 17 00:00:00 2001 From: Bass Date: Fri, 23 Aug 2019 22:25:45 +0100 Subject: Additional Lang --- .../GT_MetaTileEntity_EM_essentiaDequantizer.java | 59 +++++++++++----------- .../GT_MetaTileEntity_EM_essentiaQuantizer.java | 57 +++++++++++---------- src/main/resources/assets/tectech/lang/en_US.lang | 19 ++++++- 3 files changed, 77 insertions(+), 58 deletions(-) (limited to 'src/main/resources/assets/tectech') diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java index 3d64ceee62..afaa9052cd 100644 --- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java +++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java @@ -21,6 +21,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.StatCollector; import net.minecraftforge.common.util.ForgeDirection; import static com.github.technus.tectech.CommonValues.V; @@ -38,14 +39,14 @@ public class GT_MetaTileEntity_EM_essentiaDequantizer extends GT_MetaTileEntity_ //region Structure //use multi A energy inputs, use less power the longer it runs private static final String[][] shape = new String[][]{ - {" "," . "," ",}, - {"0A0",E,"0A0",}, - {"121","232","121",}, - {"\"\"\"","\"2\"","\"\"\"",}, - {"202","0!0","202",}, + {" ", " . ", " ",}, + {"0A0", E, "0A0",}, + {"121", "232", "121",}, + {"\"\"\"", "\"2\"", "\"\"\"",}, + {"202", "0!0", "202",}, }; private static final Block[] blockType = new Block[]{QuantumGlassBlock.INSTANCE, sBlockCasingsTT, sBlockCasingsTT, sBlockCasingsTT}; - private static final byte[] blockMeta = new byte[]{0,0,4,8}; + private static final byte[] blockMeta = new byte[]{0, 0, 4, 8}; private final IHatchAdder[] addingMethods = new IHatchAdder[]{ this::addClassicToMachineList, this::addElementalInputToMachineList, @@ -54,11 +55,11 @@ public class GT_MetaTileEntity_EM_essentiaDequantizer extends GT_MetaTileEntity_ private static final Block[] blockTypeFallback = new Block[]{sBlockCasingsTT, sBlockCasingsTT, sBlockCasingsTT}; private static final byte[] blockMetaFallback = new byte[]{0, 4, 4}; private static final String[] description = new String[]{ - EnumChatFormatting.AQUA+"Hint Details:", - "1 - Classic Hatches or High Power Casing", - "2 - Elemental Input Hatch", - "3 - Elemental Overflow Hatches or Elemental Casing", - "General - Some sort of Essentia Storage", + EnumChatFormatting.AQUA + StatCollector.translateToLocal("tt.keyword.Hint_Details") + ":", + StatCollector.translateToLocal("gt.blockmachines.multimachine.em.emtoessentia.hint.0"),//1 - Classic Hatches or High Power Casing + StatCollector.translateToLocal("gt.blockmachines.multimachine.em.emtoessentia.hint.1"),//2 - Elemental Input Hatch + StatCollector.translateToLocal("gt.blockmachines.multimachine.em.emtoessentia.hint.2"),//3 - Elemental Overflow Hatches or Elemental Casing + StatCollector.translateToLocal("gt.blockmachines.multimachine.em.emtoessentia.hint.3"),//General - Some sort of Essentia Storage }; //endregion @@ -77,7 +78,7 @@ public class GT_MetaTileEntity_EM_essentiaDequantizer extends GT_MetaTileEntity_ @Override @SideOnly(Side.CLIENT) - protected ResourceLocation getActivitySound(){ + protected ResourceLocation getActivitySound() { return GT_MetaTileEntity_EM_quantizer.activitySound; } @@ -88,22 +89,22 @@ public class GT_MetaTileEntity_EM_essentiaDequantizer extends GT_MetaTileEntity_ @Override public void construct(int stackSize, boolean hintsOnly) { - IGregTechTileEntity iGregTechTileEntity=getBaseMetaTileEntity(); + IGregTechTileEntity iGregTechTileEntity = getBaseMetaTileEntity(); int xDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetX; int yDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetY; int zDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetZ; - if(hintsOnly){ + if (hintsOnly) { TecTech.proxy.hint_particle(iGregTechTileEntity.getWorld(), - iGregTechTileEntity.getXCoord()+xDir, - iGregTechTileEntity.getYCoord()+yDir, - iGregTechTileEntity.getZCoord()+zDir, - TT_Container_Casings.sHintCasingsTT,12); - } else{ - if(iGregTechTileEntity.getBlockOffset(xDir,0,zDir).getMaterial() == Material.air) { + iGregTechTileEntity.getXCoord() + xDir, + iGregTechTileEntity.getYCoord() + yDir, + iGregTechTileEntity.getZCoord() + zDir, + TT_Container_Casings.sHintCasingsTT, 12); + } else { + if (iGregTechTileEntity.getBlockOffset(xDir, 0, zDir).getMaterial() == Material.air) { iGregTechTileEntity.getWorld().setBlock(iGregTechTileEntity.getXCoord() + xDir, iGregTechTileEntity.getYCoord() + yDir, iGregTechTileEntity.getZCoord() + zDir, TT_Container_Casings.sHintCasingsTT, 12, 2); } } - StructureBuilderExtreme(shape, blockType, blockMeta,1, 1, 0, iGregTechTileEntity,this,hintsOnly); + StructureBuilderExtreme(shape, blockType, blockMeta, 1, 1, 0, iGregTechTileEntity, this, hintsOnly); } @Override @@ -114,20 +115,20 @@ public class GT_MetaTileEntity_EM_essentiaDequantizer extends GT_MetaTileEntity_ @Override public boolean checkRecipe_EM(ItemStack itemStack) { TileEntity container = essentiaContainerCompat.getContainer(this); - if (eInputHatches.size() < 1 || container ==null) { + if (eInputHatches.size() < 1 || container == null) { stopMachine(); return false; } - cElementalInstanceStackMap inputHatchContainer=eInputHatches.get(0).getContainerHandler(); - if(inputHatchContainer.hasStacks()){ + cElementalInstanceStackMap inputHatchContainer = eInputHatches.get(0).getContainerHandler(); + if (inputHatchContainer.hasStacks()) { cElementalInstanceStack stack = inputHatchContainer.getFirst(); - inputHatchContainer.removeAmount(false,new cElementalInstanceStack(stack.definition,1)); - if(!essentiaContainerCompat.putElementalInstanceStack(container,stack)) { + inputHatchContainer.removeAmount(false, new cElementalInstanceStack(stack.definition, 1)); + if (!essentiaContainerCompat.putElementalInstanceStack(container, stack)) { cleanStackEM_EM(stack); } mMaxProgresstime = 20; mEfficiencyIncrease = 10000; - eAmpereFlow=1; + eAmpereFlow = 1; if (stack.definition instanceof ePrimalAspectDefinition) { mEUt = (int) -V[8]; } else { @@ -142,8 +143,8 @@ public class GT_MetaTileEntity_EM_essentiaDequantizer extends GT_MetaTileEntity_ public String[] getDescription() { return new String[]{ CommonValues.TEC_MARK_EM, - "Transform quantum form back to...", - EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "regular one, but why?" + StatCollector.translateToLocal("gt.blockmachines.multimachine.em.emtoessentia.desc.0"),//Transform quantum form back to... + EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + StatCollector.translateToLocal("gt.blockmachines.multimachine.em.emtoessentia.desc.1")//regular one, but why? }; } } diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java index 9bd16c959b..d7570f7889 100644 --- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java +++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java @@ -21,6 +21,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.StatCollector; import net.minecraftforge.common.util.ForgeDirection; import static com.github.technus.tectech.CommonValues.V; @@ -38,27 +39,27 @@ public class GT_MetaTileEntity_EM_essentiaQuantizer extends GT_MetaTileEntity_Mu //region Structure //use multi A energy inputs, use less power the longer it runs private static final String[][] shape = new String[][]{ - {" "," . "," ",}, - {"0A0",E,"0A0",}, - {"121","232","121",}, - {"\"\"\"","\"1\"","\"\"\"",}, - {"010","1!1","010",}, + {" ", " . ", " ",}, + {"0A0", E, "0A0",}, + {"121", "232", "121",}, + {"\"\"\"", "\"1\"", "\"\"\"",}, + {"010", "1!1", "010",}, }; private static final Block[] blockType = new Block[]{QuantumGlassBlock.INSTANCE, sBlockCasingsTT, sBlockCasingsTT, sBlockCasingsTT}; - private static final byte[] blockMeta = new byte[]{0,4,0,8}; + private static final byte[] blockMeta = new byte[]{0, 4, 0, 8}; private final IHatchAdder[] addingMethods = new IHatchAdder[]{ this::addClassicToMachineList, this::addElementalOutputToMachineList, this::addElementalMufflerToMachineList}; - private static final short[] casingTextures = new short[]{textureOffset, textureOffset+4, textureOffset + 4}; + private static final short[] casingTextures = new short[]{textureOffset, textureOffset + 4, textureOffset + 4}; private static final Block[] blockTypeFallback = new Block[]{sBlockCasingsTT, sBlockCasingsTT, sBlockCasingsTT}; private static final byte[] blockMetaFallback = new byte[]{0, 4, 4}; private static final String[] description = new String[]{ - EnumChatFormatting.AQUA+"Hint Details:", - "1 - Classic Hatches or High Power Casing", - "2 - Elemental Output Hatch", - "3 - Elemental Overflow Hatches or Elemental Casing", - "General - Some sort of Essentia Storage", + EnumChatFormatting.AQUA + StatCollector.translateToLocal("tt.keyword.Hint_Details") + ":", + StatCollector.translateToLocal("gt.blockmachines.multimachine.em.essentiatoem.hint.0"),//1 - Classic Hatches or High Power Casing + StatCollector.translateToLocal("gt.blockmachines.multimachine.em.essentiatoem.hint.1"),//2 - Elemental Output Hatch + StatCollector.translateToLocal("gt.blockmachines.multimachine.em.essentiatoem.hint.2"),//3 - Elemental Overflow Hatches or Elemental Casing + StatCollector.translateToLocal("gt.blockmachines.multimachine.em.essentiatoem.hint.3"),//General - Some sort of Essentia Storage }; //endregion @@ -72,7 +73,7 @@ public class GT_MetaTileEntity_EM_essentiaQuantizer extends GT_MetaTileEntity_Mu @Override @SideOnly(Side.CLIENT) - protected ResourceLocation getActivitySound(){ + protected ResourceLocation getActivitySound() { return GT_MetaTileEntity_EM_quantizer.activitySound; } @@ -88,22 +89,22 @@ public class GT_MetaTileEntity_EM_essentiaQuantizer extends GT_MetaTileEntity_Mu @Override public void construct(int stackSize, boolean hintsOnly) { - IGregTechTileEntity iGregTechTileEntity=getBaseMetaTileEntity(); + IGregTechTileEntity iGregTechTileEntity = getBaseMetaTileEntity(); int xDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetX; int yDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetY; int zDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetZ; - if(hintsOnly){ + if (hintsOnly) { TecTech.proxy.hint_particle(iGregTechTileEntity.getWorld(), - iGregTechTileEntity.getXCoord()+xDir, - iGregTechTileEntity.getYCoord()+yDir, - iGregTechTileEntity.getZCoord()+zDir, - TT_Container_Casings.sHintCasingsTT,12); - } else{ - if(iGregTechTileEntity.getBlockOffset(xDir,0,zDir).getMaterial() == Material.air) { + iGregTechTileEntity.getXCoord() + xDir, + iGregTechTileEntity.getYCoord() + yDir, + iGregTechTileEntity.getZCoord() + zDir, + TT_Container_Casings.sHintCasingsTT, 12); + } else { + if (iGregTechTileEntity.getBlockOffset(xDir, 0, zDir).getMaterial() == Material.air) { iGregTechTileEntity.getWorld().setBlock(iGregTechTileEntity.getXCoord() + xDir, iGregTechTileEntity.getYCoord() + yDir, iGregTechTileEntity.getZCoord() + zDir, TT_Container_Casings.sHintCasingsTT, 12, 2); } } - StructureBuilderExtreme(shape, blockType, blockMeta,1, 1, 0, iGregTechTileEntity,this,hintsOnly); + StructureBuilderExtreme(shape, blockType, blockMeta, 1, 1, 0, iGregTechTileEntity, this, hintsOnly); } @Override @@ -115,19 +116,19 @@ public class GT_MetaTileEntity_EM_essentiaQuantizer extends GT_MetaTileEntity_Mu public String[] getDescription() { return new String[]{ CommonValues.TEC_MARK_EM, - "Conveniently convert regular stuff into quantum form.", - EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "To make it more inconvenient." + StatCollector.translateToLocal("gt.blockmachines.multimachine.em.essentiatoem.desc.0"),//Conveniently convert regular stuff into quantum form. + EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + StatCollector.translateToLocal("gt.blockmachines.multimachine.em.essentiatoem.desc.1")//To make it more inconvenient. }; } @Override public boolean checkRecipe_EM(ItemStack itemStack) { TileEntity container = essentiaContainerCompat.getContainer(this); - cElementalInstanceStack newStack=essentiaContainerCompat.getFromContainer(container); - if(newStack!=null){ + cElementalInstanceStack newStack = essentiaContainerCompat.getFromContainer(container); + if (newStack != null) { mMaxProgresstime = 20; mEfficiencyIncrease = 10000; - eAmpereFlow=1; + eAmpereFlow = 1; outputEM = new cElementalInstanceStackMap[]{ new cElementalInstanceStackMap(newStack) }; @@ -148,6 +149,6 @@ public class GT_MetaTileEntity_EM_essentiaQuantizer extends GT_MetaTileEntity_Mu return; } eOutputHatches.get(0).getContainerHandler().putUnifyAll(outputEM[0]); - outputEM=null; + outputEM = null; } } diff --git a/src/main/resources/assets/tectech/lang/en_US.lang b/src/main/resources/assets/tectech/lang/en_US.lang index 5f6af25f00..60ac67a9a5 100644 --- a/src/main/resources/assets/tectech/lang/en_US.lang +++ b/src/main/resources/assets/tectech/lang/en_US.lang @@ -29,7 +29,7 @@ death.attack.elementalPollution=%1$s was vaping from the wrong hole. death.attack.elementalPollution.player=%1$s was vaping from the wrong hole while fighting %2$s. death.attack.subspace=%1$s was N-th dimensionally displeased. death.attack.subspace.player=%1$s N-th dimensionally displeased while fighting %2$s. -#Machines +#Singleblock Machines gt.blockmachines.wetransformer.tier.00.name=Ultra Low Voltage Power Transformer gt.blockmachines.wetransformer.tier.00.desc=LV -> ULV (Use Soft Mallet to invert) gt.blockmachines.wetransformer.tier.01.name=Low Voltage Power Transformer @@ -91,7 +91,24 @@ gt.blockmachines.transformer.ha.tier.13.name=Extended Mega Ultimate Hi-Amp Trans gt.blockmachines.transformer.ha.tier.13.desc=OPV -> UXV (Use Soft Mallet to invert) gt.blockmachines.transformer.ha.tier.14.name=Overpowered Hi-Amp Transformer gt.blockmachines.transformer.ha.tier.14.desc=MAX -> OPV (Use Soft Mallet to invert) +#Multiblock Machines +gt.blockmachines.multimachine.em.emtoessentia.name=Essentia Dequantizer +gt.blockmachines.multimachine.em.emtoessentia.hint.0=1 - Classic Hatches or High Power Casing +gt.blockmachines.multimachine.em.emtoessentia.hint.1=2 - Elemental Input Hatch +gt.blockmachines.multimachine.em.emtoessentia.hint.2=3 - Elemental Overflow Hatches or Elemental Casing +gt.blockmachines.multimachine.em.emtoessentia.hint.3=General - Some sort of Essentia Storage +gt.blockmachines.multimachine.em.emtoessentia.desc.0=Transform quantum form back to... +gt.blockmachines.multimachine.em.emtoessentia.desc.1=regular one, but why? +gt.blockmachines.multimachine.em.essentiatoem.name=Essentia Quantizer +gt.blockmachines.multimachine.em.essentiatoem.hint.0=1 - Classic Hatches or High Power Casing +gt.blockmachines.multimachine.em.essentiatoem.hint.1=2 - Elemental Output Hatch +gt.blockmachines.multimachine.em.essentiatoem.hint.2=3 - Elemental Overflow Hatches or Elemental Casing +gt.blockmachines.multimachine.em.essentiatoem.hint.3=General - Some sort of Essentia Storage +gt.blockmachines.multimachine.em.essentiatoem.desc.0=Conveniently convert regular stuff into quantum form. +gt.blockmachines.multimachine.em.essentiatoem.desc.1=To make it more inconvenient. + #Thaumcraft compatibility +tt.keyword.Hint_Details=Hint Details tt.keyword.Air=Air tt.keyword.Earth=Earth tt.keyword.Fire=Fire -- cgit From d633c17a949aef4328eeb5cf4f74354864fcba23 Mon Sep 17 00:00:00 2001 From: Bass Date: Sat, 24 Aug 2019 19:49:26 +0100 Subject: Lang extras --- .../tectech/loader/thing/MachineLoader.java | 18 +++--- ...GT_MetaTileEntity_Hatch_ElementalContainer.java | 59 +++++++++---------- .../GT_MetaTileEntity_Hatch_InputElemental.java | 5 +- .../GT_MetaTileEntity_Hatch_OutputElemental.java | 3 +- .../GT_MetaTileEntity_Hatch_OverflowElemental.java | 45 ++++++++------- src/main/resources/assets/tectech/lang/en_US.lang | 67 +++++++++++++++++----- 6 files changed, 121 insertions(+), 76 deletions(-) (limited to 'src/main/resources/assets/tectech') diff --git a/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java b/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java index 052e3a0159..6f6d4865fc 100644 --- a/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java +++ b/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java @@ -297,7 +297,7 @@ public class MachineLoader implements Runnable { eM_energyTunnel7_UXV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( 15198, "hatch.energytunnel7.tier.13", "UXV 1048576/t Laser Target Hatch", 13, 1048576).getStackForm(1L)); eM_energyTunnel9001.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15199, "hatch.energytunnel.tier.14", "Legendary Laser Target Hatch", 14, (int)V[14]).getStackForm(1L)); + 15199, "hatch.energytunnel.tier.14", "Legendary Laser Target Hatch", 14, (int) V[14]).getStackForm(1L)); // =================================================================================================== // Multi AMP Power OUTPUTS @@ -506,8 +506,8 @@ public class MachineLoader implements Runnable { eM_dynamoTunnel7_UXV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( 15298, "hatch.dynamotunnel7.tier.13", "UXV 1048576/t Laser Source Hatch", 13, 1048576).getStackForm(1L)); eM_dynamoTunnel9001.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15299, "hatch.dynamotunnel.tier.14", "Legendary Laser Source Hatch", 14, (int)V[14]).getStackForm(1L)); - + 15299, "hatch.dynamotunnel.tier.14", "Legendary Laser Source Hatch", 14, (int) V[14]).getStackForm(1L)); + // =================================================================================================== // MULTIBLOCKS // =================================================================================================== @@ -600,25 +600,25 @@ public class MachineLoader implements Runnable { // Tesla Transceiver // =================================================================================================== - Machine_TeslaCoil_1by1_LV.set(new GT_MetaTileEntity_TeslaCoil(16000, "machine.tt.tesla.01", "Basic Tesla Transceiver", 1,1).getStackForm(1L)); + Machine_TeslaCoil_1by1_LV.set(new GT_MetaTileEntity_TeslaCoil(16000, "machine.tt.tesla.01", "Basic Tesla Transceiver", 1, 1).getStackForm(1L)); Machine_TeslaCoil_1by1_MV.set(new GT_MetaTileEntity_TeslaCoil(16001, "machine.tt.tesla.02", "Advanced Tesla Transceiver", 2, 1).getStackForm(1L)); Machine_TeslaCoil_1by1_HV.set(new GT_MetaTileEntity_TeslaCoil(16002, "machine.tt.tesla.03", "Epyc Tesla Transceiver", 3, 1).getStackForm(1L)); Machine_TeslaCoil_1by1_EV.set(new GT_MetaTileEntity_TeslaCoil(16003, "machine.tt.tesla.04", "Ultimate Power Tesla Transceiver", 4, 1).getStackForm(1L)); Machine_TeslaCoil_1by1_IV.set(new GT_MetaTileEntity_TeslaCoil(16004, "machine.tt.tesla.05", "Insane Tesla Transceiver", 5, 1).getStackForm(1L)); - Machine_TeslaCoil_2by2_LV.set(new GT_MetaTileEntity_TeslaCoil(16005, "machine.tt.tesla.01", "Basic Tesla Transceiver", 1,4).getStackForm(1L)); + Machine_TeslaCoil_2by2_LV.set(new GT_MetaTileEntity_TeslaCoil(16005, "machine.tt.tesla.01", "Basic Tesla Transceiver", 1, 4).getStackForm(1L)); Machine_TeslaCoil_2by2_MV.set(new GT_MetaTileEntity_TeslaCoil(16006, "machine.tt.tesla.02", "Advanced Tesla Transceiver", 2, 4).getStackForm(1L)); Machine_TeslaCoil_2by2_HV.set(new GT_MetaTileEntity_TeslaCoil(16007, "machine.tt.tesla.03", "Epyc Tesla Transceiver", 3, 4).getStackForm(1L)); Machine_TeslaCoil_2by2_EV.set(new GT_MetaTileEntity_TeslaCoil(16008, "machine.tt.tesla.04", "Ultimate Power Tesla Transceiver", 4, 4).getStackForm(1L)); Machine_TeslaCoil_2by2_IV.set(new GT_MetaTileEntity_TeslaCoil(16009, "machine.tt.tesla.05", "Insane Tesla Transceiver", 5, 4).getStackForm(1L)); - Machine_TeslaCoil_3by3_LV.set(new GT_MetaTileEntity_TeslaCoil(16010, "machine.tt.tesla.01", "Basic Tesla Transceiver", 1,9).getStackForm(1L)); + Machine_TeslaCoil_3by3_LV.set(new GT_MetaTileEntity_TeslaCoil(16010, "machine.tt.tesla.01", "Basic Tesla Transceiver", 1, 9).getStackForm(1L)); Machine_TeslaCoil_3by3_MV.set(new GT_MetaTileEntity_TeslaCoil(16011, "machine.tt.tesla.02", "Advanced Tesla Transceiver", 2, 9).getStackForm(1L)); Machine_TeslaCoil_3by3_HV.set(new GT_MetaTileEntity_TeslaCoil(16012, "machine.tt.tesla.03", "Epyc Tesla Transceiver", 3, 9).getStackForm(1L)); Machine_TeslaCoil_3by3_EV.set(new GT_MetaTileEntity_TeslaCoil(16013, "machine.tt.tesla.04", "Ultimate Power Tesla Transceiver", 4, 9).getStackForm(1L)); Machine_TeslaCoil_3by3_IV.set(new GT_MetaTileEntity_TeslaCoil(16014, "machine.tt.tesla.05", "Insane Tesla Transceiver", 5, 9).getStackForm(1L)); - Machine_TeslaCoil_4by4_LV.set(new GT_MetaTileEntity_TeslaCoil(16015, "machine.tt.tesla.01", "Basic Tesla Transceiver", 1,16).getStackForm(1L)); + Machine_TeslaCoil_4by4_LV.set(new GT_MetaTileEntity_TeslaCoil(16015, "machine.tt.tesla.01", "Basic Tesla Transceiver", 1, 16).getStackForm(1L)); Machine_TeslaCoil_4by4_MV.set(new GT_MetaTileEntity_TeslaCoil(16016, "machine.tt.tesla.02", "Advanced Tesla Transceiver", 2, 16).getStackForm(1L)); Machine_TeslaCoil_4by4_HV.set(new GT_MetaTileEntity_TeslaCoil(16017, "machine.tt.tesla.03", "Epyc Tesla Transceiver", 3, 16).getStackForm(1L)); Machine_TeslaCoil_4by4_EV.set(new GT_MetaTileEntity_TeslaCoil(16018, "machine.tt.tesla.04", "Ultimate Power Tesla Transceiver", 4, 16).getStackForm(1L)); @@ -627,8 +627,8 @@ public class MachineLoader implements Runnable { // =================================================================================================== // Debug Stuff // =================================================================================================== - Machine_DebugPollutor.set(new GT_MetaTileEntity_DebugPollutor(15495,"debug.tt.pollutor","Debug Pollution Generator",15).getStackForm(1)); - hatch_CreativeData.set(new GT_MetaTileEntity_Hatch_CreativeData(15496,"debug.tt.data","Debug Data Hatch",15).getStackForm(1)); + Machine_DebugPollutor.set(new GT_MetaTileEntity_DebugPollutor(15495, "debug.tt.pollutor", "Debug Pollution Generator", 15).getStackForm(1)); + hatch_CreativeData.set(new GT_MetaTileEntity_Hatch_CreativeData(15496, "debug.tt.data", "Debug Data Hatch", 15).getStackForm(1)); hatch_CreativeMaintenance.set(new GT_MetaTileEntity_Hatch_CreativeMaintenance(15497, "debug.tt.maintenance", "Debug Maintenance Hatch", 15).getStackForm(1L)); Machine_DebugGenny.set(new GT_MetaTileEntity_DebugPowerGenerator(15498, "debug.tt.genny", "Debug Power Generator", 15).getStackForm(1L)); Machine_DebugWriter.set(new GT_MetaTileEntity_DebugStructureWriter(15499, "debug.tt.writer", "Debug Structure Writer", 15).getStackForm(1L)); 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 066bcaa166..c96cb91f45 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 @@ -19,6 +19,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.StatCollector; import net.minecraftforge.fluids.FluidStack; import static com.github.technus.tectech.CommonValues.*; @@ -43,7 +44,7 @@ public abstract class GT_MetaTileEntity_Hatch_ElementalContainer extends GT_Meta protected GT_MetaTileEntity_Hatch_ElementalContainer(int aID, String aName, String aNameRegional, int aTier, String descr) { super(aID, aName, aNameRegional, aTier, 0, descr); - Util.setTier(aTier,this); + Util.setTier(aTier, this); } protected GT_MetaTileEntity_Hatch_ElementalContainer(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { @@ -104,7 +105,7 @@ public abstract class GT_MetaTileEntity_Hatch_ElementalContainer extends GT_Meta byte Tick = (byte) (aTick % 20); if (DECAY_AT == Tick) { purgeOverflow(); - content.tickContentByOneSecond(1,postEnergize);//Hatches don't life time mult things + content.tickContentByOneSecond(1, postEnergize);//Hatches don't life time mult things purgeOverflow(); } else if (OVERFLOW_AT == Tick) { if (overflowMatter <= 0) { @@ -124,8 +125,8 @@ public abstract class GT_MetaTileEntity_Hatch_ElementalContainer extends GT_Meta if (TecTech.configTecTech.BOOM_ENABLE) { tGTTileEntity.doExplosion(V[14]); } else { - TecTech.anomalyHandler.addAnomaly(aBaseMetaTileEntity,overflowMatter*32D); - TecTech.proxy.broadcast("Container1 BOOM! " +aBaseMetaTileEntity.getXCoord() + ' ' + aBaseMetaTileEntity.getYCoord() + ' ' + aBaseMetaTileEntity.getZCoord()); + TecTech.anomalyHandler.addAnomaly(aBaseMetaTileEntity, overflowMatter * 32D); + TecTech.proxy.broadcast("Container1 " + StatCollector.translateToLocal("tt.keyword.BOOM") + " " + aBaseMetaTileEntity.getXCoord() + ' ' + aBaseMetaTileEntity.getYCoord() + ' ' + aBaseMetaTileEntity.getZCoord()); } } deathDelay = 3;//needed in some cases like repetitive failures. Should be 4 since there is -- at end but meh... @@ -135,10 +136,10 @@ public abstract class GT_MetaTileEntity_Hatch_ElementalContainer extends GT_Meta if (TecTech.configTecTech.BOOM_ENABLE) { aBaseMetaTileEntity.doExplosion(V[14]); } else { - TecTech.anomalyHandler.addAnomaly(aBaseMetaTileEntity,overflowMatter*32D); - deathDelay=3; - overflowMatter=0; - TecTech.proxy.broadcast("Container0 BOOM! " + aBaseMetaTileEntity.getXCoord() + ' ' + aBaseMetaTileEntity.getYCoord() + ' ' + aBaseMetaTileEntity.getZCoord()); + TecTech.anomalyHandler.addAnomaly(aBaseMetaTileEntity, overflowMatter * 32D); + deathDelay = 3; + overflowMatter = 0; + TecTech.proxy.broadcast("Container0 " + StatCollector.translateToLocal("tt.keyword.BOOM") + " " + aBaseMetaTileEntity.getXCoord() + ' ' + aBaseMetaTileEntity.getYCoord() + ' ' + aBaseMetaTileEntity.getZCoord()); } } deathDelay--; @@ -220,33 +221,33 @@ public abstract class GT_MetaTileEntity_Hatch_ElementalContainer extends GT_Meta @Override public String[] getInfoData() { - if(TecTech.configTecTech.EASY_SCAN) { + if (TecTech.configTecTech.EASY_SCAN) { if (id > 0) { if (content == null || content.size() == 0) { - return new String[]{"ID: " + EnumChatFormatting.AQUA + id, "No Stacks"}; + 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] = "ID: " + EnumChatFormatting.AQUA + id; + 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[]{"No Stacks"}; + return new String[]{StatCollector.translateToLocal("tt.keyphrase.No_Stacks")}; } return content.getElementalInfo(); } else { - if(id>0){ + if (id > 0) { if (content == null || content.size() == 0) { - return new String[]{"ID: " + EnumChatFormatting.AQUA + id, "No Stacks"}; + return new String[]{StatCollector.translateToLocal("tt.keyword.ID") + ": " + EnumChatFormatting.AQUA + id, StatCollector.translateToLocal("tt.keyphrase.No_Stacks")}; } - return new String[]{"ID: " + EnumChatFormatting.AQUA + id, "Contains EM"}; + 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[]{"No Stacks"}; + return new String[]{StatCollector.translateToLocal("tt.keyphrase.No_Stacks")}; } - return new String[]{"Contains EM"}; + return new String[]{StatCollector.translateToLocal("tt.keyphrase.Contains_EM")}; } } @@ -259,27 +260,27 @@ public abstract class GT_MetaTileEntity_Hatch_ElementalContainer extends GT_Meta return new String[]{ TEC_MARK_EM, mDescription, - "Max stacks amount: " + EnumChatFormatting.AQUA + getMaxStacksCount(), - "Stack capacity: " + EnumChatFormatting.AQUA + getMaxStackSize(), - "Place Overflow Hatch behind,on top or below", - "to provide overflow protection while this block", - "is not attached to multi block.", - "Transport range can be extended in straight", - "line up to 15 blocks with quantum tunnels.", - EnumChatFormatting.AQUA + "Must be painted to work" + StatCollector.translateToLocal("tt.base.emhatch.desc.0") + " " + EnumChatFormatting.AQUA + getMaxStacksCount(),//Max stacks amount: + StatCollector.translateToLocal("tt.base.emhatch.desc.1") + " " + EnumChatFormatting.AQUA + getMaxStackSize(),//Stack capacity: + StatCollector.translateToLocal("tt.base.emhatch.desc.2"),//Place Overflow Hatch behind,on top or below + StatCollector.translateToLocal("tt.base.emhatch.desc.3"),//to provide overflow protection while this block + StatCollector.translateToLocal("tt.base.emhatch.desc.4"),//is not attached to multi block. + StatCollector.translateToLocal("tt.base.emhatch.desc.5"),//Transport range can be extended in straight + StatCollector.translateToLocal("tt.base.emhatch.desc.6"),//line up to 15 blocks with quantum tunnels. + EnumChatFormatting.AQUA + StatCollector.translateToLocal("tt.base.emhatch.desc.7")//Must be painted to work }; } @Override public void onRemoval() { if (isValidMetaTileEntity(this) && getBaseMetaTileEntity().isActive()) { - TecTech.anomalyHandler.addAnomaly(getBaseMetaTileEntity(),(overflowMatter+content.getMass())*16D); - IGregTechTileEntity base=getBaseMetaTileEntity(); + TecTech.anomalyHandler.addAnomaly(getBaseMetaTileEntity(), (overflowMatter + content.getMass()) * 16D); + IGregTechTileEntity base = getBaseMetaTileEntity(); if (TecTech.configTecTech.BOOM_ENABLE) { base.doExplosion(V[15]); } else { - TecTech.proxy.broadcast("BOOM! " +base.getXCoord() + ' ' + base.getYCoord() + ' ' + base.getZCoord()); + TecTech.proxy.broadcast(StatCollector.translateToLocal("tt.keyword.BOOM") + " " + base.getXCoord() + ' ' + base.getYCoord() + ' ' + base.getZCoord()); } } } -} +} \ No newline at end of file diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_InputElemental.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_InputElemental.java index 6078c6379a..466b0e64af 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_InputElemental.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_InputElemental.java @@ -4,14 +4,15 @@ import com.github.technus.tectech.Util; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; +import net.minecraft.util.StatCollector; /** * Created by danie_000 on 27.10.2016. */ public class GT_MetaTileEntity_Hatch_InputElemental extends GT_MetaTileEntity_Hatch_ElementalContainer { public GT_MetaTileEntity_Hatch_InputElemental(int aID, String aName, String aNameRegional, int aTier) { - super(aID, aName, aNameRegional, aTier, "Elemental Input for Multiblocks"); - Util.setTier(aTier,this); + super(aID, aName, aNameRegional, aTier, StatCollector.translateToLocal("gt.blockmachines.emin.desc"));//Elemental Input for Multiblocks + Util.setTier(aTier, this); } //public GT_MetaTileEntity_Hatch_InputElemental(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OutputElemental.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OutputElemental.java index adfcb1d464..8801388e84 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OutputElemental.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OutputElemental.java @@ -7,13 +7,14 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.util.GT_Utility; +import net.minecraft.util.StatCollector; /** * Created by danie_000 on 27.10.2016. */ public class GT_MetaTileEntity_Hatch_OutputElemental extends GT_MetaTileEntity_Hatch_ElementalContainer { public GT_MetaTileEntity_Hatch_OutputElemental(int aID, String aName, String aNameRegional, int aTier) { - super(aID, aName, aNameRegional, aTier, "Elemental Output for Multiblocks"); + super(aID, aName, aNameRegional, aTier, StatCollector.translateToLocal("gt.blockmachines.emout.desc"));//Elemental Output for Multiblocks Util.setTier(aTier,this); } diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OverflowElemental.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OverflowElemental.java index 18eb8b8c72..3e7ceec796 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OverflowElemental.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OverflowElemental.java @@ -21,6 +21,7 @@ import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.StatCollector; import net.minecraft.world.EnumSkyBlock; import net.minecraftforge.common.util.ForgeDirection; @@ -45,11 +46,11 @@ public class GT_MetaTileEntity_Hatch_OverflowElemental extends GT_MetaTileEntity private final float overflowDisperse; public GT_MetaTileEntity_Hatch_OverflowElemental(int aID, String aName, String aNameRegional, int aTier, float max) { - super(aID, aName, aNameRegional, aTier, 0, "Disposes excess elemental Matter"); + super(aID, aName, aNameRegional, aTier, 0, StatCollector.translateToLocal("gt.blockmachines.hatch.emmuffler.desc.0"));//Disposes excess elemental Matter overflowMatter = max / 2; overflowMax = max; overflowDisperse = overflowMax / (float) (30 - aTier); - Util.setTier(aTier,this); + Util.setTier(aTier, this); } public GT_MetaTileEntity_Hatch_OverflowElemental(String aName, int aTier, float max, String aDescription, ITexture[][][] aTextures) { @@ -84,9 +85,9 @@ public class GT_MetaTileEntity_Hatch_OverflowElemental extends GT_MetaTileEntity return new String[]{ CommonValues.TEC_MARK_EM, mDescription, - "Mass capacity: " + EnumChatFormatting.AQUA + String.format(Locale.ENGLISH, "%+.2E", overflowMax) + " eV/c\u00b2", - "Disposal Speed: " + EnumChatFormatting.AQUA + String.format(Locale.ENGLISH, "%+.2E", overflowDisperse) + " (eV/c\u00b2)/s", - "DO NOT OBSTRUCT THE OUTPUT!" + StatCollector.translateToLocal("gt.blockmachines.hatch.emmuffler.desc.1") + ": " + EnumChatFormatting.AQUA + String.format(Locale.ENGLISH, "%+.2E", overflowMax) + " eV/c\u00b2", + StatCollector.translateToLocal("gt.blockmachines.hatch.emmuffler.desc.2") + ": " + EnumChatFormatting.AQUA + String.format(Locale.ENGLISH, "%+.2E", overflowDisperse) + " (eV/c\u00b2)/s", + StatCollector.translateToLocal("gt.blockmachines.hatch.emmuffler.desc.3") }; } @@ -142,10 +143,10 @@ public class GT_MetaTileEntity_Hatch_OverflowElemental extends GT_MetaTileEntity if (aBaseMetaTileEntity.isServerSide() && aTick % 20 == DISPERSE_AT) { if (aBaseMetaTileEntity.isActive()) { if (overflowMatter > overflowDisperse) { - TecTech.anomalyHandler.addAnomaly(aBaseMetaTileEntity,overflowDisperse); + TecTech.anomalyHandler.addAnomaly(aBaseMetaTileEntity, overflowDisperse); overflowMatter -= overflowDisperse; } else { - TecTech.anomalyHandler.addAnomaly(aBaseMetaTileEntity,overflowMatter); + TecTech.anomalyHandler.addAnomaly(aBaseMetaTileEntity, overflowMatter); overflowMatter = 0; aBaseMetaTileEntity.setActive(false); aBaseMetaTileEntity.setLightValue((byte) 0); @@ -166,20 +167,20 @@ public class GT_MetaTileEntity_Hatch_OverflowElemental extends GT_MetaTileEntity //DOES NOT CHECK FOR TOO MUCH, it is done only while putting stuff in (OPTIMIZATION!!!) } - private void vapePollution(IGregTechTileEntity mte){ - float xPos=mte.getXCoord()+0.5f; - float yPos=mte.getYCoord()+0.5f; - float zPos=mte.getZCoord()+0.5f; + private void vapePollution(IGregTechTileEntity mte) { + float xPos = mte.getXCoord() + 0.5f; + float yPos = mte.getYCoord() + 0.5f; + float zPos = mte.getZCoord() + 0.5f; int xDirShift = ForgeDirection.getOrientation(mte.getFrontFacing()).offsetX; int yDirShift = ForgeDirection.getOrientation(mte.getFrontFacing()).offsetY; int zDirShift = ForgeDirection.getOrientation(mte.getFrontFacing()).offsetZ; - AxisAlignedBB aabb=AxisAlignedBB.getBoundingBox(xPos-.5+xDirShift,yPos-.5+yDirShift,zPos-.5+zDirShift,xPos+.5+xDirShift,yPos+1.5+yDirShift,zPos+.5+zDirShift); + AxisAlignedBB aabb = AxisAlignedBB.getBoundingBox(xPos - .5 + xDirShift, yPos - .5 + yDirShift, zPos - .5 + zDirShift, xPos + .5 + xDirShift, yPos + 1.5 + yDirShift, zPos + .5 + zDirShift); for (Object entity : mte.getWorld().getEntitiesWithinAABB(EntityLivingBase.class, aabb)) { - float damagingFactor = (float)Math.log(overflowDisperse); - ((EntityLivingBase) entity).addPotionEffect(new PotionEffect(Potion.confusion.id,1,(int)(damagingFactor*20))); - ((EntityLivingBase) entity).addPotionEffect(new PotionEffect(Potion.wither.id,2,(int)(damagingFactor*15))); + float damagingFactor = (float) Math.log(overflowDisperse); + ((EntityLivingBase) entity).addPotionEffect(new PotionEffect(Potion.confusion.id, 1, (int) (damagingFactor * 20))); + ((EntityLivingBase) entity).addPotionEffect(new PotionEffect(Potion.wither.id, 2, (int) (damagingFactor * 15))); ((EntityLivingBase) entity).attackEntityFrom(elementalPollution, damagingFactor); } } @@ -192,28 +193,28 @@ public class GT_MetaTileEntity_Hatch_OverflowElemental extends GT_MetaTileEntity @Override public String[] getInfoData() { return new String[]{ - "Contained mass:", + StatCollector.translateToLocal("tt.keyphrase.Contained_mass") + ":", EnumChatFormatting.RED + Double.toString(overflowMatter) + EnumChatFormatting.RESET + " eV/c\u00b2 /", EnumChatFormatting.GREEN + Double.toString(overflowMax) + EnumChatFormatting.RESET + " eV/c\u00b2", - "Mass Disposal speed: " + EnumChatFormatting.BLUE + overflowDisperse + EnumChatFormatting.RESET + " (eV/c\u00b2)/s" + StatCollector.translateToLocal("tt.keyphrase.Mass_Disposal_speed") + ": " + EnumChatFormatting.BLUE + overflowDisperse + EnumChatFormatting.RESET + " (eV/c\u00b2)/s" }; } @Override public void onRemoval() { if (isValidMetaTileEntity(this) && getBaseMetaTileEntity().isActive()) { - TecTech.anomalyHandler.addAnomaly(getBaseMetaTileEntity(),overflowMatter*8D); + TecTech.anomalyHandler.addAnomaly(getBaseMetaTileEntity(), overflowMatter * 8D); if (TecTech.configTecTech.BOOM_ENABLE) { getBaseMetaTileEntity().doExplosion(V[15]); } else { - TecTech.proxy.broadcast("Muffler BOOM! " + getBaseMetaTileEntity().getXCoord() + ' ' + getBaseMetaTileEntity().getYCoord() + ' ' + getBaseMetaTileEntity().getZCoord()); + TecTech.proxy.broadcast(StatCollector.translateToLocal("tt.keyphrase.Muffler_BOOM") + " " + getBaseMetaTileEntity().getXCoord() + ' ' + getBaseMetaTileEntity().getYCoord() + ' ' + getBaseMetaTileEntity().getZCoord()); } } } //Return - Should Explode - public boolean addOverflowMatter(float matter){ - overflowMatter+=matter; + public boolean addOverflowMatter(float matter) { + overflowMatter += matter; return overflowMatter > overflowMax; } @@ -226,4 +227,4 @@ public class GT_MetaTileEntity_Hatch_OverflowElemental extends GT_MetaTileEntity this.overflowMatter = overflowMatter; return overflowMatter > overflowMax; } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/tectech/lang/en_US.lang b/src/main/resources/assets/tectech/lang/en_US.lang index 60ac67a9a5..561a4e7ed4 100644 --- a/src/main/resources/assets/tectech/lang/en_US.lang +++ b/src/main/resources/assets/tectech/lang/en_US.lang @@ -20,8 +20,6 @@ item.tm.teslaCoilCapacitor.3.name=EV Tesla Capacitor item.tm.teslaCoilCapacitor.4.name=IV Tesla Capacitor item.tm.itemTeslaComponent.0.name=Electrum Tesla Windings item.tm.itemTeslaComponent.1.name=Superconductive Tesla Windings -tile.turretHeadEM.name=Elemental Matter Turret -tile.turretBaseEM.name=Elemental Turret Base #Death Messages death.attack.microwaving=%1$s was dehydrated by radiation. death.attack.microwaving.player=%1$s was dehydrated by radiation while fighting %2$s. @@ -29,7 +27,14 @@ death.attack.elementalPollution=%1$s was vaping from the wrong hole. death.attack.elementalPollution.player=%1$s was vaping from the wrong hole while fighting %2$s. death.attack.subspace=%1$s was N-th dimensionally displeased. death.attack.subspace.player=%1$s N-th dimensionally displeased while fighting %2$s. -#Singleblock Machines +#Machine hulls +gt.blockmachines.hull.tier.10.name=UEV Machine Hull +gt.blockmachines.hull.tier.11.name=UIV Machine Hull +gt.blockmachines.hull.tier.12.name=UMV Machine Hull +gt.blockmachines.hull.tier.13.name=UXV Machine Hull +gt.blockmachines.hull.tier.14.name=OPV Machine Hull +gt.blockmachines.hull.tier.15.name=MAX Machine Hull +#Transformers gt.blockmachines.wetransformer.tier.00.name=Ultra Low Voltage Power Transformer gt.blockmachines.wetransformer.tier.00.desc=LV -> ULV (Use Soft Mallet to invert) gt.blockmachines.wetransformer.tier.01.name=Low Voltage Power Transformer @@ -60,13 +65,6 @@ gt.blockmachines.wetransformer.tier.13.name=Extended Mega Ultimate Power Transfo gt.blockmachines.wetransformer.tier.13.desc=OPV -> UXV (Use Soft Mallet to invert) gt.blockmachines.wetransformer.tier.14.name=Overpowered Power Transformer gt.blockmachines.wetransformer.tier.14.desc=MAX -> OPV (Use Soft Mallet to invert) -#The rainbow 'You just gotta use your Imagination' bit isn't ever translated anyway -gt.blockmachines.hull.tier.10.name=UEV Machine Hull -gt.blockmachines.hull.tier.11.name=UIV Machine Hull -gt.blockmachines.hull.tier.12.name=UMV Machine Hull -gt.blockmachines.hull.tier.13.name=UXV Machine Hull -gt.blockmachines.hull.tier.14.name=OPV Machine Hull -gt.blockmachines.hull.tier.15.name=MAX Machine Hull gt.blockmachines.transformer.tier.09.name=Highly Ultimate Transformer gt.blockmachines.transformer.tier.09.desc=UEV -> UHV (Use Soft Mallet to invert) gt.blockmachines.transformer.tier.10.name=Extremely Ultimate Transformer @@ -91,7 +89,48 @@ gt.blockmachines.transformer.ha.tier.13.name=Extended Mega Ultimate Hi-Amp Trans gt.blockmachines.transformer.ha.tier.13.desc=OPV -> UXV (Use Soft Mallet to invert) gt.blockmachines.transformer.ha.tier.14.name=Overpowered Hi-Amp Transformer gt.blockmachines.transformer.ha.tier.14.desc=MAX -> OPV (Use Soft Mallet to invert) -#Multiblock Machines +#Hatches +tt.base.emhatch.desc.0=Max stacks amount: +tt.base.emhatch.desc.1=Stack capacity: +tt.base.emhatch.desc.2=Place Overflow Hatch behind,on top or below +tt.base.emhatch.desc.3=to provide overflow protection while this block +tt.base.emhatch.desc.4=is not attached to multi block. +tt.base.emhatch.desc.5=Transport range can be extended in straight +tt.base.emhatch.desc.6=line up to 15 blocks with quantum tunnels. +tt.base.emhatch.desc.7=Must be painted to work +gt.blockmachines.hatch.emmuffler.tier.08.name=UV Overflow Output Hatch +gt.blockmachines.hatch.emmuffler.tier.09.name=UHV Overflow Output Hatch +gt.blockmachines.hatch.emmuffler.tier.10.name=UEV Overflow Output Hatch +gt.blockmachines.hatch.emmuffler.tier.11.name=UIV Overflow Output Hatch +gt.blockmachines.hatch.emmuffler.tier.12.name=UMV Overflow Output Hatch +gt.blockmachines.hatch.emmuffler.tier.13.name=UXV Overflow Output Hatch +gt.blockmachines.hatch.emmuffler.desc.0=Disposes excess elemental Matter +gt.blockmachines.hatch.emmuffler.desc.1=Mass capacity +gt.blockmachines.hatch.emmuffler.desc.2=Disposal Speed +gt.blockmachines.hatch.emmuffler.desc.3=DO NOT OBSTRUCT THE OUTPUT! + +tt.keyword.BOOM=BOOM! +tt.keyword.ID=ID +tt.keyphrase.No_Stacks=No Stacks +tt.keyphrase.Contains_EM=Contains EM +tt.keyphrase.Contained_mass=Contained mass +tt.keyphrase.Mass_Disposal_speed=Mass Disposal speed +tt.keyphrase.Muffler_BOOM=Muffler BOOM! +gt.blockmachines.emin.tier.08.name=UV Elemental Input Hatch +gt.blockmachines.emin.tier.09.name=UHV Elemental Input Hatch +gt.blockmachines.emin.tier.10.name=UEV Elemental Input Hatch +gt.blockmachines.emin.tier.11.name=UIV Elemental Input Hatch +gt.blockmachines.emin.tier.12.name=UMV Elemental Input Hatch +gt.blockmachines.emin.tier.13.name=UXV Elemental Input Hatch +gt.blockmachines.emin.desc=Elemental Input for Multiblocks +gt.blockmachines.emout.tier.08.name=UV Elemental Output Hatch +gt.blockmachines.emout.tier.09.name=UHV Elemental Output Hatch +gt.blockmachines.emout.tier.10.name=UEV Elemental Output Hatch +gt.blockmachines.emout.tier.11.name=UIV Elemental Output Hatch +gt.blockmachines.emout.tier.12.name=UMV Elemental Output Hatch +gt.blockmachines.emout.tier.13.name=UXV Elemental Output Hatch +gt.blockmachines.emout.desc=Elemental Output for Multiblocks +#Multiblocks gt.blockmachines.multimachine.em.emtoessentia.name=Essentia Dequantizer gt.blockmachines.multimachine.em.emtoessentia.hint.0=1 - Classic Hatches or High Power Casing gt.blockmachines.multimachine.em.emtoessentia.hint.1=2 - Elemental Input Hatch @@ -106,7 +145,6 @@ gt.blockmachines.multimachine.em.essentiatoem.hint.2=3 - Elemental Overflow Hatc gt.blockmachines.multimachine.em.essentiatoem.hint.3=General - Some sort of Essentia Storage gt.blockmachines.multimachine.em.essentiatoem.desc.0=Conveniently convert regular stuff into quantum form. gt.blockmachines.multimachine.em.essentiatoem.desc.1=To make it more inconvenient. - #Thaumcraft compatibility tt.keyword.Hint_Details=Hint Details tt.keyword.Air=Air @@ -124,4 +162,7 @@ tt.keyword.COLORLESS=COLORLESS tt.keyword.CARRIES_COLOR=CARRIES COLOR tt.keyword.MASS=MASS tt.keyword.LIFE_TIME=LIFE TIME -tt.keyphrase.At_current_energy_level=At current energy level \ No newline at end of file +tt.keyphrase.At_current_energy_level=At current energy level +#OpenTurrets compatibility +tile.turretHeadEM.name=Elemental Matter Turret +tile.turretBaseEM.name=Elemental Turret Base \ No newline at end of file -- cgit From 29ca5bf60833827aea03eea8dcda6c40f2e1383b Mon Sep 17 00:00:00 2001 From: Bass Date: Sun, 25 Aug 2019 16:45:20 +0100 Subject: More Lang --- .../tectech/loader/thing/MachineLoader.java | 2 - .../hatch/GT_MetaTileEntity_Hatch_DynamoMulti.java | 7 +- .../GT_MetaTileEntity_Hatch_DynamoTunnel.java | 41 ++-- .../hatch/GT_MetaTileEntity_Hatch_EnergyMulti.java | 9 +- .../GT_MetaTileEntity_Hatch_EnergyTunnel.java | 15 +- .../multi/GT_MetaTileEntity_EM_transformer.java | 26 +-- src/main/resources/assets/tectech/lang/en_US.lang | 217 ++++++++++++++++++++- 7 files changed, 260 insertions(+), 57 deletions(-) (limited to 'src/main/resources/assets/tectech') diff --git a/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java b/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java index 6f6d4865fc..ececaa70dc 100644 --- a/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java +++ b/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java @@ -157,7 +157,6 @@ public class MachineLoader implements Runnable { eM_energyMulti64_UXV.set(new GT_MetaTileEntity_Hatch_EnergyMulti( 15128, "hatch.energymulti64.tier.13", "UXV 64A Energy Hatch", 13, 64).getStackForm(1L)); - // =================================================================================================== // Multi AMP Laser INPUTS // =================================================================================================== @@ -303,7 +302,6 @@ public class MachineLoader implements Runnable { // Multi AMP Power OUTPUTS // =================================================================================================== - eM_dynamoMulti4_IV.set(new GT_MetaTileEntity_Hatch_DynamoMulti( 15200, "hatch.dynamomulti04.tier.05", "IV 4A Dynamo Hatch", 5, 4).getStackForm(1L)); eM_dynamoMulti16_IV.set(new GT_MetaTileEntity_Hatch_DynamoMulti( diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DynamoMulti.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DynamoMulti.java index 1ba4854b62..81ad00ea06 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DynamoMulti.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DynamoMulti.java @@ -8,6 +8,7 @@ import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.StatCollector; import static com.github.technus.tectech.CommonValues.V; import static com.github.technus.tectech.thing.metaTileEntity.Textures.OVERLAYS_ENERGY_IN_POWER_TT; @@ -19,9 +20,9 @@ public class GT_MetaTileEntity_Hatch_DynamoMulti extends GT_MetaTileEntity_Hatch public final int Amperes; public GT_MetaTileEntity_Hatch_DynamoMulti(int aID, String aName, String aNameRegional, int aTier, int aAmp) { - super(aID, aName, aNameRegional, aTier, 0, "Multiple Ampere Energy Extractor for Multiblocks"); + super(aID, aName, aNameRegional, aTier, 0, StatCollector.translateToLocal("gt.blockmachines.hatch.dynamomulti.desc.0"));//Multiple Ampere Energy Extractor for Multiblocks Amperes = aAmp; - Util.setTier(aTier,this); + Util.setTier(aTier, this); } public GT_MetaTileEntity_Hatch_DynamoMulti(String aName, int aTier, int aAmp, String aDescription, ITexture[][][] aTextures) { @@ -117,4 +118,4 @@ public class GT_MetaTileEntity_Hatch_DynamoMulti extends GT_MetaTileEntity_Hatch //"Amperes Out: "+ EnumChatFormatting.AQUA+Amperes+" A" }; } -} +} \ No newline at end of file diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DynamoTunnel.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DynamoTunnel.java index 2e1a62f46d..95bb0bc60d 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DynamoTunnel.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DynamoTunnel.java @@ -12,6 +12,7 @@ import gregtech.api.util.GT_Utility; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.StatCollector; import static com.github.technus.tectech.CommonValues.TRANSFER_AT; import static com.github.technus.tectech.CommonValues.V; @@ -22,8 +23,8 @@ import static com.github.technus.tectech.thing.metaTileEntity.Textures.OVERLAYS_ */ public class GT_MetaTileEntity_Hatch_DynamoTunnel extends GT_MetaTileEntity_Hatch_DynamoMulti implements IConnectsToEnergyTunnel { public GT_MetaTileEntity_Hatch_DynamoTunnel(int aID, String aName, String aNameRegional, int aTier, int aAmp) { - super(aID, aName, aNameRegional, aTier, 0, "Energy extracting terminal for Multiblocks",aAmp); - Util.setTier(aTier,this); + super(aID, aName, aNameRegional, aTier, 0, StatCollector.translateToLocal("gt.blockmachines.hatch.dynamotunnel.desc.0"), aAmp);//Energy extracting terminal for Multiblocks + Util.setTier(aTier, this); } public GT_MetaTileEntity_Hatch_DynamoTunnel(String aName, int aTier, int aAmp, String aDescription, ITexture[][][] aTextures) { @@ -105,7 +106,7 @@ public class GT_MetaTileEntity_Hatch_DynamoTunnel extends GT_MetaTileEntity_Hatc return new String[]{ CommonValues.TEC_MARK_GENERAL, mDescription, - "Throughput: "+ EnumChatFormatting.YELLOW +(Amperes*maxEUOutput())+EnumChatFormatting.RESET+" EU/t" + StatCollector.translateToLocal("gt.blockmachines.hatch.dynamotunnel.desc.1") + ": " + EnumChatFormatting.YELLOW + (Amperes * maxEUOutput()) + EnumChatFormatting.RESET + " EU/t"//Throughput }; } @@ -114,13 +115,13 @@ public class GT_MetaTileEntity_Hatch_DynamoTunnel extends GT_MetaTileEntity_Hatc if (aBaseMetaTileEntity.isServerSide()) { byte Tick = (byte) (aTick % 20); if (TRANSFER_AT == Tick) { - if(aBaseMetaTileEntity.getStoredEU()>0){ - setEUVar(aBaseMetaTileEntity.getStoredEU()-Amperes); - if(aBaseMetaTileEntity.getStoredEU()<0){ + if (aBaseMetaTileEntity.getStoredEU() > 0) { + setEUVar(aBaseMetaTileEntity.getStoredEU() - Amperes); + if (aBaseMetaTileEntity.getStoredEU() < 0) { setEUVar(0); } } - if(aBaseMetaTileEntity.getStoredEU()>getMinimumStoredEU()){ + if (aBaseMetaTileEntity.getStoredEU() > getMinimumStoredEU()) { moveAround(aBaseMetaTileEntity); } } @@ -141,30 +142,30 @@ public class GT_MetaTileEntity_Hatch_DynamoTunnel extends GT_MetaTileEntity_Hatc if (aMetaTileEntity != null) { if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_EnergyTunnel && opposite == tGTTileEntity.getFrontFacing()) { - if(maxEUOutput()>((GT_MetaTileEntity_Hatch_EnergyTunnel) aMetaTileEntity).maxEUInput()){ + if (maxEUOutput() > ((GT_MetaTileEntity_Hatch_EnergyTunnel) aMetaTileEntity).maxEUInput()) { aMetaTileEntity.doExplosion(maxEUOutput()); - setEUVar(aBaseMetaTileEntity.getStoredEU()-maxEUOutput()); + setEUVar(aBaseMetaTileEntity.getStoredEU() - maxEUOutput()); return; - }else if(maxEUOutput()==((GT_MetaTileEntity_Hatch_EnergyTunnel) aMetaTileEntity).maxEUInput()) { - long diff=Math.min( - Amperes*20, + } else if (maxEUOutput() == ((GT_MetaTileEntity_Hatch_EnergyTunnel) aMetaTileEntity).maxEUInput()) { + long diff = Math.min( + Amperes * 20, Math.min( - ((GT_MetaTileEntity_Hatch_EnergyTunnel) aMetaTileEntity).maxEUStore()- + ((GT_MetaTileEntity_Hatch_EnergyTunnel) aMetaTileEntity).maxEUStore() - aMetaTileEntity.getBaseMetaTileEntity().getStoredEU(), - maxEUStore()-aBaseMetaTileEntity.getStoredEU() - )/maxEUOutput() - )*maxEUOutput(); + maxEUStore() - aBaseMetaTileEntity.getStoredEU() + ) / maxEUOutput() + ) * maxEUOutput(); - setEUVar(aBaseMetaTileEntity.getStoredEU()-diff); + setEUVar(aBaseMetaTileEntity.getStoredEU() - diff); ((GT_MetaTileEntity_Hatch_EnergyTunnel) aMetaTileEntity) - .setEUVar(aMetaTileEntity.getBaseMetaTileEntity().getStoredEU()+diff); + .setEUVar(aMetaTileEntity.getBaseMetaTileEntity().getStoredEU() + diff); } return; } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Pipe_Energy) { if (((GT_MetaTileEntity_Pipe_Energy) aMetaTileEntity).connectionCount < 2) { return; - }else { + } else { ((GT_MetaTileEntity_Pipe_Energy) aMetaTileEntity).markUsed(); } } else { @@ -183,4 +184,4 @@ public class GT_MetaTileEntity_Hatch_DynamoTunnel extends GT_MetaTileEntity_Hatc public boolean canConnect(byte side) { return isOutputFacing(side); } -} +} \ No newline at end of file diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyMulti.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyMulti.java index 06bdd4faba..b9030d2dbe 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyMulti.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyMulti.java @@ -9,6 +9,7 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.StatCollector; import static com.github.technus.tectech.CommonValues.V; import static com.github.technus.tectech.thing.metaTileEntity.Textures.OVERLAYS_ENERGY_IN_POWER_TT; @@ -20,9 +21,9 @@ public class GT_MetaTileEntity_Hatch_EnergyMulti extends GT_MetaTileEntity_Hatch public final int Amperes; public GT_MetaTileEntity_Hatch_EnergyMulti(int aID, String aName, String aNameRegional, int aTier, int aAmp) { - super(aID, aName, aNameRegional, aTier, 0, "Multiple Ampere Energy Injector for Multiblocks"); + super(aID, aName, aNameRegional, aTier, 0, StatCollector.translateToLocal("gt.blockmachines.hatch.energymulti.desc.0"));//Multiple Ampere Energy Injector for Multiblocks Amperes = aAmp; - Util.setTier(aTier,this); + Util.setTier(aTier, this); } public GT_MetaTileEntity_Hatch_EnergyMulti(String aName, int aTier, int aAmp, String aDescription, ITexture[][][] aTextures) { @@ -30,7 +31,7 @@ public class GT_MetaTileEntity_Hatch_EnergyMulti extends GT_MetaTileEntity_Hatch Amperes = aAmp; } - public GT_MetaTileEntity_Hatch_EnergyMulti(int aID, String aName, String aNameRegional, int aTier, int i, String description,int aAmp) { + public GT_MetaTileEntity_Hatch_EnergyMulti(int aID, String aName, String aNameRegional, int aTier, int i, String description, int aAmp) { super(aID, aName, aNameRegional, aTier, 0, description); Amperes = aAmp; } @@ -115,7 +116,7 @@ public class GT_MetaTileEntity_Hatch_EnergyMulti extends GT_MetaTileEntity_Hatch return new String[]{ CommonValues.TEC_MARK_GENERAL, mDescription, - "Amperes In: " + EnumChatFormatting.AQUA + maxAmperesIn() + " A" + StatCollector.translateToLocal("gt.blockmachines.hatch.energymulti.desc.1") + ": " + EnumChatFormatting.AQUA + maxAmperesIn() + " A"//Amperes In }; } } diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyTunnel.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyTunnel.java index e074f9dabb..118a659e93 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyTunnel.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyTunnel.java @@ -10,6 +10,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.StatCollector; import static com.github.technus.tectech.CommonValues.TRANSFER_AT; import static com.github.technus.tectech.CommonValues.V; @@ -20,8 +21,8 @@ import static com.github.technus.tectech.thing.metaTileEntity.Textures.OVERLAYS_ */ public class GT_MetaTileEntity_Hatch_EnergyTunnel extends GT_MetaTileEntity_Hatch_EnergyMulti implements IConnectsToEnergyTunnel { public GT_MetaTileEntity_Hatch_EnergyTunnel(int aID, String aName, String aNameRegional, int aTier, int aAmp) { - super(aID, aName, aNameRegional, aTier, 0, "Energy injecting terminal for Multiblocks",aAmp); - Util.setTier(aTier,this); + super(aID, aName, aNameRegional, aTier, 0, StatCollector.translateToLocal("gt.blockmachines.hatch.energytunnel.desc.0"), aAmp);//Energy injecting terminal for Multiblocks + Util.setTier(aTier, this); } public GT_MetaTileEntity_Hatch_EnergyTunnel(String aName, int aTier, int aAmp, String aDescription, ITexture[][][] aTextures) { @@ -113,7 +114,7 @@ public class GT_MetaTileEntity_Hatch_EnergyTunnel extends GT_MetaTileEntity_Hatc return new String[]{ CommonValues.TEC_MARK_GENERAL, mDescription, - "Throughput: "+ EnumChatFormatting.YELLOW +(Amperes*maxEUInput())+EnumChatFormatting.RESET+" EU/t" + StatCollector.translateToLocal("gt.blockmachines.hatch.energytunnel.desc.1") + ": " + EnumChatFormatting.YELLOW + (Amperes * maxEUInput()) + EnumChatFormatting.RESET + " EU/t"//Throughput }; } @@ -127,13 +128,13 @@ public class GT_MetaTileEntity_Hatch_EnergyTunnel extends GT_MetaTileEntity_Hatc if (aBaseMetaTileEntity.isServerSide()) { byte Tick = (byte) (aTick % 20); if (TRANSFER_AT == Tick) { - if(aBaseMetaTileEntity.getStoredEU()>0){ - setEUVar(aBaseMetaTileEntity.getStoredEU()-Amperes); - if(aBaseMetaTileEntity.getStoredEU()<0){ + if (aBaseMetaTileEntity.getStoredEU() > 0) { + setEUVar(aBaseMetaTileEntity.getStoredEU() - Amperes); + if (aBaseMetaTileEntity.getStoredEU() < 0) { setEUVar(0); } } } } } -} +} \ No newline at end of file diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_transformer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_transformer.java index e384a8d7e2..245aa53288 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_transformer.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_transformer.java @@ -29,12 +29,12 @@ import static gregtech.api.GregTech_API.sBlockCasings1; /** * Created by danie_000 on 17.12.2016. */ -public class GT_MetaTileEntity_EM_transformer extends GT_MetaTileEntity_MultiblockBase_EM implements IConstructable{ +public class GT_MetaTileEntity_EM_transformer extends GT_MetaTileEntity_MultiblockBase_EM implements IConstructable { //region Structure private static final String[][] shape = new String[][]{ - {" "," . "," ",}, - {" "," 0 "," ",}, - {" "," "," ",}, + {" ", " . ", " ",}, + {" ", " 0 ", " ",}, + {" ", " ", " ",}, }; private static final Block[] blockType = new Block[]{sBlockCasings1}; private static final byte[] blockMeta = new byte[]{15}; @@ -43,7 +43,7 @@ public class GT_MetaTileEntity_EM_transformer extends GT_MetaTileEntity_Multiblo private static final Block[] blockTypeFallback = new Block[]{sBlockCasingsTT}; private static final byte[] blockMetaFallback = new byte[]{0}; private static final String[] description = new String[]{ - EnumChatFormatting.AQUA+"Hint Details:", + EnumChatFormatting.AQUA + "Hint Details:", "1 - Energy IO Hatches or High Power Casing", }; //endregion @@ -56,7 +56,7 @@ public class GT_MetaTileEntity_EM_transformer extends GT_MetaTileEntity_Multiblo mHardHammer = true; mSolderingTool = true; mCrowbar = true; - eDismantleBoom=true; + eDismantleBoom = true; } public GT_MetaTileEntity_EM_transformer(String aName) { @@ -67,14 +67,14 @@ public class GT_MetaTileEntity_EM_transformer extends GT_MetaTileEntity_Multiblo mHardHammer = true; mSolderingTool = true; mCrowbar = true; - eDismantleBoom=true; + eDismantleBoom = true; } - public final static ResourceLocation activitySound=new ResourceLocation(Reference.MODID+":fx_noise"); + public final static ResourceLocation activitySound = new ResourceLocation(Reference.MODID + ":fx_noise"); @Override @SideOnly(Side.CLIENT) - protected ResourceLocation getActivitySound(){ + protected ResourceLocation getActivitySound() { return activitySound; } @@ -90,17 +90,17 @@ public class GT_MetaTileEntity_EM_transformer extends GT_MetaTileEntity_Multiblo @Override public void construct(int stackSize, boolean hintsOnly) { - StructureBuilderExtreme(shape, blockType, blockMeta,1, 1, 0, getBaseMetaTileEntity(),this,hintsOnly); + StructureBuilderExtreme(shape, blockType, blockMeta, 1, 1, 0, getBaseMetaTileEntity(), this, hintsOnly); } @Override public Object getServerGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) { - return new GT_Container_MultiMachineEM(aPlayerInventory, aBaseMetaTileEntity,true,false,false); + return new GT_Container_MultiMachineEM(aPlayerInventory, aBaseMetaTileEntity, true, false, false); } @Override public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) { - return new GT_GUIContainer_MultiMachineEM(aPlayerInventory, aBaseMetaTileEntity, getLocalName(), "EMDisplay.png",true,false,false); + return new GT_GUIContainer_MultiMachineEM(aPlayerInventory, aBaseMetaTileEntity, getLocalName(), "EMDisplay.png", true, false, false); } @Override @@ -156,4 +156,4 @@ public class GT_MetaTileEntity_EM_transformer extends GT_MetaTileEntity_Multiblo public boolean doRandomMaintenanceDamage() { return true; } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/tectech/lang/en_US.lang b/src/main/resources/assets/tectech/lang/en_US.lang index 561a4e7ed4..da8c6c609c 100644 --- a/src/main/resources/assets/tectech/lang/en_US.lang +++ b/src/main/resources/assets/tectech/lang/en_US.lang @@ -13,11 +13,13 @@ item.em.parametrizerMemoryCard.name=Parametrizer Memory Card item.em.EuMeterGT.name=GT EU meter item.tm.teslaCover.0.name=Tesla Coil Cover item.tm.teslaCover.1.name=Tesla Coil Cover Rich Edition + item.tm.teslaCoilCapacitor.0.name=LV Tesla Capacitor item.tm.teslaCoilCapacitor.1.name=MV Tesla Capacitor item.tm.teslaCoilCapacitor.2.name=HV Tesla Capacitor item.tm.teslaCoilCapacitor.3.name=EV Tesla Capacitor item.tm.teslaCoilCapacitor.4.name=IV Tesla Capacitor + item.tm.itemTeslaComponent.0.name=Electrum Tesla Windings item.tm.itemTeslaComponent.1.name=Superconductive Tesla Windings #Death Messages @@ -65,6 +67,7 @@ gt.blockmachines.wetransformer.tier.13.name=Extended Mega Ultimate Power Transfo gt.blockmachines.wetransformer.tier.13.desc=OPV -> UXV (Use Soft Mallet to invert) gt.blockmachines.wetransformer.tier.14.name=Overpowered Power Transformer gt.blockmachines.wetransformer.tier.14.desc=MAX -> OPV (Use Soft Mallet to invert) + gt.blockmachines.transformer.tier.09.name=Highly Ultimate Transformer gt.blockmachines.transformer.tier.09.desc=UEV -> UHV (Use Soft Mallet to invert) gt.blockmachines.transformer.tier.10.name=Extremely Ultimate Transformer @@ -77,6 +80,7 @@ gt.blockmachines.transformer.tier.13.name=Extended Mega Ultimate Transformer gt.blockmachines.transformer.tier.13.desc=OPV -> UXV (Use Soft Mallet to invert) gt.blockmachines.transformer.tier.14.name=Overpowered Transformer gt.blockmachines.transformer.tier.14.desc=MAX -> OPV (Use Soft Mallet to invert) + gt.blockmachines.transformer.ha.tier.09.name=Highly Ultimate Hi-Amp Transformer gt.blockmachines.transformer.ha.tier.09.desc=UEV -> UHV (Use Soft Mallet to invert gt.blockmachines.transformer.ha.tier.10.name=Extremely Ultimate Hi-Amp Transformer @@ -98,6 +102,7 @@ tt.base.emhatch.desc.4=is not attached to multi block. tt.base.emhatch.desc.5=Transport range can be extended in straight tt.base.emhatch.desc.6=line up to 15 blocks with quantum tunnels. tt.base.emhatch.desc.7=Must be painted to work + gt.blockmachines.hatch.emmuffler.tier.08.name=UV Overflow Output Hatch gt.blockmachines.hatch.emmuffler.tier.09.name=UHV Overflow Output Hatch gt.blockmachines.hatch.emmuffler.tier.10.name=UEV Overflow Output Hatch @@ -109,13 +114,200 @@ gt.blockmachines.hatch.emmuffler.desc.1=Mass capacity gt.blockmachines.hatch.emmuffler.desc.2=Disposal Speed gt.blockmachines.hatch.emmuffler.desc.3=DO NOT OBSTRUCT THE OUTPUT! -tt.keyword.BOOM=BOOM! -tt.keyword.ID=ID -tt.keyphrase.No_Stacks=No Stacks -tt.keyphrase.Contains_EM=Contains EM -tt.keyphrase.Contained_mass=Contained mass -tt.keyphrase.Mass_Disposal_speed=Mass Disposal speed -tt.keyphrase.Muffler_BOOM=Muffler BOOM! +gt.blockmachines.hatch.energymulti04.tier.05.name=IV 4A Energy Hatch +gt.blockmachines.hatch.energymulti16.tier.05.name=IV 16A Energy Hatch +gt.blockmachines.hatch.energymulti64.tier.05.name=IV 64A Energy Hatch +gt.blockmachines.hatch.energymulti04.tier.06.name=LuV 4A Energy Hatch +gt.blockmachines.hatch.energymulti16.tier.06.name=LuV 16A Energy Hatch +gt.blockmachines.hatch.energymulti64.tier.06.name=LuV 64A Energy Hatch +gt.blockmachines.hatch.energymulti04.tier.07.name=ZPM 4A Energy Hatch +gt.blockmachines.hatch.energymulti16.tier.07.name=ZPM 16A Energy Hatch +gt.blockmachines.hatch.energymulti64.tier.07.name=ZPM 64A Energy Hatch +gt.blockmachines.hatch.energymulti04.tier.08.name=UV 4A Energy Hatch +gt.blockmachines.hatch.energymulti16.tier.08.name=UV 16A Energy Hatch +gt.blockmachines.hatch.energymulti64.tier.08.name=UV 64A Energy Hatch +gt.blockmachines.hatch.energymulti04.tier.09.name=UHV 4A Energy Hatch +gt.blockmachines.hatch.energymulti16.tier.09.name=UHV 16A Energy Hatch +gt.blockmachines.hatch.energymulti64.tier.09.name=UHV 64A Energy Hatch +gt.blockmachines.hatch.energymulti04.tier.10.name=UEV 4A Energy Hatch +gt.blockmachines.hatch.energymulti16.tier.10.name=UEV 16A Energy Hatch +gt.blockmachines.hatch.energymulti64.tier.10.name=UEV 64A Energy Hatch +gt.blockmachines.hatch.energymulti04.tier.11.name=UIV 4A Energy Hatch +gt.blockmachines.hatch.energymulti16.tier.11.name=UIV 16A Energy Hatch +gt.blockmachines.hatch.energymulti64.tier.11.name=UIV 64A Energy Hatch +gt.blockmachines.hatch.energymulti04.tier.12.name=UMV 4A Energy Hatch +gt.blockmachines.hatch.energymulti16.tier.12.name=UMV 16A Energy Hatch +gt.blockmachines.hatch.energymulti64.tier.12.name=UMV 64A Energy Hatch +gt.blockmachines.hatch.energymulti04.tier.13.name=UXV 4A Energy Hatch +gt.blockmachines.hatch.energymulti16.tier.13.name=UXV 16A Energy Hatch +gt.blockmachines.hatch.energymulti64.tier.13.name=UXV 64A Energy Hatch +gt.blockmachines.hatch.energymulti.desc.0=Multiple Ampere Energy Injector for Multiblocks +gt.blockmachines.hatch.energymulti.desc.1=Amperes In + +gt.blockmachines.hatch.energytunnel1.tier.05.name=IV 256/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel2.tier.05.name=IV 1024/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel3.tier.05.name=IV 4096/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel4.tier.05.name=IV 16384/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel5.tier.05.name=IV 65536/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel6.tier.05.name=IV 262144/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel7.tier.05.name=IV 1048576/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel1.tier.06.name=LuV 256/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel2.tier.06.name=LuV 1024/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel3.tier.06.name=LuV 4096/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel4.tier.06.name=LuV 16384/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel5.tier.06.name=LuV 65536/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel6.tier.06.name=LuV 262144/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel7.tier.06.name=LuV 1048576/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel1.tier.07.name=ZPM 256/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel2.tier.07.name=ZPM 1024/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel3.tier.07.name=ZPM 4096/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel4.tier.07.name=ZPM 16384/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel5.tier.07.name=ZPM 65536/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel6.tier.07.name=ZPM 262144/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel7.tier.07.name=ZPM 1048576/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel1.tier.08.name=UV 256/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel2.tier.08.name=UV 1024/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel3.tier.08.name=UV 4096/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel4.tier.08.name=UV 16384/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel5.tier.08.name=UV 65536/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel6.tier.08.name=UV 262144/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel7.tier.08.name=UV 1048576/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel1.tier.09.name=UHV 256/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel2.tier.09.name=UHV 1024/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel3.tier.09.name=UHV 4096/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel4.tier.09.name=UHV 16384/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel5.tier.09.name=UHV 65536/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel6.tier.09.name=UHV 262144/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel7.tier.09.name=UHV 1048576/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel1.tier.10.name=UEV 256/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel2.tier.10.name=UEV 1024/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel3.tier.10.name=UEV 4096/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel4.tier.10.name=UEV 16384/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel5.tier.10.name=UEV 65536/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel6.tier.10.name=UEV 262144/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel7.tier.10.name=UEV 1048576/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel1.tier.11.name=UIV 256/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel2.tier.11.name=UIV 1024/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel3.tier.11.name=UIV 4096/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel4.tier.11.name=UIV 16384/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel5.tier.11.name=UIV 65536/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel6.tier.11.name=UIV 262144/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel7.tier.11.name=UIV 1048576/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel1.tier.12.name=UMV 256/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel2.tier.12.name=UMV 1024/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel3.tier.12.name=UMV 4096/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel4.tier.12.name=UMV 16384/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel5.tier.12.name=UMV 65536/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel6.tier.12.name=UMV 262144/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel7.tier.12.name=UMV 1048576/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel1.tier.13.name=UXV 256/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel2.tier.13.name=UXV 1024/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel3.tier.13.name=UXV 4096/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel4.tier.13.name=UXV 16384/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel5.tier.13.name=UXV 65536/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel6.tier.13.name=UXV 262144/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel7.tier.13.name=UXV 1048576/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel.tier.14.name=Legendary Laser Target Hatch +gt.blockmachines.hatch.energytunnel.desc.0=Energy injecting terminal for Multiblocks +gt.blockmachines.hatch.energytunnel.desc.1=Throughput + +gt.blockmachines.hatch.dynamomulti04.tier.05.name=IV 4A Dynamo Hatch +gt.blockmachines.hatch.dynamomulti16.tier.05.name=IV 16A Dynamo Hatch +gt.blockmachines.hatch.dynamomulti64.tier.05.name=IV 64A Dynamo Hatch +gt.blockmachines.hatch.dynamomulti04.tier.06.name=LuV 4A Dynamo Hatch +gt.blockmachines.hatch.dynamomulti16.tier.06.name=LuV 16A Dynamo Hatch +gt.blockmachines.hatch.dynamomulti64.tier.06.name=LuV 64A Dynamo Hatch +gt.blockmachines.hatch.dynamomulti04.tier.07.name=ZPM 4A Dynamo Hatch +gt.blockmachines.hatch.dynamomulti16.tier.07.name=ZPM 16A Dynamo Hatch +gt.blockmachines.hatch.dynamomulti64.tier.07.name=ZPM 64A Dynamo Hatch +gt.blockmachines.hatch.dynamomulti04.tier.08.name=UV 4A Dynamo Hatch +gt.blockmachines.hatch.dynamomulti16.tier.08.name=UV 16A Dynamo Hatch +gt.blockmachines.hatch.dynamomulti64.tier.08.name=UV 64A Dynamo Hatch +gt.blockmachines.hatch.dynamomulti04.tier.09.name=UHV 4A Dynamo Hatch +gt.blockmachines.hatch.dynamomulti16.tier.09.name=UHV 16A Dynamo Hatch +gt.blockmachines.hatch.dynamomulti64.tier.09.name=UHV 64A Dynamo Hatch +gt.blockmachines.hatch.dynamomulti04.tier.10.name=UEV 4A Dynamo Hatch +gt.blockmachines.hatch.dynamomulti16.tier.10.name=UEV 16A Dynamo Hatch +gt.blockmachines.hatch.dynamomulti64.tier.10.name=UEV 64A Dynamo Hatch +gt.blockmachines.hatch.dynamomulti04.tier.11.name=UIV 4A Dynamo Hatch +gt.blockmachines.hatch.dynamomulti16.tier.11.name=UIV 16A Dynamo Hatch +gt.blockmachines.hatch.dynamomulti64.tier.11.name=UIV 64A Dynamo Hatch +gt.blockmachines.hatch.dynamomulti04.tier.12.name=UMV 4A Dynamo Hatch +gt.blockmachines.hatch.dynamomulti16.tier.12.name=UMV 16A Dynamo Hatch +gt.blockmachines.hatch.dynamomulti64.tier.12.name=UMV 64A Dynamo Hatch +gt.blockmachines.hatch.dynamomulti04.tier.13.name=IV 4A Dynamo Hatch +gt.blockmachines.hatch.dynamomulti16.tier.13.name=IV 16A Dynamo Hatch +gt.blockmachines.hatch.dynamomulti64.tier.13.name=IV 64A Dynamo Hatch +gt.blockmachines.hatch.dynamomulti.desc.0=Multiple Ampere Energy Extractor for Multiblocks +gt.blockmachines.hatch.dynamomulti.desc.1=Amperes Out + +gt.blockmachines.hatch.dynamotunnel1.tier.05=IV 256/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel2.tier.05=IV 1024/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel3.tier.05=IV 4096/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel4.tier.05=IV 16384/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel5.tier.05=IV 65536/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel6.tier.05=IV 262144/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel7.tier.05=IV 1048576/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel1.tier.06=LuV 256/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel2.tier.06=LuV 1024/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel3.tier.06=LuV 4096/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel4.tier.06=LuV 16384/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel5.tier.06=LuV 65536/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel6.tier.06=LuV 262144/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel7.tier.06=LuV 1048576/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel1.tier.07=ZPM 256/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel2.tier.07=ZPM 1024/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel3.tier.07=ZPM 4096/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel4.tier.07=ZPM 16384/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel5.tier.07=ZPM 65536/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel6.tier.07=ZPM 262144/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel7.tier.07=ZPM 1048576/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel1.tier.08=UV 256/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel2.tier.08=UV 1024/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel3.tier.08=UV 4096/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel4.tier.08=UV 16384/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel5.tier.08=UV 65536/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel6.tier.08=UV 262144/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel7.tier.08=UV 1048576/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel1.tier.09=UHV 256/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel2.tier.09=UHV 1024/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel3.tier.09=UHV 4096/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel4.tier.09=UHV 16384/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel5.tier.09=UHV 65536/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel6.tier.09=UHV 262144/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel7.tier.09=UHV 1048576/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel1.tier.10=UEV 256/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel2.tier.10=UEV 1024/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel3.tier.10=UEV 4096/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel4.tier.10=UEV 16384/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel5.tier.10=UEV 65536/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel6.tier.10=UEV 262144/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel7.tier.10=UEV 1048576/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel1.tier.11=UIV 256/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel2.tier.11=UIV 1024/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel3.tier.11=UIV 4096/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel4.tier.11=UIV 16384/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel5.tier.11=UIV 65536/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel6.tier.11=UIV 262144/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel7.tier.11=UIV 1048576/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel1.tier.12=UMV 256/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel2.tier.12=UMV 1024/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel3.tier.12=UMV 4096/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel4.tier.12=UMV 16384/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel5.tier.12=UMV 65536/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel6.tier.12=UMV 262144/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel7.tier.12=UMV 1048576/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel1.tier.13=UXV 256/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel2.tier.13=UXV 1024/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel3.tier.13=UXV 4096/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel4.tier.13=UXV 16384/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel5.tier.13=UXV 65536/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel6.tier.13=UXV 262144/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel7.tier.13=UXV 1048576/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel.tier.14=Legendary Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel.desc.0=Energy extracting terminal for Multiblocks +gt.blockmachines.hatch.dynamotunnel.desc.1=Throughput + gt.blockmachines.emin.tier.08.name=UV Elemental Input Hatch gt.blockmachines.emin.tier.09.name=UHV Elemental Input Hatch gt.blockmachines.emin.tier.10.name=UEV Elemental Input Hatch @@ -123,6 +315,7 @@ gt.blockmachines.emin.tier.11.name=UIV Elemental Input Hatch gt.blockmachines.emin.tier.12.name=UMV Elemental Input Hatch gt.blockmachines.emin.tier.13.name=UXV Elemental Input Hatch gt.blockmachines.emin.desc=Elemental Input for Multiblocks + gt.blockmachines.emout.tier.08.name=UV Elemental Output Hatch gt.blockmachines.emout.tier.09.name=UHV Elemental Output Hatch gt.blockmachines.emout.tier.10.name=UEV Elemental Output Hatch @@ -138,6 +331,7 @@ gt.blockmachines.multimachine.em.emtoessentia.hint.2=3 - Elemental Overflow Hatc gt.blockmachines.multimachine.em.emtoessentia.hint.3=General - Some sort of Essentia Storage gt.blockmachines.multimachine.em.emtoessentia.desc.0=Transform quantum form back to... gt.blockmachines.multimachine.em.emtoessentia.desc.1=regular one, but why? + gt.blockmachines.multimachine.em.essentiatoem.name=Essentia Quantizer gt.blockmachines.multimachine.em.essentiatoem.hint.0=1 - Classic Hatches or High Power Casing gt.blockmachines.multimachine.em.essentiatoem.hint.1=2 - Elemental Output Hatch @@ -145,7 +339,7 @@ gt.blockmachines.multimachine.em.essentiatoem.hint.2=3 - Elemental Overflow Hatc gt.blockmachines.multimachine.em.essentiatoem.hint.3=General - Some sort of Essentia Storage gt.blockmachines.multimachine.em.essentiatoem.desc.0=Conveniently convert regular stuff into quantum form. gt.blockmachines.multimachine.em.essentiatoem.desc.1=To make it more inconvenient. -#Thaumcraft compatibility +#Keywords and phrases tt.keyword.Hint_Details=Hint Details tt.keyword.Air=Air tt.keyword.Earth=Earth @@ -162,7 +356,14 @@ tt.keyword.COLORLESS=COLORLESS tt.keyword.CARRIES_COLOR=CARRIES COLOR tt.keyword.MASS=MASS tt.keyword.LIFE_TIME=LIFE TIME +tt.keyword.BOOM=BOOM! +tt.keyword.ID=ID tt.keyphrase.At_current_energy_level=At current energy level +tt.keyphrase.No_Stacks=No Stacks +tt.keyphrase.Contains_EM=Contains EM +tt.keyphrase.Contained_mass=Contained mass +tt.keyphrase.Mass_Disposal_speed=Mass Disposal speed +tt.keyphrase.Muffler_BOOM=Muffler BOOM! #OpenTurrets compatibility tile.turretHeadEM.name=Elemental Matter Turret tile.turretBaseEM.name=Elemental Turret Base \ No newline at end of file -- cgit From 6e1c2fb0bd2b3062cfa35e8c14d678549ee9c1a6 Mon Sep 17 00:00:00 2001 From: Bass Date: Sun, 25 Aug 2019 20:03:07 +0100 Subject: Tesla Network Code Streamline --- .../technus/tectech/loader/NetworkDispatcher.java | 1 - .../tectech/loader/thing/MachineLoader.java | 4 +- .../technus/tectech/loader/thing/ThingsLoader.java | 1 + .../tectech/mechanics/data/RendererMessage.java | 18 -------- .../technus/tectech/thing/CustomItemList.java | 2 +- .../technus/tectech/thing/item/EuMeterGT.java | 30 ++++++------- .../technus/tectech/thing/item/TeslaStaff.java | 50 +++++++++++++++++++++ .../multi/GT_MetaTileEntity_EM_transformer.java | 11 ++--- .../multi/GT_MetaTileEntity_TM_microwave.java | 3 +- src/main/resources/assets/tectech/lang/en_US.lang | 30 +++++++++++++ .../tectech/textures/items/itemTeslaStaff.png | Bin 0 -> 433 bytes 11 files changed, 107 insertions(+), 43 deletions(-) create mode 100644 src/main/java/com/github/technus/tectech/thing/item/TeslaStaff.java create mode 100644 src/main/resources/assets/tectech/textures/items/itemTeslaStaff.png (limited to 'src/main/resources/assets/tectech') diff --git a/src/main/java/com/github/technus/tectech/loader/NetworkDispatcher.java b/src/main/java/com/github/technus/tectech/loader/NetworkDispatcher.java index 72d1a23b05..7c8b7d66b7 100644 --- a/src/main/java/com/github/technus/tectech/loader/NetworkDispatcher.java +++ b/src/main/java/com/github/technus/tectech/loader/NetworkDispatcher.java @@ -27,7 +27,6 @@ public class NetworkDispatcher extends eu.usrv.yamcore.network.PacketDispatcher registerMessage(ChunkDataMessage.ClientHandler.class, ChunkDataMessage.ChunkDataData.class); registerMessage(PlayerDataMessage.ServerHandler.class, PlayerDataMessage.PlayerDataQuery.class); registerMessage(PlayerDataMessage.ClientHandler.class, PlayerDataMessage.PlayerDataData.class); - registerMessage(RendererMessage.ServerHandler.class, RendererMessage.RendererQuery.class); registerMessage(RendererMessage.ClientHandler.class, RendererMessage.RendererData.class); } } diff --git a/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java b/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java index ececaa70dc..59e9f99a14 100644 --- a/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java +++ b/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java @@ -511,12 +511,12 @@ public class MachineLoader implements Runnable { // =================================================================================================== Machine_Multi_Transformer.set(new GT_MetaTileEntity_EM_transformer(15300, "multimachine.em.transformer", "Active Transformer").getStackForm(1L)); + Machine_Multi_Microwave.set(new GT_MetaTileEntity_TM_microwave(15312, "multimachine.tm.microwave", "Microwave Grinder").getStackForm(1L)); + Machine_Multi_TeslaCoil.set(new GT_MetaTileEntity_TM_teslaCoil(15314, "multimachine.tm.teslaCoil", "Tesla Tower").getStackForm(1L)); Machine_Multi_Switch.set(new GT_MetaTileEntity_EM_switch(15310, "multimachine.em.switch", "Network Switch With QoS").getStackForm(1L)); Machine_Multi_Computer.set(new GT_MetaTileEntity_EM_computer(15311, "multimachine.em.computer", "Quantum Computer").getStackForm(1L)); - Machine_Multi_Microwave.set(new GT_MetaTileEntity_TM_microwave(15312, "multimachine.tm.microwave", "Microwave Grinder").getStackForm(1L)); Machine_Multi_DataBank.set(new GT_MetaTileEntity_EM_dataBank(15313, "multimachine.em.databank", "Data Bank").getStackForm(1L)); - Machine_Multi_TeslaCoil.set(new GT_MetaTileEntity_TM_teslaCoil(15314, "multimachine.tm.teslaCoil", "Tesla Tower").getStackForm(1L)); Machine_Multi_EMjunction.set(new GT_MetaTileEntity_EM_junction(15320, "multimachine.em.junction", "Matter Junction").getStackForm(1L)); Machine_Multi_MatterToEM.set(new GT_MetaTileEntity_EM_quantizer(15321, "multimachine.em.mattertoem", "Matter Quantizer").getStackForm(1L)); diff --git a/src/main/java/com/github/technus/tectech/loader/thing/ThingsLoader.java b/src/main/java/com/github/technus/tectech/loader/thing/ThingsLoader.java index 6aa238df49..4596e8a2c8 100644 --- a/src/main/java/com/github/technus/tectech/loader/thing/ThingsLoader.java +++ b/src/main/java/com/github/technus/tectech/loader/thing/ThingsLoader.java @@ -57,6 +57,7 @@ public class ThingsLoader implements Runnable { ParametrizerMemoryCard.run(); ElementalDefinitionScanStorage_EM.run(); EuMeterGT.run(); + TeslaStaff.run(); TeslaCoilCover.run(); TeslaCoilCapacitor.run(); TecTech.LOGGER.info("Useful Items registered"); 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 796e6ec40a..a4e5bb318e 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 @@ -5,7 +5,6 @@ import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import eu.usrv.yamcore.network.client.AbstractClientMessageHandler; -import eu.usrv.yamcore.network.server.AbstractServerMessageHandler; import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; @@ -49,20 +48,10 @@ public class RendererMessage implements IMessage { } } - - public static class RendererQuery extends RendererMessage { - public RendererQuery() { - } - } - public static class RendererData extends RendererMessage { public RendererData() { } - public RendererData(RendererQuery query) { - sparkList = query.sparkList; - } - public RendererData(HashSet eSparkList) { sparkList = eSparkList; } @@ -80,13 +69,6 @@ public class RendererMessage implements IMessage { } } - public static class ServerHandler extends AbstractServerMessageHandler { - @Override - public IMessage handleServerMessage(EntityPlayer pPlayer, RendererQuery pMessage, MessageContext pCtx) { - return new RendererData(pMessage); - } - } - private static void thaumLightning(int tX, int tY, int tZ, int tXN, int tYN, int tZN, int wID) { if (Loader.isModLoaded("Thaumcraft")) { World world = DimensionManager.getWorld(wID); diff --git a/src/main/java/com/github/technus/tectech/thing/CustomItemList.java b/src/main/java/com/github/technus/tectech/thing/CustomItemList.java index 1f83706aad..ba3f98fe6a 100644 --- a/src/main/java/com/github/technus/tectech/thing/CustomItemList.java +++ b/src/main/java/com/github/technus/tectech/thing/CustomItemList.java @@ -92,7 +92,7 @@ public enum CustomItemList implements IItemContainer { Machine_Multi_BHG, hint_0,hint_1,hint_2,hint_3,hint_4,hint_5,hint_6,hint_7,hint_8,hint_9,hint_10,hint_11, hint_general,hint_air,hint_noAir,hint_error, - scanContainer,parametrizerMemory,teslaCapacitor,teslaCover,teslaComponent, + scanContainer,parametrizerMemory,teslaCapacitor,teslaCover,teslaComponent,teslaStaff, Machine_TeslaCoil_1by1_LV, Machine_TeslaCoil_1by1_MV, Machine_TeslaCoil_1by1_HV, Machine_TeslaCoil_1by1_EV, Machine_TeslaCoil_1by1_IV, Machine_TeslaCoil_2by2_LV, Machine_TeslaCoil_2by2_MV, Machine_TeslaCoil_2by2_HV, Machine_TeslaCoil_2by2_EV, Machine_TeslaCoil_2by2_IV, diff --git a/src/main/java/com/github/technus/tectech/thing/item/EuMeterGT.java b/src/main/java/com/github/technus/tectech/thing/item/EuMeterGT.java index 8edcd32bdb..3f9562f23a 100644 --- a/src/main/java/com/github/technus/tectech/thing/item/EuMeterGT.java +++ b/src/main/java/com/github/technus/tectech/thing/item/EuMeterGT.java @@ -34,33 +34,33 @@ public class EuMeterGT extends Item { @Override public boolean onItemUseFirst(ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ, int aSide, float hitX, float hitY, float hitZ) { TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ); - if(tTileEntity==null || aPlayer instanceof FakePlayer) { + if (tTileEntity == null || aPlayer instanceof FakePlayer) { return aPlayer instanceof EntityPlayerMP; } if (aPlayer instanceof EntityPlayerMP && !aPlayer.isSneaking() && tTileEntity instanceof IGregTechTileEntity) { if (tTileEntity instanceof BaseMetaTileEntity) { - GT_Utility.sendChatToPlayer(aPlayer, EnumChatFormatting.AQUA+"----- X:"+aX+" Y:"+aY+" Z:"+aZ+" D:"+aWorld.provider.dimensionId+" S:"+aSide + " -----"); - GT_Utility.sendChatToPlayer(aPlayer, "Stored energy: "+EnumChatFormatting.YELLOW+(((BaseMetaTileEntity) tTileEntity).getUniversalEnergyStored())+EnumChatFormatting.RESET+'/'+EnumChatFormatting.GREEN+(((BaseMetaTileEntity) tTileEntity).getUniversalEnergyCapacity())); - GT_Utility.sendChatToPlayer(aPlayer, "Stored EU: "+EnumChatFormatting.YELLOW+(((BaseMetaTileEntity) tTileEntity).getStoredEU())+EnumChatFormatting.RESET+'/'+EnumChatFormatting.GREEN+(((BaseMetaTileEntity) tTileEntity).getEUCapacity())); - GT_Utility.sendChatToPlayer(aPlayer, "Average I/O: "+EnumChatFormatting.YELLOW+(((BaseMetaTileEntity) tTileEntity).getAverageElectricInput())+EnumChatFormatting.RESET+'/'+EnumChatFormatting.YELLOW+(((BaseMetaTileEntity) tTileEntity).getAverageElectricOutput())); - GT_Utility.sendChatToPlayer(aPlayer, "Voltage I/O (max): "+EnumChatFormatting.GOLD+(((BaseMetaTileEntity) tTileEntity).getInputVoltage())+EnumChatFormatting.RESET+'/'+EnumChatFormatting.GOLD+(((BaseMetaTileEntity) tTileEntity).getOutputVoltage())); - GT_Utility.sendChatToPlayer(aPlayer, "Voltage I/O max: "+EnumChatFormatting.RED+(((BaseMetaTileEntity) tTileEntity).getMaxSafeInput())+EnumChatFormatting.RESET+'/'+EnumChatFormatting.RED+(((BaseMetaTileEntity) tTileEntity).getMaxEnergyOutput())); - GT_Utility.sendChatToPlayer(aPlayer, "Amperage I/O (max): "+EnumChatFormatting.GOLD+(((BaseMetaTileEntity) tTileEntity).getInputAmperage())+EnumChatFormatting.RESET+'/'+EnumChatFormatting.GOLD+(((BaseMetaTileEntity) tTileEntity).getOutputAmperage())); - GT_Utility.sendChatToPlayer(aPlayer, "Side capabilities: "+(((BaseMetaTileEntity) tTileEntity).inputEnergyFrom((byte) aSide)?"input ":"")+(((BaseMetaTileEntity) tTileEntity).outputsEnergyTo((byte) aSide)?"output ":"")); + GT_Utility.sendChatToPlayer(aPlayer, EnumChatFormatting.AQUA + "----- X:" + aX + " Y:" + aY + " Z:" + aZ + " D:" + aWorld.provider.dimensionId + " S:" + aSide + " -----"); + GT_Utility.sendChatToPlayer(aPlayer, "Stored energy: " + EnumChatFormatting.YELLOW + (((BaseMetaTileEntity) tTileEntity).getUniversalEnergyStored()) + EnumChatFormatting.RESET + '/' + EnumChatFormatting.GREEN + (((BaseMetaTileEntity) tTileEntity).getUniversalEnergyCapacity())); + GT_Utility.sendChatToPlayer(aPlayer, "Stored EU: " + EnumChatFormatting.YELLOW + (((BaseMetaTileEntity) tTileEntity).getStoredEU()) + EnumChatFormatting.RESET + '/' + EnumChatFormatting.GREEN + (((BaseMetaTileEntity) tTileEntity).getEUCapacity())); + GT_Utility.sendChatToPlayer(aPlayer, "Average I/O: " + EnumChatFormatting.YELLOW + (((BaseMetaTileEntity) tTileEntity).getAverageElectricInput()) + EnumChatFormatting.RESET + '/' + EnumChatFormatting.YELLOW + (((BaseMetaTileEntity) tTileEntity).getAverageElectricOutput())); + GT_Utility.sendChatToPlayer(aPlayer, "Voltage I/O (max): " + EnumChatFormatting.GOLD + (((BaseMetaTileEntity) tTileEntity).getInputVoltage()) + EnumChatFormatting.RESET + '/' + EnumChatFormatting.GOLD + (((BaseMetaTileEntity) tTileEntity).getOutputVoltage())); + GT_Utility.sendChatToPlayer(aPlayer, "Voltage I/O max: " + EnumChatFormatting.RED + (((BaseMetaTileEntity) tTileEntity).getMaxSafeInput()) + EnumChatFormatting.RESET + '/' + EnumChatFormatting.RED + (((BaseMetaTileEntity) tTileEntity).getMaxEnergyOutput())); + GT_Utility.sendChatToPlayer(aPlayer, "Amperage I/O (max): " + EnumChatFormatting.GOLD + (((BaseMetaTileEntity) tTileEntity).getInputAmperage()) + EnumChatFormatting.RESET + '/' + EnumChatFormatting.GOLD + (((BaseMetaTileEntity) tTileEntity).getOutputAmperage())); + GT_Utility.sendChatToPlayer(aPlayer, "Side capabilities: " + (((BaseMetaTileEntity) tTileEntity).inputEnergyFrom((byte) aSide) ? "input " : "") + (((BaseMetaTileEntity) tTileEntity).outputsEnergyTo((byte) aSide) ? "output " : "")); return true; } else if (tTileEntity instanceof BaseMetaPipeEntity) { - if(((BaseMetaPipeEntity) tTileEntity).getMetaTileEntity() instanceof GT_MetaPipeEntity_Cable){ + if (((BaseMetaPipeEntity) tTileEntity).getMetaTileEntity() instanceof GT_MetaPipeEntity_Cable) { ArrayList tList = new ArrayList<>(); GT_Utility.getCoordinateScan(tList, aPlayer, aWorld, 1, aX, aY, aZ, aSide, hitX, hitY, hitZ); - for(String str:tList){ - GT_Utility.sendChatToPlayer(aPlayer,str); + for (String str : tList) { + GT_Utility.sendChatToPlayer(aPlayer, str); } } return true; } } - if(!(aPlayer instanceof EntityPlayerMP)){ - GT_Utility.doSoundAtClient(Reference.MODID+":fx_scan", 1, 1.0F, (double)aX, (double)aY, (double)aZ); + if (!(aPlayer instanceof EntityPlayerMP)) { + GT_Utility.doSoundAtClient(Reference.MODID + ":fx_scan", 1, 1.0F, (double) aX, (double) aY, (double) aZ); } return false; } @@ -76,4 +76,4 @@ public class EuMeterGT extends Item { INSTANCE = new EuMeterGT(); GameRegistry.registerItem(INSTANCE, INSTANCE.getUnlocalizedName()); } -} +} \ No newline at end of file diff --git a/src/main/java/com/github/technus/tectech/thing/item/TeslaStaff.java b/src/main/java/com/github/technus/tectech/thing/item/TeslaStaff.java new file mode 100644 index 0000000000..0102d367c3 --- /dev/null +++ b/src/main/java/com/github/technus/tectech/thing/item/TeslaStaff.java @@ -0,0 +1,50 @@ +package com.github.technus.tectech.thing.item; + +import com.github.technus.tectech.CommonValues; +import com.github.technus.tectech.Reference; +import cpw.mods.fml.common.registry.GameRegistry; +import gregtech.api.util.GT_Utility; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + +import java.util.List; + +import static com.github.technus.tectech.Reference.MODID; +import static com.github.technus.tectech.thing.CustomItemList.teslaStaff; + + +public final class TeslaStaff extends Item { + public static TeslaStaff INSTANCE; + + private TeslaStaff() { + setUnlocalizedName("tm.teslaStaff"); + setTextureName(MODID + ":itemTeslaStaff"); + } + + @Override + public void addInformation(ItemStack aStack, EntityPlayer ep, List aList, boolean boo) { + aList.add(CommonValues.BASS_MARK); + aList.add("Power of the gods, at the whim of a mortal!"); + } + + @Override + public boolean onLeftClickEntity(ItemStack stack, EntityPlayer aPlayer, Entity entity) { + GT_Utility.sendChatToPlayer(aPlayer, "Zapperoni!"); + if (!(aPlayer instanceof EntityPlayerMP)) { + double aX = aPlayer.posX; + double aY = aPlayer.posY; + double aZ = aPlayer.posZ; + GT_Utility.doSoundAtClient(Reference.MODID + ":fx_scan", 1, 1.0F, aX, aY, aZ); + } + return false; + } + + public static void run() { + INSTANCE = new TeslaStaff(); + GameRegistry.registerItem(INSTANCE, INSTANCE.getUnlocalizedName()); + teslaStaff.set(INSTANCE); + } +} \ No newline at end of file diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_transformer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_transformer.java index 245aa53288..26d447cf69 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_transformer.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_transformer.java @@ -19,6 +19,7 @@ import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.StatCollector; import static com.github.technus.tectech.Util.StructureBuilderExtreme; import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset; @@ -43,8 +44,8 @@ public class GT_MetaTileEntity_EM_transformer extends GT_MetaTileEntity_Multiblo private static final Block[] blockTypeFallback = new Block[]{sBlockCasingsTT}; private static final byte[] blockMetaFallback = new byte[]{0}; private static final String[] description = new String[]{ - EnumChatFormatting.AQUA + "Hint Details:", - "1 - Energy IO Hatches or High Power Casing", + EnumChatFormatting.AQUA + StatCollector.translateToLocal("tt.keyword.Hint_Details") + ":", + StatCollector.translateToLocal("gt.blockmachines.multimachine.em.transformer.hint"),//1 - Energy IO Hatches or High Power Casing }; //endregion @@ -120,9 +121,9 @@ public class GT_MetaTileEntity_EM_transformer extends GT_MetaTileEntity_Multiblo public String[] getDescription() { return new String[]{ CommonValues.TEC_MARK_GENERAL, - "Power substation", - EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "All the transformation!", - EnumChatFormatting.BLUE + "Only 0.78125% power loss, HAYO!", + StatCollector.translateToLocal("gt.blockmachines.multimachine.em.transformer.desc.0"),//Power substation + EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + StatCollector.translateToLocal("gt.blockmachines.multimachine.em.transformer.desc.1"),//All the transformation! + EnumChatFormatting.BLUE + StatCollector.translateToLocal("gt.blockmachines.multimachine.em.transformer.desc.2"),//Only 0.78125% power loss, HAYO! }; } diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java index 228d549258..cae6cb1628 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java @@ -19,6 +19,7 @@ import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.StatCollector; import java.util.ArrayList; import java.util.HashSet; @@ -52,7 +53,7 @@ public class GT_MetaTileEntity_TM_microwave extends GT_MetaTileEntity_Multiblock private static final Block[] blockTypeFallback = new Block[]{sBlockCasings4}; private static final byte[] blockMetaFallback = new byte[]{1}; private static final String[] description = new String[]{ - EnumChatFormatting.AQUA+"Hint Details:", + EnumChatFormatting.AQUA+ StatCollector.translateToLocal("tt.keyword.Hint_Details") + ":", "1 - Classic Hatches or Clean Stainless Steel Casing", "Also acts like a hopper so give it an Output Bus", }; diff --git a/src/main/resources/assets/tectech/lang/en_US.lang b/src/main/resources/assets/tectech/lang/en_US.lang index da8c6c609c..ad7426f44c 100644 --- a/src/main/resources/assets/tectech/lang/en_US.lang +++ b/src/main/resources/assets/tectech/lang/en_US.lang @@ -324,6 +324,22 @@ gt.blockmachines.emout.tier.12.name=UMV Elemental Output Hatch gt.blockmachines.emout.tier.13.name=UXV Elemental Output Hatch gt.blockmachines.emout.desc=Elemental Output for Multiblocks #Multiblocks +gt.blockmachines.multimachine.em.transformer.name=Active Transformer +gt.blockmachines.multimachine.em.transformer.hint=1 - Energy IO Hatches or High Power Casing +gt.blockmachines.multimachine.em.transformer.desc.0=Power substation +gt.blockmachines.multimachine.em.transformer.desc.1=All the transformation! +gt.blockmachines.multimachine.em.transformer.desc.2=Only 0.78125% power loss, HAYO! + +gt.blockmachines.multimachine.tm.microwave.name=Microwave Grinder + +gt.blockmachines.multimachine.tm.teslaCoil.name=Tesla Tower +gt.blockmachines.multimachine.em.switch.name=Network Switch With QoS +gt.blockmachines.multimachine.em.computer.name=Quantum Computer +gt.blockmachines.multimachine.em.databank.name=Data Bank +gt.blockmachines.multimachine.em.junction.name=Matter Junction +gt.blockmachines.multimachine.em.mattertoem.name=Matter Quantizer +gt.blockmachines.multimachine.em.emtomatter.name=Matter Dequantizer + gt.blockmachines.multimachine.em.emtoessentia.name=Essentia Dequantizer gt.blockmachines.multimachine.em.emtoessentia.hint.0=1 - Classic Hatches or High Power Casing gt.blockmachines.multimachine.em.emtoessentia.hint.1=2 - Elemental Input Hatch @@ -339,6 +355,19 @@ gt.blockmachines.multimachine.em.essentiatoem.hint.2=3 - Elemental Overflow Hatc gt.blockmachines.multimachine.em.essentiatoem.hint.3=General - Some sort of Essentia Storage gt.blockmachines.multimachine.em.essentiatoem.desc.0=Conveniently convert regular stuff into quantum form. gt.blockmachines.multimachine.em.essentiatoem.desc.1=To make it more inconvenient. + +gt.blockmachines.multimachine.em.scanner.name=Elemental Scanner +gt.blockmachines.multimachine.em.research.name=Research station +gt.blockmachines.multimachine.em.collider.name=Matter Collider +gt.blockmachines.multimachine.em.infuser.name=Energy Infuser +gt.blockmachines.multimachine.em.processing.name=Quantum Processing Machine +gt.blockmachines.multimachine.em.crafter.name=Matter Assembler +gt.blockmachines.multimachine.em.stabilizer.name=Elemental Stabilizer +gt.blockmachines.multimachine.em.wormhole.name=Wormhole +gt.blockmachines.multimachine.em.decay.name=Decay Generator +gt.blockmachines.multimachine.em.annihilation.name=Annihilation Generator +gt.blockmachines.multimachine.em.blackholegenerator.name=Black Hole Generator + #Keywords and phrases tt.keyword.Hint_Details=Hint Details tt.keyword.Air=Air @@ -358,6 +387,7 @@ tt.keyword.MASS=MASS tt.keyword.LIFE_TIME=LIFE TIME tt.keyword.BOOM=BOOM! tt.keyword.ID=ID + tt.keyphrase.At_current_energy_level=At current energy level tt.keyphrase.No_Stacks=No Stacks tt.keyphrase.Contains_EM=Contains EM diff --git a/src/main/resources/assets/tectech/textures/items/itemTeslaStaff.png b/src/main/resources/assets/tectech/textures/items/itemTeslaStaff.png new file mode 100644 index 0000000000..db124817cc Binary files /dev/null and b/src/main/resources/assets/tectech/textures/items/itemTeslaStaff.png differ -- cgit From 925052fb4a8968adc1b0395aa808ea9780ee59c2 Mon Sep 17 00:00:00 2001 From: Bass Date: Mon, 26 Aug 2019 21:24:07 +0100 Subject: Lang continued! --- .../multi/GT_MetaTileEntity_TM_microwave.java | 130 +++++++++++---------- .../multi/GT_MetaTileEntity_TM_teslaCoil.java | 53 ++++----- src/main/resources/assets/tectech/lang/en_US.lang | 35 ++++++ 3 files changed, 128 insertions(+), 90 deletions(-) (limited to 'src/main/resources/assets/tectech') diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java index cae6cb1628..25a74a8a9b 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java @@ -34,7 +34,7 @@ import static gregtech.api.GregTech_API.sBlockCasings4; * Created by danie_000 on 17.12.2016. */ public class GT_MetaTileEntity_TM_microwave extends GT_MetaTileEntity_MultiblockBase_EM implements IConstructable { - private boolean hasBeenPausedThisCycle=false; + private boolean hasBeenPausedThisCycle = false; //region Structure //use multi A energy inputs, use less power the longer it runs @@ -53,27 +53,28 @@ public class GT_MetaTileEntity_TM_microwave extends GT_MetaTileEntity_Multiblock private static final Block[] blockTypeFallback = new Block[]{sBlockCasings4}; private static final byte[] blockMetaFallback = new byte[]{1}; private static final String[] description = new String[]{ - EnumChatFormatting.AQUA+ StatCollector.translateToLocal("tt.keyword.Hint_Details") + ":", - "1 - Classic Hatches or Clean Stainless Steel Casing", - "Also acts like a hopper so give it an Output Bus", + EnumChatFormatting.AQUA + StatCollector.translateToLocal("tt.keyword.Hint_Details") + ":", + StatCollector.translateToLocal("gt.blockmachines.multimachine.tm.microwave.hint.0"),//1 - Classic Hatches or Clean Stainless Steel Casing + StatCollector.translateToLocal("gt.blockmachines.multimachine.tm.microwave.hint.1"),//Also acts like a hopper so give it an Output Bus }; //endregion //region parameters - protected Parameters.Group.ParameterIn powerSetting,timerSetting; - protected Parameters.Group.ParameterOut timerValue,remainingTime; - private static final INameFunction POWER_SETTING_NAME = (base, p)-> "Power setting"; - private static final INameFunction TIMER_SETTING_NAME = (base, p)-> "Timer setting"; - private static final INameFunction TIMER_REMAINING_NAME = (base, p)-> "Timer remaining"; - private static final INameFunction TIMER_VALUE_NAME = (base, p)-> "Timer value"; - private static final IStatusFunction POWER_STATUS= - (base,p)-> LedStatus.fromLimitsInclusiveOuterBoundary(p.get(),300,1000,1000,Double.POSITIVE_INFINITY); - private static final IStatusFunction TIMER_STATUS=(base, p)->{ - double value=p.get(); - if(Double.isNaN(value)) return STATUS_WRONG; - value=(int)value; - if(value<=0) return STATUS_TOO_LOW; - if(value>3000) return STATUS_TOO_HIGH; + protected Parameters.Group.ParameterIn powerSetting, timerSetting; + protected Parameters.Group.ParameterOut timerValue, remainingTime; + private static final INameFunction POWER_SETTING_NAME = (base, p) -> StatCollector.translateToLocal("gt.blockmachines.multimachine.tm.microwave.cfgi.0");//Power setting + private static final INameFunction TIMER_SETTING_NAME = (base, p) -> StatCollector.translateToLocal("gt.blockmachines.multimachine.tm.microwave.cfgi.1");//Timer setting + + private static final INameFunction TIMER_VALUE_NAME = (base, p) -> StatCollector.translateToLocal("gt.blockmachines.multimachine.tm.microwave.cfgo.0");//Timer value + private static final INameFunction TIMER_REMAINING_NAME = (base, p) -> StatCollector.translateToLocal("gt.blockmachines.multimachine.tm.microwave.cfgo.1");//Timer remaining + private static final IStatusFunction POWER_STATUS = + (base, p) -> LedStatus.fromLimitsInclusiveOuterBoundary(p.get(), 300, 1000, 1000, Double.POSITIVE_INFINITY); + private static final IStatusFunction TIMER_STATUS = (base, p) -> { + double value = p.get(); + if (Double.isNaN(value)) return STATUS_WRONG; + value = (int) value; + if (value <= 0) return STATUS_TOO_LOW; + if (value > 3000) return STATUS_TOO_HIGH; return STATUS_OK; }; //endregion @@ -88,11 +89,12 @@ public class GT_MetaTileEntity_TM_microwave extends GT_MetaTileEntity_Multiblock @Override protected void parametersInstantiation_EM() { - Parameters.Group hatch_0=parametrization.getGroup(0, true); - powerSetting=hatch_0.makeInParameter(0,1000, POWER_SETTING_NAME,POWER_STATUS); - timerSetting=hatch_0.makeInParameter(1,360, TIMER_SETTING_NAME,TIMER_STATUS); - timerValue=hatch_0.makeOutParameter(0,0,TIMER_VALUE_NAME,TIMER_STATUS); - remainingTime=hatch_0.makeOutParameter(1,360,TIMER_REMAINING_NAME,TIMER_STATUS); + Parameters.Group hatch_0 = parametrization.getGroup(0, true); + powerSetting = hatch_0.makeInParameter(0, 1000, POWER_SETTING_NAME, POWER_STATUS); + timerSetting = hatch_0.makeInParameter(1, 360, TIMER_SETTING_NAME, TIMER_STATUS); + + timerValue = hatch_0.makeOutParameter(0, 0, TIMER_VALUE_NAME, TIMER_STATUS); + remainingTime = hatch_0.makeOutParameter(1, 360, TIMER_REMAINING_NAME, TIMER_STATUS); } @Override @@ -104,7 +106,7 @@ public class GT_MetaTileEntity_TM_microwave extends GT_MetaTileEntity_Multiblock public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) { if (aSide == aFacing) { return new ITexture[]{Textures.BlockIcons.CASING_BLOCKS[49], new TT_RenderedTexture(aActive ? Textures.BlockIcons.OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_ACTIVE : Textures.BlockIcons.OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE)}; - }else if(aSide == GT_Utility.getOppositeSide(aFacing)) { + } else if (aSide == GT_Utility.getOppositeSide(aFacing)) { return new ITexture[]{Textures.BlockIcons.CASING_BLOCKS[49], aActive ? Textures.BlockIcons.CASING_BLOCKS[52] : Textures.BlockIcons.CASING_BLOCKS[53]}; } return new ITexture[]{Textures.BlockIcons.CASING_BLOCKS[49]}; @@ -127,7 +129,7 @@ public class GT_MetaTileEntity_TM_microwave extends GT_MetaTileEntity_Multiblock @Override public void construct(int stackSize, boolean hintsOnly) { - StructureBuilderExtreme(shape, blockType, blockMeta, 2, 2, 0, getBaseMetaTileEntity(),this, hintsOnly); + StructureBuilderExtreme(shape, blockType, blockMeta, 2, 2, 0, getBaseMetaTileEntity(), this, hintsOnly); } @Override @@ -139,23 +141,23 @@ public class GT_MetaTileEntity_TM_microwave extends GT_MetaTileEntity_Multiblock public String[] getDescription() { return new String[]{ CommonValues.BASS_MARK, - "High Frequency Oven", - EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "From live to done in seconds!", - EnumChatFormatting.BLUE + "I said nuke the... I meant microwave supper!", + StatCollector.translateToLocal("gt.blockmachines.multimachine.tm.microwave.desc.0"),//High Frequency Oven + EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + StatCollector.translateToLocal("gt.blockmachines.multimachine.tm.microwave.desc.1"),//From live to done in seconds! + EnumChatFormatting.BLUE + StatCollector.translateToLocal("gt.blockmachines.multimachine.tm.microwave.desc.2"),//I said nuke the... I meant microwave supper! }; } @Override public boolean checkRecipe_EM(ItemStack itemStack) { - hasBeenPausedThisCycle =false; - if((int)powerSetting.get()<300 || timerSetting.get()<=0 || timerSetting.get()>3000) { + hasBeenPausedThisCycle = false; + if ((int) powerSetting.get() < 300 || timerSetting.get() <= 0 || timerSetting.get() > 3000) { return false; } if (remainingTime.get() <= 0) { remainingTime.set(timerSetting.get()); timerValue.set(0); } - mEUt = -((int)powerSetting.get() >> 1); + mEUt = -((int) powerSetting.get() >> 1); eAmpereFlow = 1; mMaxProgresstime = 20; mEfficiencyIncrease = 10000; @@ -164,37 +166,37 @@ public class GT_MetaTileEntity_TM_microwave extends GT_MetaTileEntity_Multiblock @Override public void outputAfterRecipe_EM() { - if(hasBeenPausedThisCycle) { + if (hasBeenPausedThisCycle) { return;//skip timer and actions if paused } - timerValue.set(timerValue.get()+1); - remainingTime.set(timerSetting.get()-timerValue.get()); - IGregTechTileEntity mte=getBaseMetaTileEntity(); - int[] xyzOffsets= getTranslatedOffsets(0,-1,2); - double xPos=mte.getXCoord()+0.5f+xyzOffsets[0]; - double yPos=mte.getYCoord()+0.5f+xyzOffsets[1]; - double zPos=mte.getZCoord()+0.5f+xyzOffsets[2]; - AxisAlignedBB aabb=getBoundingBox(-2,-2,-2,2,2,2).offset(xPos,yPos,zPos); - xyzOffsets= getTranslatedOffsets(0,-4,0); - double[] xyzExpansion= getTranslatedOffsets(1.5,0,1.5); - for(int i=0;i<3;i++){//gets ABS from translated to get expansion values - if(xyzExpansion[i]<0)xyzExpansion[i]=-xyzExpansion[i]; + timerValue.set(timerValue.get() + 1); + remainingTime.set(timerSetting.get() - timerValue.get()); + IGregTechTileEntity mte = getBaseMetaTileEntity(); + int[] xyzOffsets = getTranslatedOffsets(0, -1, 2); + double xPos = mte.getXCoord() + 0.5f + xyzOffsets[0]; + double yPos = mte.getYCoord() + 0.5f + xyzOffsets[1]; + double zPos = mte.getZCoord() + 0.5f + xyzOffsets[2]; + AxisAlignedBB aabb = getBoundingBox(-2, -2, -2, 2, 2, 2).offset(xPos, yPos, zPos); + xyzOffsets = getTranslatedOffsets(0, -4, 0); + double[] xyzExpansion = getTranslatedOffsets(1.5, 0, 1.5); + for (int i = 0; i < 3; i++) {//gets ABS from translated to get expansion values + if (xyzExpansion[i] < 0) xyzExpansion[i] = -xyzExpansion[i]; } - int power=(int)powerSetting.get(); + int power = (int) powerSetting.get(); int damagingFactor = - Math.min(power >> 6,8)+ - Math.min(power >> 8,24)+ - Math.min(power >> 12,48)+ + Math.min(power >> 6, 8) + + Math.min(power >> 8, 24) + + Math.min(power >> 12, 48) + (power >> 18); - ArrayList itemsToOutput=new ArrayList<>(); - HashSet tickedStuff=new HashSet<>(); + ArrayList itemsToOutput = new ArrayList<>(); + HashSet tickedStuff = new HashSet<>(); - boolean inside=true; + boolean inside = true; do { for (Object entity : mte.getWorld().getEntitiesWithinAABBExcludingEntity(null, aabb)) { if (entity instanceof Entity) { - if(tickedStuff.add((Entity)entity)) { + if (tickedStuff.add((Entity) entity)) { if (inside && entity instanceof EntityItem) { GT_Recipe tRecipe = GT_Recipe.GT_Recipe_Map.sMicrowaveRecipes.findRecipe( mte, null, true, 128, null, null, new ItemStack[]{((EntityItem) entity).getEntityItem()}); @@ -205,33 +207,33 @@ public class GT_MetaTileEntity_TM_microwave extends GT_MetaTileEntity_Multiblock newStuff.stackSize = ((EntityItem) entity).getEntityItem().stackSize; itemsToOutput.add(newStuff); } - ((EntityItem) entity).delayBeforeCanPickup=2; + ((EntityItem) entity).delayBeforeCanPickup = 2; ((EntityItem) entity).setDead(); } else if (entity instanceof EntityLivingBase) { - if(!GT_Utility.isWearingFullElectroHazmat((EntityLivingBase) entity)) { + if (!GT_Utility.isWearingFullElectroHazmat((EntityLivingBase) entity)) { ((EntityLivingBase) entity).attackEntityFrom(microwaving, damagingFactor); } } } } } - aabb.offset(xyzOffsets[0],xyzOffsets[1],xyzOffsets[2]); - aabb=aabb.expand(xyzExpansion[0],xyzExpansion[1],xyzExpansion[2]); - inside=false; - damagingFactor>>=1; - } while(damagingFactor>0); + aabb.offset(xyzOffsets[0], xyzOffsets[1], xyzOffsets[2]); + aabb = aabb.expand(xyzExpansion[0], xyzExpansion[1], xyzExpansion[2]); + inside = false; + damagingFactor >>= 1; + } while (damagingFactor > 0); - mOutputItems= itemsToOutput.toArray(nullItem); + mOutputItems = itemsToOutput.toArray(nullItem); - if(remainingTime.get() <=0) { - mte.getWorld().playSoundEffect(xPos,yPos,zPos, Reference.MODID+":microwave_ding", 1, 1); + if (remainingTime.get() <= 0) { + mte.getWorld().playSoundEffect(xPos, yPos, zPos, Reference.MODID + ":microwave_ding", 1, 1); stopMachine(); } } @Override public boolean onRunningTick(ItemStack aStack) { - if(eSafeVoid) { + if (eSafeVoid) { hasBeenPausedThisCycle = true; } return hasBeenPausedThisCycle || super.onRunningTick(aStack);//consume eu and other resources if not paused @@ -248,4 +250,4 @@ public class GT_MetaTileEntity_TM_microwave extends GT_MetaTileEntity_Multiblock public byte getTileEntityBaseType() { return 1; } -} +} \ No newline at end of file diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java index df8f44b133..87a480fd36 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java @@ -27,6 +27,7 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.StatCollector; import java.util.ArrayList; import java.util.HashMap; @@ -97,9 +98,9 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock private static final Block[] blockTypeFallback = new Block[]{sBlockCasingsBA0, null}; private static final byte[] blockMetaFallback = new byte[]{6, 0}; private static final String[] description = new String[]{ - EnumChatFormatting.AQUA + "Hint Details:", - "1 - Classic Hatches, Capacitor Hatches or Tesla Base Casing", - "2 - Titanium Frames", + EnumChatFormatting.AQUA + StatCollector.translateToLocal("tt.keyword.Hint_Details") + ":", + StatCollector.translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.hint.0"),//1 - Classic Hatches, Capacitor Hatches or Tesla Base Casing + StatCollector.translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.hint.1"),//2 - Titanium Frames }; //endregion @@ -107,26 +108,26 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock protected Parameters.Group.ParameterIn popogaSetting, histLowSetting, histHighSetting, transferRadiusTowerSetting, transferRadiusTransceiverSetting, transferRadiusCoverUltimateSetting, outputVoltageSetting, outputCurrentSetting, scanTimeMinSetting, overDriveSetting; protected Parameters.Group.ParameterOut popogaDisplay, transferRadiusTowerDisplay, transferRadiusTransceiverDisplay, transferRadiusCoverUltimateDisplay, outputVoltageDisplay, outputCurrentDisplay, energyCapacityDisplay, energyStoredDisplay, energyFractionDisplay, scanTimeDisplay; - private static final INameFunction HYSTERESIS_LOW_SETTING_NAME = (base, p) -> "Hysteresis low setting"; - private static final INameFunction HYSTERESIS_HIGH_SETTING_NAME = (base, p) -> "Hysteresis high setting"; - private static final INameFunction TRANSFER_RADIUS_TOWER_SETTING_NAME = (base, p) -> "Tesla Towers transfer radius setting"; - private static final INameFunction TRANSFER_RADIUS_TRANSCEIVER_SETTING_NAME = (base, p) -> "Tesla Transceiver transfer radius setting"; - private static final INameFunction TRANSFER_RADIUS_COVER_ULTIMATE_SETTING_NAME = (base, p) -> "Tesla Ultimate Cover transfer radius setting"; - private static final INameFunction OUTPUT_VOLTAGE_SETTING_NAME = (base, p) -> "Output voltage setting"; - private static final INameFunction OUTPUT_CURRENT_SETTING_NAME = (base, p) -> "Output current setting"; - private static final INameFunction SCAN_TIME_MIN_SETTING_NAME = (base, p) -> "Scan time Min setting"; - private static final INameFunction OVERDRIVE_SETTING_NAME = (base, p) -> "Overdrive setting"; - private static final INameFunction POPOGA_NAME = (base, p) -> "Unused"; - - private static final INameFunction TRANSFER_RADIUS_TOWER_DISPLAY_NAME = (base, p) -> "Tesla Towers transfer radius display"; - private static final INameFunction TRANSFER_RADIUS_TRANSCEIVER_DISPLAY_NAME = (base, p) -> "Tesla Transceiver transfer radius display"; - private static final INameFunction TRANSFER_RADIUS_COVER_ULTIMATE_DISPLAY_NAME = (base, p) -> "Tesla Ultimate Cover transfer radius display"; - private static final INameFunction OUTPUT_VOLTAGE_DISPLAY_NAME = (base, p) -> "Output voltage display"; - private static final INameFunction OUTPUT_CURRENT_DISPLAY_NAME = (base, p) -> "Output current display"; - private static final INameFunction ENERGY_CAPACITY_DISPLAY_NAME = (base, p) -> "Energy Capacity display"; - private static final INameFunction ENERGY_STORED_DISPLAY_NAME = (base, p) -> "Energy Stored display"; - private static final INameFunction ENERGY_FRACTION_DISPLAY_NAME = (base, p) -> "Energy Fraction display"; - private static final INameFunction SCAN_TIME_DISPLAY_NAME = (base, p) -> "Scan time display"; + private static final INameFunction HYSTERESIS_LOW_SETTING_NAME = (base, p) -> StatCollector.translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.cfgi.0");//Hysteresis low setting + private static final INameFunction HYSTERESIS_HIGH_SETTING_NAME = (base, p) -> StatCollector.translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.cfgi.1");//Hysteresis high setting + private static final INameFunction TRANSFER_RADIUS_TOWER_SETTING_NAME = (base, p) -> StatCollector.translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.cfgi.2");//Tesla Towers transfer radius setting + private static final INameFunction TRANSFER_RADIUS_TRANSCEIVER_SETTING_NAME = (base, p) -> StatCollector.translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.cfgi.3");//Tesla Transceiver transfer radius setting + private static final INameFunction TRANSFER_RADIUS_COVER_ULTIMATE_SETTING_NAME = (base, p) -> StatCollector.translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.cfgi.4");//Tesla Ultimate Cover transfer radius setting + private static final INameFunction OUTPUT_VOLTAGE_SETTING_NAME = (base, p) -> StatCollector.translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.cfgi.5");//Output voltage setting + private static final INameFunction OUTPUT_CURRENT_SETTING_NAME = (base, p) -> StatCollector.translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.cfgi.6");//Output current setting + private static final INameFunction SCAN_TIME_MIN_SETTING_NAME = (base, p) -> StatCollector.translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.cfgi.7");//Scan time Min setting + private static final INameFunction OVERDRIVE_SETTING_NAME = (base, p) -> StatCollector.translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.cfgi.8");//Overdrive setting + private static final INameFunction POPOGA_NAME = (base, p) -> StatCollector.translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.cfgi.9");//Unused + + private static final INameFunction TRANSFER_RADIUS_TOWER_DISPLAY_NAME = (base, p) -> StatCollector.translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.cfgo.0");//Tesla Towers transfer radius display + private static final INameFunction TRANSFER_RADIUS_TRANSCEIVER_DISPLAY_NAME = (base, p) -> StatCollector.translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.cfgo.1");//Tesla Transceiver transfer radius display + private static final INameFunction TRANSFER_RADIUS_COVER_ULTIMATE_DISPLAY_NAME = (base, p) -> StatCollector.translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.cfgo.2");//Tesla Ultimate Cover transfer radius display + private static final INameFunction OUTPUT_VOLTAGE_DISPLAY_NAME = (base, p) -> StatCollector.translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.cfgo.3");//Output voltage display + private static final INameFunction OUTPUT_CURRENT_DISPLAY_NAME = (base, p) -> StatCollector.translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.cfgo.4");//Output current display + private static final INameFunction ENERGY_CAPACITY_DISPLAY_NAME = (base, p) -> StatCollector.translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.cfgo.5");//Energy Capacity display + private static final INameFunction ENERGY_STORED_DISPLAY_NAME = (base, p) ->StatCollector.translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.cfgo.6");//Energy Stored display + private static final INameFunction ENERGY_FRACTION_DISPLAY_NAME = (base, p) -> StatCollector.translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.cfgo.7");//Energy Fraction display + private static final INameFunction SCAN_TIME_DISPLAY_NAME = (base, p) -> StatCollector.translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.cfgo.8");//Scan time display private static final IStatusFunction HYSTERESIS_LOW_STATUS = (base, p) -> { double value = p.get(); @@ -432,9 +433,9 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock public String[] getDescription() { return new String[]{ CommonValues.BASS_MARK, - "Tower of Wireless Power", - EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "Fewer pesky cables!", - EnumChatFormatting.BLUE + "Survival chances might be affected", + StatCollector.translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.desc.0"),//Tower of Wireless Power + EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + StatCollector.translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.desc.1"),//Fewer pesky cables! + EnumChatFormatting.BLUE + StatCollector.translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.desc.2"),//Survival chances might be affected }; } diff --git a/src/main/resources/assets/tectech/lang/en_US.lang b/src/main/resources/assets/tectech/lang/en_US.lang index ad7426f44c..18dd12b722 100644 --- a/src/main/resources/assets/tectech/lang/en_US.lang +++ b/src/main/resources/assets/tectech/lang/en_US.lang @@ -331,8 +331,42 @@ gt.blockmachines.multimachine.em.transformer.desc.1=All the transformation! gt.blockmachines.multimachine.em.transformer.desc.2=Only 0.78125% power loss, HAYO! gt.blockmachines.multimachine.tm.microwave.name=Microwave Grinder +gt.blockmachines.multimachine.tm.microwave.hint.0=1 - Classic Hatches or Clean Stainless Steel Casing +gt.blockmachines.multimachine.tm.microwave.hint.1=Also acts like a hopper so give it an Output Bus +gt.blockmachines.multimachine.tm.microwave.desc.0=High Frequency Oven +gt.blockmachines.multimachine.tm.microwave.desc.1=From live to done in seconds! +gt.blockmachines.multimachine.tm.microwave.desc.3=I said nuke the... I meant microwave supper! +gt.blockmachines.multimachine.tm.microwave.cfgi.0=Power setting +gt.blockmachines.multimachine.tm.microwave.cfgi.1=Timer setting +gt.blockmachines.multimachine.tm.microwave.cfgo.0=Timer value +gt.blockmachines.multimachine.tm.microwave.cfgo.1=Timer remaining gt.blockmachines.multimachine.tm.teslaCoil.name=Tesla Tower +gt.blockmachines.multimachine.tm.teslaCoil.hint.0=1 - Classic Hatches, Capacitor Hatches or Tesla Base Casing +gt.blockmachines.multimachine.tm.teslaCoil.hint.1=2 - Titanium Frames +gt.blockmachines.multimachine.tm.teslaCoil.desc.0=Tower of Wireless Power +gt.blockmachines.multimachine.tm.teslaCoil.desc.1=Fewer pesky cables! +gt.blockmachines.multimachine.tm.teslaCoil.desc.2=Survival chances might be affected +gt.blockmachines.multimachine.tm.teslaCoil.cfgi.0=Hysteresis low setting +gt.blockmachines.multimachine.tm.teslaCoil.cfgi.1=Hysteresis high setting +gt.blockmachines.multimachine.tm.teslaCoil.cfgi.2=Tesla Towers transfer radius setting +gt.blockmachines.multimachine.tm.teslaCoil.cfgi.3=Tesla Transceiver transfer radius setting +gt.blockmachines.multimachine.tm.teslaCoil.cfgi.4=Tesla Ultimate Cover transfer radius setting +gt.blockmachines.multimachine.tm.teslaCoil.cfgi.5=Output voltage setting +gt.blockmachines.multimachine.tm.teslaCoil.cfgi.6=Output current setting +gt.blockmachines.multimachine.tm.teslaCoil.cfgi.7=Scan time Min setting +gt.blockmachines.multimachine.tm.teslaCoil.cfgi.8=Overdrive setting +gt.blockmachines.multimachine.tm.teslaCoil.cfgi.9=Unused +gt.blockmachines.multimachine.tm.teslaCoil.cfgo.0=Tesla Towers transfer radius display +gt.blockmachines.multimachine.tm.teslaCoil.cfgo.1=Tesla Transceiver transfer radius display +gt.blockmachines.multimachine.tm.teslaCoil.cfgo.2=Tesla Ultimate Cover transfer radius display +gt.blockmachines.multimachine.tm.teslaCoil.cfgo.3=Output voltage display +gt.blockmachines.multimachine.tm.teslaCoil.cfgo.4=Output current display +gt.blockmachines.multimachine.tm.teslaCoil.cfgo.5=Energy Capacity display +gt.blockmachines.multimachine.tm.teslaCoil.cfgo.6=Energy Stored display +gt.blockmachines.multimachine.tm.teslaCoil.cfgo.7=Energy Fraction display +gt.blockmachines.multimachine.tm.teslaCoil.cfgo.8=Scan time display + gt.blockmachines.multimachine.em.switch.name=Network Switch With QoS gt.blockmachines.multimachine.em.computer.name=Quantum Computer gt.blockmachines.multimachine.em.databank.name=Data Bank @@ -369,6 +403,7 @@ gt.blockmachines.multimachine.em.annihilation.name=Annihilation Generator gt.blockmachines.multimachine.em.blackholegenerator.name=Black Hole Generator #Keywords and phrases +#SOME ARE PHRASES!!! tt.keyword.Hint_Details=Hint Details tt.keyword.Air=Air tt.keyword.Earth=Earth -- cgit From a560a97a4376e8ac198cd686b633f6f7b06c31e7 Mon Sep 17 00:00:00 2001 From: Bass Date: Tue, 27 Aug 2019 18:45:11 +0100 Subject: Lang Extra Extra? --- .../definitions/dComplexAspectDefinition.java | 4 +- .../GT_MetaTileEntity_EM_essentiaDequantizer.java | 2 +- .../GT_MetaTileEntity_EM_essentiaQuantizer.java | 2 +- .../multi/GT_MetaTileEntity_EM_computer.java | 122 +++++++++++---------- .../multi/GT_MetaTileEntity_EM_switch.java | 69 ++++++------ .../multi/GT_MetaTileEntity_EM_transformer.java | 2 +- .../multi/GT_MetaTileEntity_TM_microwave.java | 2 +- .../multi/GT_MetaTileEntity_TM_teslaCoil.java | 2 +- src/main/resources/assets/tectech/lang/en_US.lang | 21 +++- 9 files changed, 121 insertions(+), 105 deletions(-) (limited to 'src/main/resources/assets/tectech') diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/dComplexAspectDefinition.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/dComplexAspectDefinition.java index d6c4553ed5..3d01ec7fb9 100644 --- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/dComplexAspectDefinition.java +++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/dComplexAspectDefinition.java @@ -306,13 +306,13 @@ public final class dComplexAspectDefinition extends cElementalDefinition impleme lines.add(StatCollector.translateToLocal("tt.keyword.CHARGE") + " = " + getCharge() / 3f + " e"); } if (Util.areBitsSet(SCAN_GET_COLOR, capabilities)) { - lines.add(getColor() < 0 ? StatCollector.translateToLocal("tt.keyword.COLORLESS") : StatCollector.translateToLocal("tt.keyword.CARRIES_COLOR")); + lines.add(getColor() < 0 ? StatCollector.translateToLocal("tt.keyword.COLORLESS") : StatCollector.translateToLocal("tt.keyphrase.CARRIES_COLOR")); } if (Util.areBitsSet(SCAN_GET_MASS, capabilities)) { lines.add(StatCollector.translateToLocal("tt.keyword.MASS") + " = " + getMass() + " eV/c\u00b2"); } if (Util.areBitsSet(SCAN_GET_TIMESPAN_INFO, capabilities)) { - lines.add(StatCollector.translateToLocal("tt.keyword.LIFE_TIME") + " = " + getRawTimeSpan(energyLevel) + " s"); + lines.add(StatCollector.translateToLocal("tt.keyphrase.LIFE_TIME") + " = " + getRawTimeSpan(energyLevel) + " s"); lines.add(" " + StatCollector.translateToLocal("tt.keyphrase.At_current_energy_level")); } } diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java index afaa9052cd..31a81726c4 100644 --- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java +++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java @@ -55,7 +55,7 @@ public class GT_MetaTileEntity_EM_essentiaDequantizer extends GT_MetaTileEntity_ private static final Block[] blockTypeFallback = new Block[]{sBlockCasingsTT, sBlockCasingsTT, sBlockCasingsTT}; private static final byte[] blockMetaFallback = new byte[]{0, 4, 4}; private static final String[] description = new String[]{ - EnumChatFormatting.AQUA + StatCollector.translateToLocal("tt.keyword.Hint_Details") + ":", + EnumChatFormatting.AQUA + StatCollector.translateToLocal("tt.keyphrase.Hint_Details") + ":", StatCollector.translateToLocal("gt.blockmachines.multimachine.em.emtoessentia.hint.0"),//1 - Classic Hatches or High Power Casing StatCollector.translateToLocal("gt.blockmachines.multimachine.em.emtoessentia.hint.1"),//2 - Elemental Input Hatch StatCollector.translateToLocal("gt.blockmachines.multimachine.em.emtoessentia.hint.2"),//3 - Elemental Overflow Hatches or Elemental Casing diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java index d7570f7889..4425a97f64 100644 --- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java +++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java @@ -55,7 +55,7 @@ public class GT_MetaTileEntity_EM_essentiaQuantizer extends GT_MetaTileEntity_Mu private static final Block[] blockTypeFallback = new Block[]{sBlockCasingsTT, sBlockCasingsTT, sBlockCasingsTT}; private static final byte[] blockMetaFallback = new byte[]{0, 4, 4}; private static final String[] description = new String[]{ - EnumChatFormatting.AQUA + StatCollector.translateToLocal("tt.keyword.Hint_Details") + ":", + EnumChatFormatting.AQUA + StatCollector.translateToLocal("tt.keyphrase.Hint_Details") + ":", StatCollector.translateToLocal("gt.blockmachines.multimachine.em.essentiatoem.hint.0"),//1 - Classic Hatches or High Power Casing StatCollector.translateToLocal("gt.blockmachines.multimachine.em.essentiatoem.hint.1"),//2 - Elemental Output Hatch StatCollector.translateToLocal("gt.blockmachines.multimachine.em.essentiatoem.hint.2"),//3 - Elemental Overflow Hatches or Elemental Casing diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java index c39e9e0661..2f3bca7c16 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java @@ -30,6 +30,7 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.StatCollector; import java.util.ArrayList; @@ -44,35 +45,11 @@ import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStat * Created by danie_000 on 17.12.2016. */ public class GT_MetaTileEntity_EM_computer extends GT_MetaTileEntity_MultiblockBase_EM implements IConstructable { + private final ArrayList eRacks = new ArrayList<>(); + private static Textures.BlockIcons.CustomIcon ScreenOFF; private static Textures.BlockIcons.CustomIcon ScreenON; - //region parameters - protected Parameters.Group.ParameterIn overclock,overvolt; - protected Parameters.Group.ParameterOut maxCurrentTemp,availableData; - private static final INameFunction OC_NAME = (base, p)-> "Overclock ratio"; - private static final INameFunction OV_NAME = (base, p)-> "Overvoltage ratio"; - private static final INameFunction MAX_TEMP_NAME = (base, p)-> "Current max. heat"; - private static final INameFunction COMPUTE_NAME = (base, p)-> "Produced computation"; - private static final IStatusFunction OC_STATUS= - (base,p)->LedStatus.fromLimitsInclusiveOuterBoundary(p.get(),0,1,1,3); - private static final IStatusFunction OV_STATUS= - (base,p)->LedStatus.fromLimitsInclusiveOuterBoundary(p.get(),.7,.8,1.2,2); - private static final IStatusFunction MAX_TEMP_STATUS= - (base,p)->LedStatus.fromLimitsInclusiveOuterBoundary(p.get(),-10000,0,0,5000); - private static final IStatusFunction COMPUTE_STATUS=(base, p)->{ - if(base.eAvailableData<0){ - return STATUS_TOO_LOW; - } - if(base.eAvailableData==0){ - return STATUS_NEUTRAL; - } - return STATUS_OK; - }; - //endregion - - private final ArrayList eRacks = new ArrayList<>(); - //region Structure private static final String[][] front = new String[][]{{"A ", "A ", "A. ", "A ",},}; private static final String[][] terminator = new String[][]{{"A ", "A ", "A ", "A ",},}; @@ -85,9 +62,34 @@ public class GT_MetaTileEntity_EM_computer extends GT_MetaTileEntity_MultiblockB private static final Block[] blockTypeFallback = new Block[]{sBlockCasingsTT, sBlockCasingsTT}; private static final byte[] blockMetaFallback = new byte[]{1, 3}; private static final String[] description = new String[]{ - EnumChatFormatting.AQUA+"Hint Details:", - "1 - Classic/Data Hatches or Computer casing", - "2 - Rack Hatches or Advanced computer casing", + EnumChatFormatting.AQUA + StatCollector.translateToLocal("tt.keyphrase.Hint_Details") + ":", + StatCollector.translateToLocal("gt.blockmachines.multimachine.em.computer.hint.0"),//1 - Classic/Data Hatches or Computer casing + StatCollector.translateToLocal("gt.blockmachines.multimachine.em.computer.hint.1"),//2 - Rack Hatches or Advanced computer casing + }; + //endregion + + //region parameters + protected Parameters.Group.ParameterIn overclock, overvolt; + protected Parameters.Group.ParameterOut maxCurrentTemp, availableData; + + private static final INameFunction OC_NAME = (base, p) -> StatCollector.translateToLocal("gt.blockmachines.multimachine.em.computer.cfgi.0");//Overclock ratio + private static final INameFunction OV_NAME = (base, p) -> StatCollector.translateToLocal("gt.blockmachines.multimachine.em.computer.cfgi.1");//Overvoltage ratio + private static final INameFunction MAX_TEMP_NAME = (base, p) -> StatCollector.translateToLocal("gt.blockmachines.multimachine.em.computer.cfgo.0");//Current max. heat + private static final INameFunction COMPUTE_NAME = (base, p) -> StatCollector.translateToLocal("gt.blockmachines.multimachine.em.computer.cfgo.1");//Produced computation + private static final IStatusFunction OC_STATUS = + (base, p) -> LedStatus.fromLimitsInclusiveOuterBoundary(p.get(), 0, 1, 1, 3); + private static final IStatusFunction OV_STATUS = + (base, p) -> LedStatus.fromLimitsInclusiveOuterBoundary(p.get(), .7, .8, 1.2, 2); + private static final IStatusFunction MAX_TEMP_STATUS = + (base, p) -> LedStatus.fromLimitsInclusiveOuterBoundary(p.get(), -10000, 0, 0, 5000); + private static final IStatusFunction COMPUTE_STATUS = (base, p) -> { + if (base.eAvailableData < 0) { + return STATUS_TOO_LOW; + } + if (base.eAvailableData == 0) { + return STATUS_NEUTRAL; + } + return STATUS_OK; }; //endregion @@ -105,16 +107,16 @@ public class GT_MetaTileEntity_EM_computer extends GT_MetaTileEntity_MultiblockB @Override protected void parametersInstantiation_EM() { - Parameters.Group hatch_0=parametrization.getGroup(0); - overclock=hatch_0.makeInParameter(0,1,OC_NAME,OC_STATUS); - overvolt=hatch_0.makeInParameter(1,1,OV_NAME,OV_STATUS); - maxCurrentTemp=hatch_0.makeOutParameter(0,0,MAX_TEMP_NAME,MAX_TEMP_STATUS); - availableData=hatch_0.makeOutParameter(1,0,COMPUTE_NAME,COMPUTE_STATUS); + Parameters.Group hatch_0 = parametrization.getGroup(0); + overclock = hatch_0.makeInParameter(0, 1, OC_NAME, OC_STATUS); + overvolt = hatch_0.makeInParameter(1, 1, OV_NAME, OV_STATUS); + maxCurrentTemp = hatch_0.makeOutParameter(0, 0, MAX_TEMP_NAME, MAX_TEMP_STATUS); + availableData = hatch_0.makeOutParameter(1, 0, COMPUTE_NAME, COMPUTE_STATUS); } @Override @SideOnly(Side.CLIENT) - protected ResourceLocation getActivitySound(){ + protected ResourceLocation getActivitySound() { return GT_MetaTileEntity_EM_switch.activitySound; } @@ -141,20 +143,20 @@ public class GT_MetaTileEntity_EM_computer extends GT_MetaTileEntity_MultiblockB @Override public boolean checkRecipe_EM(ItemStack itemStack) { - parametrization.setToDefaults(false,true); + parametrization.setToDefaults(false, true); eAvailableData = 0; - double maxTemp=0; - double overClockRatio= overclock.get(); - double overVoltageRatio= overvolt.get(); - if(Double.isNaN(overClockRatio) || Double.isNaN(overVoltageRatio)) { + double maxTemp = 0; + double overClockRatio = overclock.get(); + double overVoltageRatio = overvolt.get(); + if (Double.isNaN(overClockRatio) || Double.isNaN(overVoltageRatio)) { return false; } - if(overclock.getStatus(true).isOk && overvolt.getStatus(true).isOk){ - float eut=V[8] * (float)overVoltageRatio * (float)overClockRatio; - if(eut maxTemp) { - maxTemp=rack.heat; + maxTemp = rack.heat; } rackComputation = rack.tickComponents((float) overClockRatio, (float) overVoltageRatio); if (rackComputation > 0) { @@ -191,8 +193,8 @@ public class GT_MetaTileEntity_EM_computer extends GT_MetaTileEntity_MultiblockB availableData.set(eAvailableData); return true; } else { - eAvailableData=0; - mEUt = -(int)V[8]; + eAvailableData = 0; + mEUt = -(int) V[8]; eAmpereFlow = 1; mMaxProgresstime = 20; mEfficiencyIncrease = 10000; @@ -209,7 +211,7 @@ public class GT_MetaTileEntity_EM_computer extends GT_MetaTileEntity_MultiblockB if (!eOutputData.isEmpty()) { Vec3pos pos = new Vec3pos(getBaseMetaTileEntity()); QuantumDataPacket pack = new QuantumDataPacket(eAvailableData / eOutputData.size()).unifyTraceWith(pos); - if(pack==null){ + if (pack == null) { return; } for (GT_MetaTileEntity_Hatch_InputData hatch : eInputData) { @@ -256,7 +258,7 @@ public class GT_MetaTileEntity_EM_computer extends GT_MetaTileEntity_MultiblockB @Override public void stopMachine() { super.stopMachine(); - eAvailableData=0; + eAvailableData = 0; for (GT_MetaTileEntity_Hatch_Rack rack : eRacks) { if (GT_MetaTileEntity_MultiBlockBase.isValidMetaTileEntity(rack)) { rack.getBaseMetaTileEntity().setActive(false); @@ -306,17 +308,17 @@ public class GT_MetaTileEntity_EM_computer extends GT_MetaTileEntity_MultiblockB @Override public void construct(int stackSize, boolean hintsOnly) { - IGregTechTileEntity igt=getBaseMetaTileEntity(); - StructureBuilderExtreme(front, blockType, blockMeta, 1, 2, 0, igt,this,hintsOnly); - StructureBuilderExtreme(cap, blockType, blockMeta, 1, 2, -1, igt,this,hintsOnly); + IGregTechTileEntity igt = getBaseMetaTileEntity(); + StructureBuilderExtreme(front, blockType, blockMeta, 1, 2, 0, igt, this, hintsOnly); + StructureBuilderExtreme(cap, blockType, blockMeta, 1, 2, -1, igt, this, hintsOnly); - byte offset=-2; - for (int rackSlices = stackSize >12?12: stackSize; rackSlices>0 ; rackSlices--) { - StructureBuilderExtreme(slice, blockType, blockMeta, 1, 2, offset--, igt,this,hintsOnly); + byte offset = -2; + for (int rackSlices = stackSize > 12 ? 12 : stackSize; rackSlices > 0; rackSlices--) { + StructureBuilderExtreme(slice, blockType, blockMeta, 1, 2, offset--, igt, this, hintsOnly); } - StructureBuilderExtreme(cap, blockType, blockMeta, 1, 2, offset--, igt,this,hintsOnly); - StructureBuilderExtreme(terminator, blockType, blockMeta, 1, 2, offset,igt,this,hintsOnly); + StructureBuilderExtreme(cap, blockType, blockMeta, 1, 2, offset--, igt, this, hintsOnly); + StructureBuilderExtreme(terminator, blockType, blockMeta, 1, 2, offset, igt, this, hintsOnly); } @Override @@ -336,7 +338,7 @@ public class GT_MetaTileEntity_EM_computer extends GT_MetaTileEntity_MultiblockB return new String[]{ CommonValues.TEC_MARK_EM, Util.intBitsToString(TecTech.RANDOM.nextInt()), - EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "You need it to process the number above" + EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + StatCollector.translateToLocal("gt.blockmachines.multimachine.em.computer.desc")//You need it to process the number above }; } @@ -355,4 +357,4 @@ public class GT_MetaTileEntity_EM_computer extends GT_MetaTileEntity_MultiblockB } return false; } -} +} \ No newline at end of file diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_switch.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_switch.java index 1c5d1bccdd..be244e6820 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_switch.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_switch.java @@ -23,6 +23,7 @@ import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.StatCollector; import static com.github.technus.tectech.CommonValues.V; import static com.github.technus.tectech.Util.StructureBuilderExtreme; @@ -34,40 +35,40 @@ import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStat /** * Created by danie_000 on 17.12.2016. */ -public class GT_MetaTileEntity_EM_switch extends GT_MetaTileEntity_MultiblockBase_EM implements IConstructable{ +public class GT_MetaTileEntity_EM_switch extends GT_MetaTileEntity_MultiblockBase_EM implements IConstructable { //region Structure private static final String[][] shape = new String[][]{ - {" "," . "," ",}, - {" "," 0 "," ",}, - {" "," "," ",}, + {" ", " . ", " ",}, + {" ", " 0 ", " ",}, + {" ", " ", " ",}, }; private static final Block[] blockType = new Block[]{sBlockCasingsTT}; private static final byte[] blockMeta = new byte[]{3}; private final IHatchAdder[] addingMethods = new IHatchAdder[]{this::addClassicToMachineList}; - private static final short[] casingTextures = new short[]{textureOffset+1}; + private static final short[] casingTextures = new short[]{textureOffset + 1}; private static final Block[] blockTypeFallback = new Block[]{sBlockCasingsTT}; private static final byte[] blockMetaFallback = new byte[]{1}; private static final String[] description = new String[]{ - EnumChatFormatting.AQUA+"Hint Details:", - "1 - Classic/Data Hatches or Computer casing", + EnumChatFormatting.AQUA + StatCollector.translateToLocal("tt.keyphrase.Hint_Details") + ":", + "1 - Classic/Data Hatches or Computer casing",//1 - Classic/Data Hatches or Computer casing }; //endregion //region parameters - private static final INameFunction ROUTE_NAME= - (base,p)->(p.parameterId()==0?"Destination ":"Weight ")+p.hatchId(); + private static final INameFunction ROUTE_NAME = + (base, p) -> (p.parameterId() == 0 ? StatCollector.translateToLocal("tt.keyword.Destination") + " " : StatCollector.translateToLocal("tt.keyword.Weight") + " ") + p.hatchId(); private static final IStatusFunction WEI_STATUS = - (base,p)-> { - double v=p.get(); + (base, p) -> { + double v = p.get(); if (Double.isNaN(v)) return STATUS_WRONG; - if(v<0) return STATUS_TOO_LOW; - if(v==0) return STATUS_LOW; - if(Double.isInfinite(v)) return STATUS_HIGH; + if (v < 0) return STATUS_TOO_LOW; + if (v == 0) return STATUS_LOW; + if (Double.isInfinite(v)) return STATUS_HIGH; return STATUS_OK; }; private static final IStatusFunction DST_STATUS = - (base,p)->{ - if(base.weight[p.hatchId()].getStatus(false).isOk) { + (base, p) -> { + if (base.weight[p.hatchId()].getStatus(false).isOk) { double v = p.get(); if (Double.isNaN(v)) return STATUS_WRONG; v = (int) v; @@ -91,20 +92,20 @@ public class GT_MetaTileEntity_EM_switch extends GT_MetaTileEntity_MultiblockBas @Override protected void parametersInstantiation_EM() { - dst=new Parameters.Group.ParameterIn[10]; - weight =new Parameters.Group.ParameterIn[10]; + dst = new Parameters.Group.ParameterIn[10]; + weight = new Parameters.Group.ParameterIn[10]; for (int i = 0; i < 10; i++) { Parameters.Group hatch = parametrization.getGroup(i); dst[i] = hatch.makeInParameter(0, i, ROUTE_NAME, DST_STATUS); - weight[i] = hatch.makeInParameter(1,0, ROUTE_NAME, WEI_STATUS); + weight[i] = hatch.makeInParameter(1, 0, ROUTE_NAME, WEI_STATUS); } } - public final static ResourceLocation activitySound=new ResourceLocation(Reference.MODID+":fx_hi_freq"); + public final static ResourceLocation activitySound = new ResourceLocation(Reference.MODID + ":fx_hi_freq"); @Override @SideOnly(Side.CLIENT) - protected ResourceLocation getActivitySound(){ + protected ResourceLocation getActivitySound() { return activitySound; } @@ -128,7 +129,7 @@ public class GT_MetaTileEntity_EM_switch extends GT_MetaTileEntity_MultiblockBas @Override public void construct(int stackSize, boolean hintsOnly) { - StructureBuilderExtreme(shape, blockType, blockMeta,1, 1, 0, getBaseMetaTileEntity(),this,hintsOnly); + StructureBuilderExtreme(shape, blockType, blockMeta, 1, 1, 0, getBaseMetaTileEntity(), this, hintsOnly); } @Override @@ -162,7 +163,7 @@ public class GT_MetaTileEntity_EM_switch extends GT_MetaTileEntity_MultiblockBas double total = 0; double weight; for (int i = 0; i < 10; i++) {//each param pair - weight= this.weight[i].get(); + weight = this.weight[i].get(); if (weight > 0 && dst[i].get() >= 0) { total += weight;//Total weighted div } @@ -170,7 +171,7 @@ public class GT_MetaTileEntity_EM_switch extends GT_MetaTileEntity_MultiblockBas Vec3pos pos = new Vec3pos(getBaseMetaTileEntity()); QuantumDataPacket pack = new QuantumDataPacket(0L).unifyTraceWith(pos); - if(pack==null) { + if (pack == null) { return; } for (GT_MetaTileEntity_Hatch_InputData hatch : eInputData) { @@ -187,27 +188,27 @@ public class GT_MetaTileEntity_EM_switch extends GT_MetaTileEntity_MultiblockBas double dest; for (int i = 0; i < 10; i++) { - dest= dst[i].get(); - weight= this.weight[i].get(); + dest = dst[i].get(); + weight = this.weight[i].get(); if (weight > 0 && dest >= 0) { - int outIndex = (int)dest - 1; + int outIndex = (int) dest - 1; if (outIndex < 0 || outIndex >= eOutputData.size()) { continue; } GT_MetaTileEntity_Hatch_OutputData out = eOutputData.get(outIndex); - if(Double.isInfinite(total)){ - if(Double.isInfinite(weight)){ + if (Double.isInfinite(total)) { + if (Double.isInfinite(weight)) { out.q = new QuantumDataPacket(remaining).unifyTraceWith(pack); break; } - }else{ + } else { long part = (long) Math.floor(pack.getContent() * weight / total); if (part > 0) { remaining -= part; if (remaining > 0) { out.q = new QuantumDataPacket(part).unifyTraceWith(pack); } else if (part + remaining > 0) { - out.q = new QuantumDataPacket( part + remaining).unifyTraceWith(pack); + out.q = new QuantumDataPacket(part + remaining).unifyTraceWith(pack); break; } else { break; @@ -223,8 +224,8 @@ public class GT_MetaTileEntity_EM_switch extends GT_MetaTileEntity_MultiblockBas public String[] getDescription() { return new String[]{ CommonValues.TEC_MARK_EM, - "User controlled computation power routing", - EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "Quality of service is a must" + StatCollector.translateToLocal("gt.blockmachines.multimachine.em.switch.desc.0"),//User controlled computation power routing + EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + StatCollector.translateToLocal("gt.blockmachines.multimachine.em.switch.desc.1")//Quality of service is a must }; } -} +} \ No newline at end of file diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_transformer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_transformer.java index 26d447cf69..76ee59977c 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_transformer.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_transformer.java @@ -44,7 +44,7 @@ public class GT_MetaTileEntity_EM_transformer extends GT_MetaTileEntity_Multiblo private static final Block[] blockTypeFallback = new Block[]{sBlockCasingsTT}; private static final byte[] blockMetaFallback = new byte[]{0}; private static final String[] description = new String[]{ - EnumChatFormatting.AQUA + StatCollector.translateToLocal("tt.keyword.Hint_Details") + ":", + EnumChatFormatting.AQUA + StatCollector.translateToLocal("tt.keyphrase.Hint_Details") + ":", StatCollector.translateToLocal("gt.blockmachines.multimachine.em.transformer.hint"),//1 - Energy IO Hatches or High Power Casing }; //endregion diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java index 25a74a8a9b..f0feb4a635 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java @@ -53,7 +53,7 @@ public class GT_MetaTileEntity_TM_microwave extends GT_MetaTileEntity_Multiblock private static final Block[] blockTypeFallback = new Block[]{sBlockCasings4}; private static final byte[] blockMetaFallback = new byte[]{1}; private static final String[] description = new String[]{ - EnumChatFormatting.AQUA + StatCollector.translateToLocal("tt.keyword.Hint_Details") + ":", + EnumChatFormatting.AQUA + StatCollector.translateToLocal("tt.keyphrase.Hint_Details") + ":", StatCollector.translateToLocal("gt.blockmachines.multimachine.tm.microwave.hint.0"),//1 - Classic Hatches or Clean Stainless Steel Casing StatCollector.translateToLocal("gt.blockmachines.multimachine.tm.microwave.hint.1"),//Also acts like a hopper so give it an Output Bus }; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java index 87a480fd36..40ea3084c8 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java @@ -98,7 +98,7 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock private static final Block[] blockTypeFallback = new Block[]{sBlockCasingsBA0, null}; private static final byte[] blockMetaFallback = new byte[]{6, 0}; private static final String[] description = new String[]{ - EnumChatFormatting.AQUA + StatCollector.translateToLocal("tt.keyword.Hint_Details") + ":", + EnumChatFormatting.AQUA + StatCollector.translateToLocal("tt.keyphrase.Hint_Details") + ":", StatCollector.translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.hint.0"),//1 - Classic Hatches, Capacitor Hatches or Tesla Base Casing StatCollector.translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.hint.1"),//2 - Titanium Frames }; diff --git a/src/main/resources/assets/tectech/lang/en_US.lang b/src/main/resources/assets/tectech/lang/en_US.lang index 18dd12b722..8d14c74dbe 100644 --- a/src/main/resources/assets/tectech/lang/en_US.lang +++ b/src/main/resources/assets/tectech/lang/en_US.lang @@ -368,7 +368,19 @@ gt.blockmachines.multimachine.tm.teslaCoil.cfgo.7=Energy Fraction display gt.blockmachines.multimachine.tm.teslaCoil.cfgo.8=Scan time display gt.blockmachines.multimachine.em.switch.name=Network Switch With QoS +gt.blockmachines.multimachine.em.switch.hint=1 - Classic/Data Hatches or Computer casing +gt.blockmachines.multimachine.em.switch.desc.0=User controlled computation power routing +gt.blockmachines.multimachine.em.switch.desc.1=Quality of service is a must + gt.blockmachines.multimachine.em.computer.name=Quantum Computer +gt.blockmachines.multimachine.em.computer.hint.0=1 - Classic/Data Hatches or Computer casing +gt.blockmachines.multimachine.em.computer.hint.1=2 - Rack Hatches or Advanced computer casing +gt.blockmachines.multimachine.em.computer.desc=You need it to process the number above +gt.blockmachines.multimachine.em.computer.cfgi.0=Overclock ratio +gt.blockmachines.multimachine.em.computer.cfgi.1=Overvoltage ratio +gt.blockmachines.multimachine.em.computer.cfgo.0=Current max. heat +gt.blockmachines.multimachine.em.computer.cfgo.1=Produced computation + gt.blockmachines.multimachine.em.databank.name=Data Bank gt.blockmachines.multimachine.em.junction.name=Matter Junction gt.blockmachines.multimachine.em.mattertoem.name=Matter Quantizer @@ -403,8 +415,6 @@ gt.blockmachines.multimachine.em.annihilation.name=Annihilation Generator gt.blockmachines.multimachine.em.blackholegenerator.name=Black Hole Generator #Keywords and phrases -#SOME ARE PHRASES!!! -tt.keyword.Hint_Details=Hint Details tt.keyword.Air=Air tt.keyword.Earth=Earth tt.keyword.Fire=Fire @@ -417,12 +427,15 @@ tt.keyword.CLASS=CLASS tt.keyword.NAME=NAME tt.keyword.CHARGE=CHARGE tt.keyword.COLORLESS=COLORLESS -tt.keyword.CARRIES_COLOR=CARRIES COLOR tt.keyword.MASS=MASS -tt.keyword.LIFE_TIME=LIFE TIME tt.keyword.BOOM=BOOM! tt.keyword.ID=ID +tt.keyword.Destination=Destination +tt.keyword.Weight=Weight +tt.keyphrase.LIFE_TIME=LIFE TIME +tt.keyphrase.CARRIES_COLOR=CARRIES COLOR +tt.keyphrase.Hint_Details=Hint Details tt.keyphrase.At_current_energy_level=At current energy level tt.keyphrase.No_Stacks=No Stacks tt.keyphrase.Contains_EM=Contains EM -- cgit From a977ef0b2795af0c846889d86b3f8108c4d88d74 Mon Sep 17 00:00:00 2001 From: Bass Date: Thu, 29 Aug 2019 01:25:58 +0100 Subject: Further sacrifices --- .../dreamcraft/NoDreamCraftMachineLoader.java | 101 ++++++--------------- .../tectech/mechanics/data/RendererMessage.java | 8 +- .../technus/tectech/mechanics/data/thaumSpark.java | 8 +- .../multi/GT_MetaTileEntity_TM_teslaCoil.java | 6 +- .../single/GT_MetaTileEntity_TT_Transformer.java | 54 +++++++++++ .../single/GT_MetaTileEntity_TeslaCoil.java | 6 +- .../single/GT_MetaTileEntity_WetTransformer.java | 39 ++------ src/main/resources/assets/tectech/lang/en_US.lang | 25 ++--- 8 files changed, 117 insertions(+), 130 deletions(-) create mode 100644 src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TT_Transformer.java (limited to 'src/main/resources/assets/tectech') diff --git a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/NoDreamCraftMachineLoader.java b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/NoDreamCraftMachineLoader.java index 0570299f4e..7807dd921e 100644 --- a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/NoDreamCraftMachineLoader.java +++ b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/NoDreamCraftMachineLoader.java @@ -4,6 +4,7 @@ import com.github.technus.tectech.Reference; import com.github.technus.tectech.TecTech; import com.github.technus.tectech.Util; import com.github.technus.tectech.thing.CustomItemList; +import com.github.technus.tectech.thing.metaTileEntity.single.GT_MetaTileEntity_TT_Transformer; import com.github.technus.tectech.thing.metaTileEntity.single.GT_MetaTileEntity_WetTransformer; import cpw.mods.fml.common.Loader; import gregtech.api.enums.GT_Values; @@ -11,7 +12,6 @@ import gregtech.api.interfaces.ITexture; import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicHull; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_TieredMachineBlock; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Transformer; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; @@ -41,9 +41,7 @@ public class NoDreamCraftMachineLoader implements Runnable { public void run() { try { CustomItemList.WetTransformer_LV_ULV.set(new GT_MetaTileEntity_WetTransformer( - 12000, "wettransformer.tier.00", "Ultra Low Voltage Power Transformer", 0, - //LV -> ULV (Use Soft Mallet to invert) - StatCollector.translateToLocal("gt.blockmachines.wetransformer.tier.00.desc")).getStackForm(1L)); + 12000, "wettransformer.tier.00", "Ultra Low Voltage Power Transformer", 0).getStackForm(1L));//LV -> ULV (Use Soft Mallet to invert) } catch (IllegalArgumentException e) { System.out.println(METATILEENTITIES[12000].getClass().getCanonicalName()); TecTech.LOGGER.error(e); @@ -52,74 +50,46 @@ public class NoDreamCraftMachineLoader implements Runnable { } CustomItemList.WetTransformer_MV_LV.set(new GT_MetaTileEntity_WetTransformer( - 12001, "wetransformer.tier.01", "Low Voltage Power Transformer", 1, - //MV -> LV (Use Soft Mallet to invert) - StatCollector.translateToLocal("gt.blockmachines.wetransformer.tier.01.desc")).getStackForm(1L)); + 12001, "wetransformer.tier.01", "Low Voltage Power Transformer", 1).getStackForm(1L));//MV -> LV (Use Soft Mallet to invert) CustomItemList.WetTransformer_HV_MV.set(new GT_MetaTileEntity_WetTransformer( - 12002, "wettransformer.tier.02", "Medium Voltage Power Transformer", 2, - //HV -> MV (Use Soft Mallet to invert) - StatCollector.translateToLocal("gt.blockmachines.wetransformer.tier.02.desc")).getStackForm(1L)); + 12002, "wettransformer.tier.02", "Medium Voltage Power Transformer", 2).getStackForm(1L));//HV -> MV (Use Soft Mallet to invert) CustomItemList.WetTransformer_EV_HV.set(new GT_MetaTileEntity_WetTransformer( - 12003, "wettransformer.tier.03", "High Voltage Power Transformer", 3, - //EV -> HV (Use Soft Mallet to invert) - StatCollector.translateToLocal("gt.blockmachines.wetransformer.tier.03.desc")).getStackForm(1L)); + 12003, "wettransformer.tier.03", "High Voltage Power Transformer", 3).getStackForm(1L));//EV -> HV (Use Soft Mallet to invert) CustomItemList.WetTransformer_IV_EV.set(new GT_MetaTileEntity_WetTransformer( - 12004, "wettransformer.tier.04", "Extreme Power Transformer", 4, - //IV -> EV (Use Soft Mallet to invert) - StatCollector.translateToLocal("gt.blockmachines.wetransformer.tier.04.desc")).getStackForm(1L)); + 12004, "wettransformer.tier.04", "Extreme Power Transformer", 4).getStackForm(1L));//IV -> EV (Use Soft Mallet to invert) CustomItemList.WetTransformer_LuV_IV.set(new GT_MetaTileEntity_WetTransformer( - 12005, "wettransformer.tier.05", "Insane Power Transformer", 5, - //LuV -> IV (Use Soft Mallet to invert) - StatCollector.translateToLocal("gt.blockmachines.wetransformer.tier.05.desc")).getStackForm(1L)); + 12005, "wettransformer.tier.05", "Insane Power Transformer", 5).getStackForm(1L));//LuV -> IV (Use Soft Mallet to invert) CustomItemList.WetTransformer_ZPM_LuV.set(new GT_MetaTileEntity_WetTransformer( - 12006, "wettransformer.tier.06", "Ludicrous Power Transformer", 6, - //ZPM -> LuV (Use Soft Mallet to invert) - StatCollector.translateToLocal("gt.blockmachines.wetransformer.tier.06.desc")).getStackForm(1L)); + 12006, "wettransformer.tier.06", "Ludicrous Power Transformer", 6).getStackForm(1L));//ZPM -> LuV (Use Soft Mallet to invert) CustomItemList.WetTransformer_UV_ZPM.set(new GT_MetaTileEntity_WetTransformer( - 12007, "wettransformer.tier.07", "ZPM Voltage Power Transformer", 7, - //UV -> ZPM (Use Soft Mallet to invert) - StatCollector.translateToLocal("gt.blockmachines.wetransformer.tier.07.desc")).getStackForm(1L)); + 12007, "wettransformer.tier.07", "ZPM Voltage Power Transformer", 7).getStackForm(1L));//UV -> ZPM (Use Soft Mallet to invert) CustomItemList.WetTransformer_UHV_UV.set(new GT_MetaTileEntity_WetTransformer( - 12008, "wettransformer.tier.08", "Ultimate Power Transformer", 8, - //UHV -> UV (Use Soft Mallet to invert) - StatCollector.translateToLocal("gt.blockmachines.wetransformer.tier.08.desc")).getStackForm(1L)); + 12008, "wettransformer.tier.08", "Ultimate Power Transformer", 8).getStackForm(1L));//UHV -> UV (Use Soft Mallet to invert) CustomItemList.WetTransformer_UEV_UHV.set(new GT_MetaTileEntity_WetTransformer( - 12009, "wettransformer.tier.09", "Highly Ultimate Power Transformer", 9, - //UEV -> UHV (Use Soft Mallet to invert) - StatCollector.translateToLocal("gt.blockmachines.wetransformer.tier.09.desc")).getStackForm(1L)); + 12009, "wettransformer.tier.09", "Highly Ultimate Power Transformer", 9).getStackForm(1L));//UEV -> UHV (Use Soft Mallet to invert) CustomItemList.WetTransformer_UIV_UEV.set(new GT_MetaTileEntity_WetTransformer( - 12010, "wettransformer.tier.10", "Extremely Ultimate Power Transformer", 10, - //UIV -> UEV (Use Soft Mallet to invert) - StatCollector.translateToLocal("gt.blockmachines.wetransformer.tier.10.desc")).getStackForm(1L)); + 12010, "wettransformer.tier.10", "Extremely Ultimate Power Transformer", 10).getStackForm(1L));//UIV -> UEV (Use Soft Mallet to invert) CustomItemList.WetTransformer_UMV_UIV.set(new GT_MetaTileEntity_WetTransformer( - 12011, "wettransformer.tier.11", "Insanely Ultimate Power Transformer", 11, - //UMV -> UIV (Use Soft Mallet to invert) - StatCollector.translateToLocal("gt.blockmachines.wetransformer.tier.11.desc")).getStackForm(1L)); + 12011, "wettransformer.tier.11", "Insanely Ultimate Power Transformer", 11).getStackForm(1L));//UMV -> UIV (Use Soft Mallet to invert) CustomItemList.WetTransformer_UXV_UMV.set(new GT_MetaTileEntity_WetTransformer( - 12012, "wettransformer.tier.12", "Mega Ultimate Power Transformer", 12, - //UXV -> UMV (Use Soft Mallet to invert) - StatCollector.translateToLocal("gt.blockmachines.wetransformer.tier.12.desc")).getStackForm(1L)); + 12012, "wettransformer.tier.12", "Mega Ultimate Power Transformer", 12).getStackForm(1L));//UXV -> UMV (Use Soft Mallet to invert) CustomItemList.WetTransformer_OPV_UXV.set(new GT_MetaTileEntity_WetTransformer( - 12013, "wettransformer.tier.13", "Extended Mega Ultimate Power Transformer", 13, - //OPV -> UXV (Use Soft Mallet to invert) - StatCollector.translateToLocal("gt.blockmachines.wetransformer.tier.13.desc")).getStackForm(1L)); + 12013, "wettransformer.tier.13", "Extended Mega Ultimate Power Transformer", 13).getStackForm(1L));//OPV -> UXV (Use Soft Mallet to invert) CustomItemList.WetTransformer_MAXV_OPV.set(new GT_MetaTileEntity_WetTransformer( - 12014, "wettransformer.tier.14", "Overpowered Power Transformer", 14, - //MAX -> OPV (Use Soft Mallet to invert) - StatCollector.translateToLocal("gt.blockmachines.wetransformer.tier.14.desc")).getStackForm(1L)); + 12014, "wettransformer.tier.14", "Overpowered Power Transformer", 14).getStackForm(1L));//MAX -> OPV (Use Soft Mallet to invert) try { MetaTileEntity temp; @@ -186,57 +156,44 @@ public class NoDreamCraftMachineLoader implements Runnable { } CustomItemList.Hull_MAXV.set(temp.getStackForm(1L)); - - temp = new GT_MetaTileEntity_Transformer( - 11220, "transformer.tier.09", "Highly Ultimate Transformer", 9, - //UEV -> UHV (Use Soft Mallet to invert) - StatCollector.translateToLocal("gt.blockmachines.transformer.tier.09.desc")); + temp = new GT_MetaTileEntity_TT_Transformer( + 11220, "tt.transformer.tier.09", "Highly Ultimate Transformer", 9);//UEV -> UHV (Use Soft Mallet to invert) CustomItemList.Transformer_UEV_UHV.set(temp.getStackForm(1L)); - temp = new GT_MetaTileEntity_Transformer( - 11221, "transformer.tier.10", "Extremely Ultimate Transformer", 10, - //UIV -> UEV (Use Soft Mallet to invert) - StatCollector.translateToLocal("gt.blockmachines.transformer.tier.10.desc")); + temp = new GT_MetaTileEntity_TT_Transformer( + 11221, "tt.transformer.tier.10", "Extremely Ultimate Transformer", 10);//UIV -> UEV (Use Soft Mallet to invert) Util.setTier(10, temp); if (GT_Values.GT.isClientSide()) { field.set(temp, method.invoke(temp, iTexture)); } CustomItemList.Transformer_UIV_UEV.set(temp.getStackForm(1L)); - temp = new GT_MetaTileEntity_Transformer( - 11222, "transformer.tier.11", "Insanely Ultimate Transformer", 11, - //UMV -> UIV (Use Soft Mallet to invert) - StatCollector.translateToLocal("gt.blockmachines.transformer.tier.11.desc")); + temp = new GT_MetaTileEntity_TT_Transformer( + 11222, "tt.transformer.tier.11", "Insanely Ultimate Transformer", 11);//UMV -> UIV (Use Soft Mallet to invert) Util.setTier(11, temp); if (GT_Values.GT.isClientSide()) { field.set(temp, method.invoke(temp, iTexture)); } CustomItemList.Transformer_UMV_UIV.set(temp.getStackForm(1L)); - temp = new GT_MetaTileEntity_Transformer( - 11223, "transformer.tier.12", "Mega Ultimate Transformer", 12, - //UXV -> UMV (Use Soft Mallet to invert) - StatCollector.translateToLocal("gt.blockmachines.transformer.tier.12.desc")); + temp = new GT_MetaTileEntity_TT_Transformer( + 11223, "tt.transformer.tier.12", "Mega Ultimate Transformer", 12);//UXV -> UMV (Use Soft Mallet to invert) Util.setTier(12, temp); if (GT_Values.GT.isClientSide()) { field.set(temp, method.invoke(temp, iTexture)); } CustomItemList.Transformer_UXV_UMV.set(temp.getStackForm(1L)); - temp = new GT_MetaTileEntity_Transformer( - 11224, "transformer.tier.13", "Extended Mega Ultimate Transformer", 13, - //OPV -> UXV (Use Soft Mallet to invert) - StatCollector.translateToLocal("gt.blockmachines.transformer.tier.13.desc")); + temp = new GT_MetaTileEntity_TT_Transformer( + 11224, "tt.transformer.tier.13", "Extended Mega Ultimate Transformer", 13);//OPV -> UXV (Use Soft Mallet to invert) Util.setTier(13, temp); if (GT_Values.GT.isClientSide()) { field.set(temp, method.invoke(temp, iTexture)); } CustomItemList.Transformer_OPV_UXV.set(temp.getStackForm(1L)); - temp = new GT_MetaTileEntity_Transformer( - 11225, "transformer.tier.14", "Overpowered Transformer", 14, - //MAX -> OPV (Use Soft Mallet to invert) - StatCollector.translateToLocal("gt.blockmachines.transformer.tier.14.desc")); + temp = new GT_MetaTileEntity_TT_Transformer( + 11225, "tt.transformer.tier.14", "Overpowered Transformer", 14);//MAX -> OPV (Use Soft Mallet to invert) Util.setTier(14, temp); if (GT_Values.GT.isClientSide()) { field.set(temp, method.invoke(temp, iTexture)); @@ -308,4 +265,4 @@ public class NoDreamCraftMachineLoader implements Runnable { e.printStackTrace(); } } -} +} \ No newline at end of file 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 792255cd4d..449b68a846 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 @@ -15,7 +15,7 @@ import java.util.Arrays; import java.util.HashSet; public class RendererMessage implements IMessage { - HashSet sparkList = new HashSet(); + HashSet sparkList = new HashSet(); public RendererMessage() { } @@ -29,7 +29,7 @@ public class RendererMessage implements IMessage { InputStream is = new ByteArrayInputStream(boop); ObjectInputStream ois = new ObjectInputStream(is); Object data = ois.readObject(); - sparkList = (HashSet) data; + sparkList = (HashSet) data; } catch (IOException | ClassNotFoundException ex) { } } @@ -51,7 +51,7 @@ public class RendererMessage implements IMessage { public RendererData() { } - public RendererData(HashSet eSparkList) { + public RendererData(HashSet eSparkList) { sparkList = eSparkList; } } @@ -60,7 +60,7 @@ public class RendererMessage implements IMessage { public static class ClientHandler extends AbstractClientMessageHandler { @Override public IMessage handleClientMessage(EntityPlayer pPlayer, RendererData pMessage, MessageContext pCtx) { - for (thaumSpark sp : pMessage.sparkList) { + for (ThaumSpark sp : pMessage.sparkList) { thaumLightning(sp.x, sp.y, sp.z, sp.xR, sp.yR, sp.zR, sp.wID); } pMessage.sparkList.clear(); 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 df578e7849..59462679de 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 @@ -3,12 +3,12 @@ package com.github.technus.tectech.mechanics.data; import java.io.Serializable; import java.util.Objects; -public class thaumSpark implements Serializable { +public class ThaumSpark implements Serializable { private static final long serialVersionUID = -7037856938316679566L; public int x, y, z, wID; public byte xR, yR, zR; - public thaumSpark(){ + public ThaumSpark(){ this.x = 0; this.z = 0; this.y = 0; @@ -20,7 +20,7 @@ public class thaumSpark implements Serializable { this.wID = 0; } - public thaumSpark(int x, int y, int z, byte xR, byte yR, byte zR, int wID) { + public ThaumSpark(int x, int y, int z, byte xR, byte yR, byte zR, int wID) { this.x = x; this.z = z; this.y = y; @@ -36,7 +36,7 @@ public class thaumSpark implements Serializable { public boolean equals(Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; - thaumSpark that = (thaumSpark) o; + ThaumSpark that = (ThaumSpark) o; return x == that.x && y == that.y && z == that.z && diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java index 08050ad40c..a82bf9be99 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java @@ -4,7 +4,7 @@ import com.github.technus.tectech.CommonValues; import com.github.technus.tectech.TecTech; import com.github.technus.tectech.loader.NetworkDispatcher; import com.github.technus.tectech.mechanics.data.RendererMessage; -import com.github.technus.tectech.mechanics.data.thaumSpark; +import com.github.technus.tectech.mechanics.data.ThaumSpark; import com.github.technus.tectech.thing.cover.GT_Cover_TM_TeslaCoil; import com.github.technus.tectech.thing.cover.GT_Cover_TM_TeslaCoil_Ultimate; import com.github.technus.tectech.thing.metaTileEntity.IConstructable; @@ -42,7 +42,7 @@ import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStat import static gregtech.api.enums.GT_Values.E; public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_MultiblockBase_EM implements IConstructable { - private final static HashSet sparkList = new HashSet<>(); + private final static HashSet sparkList = new HashSet<>(); private static Textures.BlockIcons.CustomIcon ScreenOFF; private static Textures.BlockIcons.CustomIcon ScreenON; @@ -537,7 +537,7 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock int wID = mte.getWorld().provider.dimensionId; - sparkList.add(new thaumSpark(posTop[0], posTop[1], posTop[2], xR, yR, zR, wID)); + sparkList.add(new ThaumSpark(posTop[0], posTop[1], posTop[2], xR, yR, zR, wID)); } @Override diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TT_Transformer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TT_Transformer.java new file mode 100644 index 0000000000..325fe4906b --- /dev/null +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TT_Transformer.java @@ -0,0 +1,54 @@ +package com.github.technus.tectech.thing.metaTileEntity.single; + +import com.github.technus.tectech.CommonValues; +import com.github.technus.tectech.Util; +import gregtech.api.enums.Textures; +import gregtech.api.interfaces.ITexture; +import gregtech.api.interfaces.metatileentity.IMetaTileEntity; +import gregtech.api.interfaces.tileentity.IGregTechTileEntity; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Transformer; +import net.minecraft.util.StatCollector; + +import static com.github.technus.tectech.thing.metaTileEntity.Textures.*; + +public class GT_MetaTileEntity_TT_Transformer extends GT_MetaTileEntity_Transformer { + public GT_MetaTileEntity_TT_Transformer(int aID, String aName, String aNameRegional, int aTier) { + super(aID, aName, aNameRegional, aTier, ""); + Util.setTier(aTier, this); + } + + public GT_MetaTileEntity_TT_Transformer(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { + super(aName, aTier, aDescription, aTextures); + Util.setTier(aTier, this); + } + + @Override + public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { + return new GT_MetaTileEntity_TT_Transformer(mName, mTier, mDescription, mTextures); + } + + @Override + public ITexture[][][] getTextureSet(ITexture[] aTextures) { + ITexture[][][] rTextures = new ITexture[12][17][]; + for (byte b = -1; b < 16; b++) { + rTextures[0][b + 1] = new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[mTier][b + 1], OVERLAYS_ENERGY_OUT_MULTI_TT[mTier]}; + rTextures[1][b + 1] = new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[mTier][b + 1], OVERLAYS_ENERGY_OUT_MULTI_TT[mTier]}; + rTextures[2][b + 1] = new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[mTier][b + 1], OVERLAYS_ENERGY_OUT_MULTI_TT[mTier]}; + rTextures[3][b + 1] = new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[mTier][b + 1], OVERLAYS_ENERGY_IN_POWER_TT[mTier + 1]}; + rTextures[4][b + 1] = new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[mTier][b + 1], OVERLAYS_ENERGY_IN_POWER_TT[mTier + 1]}; + rTextures[5][b + 1] = new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[mTier][b + 1], OVERLAYS_ENERGY_IN_POWER_TT[mTier + 1]}; + rTextures[6][b + 1] = new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[mTier][b + 1], OVERLAYS_ENERGY_IN_MULTI_TT[mTier]}; + rTextures[7][b + 1] = new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[mTier][b + 1], OVERLAYS_ENERGY_IN_MULTI_TT[mTier]}; + rTextures[8][b + 1] = new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[mTier][b + 1], OVERLAYS_ENERGY_IN_MULTI_TT[mTier]}; + rTextures[9][b + 1] = new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[mTier][b + 1], OVERLAYS_ENERGY_OUT_POWER_TT[mTier + 1]}; + rTextures[10][b + 1] = new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[mTier][b + 1], OVERLAYS_ENERGY_OUT_POWER_TT[mTier + 1]}; + rTextures[11][b + 1] = new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[mTier][b + 1], OVERLAYS_ENERGY_OUT_POWER_TT[mTier + 1]}; + } + return rTextures; + } + + @Override + public String[] getDescription() { + return new String[]{StatCollector.translateToLocal("gt.blockmachines.tt.transformer.tier." + (mTier > 9 ? "" : "0") + mTier + ".desc"), CommonValues.TEC_MARK_GENERAL}; + } +} \ No newline at end of file diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TeslaCoil.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TeslaCoil.java index 802fa8fb21..efa85a6ea5 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TeslaCoil.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TeslaCoil.java @@ -5,7 +5,7 @@ import com.github.technus.tectech.TecTech; import com.github.technus.tectech.Util; import com.github.technus.tectech.loader.NetworkDispatcher; import com.github.technus.tectech.mechanics.data.RendererMessage; -import com.github.technus.tectech.mechanics.data.thaumSpark; +import com.github.technus.tectech.mechanics.data.ThaumSpark; import com.github.technus.tectech.thing.cover.GT_Cover_TM_TeslaCoil; import com.github.technus.tectech.thing.cover.GT_Cover_TM_TeslaCoil_Ultimate; import com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_TM_teslaCoil; @@ -34,7 +34,7 @@ import static java.lang.Math.round; public class GT_MetaTileEntity_TeslaCoil extends GT_MetaTileEntity_BasicBatteryBuffer { - private final static HashSet sparkList = new HashSet<>(); + private final static HashSet sparkList = new HashSet<>(); private byte sparkCount = 0; private int maxTier = 4; //Max tier of transceiver @@ -214,7 +214,7 @@ public class GT_MetaTileEntity_TeslaCoil extends GT_MetaTileEntity_BasicBatteryB int wID = mte.getWorld().provider.dimensionId; - sparkList.add(new thaumSpark(x, y, z, xR, yR, zR, wID)); + sparkList.add(new ThaumSpark(x, y, z, xR, yR, zR, wID)); } private long getEnergyEfficiency(long voltage, int distance, boolean overDriveToggle) { diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_WetTransformer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_WetTransformer.java index 375e8ba655..d104ef0141 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_WetTransformer.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_WetTransformer.java @@ -1,25 +1,20 @@ package com.github.technus.tectech.thing.metaTileEntity.single; import com.github.technus.tectech.CommonValues; -import com.github.technus.tectech.Util; -import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Transformer; +import net.minecraft.util.StatCollector; import static com.github.technus.tectech.CommonValues.V; -import static com.github.technus.tectech.thing.metaTileEntity.Textures.*; -public class GT_MetaTileEntity_WetTransformer extends GT_MetaTileEntity_Transformer { - public GT_MetaTileEntity_WetTransformer(int aID, String aName, String aNameRegional, int aTier, String aDescription) { - super(aID,aName,aNameRegional,aTier,aDescription); - Util.setTier(aTier,this); +public class GT_MetaTileEntity_WetTransformer extends GT_MetaTileEntity_TT_Transformer { + public GT_MetaTileEntity_WetTransformer(int aID, String aName, String aNameRegional, int aTier) { + super(aID, aName, aNameRegional, aTier); } public GT_MetaTileEntity_WetTransformer(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { - super(aName,aTier,aDescription,aTextures); - Util.setTier(aTier,this); + super(aName, aTier, aDescription, aTextures); } @Override @@ -27,29 +22,9 @@ public class GT_MetaTileEntity_WetTransformer extends GT_MetaTileEntity_Transfor return new GT_MetaTileEntity_WetTransformer(mName, mTier, mDescription, mTextures); } - @Override - public ITexture[][][] getTextureSet(ITexture[] aTextures) { - ITexture[][][] rTextures = new ITexture[12][17][]; - for (byte b = -1; b < 16; b++) { - rTextures[0][b + 1] = new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[mTier][b + 1], OVERLAYS_ENERGY_OUT_MULTI_TT[mTier]}; - rTextures[1][b + 1] = new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[mTier][b + 1], OVERLAYS_ENERGY_OUT_MULTI_TT[mTier]}; - rTextures[2][b + 1] = new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[mTier][b + 1], OVERLAYS_ENERGY_OUT_MULTI_TT[mTier]}; - rTextures[3][b + 1] = new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[mTier][b + 1], OVERLAYS_ENERGY_IN_POWER_TT[mTier + 1]}; - rTextures[4][b + 1] = new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[mTier][b + 1], OVERLAYS_ENERGY_IN_POWER_TT[mTier + 1]}; - rTextures[5][b + 1] = new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[mTier][b + 1], OVERLAYS_ENERGY_IN_POWER_TT[mTier + 1]}; - rTextures[6][b + 1] = new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[mTier][b + 1], OVERLAYS_ENERGY_IN_MULTI_TT[mTier]}; - rTextures[7][b + 1] = new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[mTier][b + 1], OVERLAYS_ENERGY_IN_MULTI_TT[mTier]}; - rTextures[8][b + 1] = new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[mTier][b + 1], OVERLAYS_ENERGY_IN_MULTI_TT[mTier]}; - rTextures[9][b + 1] = new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[mTier][b + 1], OVERLAYS_ENERGY_OUT_POWER_TT[mTier + 1]}; - rTextures[10][b + 1] = new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[mTier][b + 1], OVERLAYS_ENERGY_OUT_POWER_TT[mTier + 1]}; - rTextures[11][b + 1] = new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[mTier][b + 1], OVERLAYS_ENERGY_OUT_POWER_TT[mTier + 1]}; - } - return rTextures; - } - @Override public String[] getDescription() { - return new String[]{mDescription, "Accepts 16A and outputs 64A", CommonValues.TEC_MARK_GENERAL}; + return new String[]{StatCollector.translateToLocal("gt.blockmachines.wetransformer.tier." + (mTier > 9 ? "" : "0") + mTier + ".desc"), "Accepts 16A and outputs 64A", CommonValues.TEC_MARK_GENERAL}; } @Override @@ -72,4 +47,4 @@ public class GT_MetaTileEntity_WetTransformer extends GT_MetaTileEntity_Transfor public long maxAmperesIn() { return getBaseMetaTileEntity().isAllowedToWork() ? 16 : 64; } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/tectech/lang/en_US.lang b/src/main/resources/assets/tectech/lang/en_US.lang index 8d14c74dbe..755022d6a3 100644 --- a/src/main/resources/assets/tectech/lang/en_US.lang +++ b/src/main/resources/assets/tectech/lang/en_US.lang @@ -13,6 +13,7 @@ item.em.parametrizerMemoryCard.name=Parametrizer Memory Card item.em.EuMeterGT.name=GT EU meter item.tm.teslaCover.0.name=Tesla Coil Cover item.tm.teslaCover.1.name=Tesla Coil Cover Rich Edition +item.tm.teslaStaff.name=Tesla Staff item.tm.teslaCoilCapacitor.0.name=LV Tesla Capacitor item.tm.teslaCoilCapacitor.1.name=MV Tesla Capacitor @@ -68,18 +69,18 @@ gt.blockmachines.wetransformer.tier.13.desc=OPV -> UXV (Use Soft Mallet to inver gt.blockmachines.wetransformer.tier.14.name=Overpowered Power Transformer gt.blockmachines.wetransformer.tier.14.desc=MAX -> OPV (Use Soft Mallet to invert) -gt.blockmachines.transformer.tier.09.name=Highly Ultimate Transformer -gt.blockmachines.transformer.tier.09.desc=UEV -> UHV (Use Soft Mallet to invert) -gt.blockmachines.transformer.tier.10.name=Extremely Ultimate Transformer -gt.blockmachines.transformer.tier.10.desc=UIV -> UEV (Use Soft Mallet to invert) -gt.blockmachines.transformer.tier.11.name=Insanely Ultimate Transformer -gt.blockmachines.transformer.tier.11.desc=UMV -> UIV (Use Soft Mallet to invert) -gt.blockmachines.transformer.tier.12.name=Mega Ultimate Transformer -gt.blockmachines.transformer.tier.12.desc=UXV -> UMV (Use Soft Mallet to invert) -gt.blockmachines.transformer.tier.13.name=Extended Mega Ultimate Transformer -gt.blockmachines.transformer.tier.13.desc=OPV -> UXV (Use Soft Mallet to invert) -gt.blockmachines.transformer.tier.14.name=Overpowered Transformer -gt.blockmachines.transformer.tier.14.desc=MAX -> OPV (Use Soft Mallet to invert) +gt.blockmachines.tt.transformer.tier.09.name=Highly Ultimate Transformer +gt.blockmachines.tt.transformer.tier.09.desc=UEV -> UHV (Use Soft Mallet to invert) +gt.blockmachines.tt.transformer.tier.10.name=Extremely Ultimate Transformer +gt.blockmachines.tt.transformer.tier.10.desc=UIV -> UEV (Use Soft Mallet to invert) +gt.blockmachines.tt.transformer.tier.11.name=Insanely Ultimate Transformer +gt.blockmachines.tt.transformer.tier.11.desc=UMV -> UIV (Use Soft Mallet to invert) +gt.blockmachines.tt.transformer.tier.12.name=Mega Ultimate Transformer +gt.blockmachines.tt.transformer.tier.12.desc=UXV -> UMV (Use Soft Mallet to invert) +gt.blockmachines.tt.transformer.tier.13.name=Extended Mega Ultimate Transformer +gt.blockmachines.tt.transformer.tier.13.desc=OPV -> UXV (Use Soft Mallet to invert) +gt.blockmachines.tt.transformer.tier.14.name=Overpowered Transformer +gt.blockmachines.tt.transformer.tier.14.desc=MAX -> OPV (Use Soft Mallet to invert) gt.blockmachines.transformer.ha.tier.09.name=Highly Ultimate Hi-Amp Transformer gt.blockmachines.transformer.ha.tier.09.desc=UEV -> UHV (Use Soft Mallet to invert -- cgit From 6e7457be9ad03722cd431a2d946173824a275dcd Mon Sep 17 00:00:00 2001 From: Bass Date: Thu, 29 Aug 2019 04:30:29 +0100 Subject: This is only a test --- .../tectech/mechanics/data/RendererMessage.java | 3 +- .../technus/tectech/mechanics/data/ThaumSpark.java | 1 + ...GT_MetaTileEntity_Hatch_ElementalContainer.java | 57 +-- src/main/resources/assets/tectech/lang/ru_RU.lang | 448 +++++++++++++++++++++ 4 files changed, 480 insertions(+), 29 deletions(-) create mode 100644 src/main/resources/assets/tectech/lang/ru_RU.lang (limited to 'src/main/resources/assets/tectech') 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() { diff --git a/src/main/resources/assets/tectech/lang/ru_RU.lang b/src/main/resources/assets/tectech/lang/ru_RU.lang new file mode 100644 index 0000000000..1d78cd54bf --- /dev/null +++ b/src/main/resources/assets/tectech/lang/ru_RU.lang @@ -0,0 +1,448 @@ +#Creative Tab Name +itemGroup.TecTech=TecTech Interdimensional +#Blocks +tile.quantumGlass.name=Quantum Glass +tile.quantumStuff.name=Quantum Stuff +#Items +item.em.debugContainer.name=Debug EM Container +item.em.definitionContainer.name=EM Recipe Hint +item.em.definitionScanStorage.name=EM Scan Storage +item.em.constructable.name=Multiblock Machine Blueprint +item.em.frontRotate.name=Front Rotation Scrench +item.em.parametrizerMemoryCard.name=Parametrizer Memory Card +item.em.EuMeterGT.name=GT EU meter +item.tm.teslaCover.0.name=Tesla Coil Cover +item.tm.teslaCover.1.name=Tesla Coil Cover Rich Edition +item.tm.teslaStaff.name=Tesla Staff + +item.tm.teslaCoilCapacitor.0.name=LV Tesla Capacitor +item.tm.teslaCoilCapacitor.1.name=MV Tesla Capacitor +item.tm.teslaCoilCapacitor.2.name=HV Tesla Capacitor +item.tm.teslaCoilCapacitor.3.name=EV Tesla Capacitor +item.tm.teslaCoilCapacitor.4.name=IV Tesla Capacitor + +item.tm.itemTeslaComponent.0.name=Electrum Tesla Windings +item.tm.itemTeslaComponent.1.name=Superconductive Tesla Windings +#Death Messages +death.attack.microwaving=%1$s was dehydrated by radiation. +death.attack.microwaving.player=%1$s was dehydrated by radiation while fighting %2$s. +death.attack.elementalPollution=%1$s was vaping from the wrong hole. +death.attack.elementalPollution.player=%1$s was vaping from the wrong hole while fighting %2$s. +death.attack.subspace=%1$s was N-th dimensionally displeased. +death.attack.subspace.player=%1$s N-th dimensionally displeased while fighting %2$s. +#Machine hulls +gt.blockmachines.hull.tier.10.name=UEV Machine Hull +gt.blockmachines.hull.tier.11.name=UIV Machine Hull +gt.blockmachines.hull.tier.12.name=UMV Machine Hull +gt.blockmachines.hull.tier.13.name=UXV Machine Hull +gt.blockmachines.hull.tier.14.name=OPV Machine Hull +gt.blockmachines.hull.tier.15.name=MAX Machine Hull +#Transformers +gt.blockmachines.wetransformer.tier.00.name=Ultra Low Voltage Power Transformer +gt.blockmachines.wetransformer.tier.00.desc=LV -> ULV (Use Soft Mallet to invert) +gt.blockmachines.wetransformer.tier.01.name=Low Voltage Power Transformer +gt.blockmachines.wetransformer.tier.01.desc=MV -> LV (Use Soft Mallet to invert) +gt.blockmachines.wetransformer.tier.02.name=Medium Voltage Power Transformer +gt.blockmachines.wetransformer.tier.02.desc=HV -> MV (Use Soft Mallet to invert) +gt.blockmachines.wetransformer.tier.03.name=High Voltage Power Transformer +gt.blockmachines.wetransformer.tier.03.desc=EV -> HV (Use Soft Mallet to invert) +gt.blockmachines.wetransformer.tier.04.name=Extreme Power Transformer +gt.blockmachines.wetransformer.tier.04.desc=IV -> EV (Use Soft Mallet to invert) +gt.blockmachines.wetransformer.tier.05.name=Insane Power Transformer +gt.blockmachines.wetransformer.tier.05.desc=LuV -> IV (Use Soft Mallet to invert) +gt.blockmachines.wetransformer.tier.06.name=Ludicrous Power Transformer +gt.blockmachines.wetransformer.tier.06.desc=ZPM -> LuV (Use Soft Mallet to invert) +gt.blockmachines.wetransformer.tier.07.name=ZPM Voltage Power Transformer +gt.blockmachines.wetransformer.tier.07.desc=UV -> ZPM (Use Soft Mallet to invert) +gt.blockmachines.wetransformer.tier.08.name=Ultimate Power Transformer +gt.blockmachines.wetransformer.tier.08.desc=UHV -> UV (Use Soft Mallet to invert) +gt.blockmachines.wetransformer.tier.09.name=Highly Ultimate Power Transformer +gt.blockmachines.wetransformer.tier.09.desc=UEV -> UHV (Use Soft Mallet to invert) +gt.blockmachines.wetransformer.tier.10.name=Extremely Ultimate Power Transformer +gt.blockmachines.wetransformer.tier.10.desc=UIV -> UEV (Use Soft Mallet to invert) +gt.blockmachines.wetransformer.tier.11.name=Insanely Ultimate Power Transformer +gt.blockmachines.wetransformer.tier.11.desc=UMV -> UIV (Use Soft Mallet to invert) +gt.blockmachines.wetransformer.tier.12.name=Mega Ultimate Power Transformer +gt.blockmachines.wetransformer.tier.12.desc=UXV -> UMV (Use Soft Mallet to invert) +gt.blockmachines.wetransformer.tier.13.name=Extended Mega Ultimate Power Transformer +gt.blockmachines.wetransformer.tier.13.desc=OPV -> UXV (Use Soft Mallet to invert) +gt.blockmachines.wetransformer.tier.14.name=Overpowered Power Transformer +gt.blockmachines.wetransformer.tier.14.desc=MAX -> OPV (Use Soft Mallet to invert) + +gt.blockmachines.tt.transformer.tier.09.name=Highly Ultimate Transformer +gt.blockmachines.tt.transformer.tier.09.desc=UEV -> UHV (Use Soft Mallet to invert) +gt.blockmachines.tt.transformer.tier.10.name=Extremely Ultimate Transformer +gt.blockmachines.tt.transformer.tier.10.desc=UIV -> UEV (Use Soft Mallet to invert) +gt.blockmachines.tt.transformer.tier.11.name=Insanely Ultimate Transformer +gt.blockmachines.tt.transformer.tier.11.desc=UMV -> UIV (Use Soft Mallet to invert) +gt.blockmachines.tt.transformer.tier.12.name=Mega Ultimate Transformer +gt.blockmachines.tt.transformer.tier.12.desc=UXV -> UMV (Use Soft Mallet to invert) +gt.blockmachines.tt.transformer.tier.13.name=Extended Mega Ultimate Transformer +gt.blockmachines.tt.transformer.tier.13.desc=OPV -> UXV (Use Soft Mallet to invert) +gt.blockmachines.tt.transformer.tier.14.name=Overpowered Transformer +gt.blockmachines.tt.transformer.tier.14.desc=MAX -> OPV (Use Soft Mallet to invert) + +gt.blockmachines.transformer.ha.tier.09.name=Highly Ultimate Hi-Amp Transformer +gt.blockmachines.transformer.ha.tier.09.desc=UEV -> UHV (Use Soft Mallet to invert +gt.blockmachines.transformer.ha.tier.10.name=Extremely Ultimate Hi-Amp Transformer +gt.blockmachines.transformer.ha.tier.10.desc=UIV -> UEV (Use Soft Mallet to invert) +gt.blockmachines.transformer.ha.tier.11.name=Insanely Ultimate Hi-Amp Transformer +gt.blockmachines.transformer.ha.tier.11.desc=UMV -> UIV (Use Soft Mallet to invert) +gt.blockmachines.transformer.ha.tier.12.name=Mega Ultimate Hi-Amp Transformer +gt.blockmachines.transformer.ha.tier.12.desc=UXV -> UMV (Use Soft Mallet to invert) +gt.blockmachines.transformer.ha.tier.13.name=Extended Mega Ultimate Hi-Amp Transformer +gt.blockmachines.transformer.ha.tier.13.desc=OPV -> UXV (Use Soft Mallet to invert) +gt.blockmachines.transformer.ha.tier.14.name=Overpowered Hi-Amp Transformer +gt.blockmachines.transformer.ha.tier.14.desc=MAX -> OPV (Use Soft Mallet to invert) +#Hatches +tt.base.emhatch.desc.0=Max stacks amount: +tt.base.emhatch.desc.1=Stack capacity: +tt.base.emhatch.desc.2=Place Overflow Hatch behind,on top or below +tt.base.emhatch.desc.3=to provide overflow protection while this block +tt.base.emhatch.desc.4=is not attached to multi block. +tt.base.emhatch.desc.5=Transport range can be extended in straight +tt.base.emhatch.desc.6=line up to 15 blocks with quantum tunnels. +tt.base.emhatch.desc.7=Must be painted to work + +gt.blockmachines.hatch.emmuffler.tier.08.name=UV Overflow Output Hatch +gt.blockmachines.hatch.emmuffler.tier.09.name=UHV Overflow Output Hatch +gt.blockmachines.hatch.emmuffler.tier.10.name=UEV Overflow Output Hatch +gt.blockmachines.hatch.emmuffler.tier.11.name=UIV Overflow Output Hatch +gt.blockmachines.hatch.emmuffler.tier.12.name=UMV Overflow Output Hatch +gt.blockmachines.hatch.emmuffler.tier.13.name=UXV Overflow Output Hatch +gt.blockmachines.hatch.emmuffler.desc.0=Disposes excess elemental Matter +gt.blockmachines.hatch.emmuffler.desc.1=Mass capacity +gt.blockmachines.hatch.emmuffler.desc.2=Disposal Speed +gt.blockmachines.hatch.emmuffler.desc.3=DO NOT OBSTRUCT THE OUTPUT! + +gt.blockmachines.hatch.energymulti04.tier.05.name=IV 4A Energy Hatch +gt.blockmachines.hatch.energymulti16.tier.05.name=IV 16A Energy Hatch +gt.blockmachines.hatch.energymulti64.tier.05.name=IV 64A Energy Hatch +gt.blockmachines.hatch.energymulti04.tier.06.name=LuV 4A Energy Hatch +gt.blockmachines.hatch.energymulti16.tier.06.name=LuV 16A Energy Hatch +gt.blockmachines.hatch.energymulti64.tier.06.name=LuV 64A Energy Hatch +gt.blockmachines.hatch.energymulti04.tier.07.name=ZPM 4A Energy Hatch +gt.blockmachines.hatch.energymulti16.tier.07.name=ZPM 16A Energy Hatch +gt.blockmachines.hatch.energymulti64.tier.07.name=ZPM 64A Energy Hatch +gt.blockmachines.hatch.energymulti04.tier.08.name=UV 4A Energy Hatch +gt.blockmachines.hatch.energymulti16.tier.08.name=UV 16A Energy Hatch +gt.blockmachines.hatch.energymulti64.tier.08.name=UV 64A Energy Hatch +gt.blockmachines.hatch.energymulti04.tier.09.name=UHV 4A Energy Hatch +gt.blockmachines.hatch.energymulti16.tier.09.name=UHV 16A Energy Hatch +gt.blockmachines.hatch.energymulti64.tier.09.name=UHV 64A Energy Hatch +gt.blockmachines.hatch.energymulti04.tier.10.name=UEV 4A Energy Hatch +gt.blockmachines.hatch.energymulti16.tier.10.name=UEV 16A Energy Hatch +gt.blockmachines.hatch.energymulti64.tier.10.name=UEV 64A Energy Hatch +gt.blockmachines.hatch.energymulti04.tier.11.name=UIV 4A Energy Hatch +gt.blockmachines.hatch.energymulti16.tier.11.name=UIV 16A Energy Hatch +gt.blockmachines.hatch.energymulti64.tier.11.name=UIV 64A Energy Hatch +gt.blockmachines.hatch.energymulti04.tier.12.name=UMV 4A Energy Hatch +gt.blockmachines.hatch.energymulti16.tier.12.name=UMV 16A Energy Hatch +gt.blockmachines.hatch.energymulti64.tier.12.name=UMV 64A Energy Hatch +gt.blockmachines.hatch.energymulti04.tier.13.name=UXV 4A Energy Hatch +gt.blockmachines.hatch.energymulti16.tier.13.name=UXV 16A Energy Hatch +gt.blockmachines.hatch.energymulti64.tier.13.name=UXV 64A Energy Hatch +gt.blockmachines.hatch.energymulti.desc.0=Multiple Ampere Energy Injector for Multiblocks +gt.blockmachines.hatch.energymulti.desc.1=Amperes In + +gt.blockmachines.hatch.energytunnel1.tier.05.name=IV 256/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel2.tier.05.name=IV 1024/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel3.tier.05.name=IV 4096/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel4.tier.05.name=IV 16384/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel5.tier.05.name=IV 65536/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel6.tier.05.name=IV 262144/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel7.tier.05.name=IV 1048576/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel1.tier.06.name=LuV 256/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel2.tier.06.name=LuV 1024/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel3.tier.06.name=LuV 4096/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel4.tier.06.name=LuV 16384/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel5.tier.06.name=LuV 65536/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel6.tier.06.name=LuV 262144/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel7.tier.06.name=LuV 1048576/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel1.tier.07.name=ZPM 256/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel2.tier.07.name=ZPM 1024/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel3.tier.07.name=ZPM 4096/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel4.tier.07.name=ZPM 16384/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel5.tier.07.name=ZPM 65536/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel6.tier.07.name=ZPM 262144/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel7.tier.07.name=ZPM 1048576/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel1.tier.08.name=UV 256/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel2.tier.08.name=UV 1024/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel3.tier.08.name=UV 4096/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel4.tier.08.name=UV 16384/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel5.tier.08.name=UV 65536/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel6.tier.08.name=UV 262144/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel7.tier.08.name=UV 1048576/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel1.tier.09.name=UHV 256/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel2.tier.09.name=UHV 1024/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel3.tier.09.name=UHV 4096/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel4.tier.09.name=UHV 16384/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel5.tier.09.name=UHV 65536/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel6.tier.09.name=UHV 262144/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel7.tier.09.name=UHV 1048576/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel1.tier.10.name=UEV 256/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel2.tier.10.name=UEV 1024/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel3.tier.10.name=UEV 4096/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel4.tier.10.name=UEV 16384/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel5.tier.10.name=UEV 65536/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel6.tier.10.name=UEV 262144/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel7.tier.10.name=UEV 1048576/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel1.tier.11.name=UIV 256/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel2.tier.11.name=UIV 1024/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel3.tier.11.name=UIV 4096/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel4.tier.11.name=UIV 16384/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel5.tier.11.name=UIV 65536/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel6.tier.11.name=UIV 262144/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel7.tier.11.name=UIV 1048576/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel1.tier.12.name=UMV 256/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel2.tier.12.name=UMV 1024/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel3.tier.12.name=UMV 4096/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel4.tier.12.name=UMV 16384/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel5.tier.12.name=UMV 65536/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel6.tier.12.name=UMV 262144/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel7.tier.12.name=UMV 1048576/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel1.tier.13.name=UXV 256/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel2.tier.13.name=UXV 1024/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel3.tier.13.name=UXV 4096/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel4.tier.13.name=UXV 16384/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel5.tier.13.name=UXV 65536/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel6.tier.13.name=UXV 262144/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel7.tier.13.name=UXV 1048576/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel.tier.14.name=Legendary Laser Target Hatch +gt.blockmachines.hatch.energytunnel.desc.0=Energy injecting terminal for Multiblocks +gt.blockmachines.hatch.energytunnel.desc.1=Throughput + +gt.blockmachines.hatch.dynamomulti04.tier.05.name=IV 4A Dynamo Hatch +gt.blockmachines.hatch.dynamomulti16.tier.05.name=IV 16A Dynamo Hatch +gt.blockmachines.hatch.dynamomulti64.tier.05.name=IV 64A Dynamo Hatch +gt.blockmachines.hatch.dynamomulti04.tier.06.name=LuV 4A Dynamo Hatch +gt.blockmachines.hatch.dynamomulti16.tier.06.name=LuV 16A Dynamo Hatch +gt.blockmachines.hatch.dynamomulti64.tier.06.name=LuV 64A Dynamo Hatch +gt.blockmachines.hatch.dynamomulti04.tier.07.name=ZPM 4A Dynamo Hatch +gt.blockmachines.hatch.dynamomulti16.tier.07.name=ZPM 16A Dynamo Hatch +gt.blockmachines.hatch.dynamomulti64.tier.07.name=ZPM 64A Dynamo Hatch +gt.blockmachines.hatch.dynamomulti04.tier.08.name=UV 4A Dynamo Hatch +gt.blockmachines.hatch.dynamomulti16.tier.08.name=UV 16A Dynamo Hatch +gt.blockmachines.hatch.dynamomulti64.tier.08.name=UV 64A Dynamo Hatch +gt.blockmachines.hatch.dynamomulti04.tier.09.name=UHV 4A Dynamo Hatch +gt.blockmachines.hatch.dynamomulti16.tier.09.name=UHV 16A Dynamo Hatch +gt.blockmachines.hatch.dynamomulti64.tier.09.name=UHV 64A Dynamo Hatch +gt.blockmachines.hatch.dynamomulti04.tier.10.name=UEV 4A Dynamo Hatch +gt.blockmachines.hatch.dynamomulti16.tier.10.name=UEV 16A Dynamo Hatch +gt.blockmachines.hatch.dynamomulti64.tier.10.name=UEV 64A Dynamo Hatch +gt.blockmachines.hatch.dynamomulti04.tier.11.name=UIV 4A Dynamo Hatch +gt.blockmachines.hatch.dynamomulti16.tier.11.name=UIV 16A Dynamo Hatch +gt.blockmachines.hatch.dynamomulti64.tier.11.name=UIV 64A Dynamo Hatch +gt.blockmachines.hatch.dynamomulti04.tier.12.name=UMV 4A Dynamo Hatch +gt.blockmachines.hatch.dynamomulti16.tier.12.name=UMV 16A Dynamo Hatch +gt.blockmachines.hatch.dynamomulti64.tier.12.name=UMV 64A Dynamo Hatch +gt.blockmachines.hatch.dynamomulti04.tier.13.name=IV 4A Dynamo Hatch +gt.blockmachines.hatch.dynamomulti16.tier.13.name=IV 16A Dynamo Hatch +gt.blockmachines.hatch.dynamomulti64.tier.13.name=IV 64A Dynamo Hatch +gt.blockmachines.hatch.dynamomulti.desc.0=Multiple Ampere Energy Extractor for Multiblocks +gt.blockmachines.hatch.dynamomulti.desc.1=Amperes Out + +gt.blockmachines.hatch.dynamotunnel1.tier.05=IV 256/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel2.tier.05=IV 1024/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel3.tier.05=IV 4096/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel4.tier.05=IV 16384/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel5.tier.05=IV 65536/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel6.tier.05=IV 262144/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel7.tier.05=IV 1048576/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel1.tier.06=LuV 256/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel2.tier.06=LuV 1024/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel3.tier.06=LuV 4096/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel4.tier.06=LuV 16384/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel5.tier.06=LuV 65536/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel6.tier.06=LuV 262144/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel7.tier.06=LuV 1048576/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel1.tier.07=ZPM 256/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel2.tier.07=ZPM 1024/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel3.tier.07=ZPM 4096/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel4.tier.07=ZPM 16384/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel5.tier.07=ZPM 65536/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel6.tier.07=ZPM 262144/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel7.tier.07=ZPM 1048576/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel1.tier.08=UV 256/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel2.tier.08=UV 1024/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel3.tier.08=UV 4096/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel4.tier.08=UV 16384/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel5.tier.08=UV 65536/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel6.tier.08=UV 262144/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel7.tier.08=UV 1048576/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel1.tier.09=UHV 256/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel2.tier.09=UHV 1024/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel3.tier.09=UHV 4096/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel4.tier.09=UHV 16384/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel5.tier.09=UHV 65536/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel6.tier.09=UHV 262144/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel7.tier.09=UHV 1048576/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel1.tier.10=UEV 256/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel2.tier.10=UEV 1024/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel3.tier.10=UEV 4096/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel4.tier.10=UEV 16384/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel5.tier.10=UEV 65536/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel6.tier.10=UEV 262144/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel7.tier.10=UEV 1048576/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel1.tier.11=UIV 256/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel2.tier.11=UIV 1024/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel3.tier.11=UIV 4096/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel4.tier.11=UIV 16384/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel5.tier.11=UIV 65536/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel6.tier.11=UIV 262144/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel7.tier.11=UIV 1048576/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel1.tier.12=UMV 256/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel2.tier.12=UMV 1024/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel3.tier.12=UMV 4096/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel4.tier.12=UMV 16384/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel5.tier.12=UMV 65536/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel6.tier.12=UMV 262144/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel7.tier.12=UMV 1048576/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel1.tier.13=UXV 256/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel2.tier.13=UXV 1024/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel3.tier.13=UXV 4096/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel4.tier.13=UXV 16384/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel5.tier.13=UXV 65536/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel6.tier.13=UXV 262144/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel7.tier.13=UXV 1048576/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel.tier.14=Legendary Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel.desc.0=Energy extracting terminal for Multiblocks +gt.blockmachines.hatch.dynamotunnel.desc.1=Throughput + +gt.blockmachines.emin.tier.08.name=UV Elemental Input Hatch +gt.blockmachines.emin.tier.09.name=UHV Elemental Input Hatch +gt.blockmachines.emin.tier.10.name=UEV Elemental Input Hatch +gt.blockmachines.emin.tier.11.name=UIV Elemental Input Hatch +gt.blockmachines.emin.tier.12.name=UMV Elemental Input Hatch +gt.blockmachines.emin.tier.13.name=UXV Elemental Input Hatch +gt.blockmachines.emin.desc=Elemental Input for Multiblocks + +gt.blockmachines.emout.tier.08.name=UV Elemental Output Hatch +gt.blockmachines.emout.tier.09.name=UHV Elemental Output Hatch +gt.blockmachines.emout.tier.10.name=UEV Elemental Output Hatch +gt.blockmachines.emout.tier.11.name=UIV Elemental Output Hatch +gt.blockmachines.emout.tier.12.name=UMV Elemental Output Hatch +gt.blockmachines.emout.tier.13.name=UXV Elemental Output Hatch +gt.blockmachines.emout.desc=Elemental Output for Multiblocks +#Multiblocks +gt.blockmachines.multimachine.em.transformer.name=Active Transformer +gt.blockmachines.multimachine.em.transformer.hint=1 - Energy IO Hatches or High Power Casing +gt.blockmachines.multimachine.em.transformer.desc.0=Power substation +gt.blockmachines.multimachine.em.transformer.desc.1=All the transformation! +gt.blockmachines.multimachine.em.transformer.desc.2=Only 0.78125% power loss, HAYO! + +gt.blockmachines.multimachine.tm.microwave.name=Microwave Grinder +gt.blockmachines.multimachine.tm.microwave.hint.0=1 - Classic Hatches or Clean Stainless Steel Casing +gt.blockmachines.multimachine.tm.microwave.hint.1=Also acts like a hopper so give it an Output Bus +gt.blockmachines.multimachine.tm.microwave.desc.0=High Frequency Oven +gt.blockmachines.multimachine.tm.microwave.desc.1=From live to done in seconds! +gt.blockmachines.multimachine.tm.microwave.desc.3=I said nuke the... I meant microwave supper! +gt.blockmachines.multimachine.tm.microwave.cfgi.0=Power setting +gt.blockmachines.multimachine.tm.microwave.cfgi.1=Timer setting +gt.blockmachines.multimachine.tm.microwave.cfgo.0=Timer value +gt.blockmachines.multimachine.tm.microwave.cfgo.1=Timer remaining + +gt.blockmachines.multimachine.tm.teslaCoil.name=Tesla Tower +gt.blockmachines.multimachine.tm.teslaCoil.hint.0=1 - Classic Hatches, Capacitor Hatches or Tesla Base Casing +gt.blockmachines.multimachine.tm.teslaCoil.hint.1=2 - Titanium Frames +gt.blockmachines.multimachine.tm.teslaCoil.desc.0=Tower of Wireless Power +gt.blockmachines.multimachine.tm.teslaCoil.desc.1=Fewer pesky cables! +gt.blockmachines.multimachine.tm.teslaCoil.desc.2=Survival chances might be affected +gt.blockmachines.multimachine.tm.teslaCoil.cfgi.0=Hysteresis low setting +gt.blockmachines.multimachine.tm.teslaCoil.cfgi.1=Hysteresis high setting +gt.blockmachines.multimachine.tm.teslaCoil.cfgi.2=Tesla Towers transfer radius setting +gt.blockmachines.multimachine.tm.teslaCoil.cfgi.3=Tesla Transceiver transfer radius setting +gt.blockmachines.multimachine.tm.teslaCoil.cfgi.4=Tesla Ultimate Cover transfer radius setting +gt.blockmachines.multimachine.tm.teslaCoil.cfgi.5=Output voltage setting +gt.blockmachines.multimachine.tm.teslaCoil.cfgi.6=Output current setting +gt.blockmachines.multimachine.tm.teslaCoil.cfgi.7=Scan time Min setting +gt.blockmachines.multimachine.tm.teslaCoil.cfgi.8=Overdrive setting +gt.blockmachines.multimachine.tm.teslaCoil.cfgi.9=Unused +gt.blockmachines.multimachine.tm.teslaCoil.cfgo.0=Tesla Towers transfer radius display +gt.blockmachines.multimachine.tm.teslaCoil.cfgo.1=Tesla Transceiver transfer radius display +gt.blockmachines.multimachine.tm.teslaCoil.cfgo.2=Tesla Ultimate Cover transfer radius display +gt.blockmachines.multimachine.tm.teslaCoil.cfgo.3=Output voltage display +gt.blockmachines.multimachine.tm.teslaCoil.cfgo.4=Output current display +gt.blockmachines.multimachine.tm.teslaCoil.cfgo.5=Energy Capacity display +gt.blockmachines.multimachine.tm.teslaCoil.cfgo.6=Energy Stored display +gt.blockmachines.multimachine.tm.teslaCoil.cfgo.7=Energy Fraction display +gt.blockmachines.multimachine.tm.teslaCoil.cfgo.8=Scan time display + +gt.blockmachines.multimachine.em.switch.name=Network Switch With QoS +gt.blockmachines.multimachine.em.switch.hint=1 - Classic/Data Hatches or Computer casing +gt.blockmachines.multimachine.em.switch.desc.0=User controlled computation power routing +gt.blockmachines.multimachine.em.switch.desc.1=Quality of service is a must + +gt.blockmachines.multimachine.em.computer.name=Quantum Computer +gt.blockmachines.multimachine.em.computer.hint.0=1 - Classic/Data Hatches or Computer casing +gt.blockmachines.multimachine.em.computer.hint.1=2 - Rack Hatches or Advanced computer casing +gt.blockmachines.multimachine.em.computer.desc=You need it to process the number above +gt.blockmachines.multimachine.em.computer.cfgi.0=Overclock ratio +gt.blockmachines.multimachine.em.computer.cfgi.1=Overvoltage ratio +gt.blockmachines.multimachine.em.computer.cfgo.0=Current max. heat +gt.blockmachines.multimachine.em.computer.cfgo.1=Produced computation + +gt.blockmachines.multimachine.em.databank.name=Data Bank +gt.blockmachines.multimachine.em.junction.name=Matter Junction +gt.blockmachines.multimachine.em.mattertoem.name=Matter Quantizer +gt.blockmachines.multimachine.em.emtomatter.name=Matter Dequantizer + +gt.blockmachines.multimachine.em.emtoessentia.name=Essentia Dequantizer +gt.blockmachines.multimachine.em.emtoessentia.hint.0=1 - Classic Hatches or High Power Casing +gt.blockmachines.multimachine.em.emtoessentia.hint.1=2 - Elemental Input Hatch +gt.blockmachines.multimachine.em.emtoessentia.hint.2=3 - Elemental Overflow Hatches or Elemental Casing +gt.blockmachines.multimachine.em.emtoessentia.hint.3=General - Some sort of Essentia Storage +gt.blockmachines.multimachine.em.emtoessentia.desc.0=Transform quantum form back to... +gt.blockmachines.multimachine.em.emtoessentia.desc.1=regular one, but why? + +gt.blockmachines.multimachine.em.essentiatoem.name=Essentia Quantizer +gt.blockmachines.multimachine.em.essentiatoem.hint.0=1 - Classic Hatches or High Power Casing +gt.blockmachines.multimachine.em.essentiatoem.hint.1=2 - Elemental Output Hatch +gt.blockmachines.multimachine.em.essentiatoem.hint.2=3 - Elemental Overflow Hatches or Elemental Casing +gt.blockmachines.multimachine.em.essentiatoem.hint.3=General - Some sort of Essentia Storage +gt.blockmachines.multimachine.em.essentiatoem.desc.0=Conveniently convert regular stuff into quantum form. +gt.blockmachines.multimachine.em.essentiatoem.desc.1=To make it more inconvenient. + +gt.blockmachines.multimachine.em.scanner.name=Elemental Scanner +gt.blockmachines.multimachine.em.research.name=Research station +gt.blockmachines.multimachine.em.collider.name=Matter Collider +gt.blockmachines.multimachine.em.infuser.name=Energy Infuser +gt.blockmachines.multimachine.em.processing.name=Quantum Processing Machine +gt.blockmachines.multimachine.em.crafter.name=Matter Assembler +gt.blockmachines.multimachine.em.stabilizer.name=Elemental Stabilizer +gt.blockmachines.multimachine.em.wormhole.name=Wormhole +gt.blockmachines.multimachine.em.decay.name=Decay Generator +gt.blockmachines.multimachine.em.annihilation.name=Annihilation Generator +gt.blockmachines.multimachine.em.blackholegenerator.name=Black Hole Generator + +#Keywords and phrases +tt.keyword.Air=Air +tt.keyword.Earth=Earth +tt.keyword.Fire=Fire +tt.keyword.Water=Water +tt.keyword.Order=Order +tt.keyword.Entropy=Entropy +tt.keyword.Primal=Primal +tt.keyword.Aspect=Aspect +tt.keyword.CLASS=CLASS +tt.keyword.NAME=NAME +tt.keyword.CHARGE=CHARGE +tt.keyword.COLORLESS=COLORLESS +tt.keyword.MASS=MASS +tt.keyword.BOOM=BOOM! +tt.keyword.ID=BLYADD +tt.keyword.Destination=Destination +tt.keyword.Weight=Weight + +tt.keyphrase.LIFE_TIME=LIFE TIME +tt.keyphrase.CARRIES_COLOR=CARRIES COLOR +tt.keyphrase.Hint_Details=Hint Details +tt.keyphrase.At_current_energy_level=At current energy level +tt.keyphrase.No_Stacks=No Stacks +tt.keyphrase.Contains_EM=Contains EM +tt.keyphrase.Contained_mass=Contained mass +tt.keyphrase.Mass_Disposal_speed=Mass Disposal speed +tt.keyphrase.Muffler_BOOM=Muffler BOOM! +#OpenTurrets compatibility +tile.turretHeadEM.name=Elemental Matter Turret +tile.turretBaseEM.name=Elemental Turret Base \ No newline at end of file -- cgit From cec23e300f5dbfc443d6daa624015b6baa359737 Mon Sep 17 00:00:00 2001 From: Bass Date: Thu, 29 Aug 2019 18:46:53 +0100 Subject: more lang --- .../multi/GT_MetaTileEntity_EM_collider.java | 358 ++++++++-------- .../multi/GT_MetaTileEntity_EM_dataBank.java | 69 ++-- .../multi/GT_MetaTileEntity_EM_dequantizer.java | 25 +- .../multi/GT_MetaTileEntity_EM_junction.java | 55 +-- .../multi/GT_MetaTileEntity_EM_quantizer.java | 21 +- .../multi/GT_MetaTileEntity_EM_research.java | 3 +- .../multi/GT_MetaTileEntity_EM_scanner.java | 269 +++++++------ src/main/resources/assets/tectech/lang/en_US.lang | 39 ++ src/main/resources/assets/tectech/lang/ru_RU.lang | 448 --------------------- 9 files changed, 444 insertions(+), 843 deletions(-) delete mode 100644 src/main/resources/assets/tectech/lang/ru_RU.lang (limited to 'src/main/resources/assets/tectech') diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_collider.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_collider.java index 1dc80606d9..5d3a700153 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_collider.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_collider.java @@ -42,6 +42,7 @@ import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.texture import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.texturePage; import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT; import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.*; +import static net.minecraft.util.StatCollector.translateToLocal; /** * Created by danie_000 on 17.12.2016. @@ -52,44 +53,47 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB private static Textures.BlockIcons.CustomIcon ScreenON_Slave; private static Textures.BlockIcons.CustomIcon ScreenOFF_Slave; - protected static final byte FUSE_MODE=0, COLLIDE_MODE =1; + protected static final byte FUSE_MODE = 0, COLLIDE_MODE = 1; private static double MASS_TO_EU_INSTANT; - private static int STARTUP_COST,KEEPUP_COST; + private static int STARTUP_COST, KEEPUP_COST; - public static void setValues(int heliumPlasmaValue){ + public static void setValues(int heliumPlasmaValue) { double MASS_TO_EU_PARTIAL = heliumPlasmaValue / 1.75893000478707E07;//mass diff MASS_TO_EU_INSTANT = MASS_TO_EU_PARTIAL * 20; - STARTUP_COST=-heliumPlasmaValue*10000; - KEEPUP_COST=-heliumPlasmaValue; + STARTUP_COST = -heliumPlasmaValue * 10000; + KEEPUP_COST = -heliumPlasmaValue; } //region collision handlers - public static final HashMap FUSE_HANDLERS =new HashMap<>(); - public static final HashMap PRIMITIVE_FUSE_HANDLERS =new HashMap<>(); + public static final HashMap FUSE_HANDLERS = new HashMap<>(); + public static final HashMap PRIMITIVE_FUSE_HANDLERS = new HashMap<>(); + public interface IPrimitiveColliderHandler { void collide(cElementalInstanceStack in1, cElementalInstanceStack in2, cElementalInstanceStackMap out); } + public interface IColliderHandler extends IPrimitiveColliderHandler { byte getRequiredTier(); } + static { FUSE_HANDLERS.put((dAtomDefinition.getClassTypeStatic() << 16) | dAtomDefinition.getClassTypeStatic(), new IColliderHandler() { @Override public void collide(cElementalInstanceStack in1, cElementalInstanceStack in2, cElementalInstanceStackMap out) { try { - cElementalMutableDefinitionStackMap defs=new cElementalMutableDefinitionStackMap(); + cElementalMutableDefinitionStackMap defs = new cElementalMutableDefinitionStackMap(); defs.putUnifyAll(in1.definition.getSubParticles()); defs.putUnifyAll(in2.definition.getSubParticles()); dAtomDefinition atom = new dAtomDefinition(defs.toImmutable_optimized_unsafeLeavesExposedElementalTree()); - out.putUnify(new cElementalInstanceStack(atom,Math.min(in1.amount,in2.amount))); - }catch (Exception e){ - out.putUnifyAll(in1,in2); + out.putUnify(new cElementalInstanceStack(atom, Math.min(in1.amount, in2.amount))); + } catch (Exception e) { + out.putUnifyAll(in1, in2); return; } - if(in1.amount>in2.amount){ - out.putUnify(new cElementalInstanceStack(in1.definition,in1.amount-in2.amount)); - }else if (in2.amount>in1.amount){ - out.putUnify(new cElementalInstanceStack(in2.definition,in2.amount-in1.amount)); + if (in1.amount > in2.amount) { + out.putUnify(new cElementalInstanceStack(in1.definition, in1.amount - in2.amount)); + } else if (in2.amount > in1.amount) { + out.putUnify(new cElementalInstanceStack(in2.definition, in2.amount - in1.amount)); } } @@ -106,19 +110,19 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB @Override public void collide(cElementalInstanceStack in1, cElementalInstanceStack in2, cElementalInstanceStackMap out) { try { - cElementalMutableDefinitionStackMap defs=new cElementalMutableDefinitionStackMap(); + cElementalMutableDefinitionStackMap defs = new cElementalMutableDefinitionStackMap(); defs.putUnifyAll(in1.definition.getSubParticles()); defs.putUnifyAll(in2.definition.getSubParticles()); dHadronDefinition hadron = new dHadronDefinition(defs.toImmutable_optimized_unsafeLeavesExposedElementalTree()); - out.putUnify(new cElementalInstanceStack(hadron,Math.min(in1.amount,in2.amount))); - }catch (Exception e){ - out.putUnifyAll(in1,in2); + out.putUnify(new cElementalInstanceStack(hadron, Math.min(in1.amount, in2.amount))); + } catch (Exception e) { + out.putUnifyAll(in1, in2); return; } - if(in1.amount>in2.amount){ - out.putUnify(new cElementalInstanceStack(in1.definition,in1.amount-in2.amount)); - }else if (in2.amount>in1.amount){ - out.putUnify(new cElementalInstanceStack(in2.definition,in2.amount-in1.amount)); + if (in1.amount > in2.amount) { + out.putUnify(new cElementalInstanceStack(in1.definition, in1.amount - in2.amount)); + } else if (in2.amount > in1.amount) { + out.putUnify(new cElementalInstanceStack(in2.definition, in2.amount - in1.amount)); } } @@ -131,19 +135,19 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB @Override public void collide(cElementalInstanceStack in1, cElementalInstanceStack in2, cElementalInstanceStackMap out) { try { - cElementalMutableDefinitionStackMap defs=new cElementalMutableDefinitionStackMap(); + cElementalMutableDefinitionStackMap defs = new cElementalMutableDefinitionStackMap(); defs.putUnifyAll(in1.definition.getSubParticles()); defs.putUnify(in2.definition.getStackForm(1)); dHadronDefinition hadron = new dHadronDefinition(defs.toImmutable_optimized_unsafeLeavesExposedElementalTree()); - out.putUnify(new cElementalInstanceStack(hadron,Math.min(in1.amount,in2.amount))); - }catch (Exception e){ - out.putUnifyAll(in1,in2); + out.putUnify(new cElementalInstanceStack(hadron, Math.min(in1.amount, in2.amount))); + } catch (Exception e) { + out.putUnifyAll(in1, in2); return; } - if(in1.amount>in2.amount){ - out.putUnify(new cElementalInstanceStack(in1.definition,in1.amount-in2.amount)); - }else if (in2.amount>in1.amount){ - out.putUnify(new cElementalInstanceStack(in2.definition,in2.amount-in1.amount)); + if (in1.amount > in2.amount) { + out.putUnify(new cElementalInstanceStack(in1.definition, in1.amount - in2.amount)); + } else if (in2.amount > in1.amount) { + out.putUnify(new cElementalInstanceStack(in2.definition, in2.amount - in1.amount)); } } @@ -159,11 +163,11 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB FUSE_HANDLERS.put((cElementalPrimitive.getClassTypeStatic() << 16) | cElementalPrimitive.getClassTypeStatic(), new IColliderHandler() { @Override public void collide(cElementalInstanceStack in1, cElementalInstanceStack in2, cElementalInstanceStackMap out) { - IPrimitiveColliderHandler collisionHandler= PRIMITIVE_FUSE_HANDLERS.get(in1.definition.getClass().getName()+'\0'+in2.definition.getClass().getName()); + IPrimitiveColliderHandler collisionHandler = PRIMITIVE_FUSE_HANDLERS.get(in1.definition.getClass().getName() + '\0' + in2.definition.getClass().getName()); if (collisionHandler != null) { collisionHandler.collide(in2, in1, out); } else { - out.putUnifyAll(in1,in2); + out.putUnifyAll(in1, in2); } } @@ -175,40 +179,40 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB PRIMITIVE_FUSE_HANDLERS.put(eQuarkDefinition.class.getName() + '\0' + eQuarkDefinition.class.getName(), (in1, in2, out) -> { try { - cElementalMutableDefinitionStackMap defs=new cElementalMutableDefinitionStackMap(); + cElementalMutableDefinitionStackMap defs = new cElementalMutableDefinitionStackMap(); defs.putUnify(in1.definition.getStackForm(1)); defs.putUnify(in2.definition.getStackForm(1)); dHadronDefinition hadron = new dHadronDefinition(defs.toImmutable_optimized_unsafeLeavesExposedElementalTree()); - out.putUnify(new cElementalInstanceStack(hadron,Math.min(in1.amount,in2.amount))); - }catch (Exception e){ - out.putUnifyAll(in1,in2); + out.putUnify(new cElementalInstanceStack(hadron, Math.min(in1.amount, in2.amount))); + } catch (Exception e) { + out.putUnifyAll(in1, in2); return; } - if(in1.amount>in2.amount){ - out.putUnify(new cElementalInstanceStack(in1.definition,in1.amount-in2.amount)); - }else if (in2.amount>in1.amount){ - out.putUnify(new cElementalInstanceStack(in2.definition,in2.amount-in1.amount)); + if (in1.amount > in2.amount) { + out.putUnify(new cElementalInstanceStack(in1.definition, in1.amount - in2.amount)); + } else if (in2.amount > in1.amount) { + out.putUnify(new cElementalInstanceStack(in2.definition, in2.amount - in1.amount)); } }); PRIMITIVE_FUSE_HANDLERS.put(ePrimalAspectDefinition.class.getName() + '\0' + ePrimalAspectDefinition.class.getName(), (in1, in2, out) -> { if (fuseAspects(in1, in2, out)) return; - if(in1.amount>in2.amount){ - out.putUnify(new cElementalInstanceStack(in1.definition,in1.amount-in2.amount)); - }else if (in2.amount>in1.amount){ - out.putUnify(new cElementalInstanceStack(in2.definition,in2.amount-in1.amount)); + if (in1.amount > in2.amount) { + out.putUnify(new cElementalInstanceStack(in1.definition, in1.amount - in2.amount)); + } else if (in2.amount > in1.amount) { + out.putUnify(new cElementalInstanceStack(in2.definition, in2.amount - in1.amount)); } }); } private static boolean fuseAspects(cElementalInstanceStack in1, cElementalInstanceStack in2, cElementalInstanceStackMap out) { try { - cElementalMutableDefinitionStackMap defs=new cElementalMutableDefinitionStackMap(); + cElementalMutableDefinitionStackMap defs = new cElementalMutableDefinitionStackMap(); defs.putUnify(in1.definition.getStackForm(1)); defs.putUnify(in2.definition.getStackForm(1)); dComplexAspectDefinition aspect = new dComplexAspectDefinition(defs.toImmutable_optimized_unsafeLeavesExposedElementalTree()); - out.putUnify(new cElementalInstanceStack(aspect,Math.min(in1.amount,in2.amount))); - }catch (Exception e){ - out.putUnifyAll(in1,in2); + out.putUnify(new cElementalInstanceStack(aspect, Math.min(in1.amount, in2.amount))); + } catch (Exception e) { + out.putUnifyAll(in1, in2); return true; } return false; @@ -219,10 +223,10 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB @Override public void collide(cElementalInstanceStack in1, cElementalInstanceStack in2, cElementalInstanceStackMap out) { if (fuseAspects(in1, in2, out)) return; - if(in1.amount>in2.amount){ - out.putUnify(new cElementalInstanceStack(in1.definition,in1.amount-in2.amount)); - }else if (in2.amount>in1.amount){ - out.putUnify(new cElementalInstanceStack(in2.definition,in2.amount-in1.amount)); + if (in1.amount > in2.amount) { + out.putUnify(new cElementalInstanceStack(in1.definition, in1.amount - in2.amount)); + } else if (in2.amount > in1.amount) { + out.putUnify(new cElementalInstanceStack(in2.definition, in2.amount - in1.amount)); } } @@ -238,19 +242,19 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB @Override public void collide(cElementalInstanceStack in1, cElementalInstanceStack in2, cElementalInstanceStackMap out) { try { - cElementalMutableDefinitionStackMap defs=new cElementalMutableDefinitionStackMap(); + cElementalMutableDefinitionStackMap defs = new cElementalMutableDefinitionStackMap(); defs.putUnifyAll(in1.definition.getSubParticles()); defs.putUnify(in2.definition.getStackForm(1)); dAtomDefinition atom = new dAtomDefinition(defs.toImmutable_optimized_unsafeLeavesExposedElementalTree()); - out.putUnify(new cElementalInstanceStack(atom,Math.min(in1.amount,in2.amount))); - }catch (Exception e){ - out.putUnifyAll(in1,in2); + out.putUnify(new cElementalInstanceStack(atom, Math.min(in1.amount, in2.amount))); + } catch (Exception e) { + out.putUnifyAll(in1, in2); return; } - if(in1.amount>in2.amount){ - out.putUnify(new cElementalInstanceStack(in1.definition,in1.amount-in2.amount)); - }else if (in2.amount>in1.amount){ - out.putUnify(new cElementalInstanceStack(in2.definition,in2.amount-in1.amount)); + if (in1.amount > in2.amount) { + out.putUnify(new cElementalInstanceStack(in1.definition, in1.amount - in2.amount)); + } else if (in2.amount > in1.amount) { + out.putUnify(new cElementalInstanceStack(in2.definition, in2.amount - in1.amount)); } } @@ -268,9 +272,9 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB //region parameters protected Parameters.Group.ParameterIn mode; - private static final IStatusFunction MODE_STATUS = (base_EM, p)->{ - if(base_EM.isMaster()){ - double mode=p.get(); + private static final IStatusFunction MODE_STATUS = (base_EM, p) -> { + if (base_EM.isMaster()) { + double mode = p.get(); if (mode == FUSE_MODE || mode == COLLIDE_MODE) { return STATUS_OK; } else if (mode > 1) { @@ -282,12 +286,12 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB } return STATUS_UNUSED; }; - private static final INameFunction MODE_NAME = (base_EM, p)->{ - if(base_EM.isMaster()){ - double mode=p.get(); - if(mode==FUSE_MODE){ + private static final INameFunction MODE_NAME = (base_EM, p) -> { + if (base_EM.isMaster()) { + double mode = p.get(); + if (mode == FUSE_MODE) { return "Mode: Fuse"; - }else if(mode==COLLIDE_MODE){ + } else if (mode == COLLIDE_MODE) { return "Mode: Collide"; } return "Mode: Undefined"; @@ -296,32 +300,32 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB }; //endregion - protected boolean started=false; + protected boolean started = false; //region Structure //use multi A energy inputs, use less power the longer it runs private static final String[][] shape = new String[][]{ - {"I0A0A0","I00000","I0A0A0",}, - {"H0000000","G001111100","H0000000",}, - {"F22223332222","F41155555114","F22223332222",}, - {"E2000000000002","E4155111115514","E2000000000002",}, - {"D20000E00002","D41511E11514","D20000E00002",}, - {"C2000I0002","C4151I1514","C2000I0002",}, - {"B2000K0002","B4151K1514","B2000K0002",}, - {"B200M002","A0151M1510","B200M002",}, - {"A0200M0020","A0151M1510","A0200M0020",}, - {"0020O0200","0151O1510","0020O0200",}, - {"A030O030","0151O1510","A030O030",}, - {"0030O0300","0151O1510","0030O0300",}, - {"A030O030","0151O1510","A030O030",}, - {"0020O0200","0151O1510","0020O0200",}, - {"A0200M0020","A0151M1510","A0200M0020",}, - {"B200M002","A0151M1510","B200M002",}, - {"B2000K0002","B4151K1514","B2000K0002",}, - {"C2000I0002","C4151I1514","C2000I0002",}, - {"D200002 200002","D415112 . 211514","D200002 200002",}, - {"E20!!22222!!02","E4155111115514","E20!!22222!!02",}, - {"F2222#\"#2222","F41155555114","F2222#\"#2222",}, + {"I0A0A0", "I00000", "I0A0A0",}, + {"H0000000", "G001111100", "H0000000",}, + {"F22223332222", "F41155555114", "F22223332222",}, + {"E2000000000002", "E4155111115514", "E2000000000002",}, + {"D20000E00002", "D41511E11514", "D20000E00002",}, + {"C2000I0002", "C4151I1514", "C2000I0002",}, + {"B2000K0002", "B4151K1514", "B2000K0002",}, + {"B200M002", "A0151M1510", "B200M002",}, + {"A0200M0020", "A0151M1510", "A0200M0020",}, + {"0020O0200", "0151O1510", "0020O0200",}, + {"A030O030", "0151O1510", "A030O030",}, + {"0030O0300", "0151O1510", "0030O0300",}, + {"A030O030", "0151O1510", "A030O030",}, + {"0020O0200", "0151O1510", "0020O0200",}, + {"A0200M0020", "A0151M1510", "A0200M0020",}, + {"B200M002", "A0151M1510", "B200M002",}, + {"B2000K0002", "B4151K1514", "B2000K0002",}, + {"C2000I0002", "C4151I1514", "C2000I0002",}, + {"D200002 200002", "D415112 . 211514", "D200002 200002",}, + {"E20!!22222!!02", "E4155111115514", "E20!!22222!!02",}, + {"F2222#\"#2222", "F41155555114", "F2222#\"#2222",}, }; private static final Block[] blockType = new Block[]{ sBlockCasingsTT, @@ -342,7 +346,7 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB private static final Block[] blockTypeFallback = new Block[]{sBlockCasingsTT, sBlockCasingsTT, sBlockCasingsTT, sBlockCasingsTT}; private static final byte[] blockMetaFallback = new byte[]{0, 4, 4, 4}; private static final String[] description = new String[]{ - EnumChatFormatting.AQUA+"Hint Details:", + EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":", "1 - Classic Hatches or High Power Casing", "2 - Elemental Input Hatches or Molecular Casing", "3 - Elemental Output Hatches or Molecular Casing", @@ -361,8 +365,8 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB @Override protected void parametersInstantiation_EM() { - Parameters.Group hatch_0=parametrization.getGroup(0); - mode=hatch_0.makeInParameter(0,FUSE_MODE, MODE_NAME, MODE_STATUS); + Parameters.Group hatch_0 = parametrization.getGroup(0); + mode = hatch_0.makeInParameter(0, FUSE_MODE, MODE_NAME, MODE_STATUS); } @Override @@ -383,9 +387,9 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB @Override public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) { if (aSide == aFacing) { - if(aFacing%2==0){ + if (aFacing % 2 == 0) { return new ITexture[]{Textures.BlockIcons.casingTexturePages[texturePage][4], new TT_RenderedTexture(aActive ? ScreenON : ScreenOFF)}; - }else{ + } else { return new ITexture[]{Textures.BlockIcons.casingTexturePages[texturePage][4], new TT_RenderedTexture(aActive ? ScreenON_Slave : ScreenOFF_Slave)}; } } @@ -396,28 +400,28 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB public void saveNBTData(NBTTagCompound aNBT) { super.saveNBTData(aNBT); aNBT.setByte("eTier", eTier);//collider tier - aNBT.setBoolean("eStarted",started); - if(stack!=null) { + aNBT.setBoolean("eStarted", started); + if (stack != null) { aNBT.setTag("eStack", stack.toNBT()); } - aNBT.setLong("ePlasmaEnergy",plasmaEnergy); + aNBT.setLong("ePlasmaEnergy", plasmaEnergy); } @Override public void loadNBTData(NBTTagCompound aNBT) { super.loadNBTData(aNBT); eTier = aNBT.getByte("eTier");//collider tier - started=aNBT.getBoolean("eStarted"); - if(aNBT.hasKey("eStack")){ - stack=cElementalInstanceStack.fromNBT(aNBT.getCompoundTag("eStack")); + started = aNBT.getBoolean("eStarted"); + if (aNBT.hasKey("eStack")) { + stack = cElementalInstanceStack.fromNBT(aNBT.getCompoundTag("eStack")); } - plasmaEnergy=aNBT.getLong("ePlasmaEnergy"); + plasmaEnergy = aNBT.getLong("ePlasmaEnergy"); } @Override public boolean checkMachine_EM(IGregTechTileEntity iGregTechTileEntity, ItemStack itemStack) { - int xDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetX*2; - int zDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetZ*2; + int xDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetX * 2; + int zDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetZ * 2; if (iGregTechTileEntity.getBlockOffset(xDir, 0, zDir) != sBlockCasingsTT) { eTier = 0; return false; @@ -453,51 +457,51 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB @Override public void construct(int stackSize, boolean hintsOnly) { - IGregTechTileEntity iGregTechTileEntity=getBaseMetaTileEntity(); - int xDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetX*4; - int yDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetY*4; - int zDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetZ*4; - if(hintsOnly){ + IGregTechTileEntity iGregTechTileEntity = getBaseMetaTileEntity(); + int xDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetX * 4; + int yDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetY * 4; + int zDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetZ * 4; + if (hintsOnly) { TecTech.proxy.hint_particle(iGregTechTileEntity.getWorld(), - iGregTechTileEntity.getXCoord()+xDir, - iGregTechTileEntity.getYCoord()+yDir, - iGregTechTileEntity.getZCoord()+zDir, - TT_Container_Casings.sHintCasingsTT,12); - } else{ - if(iGregTechTileEntity.getBlockOffset(xDir,0,zDir).getMaterial() == Material.air) { - iGregTechTileEntity.getWorld().setBlock(iGregTechTileEntity.getXCoord() + xDir, iGregTechTileEntity.getYCoord()+yDir, iGregTechTileEntity.getZCoord() + zDir, TT_Container_Casings.sHintCasingsTT, 12, 2); + iGregTechTileEntity.getXCoord() + xDir, + iGregTechTileEntity.getYCoord() + yDir, + iGregTechTileEntity.getZCoord() + zDir, + TT_Container_Casings.sHintCasingsTT, 12); + } else { + if (iGregTechTileEntity.getBlockOffset(xDir, 0, zDir).getMaterial() == Material.air) { + iGregTechTileEntity.getWorld().setBlock(iGregTechTileEntity.getXCoord() + xDir, iGregTechTileEntity.getYCoord() + yDir, iGregTechTileEntity.getZCoord() + zDir, TT_Container_Casings.sHintCasingsTT, 12, 2); } } if ((stackSize & 1) == 1) { - StructureBuilderExtreme(shape, blockType, blockMeta1, 11, 1, 18, iGregTechTileEntity,this, hintsOnly); + StructureBuilderExtreme(shape, blockType, blockMeta1, 11, 1, 18, iGregTechTileEntity, this, hintsOnly); } else { - StructureBuilderExtreme(shape, blockType, blockMeta2, 11, 1, 18, iGregTechTileEntity,this, hintsOnly); + StructureBuilderExtreme(shape, blockType, blockMeta2, 11, 1, 18, iGregTechTileEntity, this, hintsOnly); } } @Override public void parametersStatusesWrite_EM(boolean machineBusy) { - if(isMaster()) { + if (isMaster()) { super.parametersStatusesWrite_EM(machineBusy); } } @Override public boolean checkRecipe_EM(ItemStack itemStack) { - GT_MetaTileEntity_EM_collider partner=getPartner(); - if(partner==null){ + GT_MetaTileEntity_EM_collider partner = getPartner(); + if (partner == null) { return false; } - mEfficiencyIncrease=10000; - if(started) { - if(stack==null) { + mEfficiencyIncrease = 10000; + if (started) { + if (stack == null) { for (GT_MetaTileEntity_Hatch_InputElemental inputElemental : eInputHatches) { cElementalInstanceStackMap container = inputElemental.getContainerHandler(); if (container.isEmpty()) { continue; } stack = container.remove(container.getFirst().definition); - long eut = KEEPUP_COST+(long)(KEEPUP_COST * Math.abs(stack.getMass() / dAtomDefinition.getSomethingHeavy().getMass()))/2; + long eut = KEEPUP_COST + (long) (KEEPUP_COST * Math.abs(stack.getMass() / dAtomDefinition.getSomethingHeavy().getMass())) / 2; if (eut < Integer.MIN_VALUE + 7) { return false; } @@ -515,18 +519,18 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB mEUt = KEEPUP_COST; eAmpereFlow = 2; return true; - }else{ - started=true; - mMaxProgresstime=20; - mEUt=STARTUP_COST; - eAmpereFlow=10; + } else { + started = true; + mMaxProgresstime = 20; + mEUt = STARTUP_COST; + eAmpereFlow = 10; return true; } } - protected double fuse(GT_MetaTileEntity_EM_collider partner){ - if(partner.stack!=null && stack!=null) {//todo add single event mode as an option - boolean check=stack.definition.fusionMakesEnergy(stack.getEnergy()) && + protected double fuse(GT_MetaTileEntity_EM_collider partner) { + if (partner.stack != null && stack != null) {//todo add single event mode as an option + boolean check = stack.definition.fusionMakesEnergy(stack.getEnergy()) && partner.stack.definition.fusionMakesEnergy(partner.stack.getEnergy()); cElementalInstanceStack stack2 = partner.stack; @@ -558,11 +562,11 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB } private boolean handleRecipe(cElementalInstanceStack stack2, cElementalInstanceStackMap map, IColliderHandler colliderHandler) { - if (colliderHandler != null && eTier>= colliderHandler.getRequiredTier()) { + if (colliderHandler != null && eTier >= colliderHandler.getRequiredTier()) { colliderHandler.collide(stack2, stack, map); } else { - map.putUnifyAll(stack,stack2); - outputEM=new cElementalInstanceStackMap[]{map}; + map.putUnifyAll(stack, stack2); + outputEM = new cElementalInstanceStackMap[]{map}; return true; } return false; @@ -570,10 +574,10 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB @Override protected void afterRecipeCheckFailed() { - started=false; - if(stack!=null){ + started = false; + if (stack != null) { cleanMassEM_EM(stack.getMass()); - stack=null; + stack = null; } getBaseMetaTileEntity().disableWorking(); super.afterRecipeCheckFailed(); @@ -581,29 +585,29 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB @Override public void stopMachine() { - started=false; - if(stack!=null){ + started = false; + if (stack != null) { cleanMassEM_EM(stack.getMass()); - stack=null; + stack = null; } super.stopMachine(); } @Override public void onPreTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { - if(!aBaseMetaTileEntity.isAllowedToWork()){ - started=false; + if (!aBaseMetaTileEntity.isAllowedToWork()) { + started = false; } super.onPreTick(aBaseMetaTileEntity, aTick); } - protected GT_MetaTileEntity_EM_collider getPartner(){ - IGregTechTileEntity iGregTechTileEntity=getBaseMetaTileEntity(); - int xDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetX*4; - int yDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetY*4; - int zDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetZ*4; - IGregTechTileEntity gregTechBaseTileEntity=iGregTechTileEntity.getIGregTechTileEntityOffset(xDir, yDir, zDir); - if(gregTechBaseTileEntity!=null) { + protected GT_MetaTileEntity_EM_collider getPartner() { + IGregTechTileEntity iGregTechTileEntity = getBaseMetaTileEntity(); + int xDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetX * 4; + int yDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetY * 4; + int zDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetZ * 4; + IGregTechTileEntity gregTechBaseTileEntity = iGregTechTileEntity.getIGregTechTileEntityOffset(xDir, yDir, zDir); + if (gregTechBaseTileEntity != null) { IMetaTileEntity gregTechMetaTileEntity = gregTechBaseTileEntity.getMetaTileEntity(); return gregTechMetaTileEntity instanceof GT_MetaTileEntity_EM_collider && ((GT_MetaTileEntity_EM_collider) gregTechMetaTileEntity).mMachine && @@ -613,22 +617,22 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB return null; } - protected final boolean isMaster(){ - return getBaseMetaTileEntity().getFrontFacing()%2==0; + protected final boolean isMaster() { + return getBaseMetaTileEntity().getFrontFacing() % 2 == 0; } @Override - public void outputAfterRecipe_EM(){ - GT_MetaTileEntity_EM_collider partner=getPartner(); - if(partner==null){ - if(stack!=null){ + public void outputAfterRecipe_EM() { + GT_MetaTileEntity_EM_collider partner = getPartner(); + if (partner == null) { + if (stack != null) { cleanMassEM_EM(stack.getMass()); - stack=null; + stack = null; } return; } if (isMaster()) { - switch ((int)mode.get()){ + switch ((int) mode.get()) { case FUSE_MODE: makeEU(fuse(partner)); break; @@ -636,43 +640,43 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB //collide(partner);//todo break; default: { - outputEM=new cElementalInstanceStackMap[2]; - outputEM[1]=tickStack(); - if(outputEM[1]==null){ - outputEM[1]=partner.tickStack(); - }else { - cElementalInstanceStackMap map=partner.tickStack(); - if(map!=null){ + outputEM = new cElementalInstanceStackMap[2]; + outputEM[1] = tickStack(); + if (outputEM[1] == null) { + outputEM[1] = partner.tickStack(); + } else { + cElementalInstanceStackMap map = partner.tickStack(); + if (map != null) { outputEM[1].putUnifyAll(map); } } } } - if(outputEM!=null) { - for(int i=0,lim=Math.min(outputEM.length,eOutputHatches.size());i eStacksDataOutputs = new ArrayList<>(); @@ -40,20 +41,20 @@ public class GT_MetaTileEntity_EM_dataBank extends GT_MetaTileEntity_MultiblockB //region Structure private static final String[][] shape = new String[][]{ - {"0 0","0 . 0","0 0",}, - {"0!!!0","01110","0!!!0",}, - {"0!!!0","0!!!0","0!!!0",}, + {"0 0", "0 . 0", "0 0",}, + {"0!!!0", "01110", "0!!!0",}, + {"0!!!0", "0!!!0", "0!!!0",}, }; - private static final Block[] blockType = new Block[]{sBlockCasingsTT,sBlockCasingsTT}; - private static final byte[] blockMeta = new byte[]{2,1}; - private final IHatchAdder[] addingMethods = new IHatchAdder[]{this::addClassicToMachineList,this::addDataBankHatchToMachineList}; - private static final short[] casingTextures = new short[]{textureOffset,textureOffset+1}; - private static final Block[] blockTypeFallback = new Block[]{sBlockCasingsTT,sBlockCasingsTT}; - private static final byte[] blockMetaFallback = new byte[]{0,1}; + private static final Block[] blockType = new Block[]{sBlockCasingsTT, sBlockCasingsTT}; + private static final byte[] blockMeta = new byte[]{2, 1}; + private final IHatchAdder[] addingMethods = new IHatchAdder[]{this::addClassicToMachineList, this::addDataBankHatchToMachineList}; + private static final short[] casingTextures = new short[]{textureOffset, textureOffset + 1}; + private static final Block[] blockTypeFallback = new Block[]{sBlockCasingsTT, sBlockCasingsTT}; + private static final byte[] blockMetaFallback = new byte[]{0, 1}; private static final String[] description = new String[]{ - EnumChatFormatting.AQUA+"Hint Details:", - "1 - Classic Hatches or high power casing", - "2 - Data Access/Data Bank Master Hatches or computer casing", + EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":", + translateToLocal("gt.blockmachines.multimachine.em.databank.hint.0"),//1 - Classic Hatches or high power casing + translateToLocal("gt.blockmachines.multimachine.em.databank.hint.1"),//2 - Data Access/Data Bank Master Hatches or computer casing }; //endregion @@ -65,11 +66,11 @@ public class GT_MetaTileEntity_EM_dataBank extends GT_MetaTileEntity_MultiblockB super(aName); } - public final static ResourceLocation activitySound=new ResourceLocation(Reference.MODID+":fx_hi_freq"); + public final static ResourceLocation activitySound = new ResourceLocation(Reference.MODID + ":fx_hi_freq"); @Override @SideOnly(Side.CLIENT) - protected ResourceLocation getActivitySound(){ + protected ResourceLocation getActivitySound() { return activitySound; } @@ -105,7 +106,7 @@ public class GT_MetaTileEntity_EM_dataBank extends GT_MetaTileEntity_MultiblockB @Override public void construct(int stackSize, boolean hintsOnly) { - StructureBuilderExtreme(shape, blockType, blockMeta,2, 1, 0, getBaseMetaTileEntity(),this,hintsOnly); + StructureBuilderExtreme(shape, blockType, blockMeta, 2, 1, 0, getBaseMetaTileEntity(), this, hintsOnly); } @Override @@ -116,8 +117,8 @@ public class GT_MetaTileEntity_EM_dataBank extends GT_MetaTileEntity_MultiblockB @Override public boolean checkRecipe_EM(ItemStack itemStack) { if (eDataAccessHatches.size() > 0 && eStacksDataOutputs.size() > 0) { - mEUt = -(int)V[4]; - eAmpereFlow = 1 + eStacksDataOutputs.size()*eDataAccessHatches.size(); + mEUt = -(int) V[4]; + eAmpereFlow = 1 + eStacksDataOutputs.size() * eDataAccessHatches.size(); mMaxProgresstime = 20; mEfficiencyIncrease = 10000; return true; @@ -127,24 +128,24 @@ public class GT_MetaTileEntity_EM_dataBank extends GT_MetaTileEntity_MultiblockB @Override public void outputAfterRecipe_EM() { - ArrayList stacks=new ArrayList<>(); - for(GT_MetaTileEntity_Hatch_DataAccess dataAccess:eDataAccessHatches){ - int count=dataAccess.getSizeInventory(); - for(int i=0;i stacks = new ArrayList<>(); + for (GT_MetaTileEntity_Hatch_DataAccess dataAccess : eDataAccessHatches) { + int count = dataAccess.getSizeInventory(); + for (int i = 0; i < count; i++) { + ItemStack stack = dataAccess.getStackInSlot(i); + if (stack != null) { stacks.add(stack); } } } - if(stacks.size()>0){ - ItemStack[] arr=stacks.toArray(nullItem); - for(GT_MetaTileEntity_Hatch_OutputDataItems hatch:eStacksDataOutputs){ - hatch.q=new InventoryDataPacket(arr); + if (stacks.size() > 0) { + ItemStack[] arr = stacks.toArray(nullItem); + for (GT_MetaTileEntity_Hatch_OutputDataItems hatch : eStacksDataOutputs) { + hatch.q = new InventoryDataPacket(arr); } - }else{ - for(GT_MetaTileEntity_Hatch_OutputDataItems hatch:eStacksDataOutputs){ - hatch.q=null; + } else { + for (GT_MetaTileEntity_Hatch_OutputDataItems hatch : eStacksDataOutputs) { + hatch.q = null; } } } @@ -153,8 +154,8 @@ public class GT_MetaTileEntity_EM_dataBank extends GT_MetaTileEntity_MultiblockB public String[] getDescription() { return new String[]{ CommonValues.TEC_MARK_EM, - "Remote assembly data delivery", - EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "Apply directly to the forehead" + translateToLocal("gt.blockmachines.multimachine.em.databank.desc.0"),//Remote assembly data delivery + EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + translateToLocal("gt.blockmachines.multimachine.em.databank.desc.1")//Apply directly to the forehead }; } @@ -170,10 +171,10 @@ public class GT_MetaTileEntity_EM_dataBank extends GT_MetaTileEntity_MultiblockB if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_OutputDataItems) { ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); return eStacksDataOutputs.add((GT_MetaTileEntity_Hatch_OutputDataItems) aMetaTileEntity); - }else if(aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_DataAccess && !(aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputDataItems)){ + } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_DataAccess && !(aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputDataItems)) { ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); return eDataAccessHatches.add((GT_MetaTileEntity_Hatch_DataAccess) aMetaTileEntity); } return false; } -} +} \ No newline at end of file diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantizer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantizer.java index 011105356a..e682c77702 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantizer.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantizer.java @@ -31,6 +31,7 @@ import static com.github.technus.tectech.mechanics.elementalMatter.definitions.c import static com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.dAtomDefinition.refUnstableMass; import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset; import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT; +import static net.minecraft.util.StatCollector.translateToLocal; /** * Created by danie_000 on 17.12.2016. @@ -55,10 +56,10 @@ public class GT_MetaTileEntity_EM_dequantizer extends GT_MetaTileEntity_Multiblo private static final Block[] blockTypeFallback = new Block[]{sBlockCasingsTT, sBlockCasingsTT, sBlockCasingsTT}; private static final byte[] blockMetaFallback = new byte[]{0, 4, 4}; private static final String[] description = new String[]{ - EnumChatFormatting.AQUA + "Hint Details:", - "1 - Classic Hatches or High Power Casing", - "2 - Elemental Input Hatch", - "3 - Elemental Overflow Hatches or Molecular Casing", + EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":", + translateToLocal("gt.blockmachines.multimachine.em.emtomatter.hint.0"),//1 - Classic Hatches or High Power Casing" + translateToLocal("gt.blockmachines.multimachine.em.emtomatter.hint.1"),//2 - Elemental Input Hatch + translateToLocal("gt.blockmachines.multimachine.em.emtomatter.hint.2"),//3 - Elemental Overflow Hatches or Molecular Casing }; //endregion @@ -72,7 +73,7 @@ public class GT_MetaTileEntity_EM_dequantizer extends GT_MetaTileEntity_Multiblo @Override @SideOnly(Side.CLIENT) - protected ResourceLocation getActivitySound(){ + protected ResourceLocation getActivitySound() { return GT_MetaTileEntity_EM_quantizer.activitySound; } @@ -88,7 +89,7 @@ public class GT_MetaTileEntity_EM_dequantizer extends GT_MetaTileEntity_Multiblo @Override public void construct(int stackSize, boolean hintsOnly) { - StructureBuilderExtreme(shape, blockType, blockMeta, 1, 1, 0, getBaseMetaTileEntity(),this, hintsOnly); + StructureBuilderExtreme(shape, blockType, blockMeta, 1, 1, 0, getBaseMetaTileEntity(), this, hintsOnly); } @Override @@ -105,7 +106,7 @@ public class GT_MetaTileEntity_EM_dequantizer extends GT_MetaTileEntity_Multiblo if (info != null) { if (map.removeAllAmounts(false, (iHasElementalDefinition) info.input())) { mOutputFluids = new FluidStack[]{(FluidStack) info.output()}; - startRecipe((iHasElementalDefinition) info.input(),stack.getEnergy()); + startRecipe((iHasElementalDefinition) info.input(), stack.getEnergy()); return true; } } @@ -114,7 +115,7 @@ public class GT_MetaTileEntity_EM_dequantizer extends GT_MetaTileEntity_Multiblo if (info != null) { if (map.removeAllAmounts(false, (iHasElementalDefinition) info.input())) { mOutputItems = new ItemStack[]{(ItemStack) info.output()}; - startRecipe((iHasElementalDefinition) info.input(),stack.getEnergy()); + startRecipe((iHasElementalDefinition) info.input(), stack.getEnergy()); return true; } } @@ -125,7 +126,7 @@ public class GT_MetaTileEntity_EM_dequantizer extends GT_MetaTileEntity_Multiblo ArrayList items = OreDictionary.getOres(((aOredictDequantizationInfo) info).out); if (items != null && !items.isEmpty()) { mOutputItems = new ItemStack[]{items.get(0)}; - startRecipe((iHasElementalDefinition) info.input(),stack.getEnergy()); + startRecipe((iHasElementalDefinition) info.input(), stack.getEnergy()); return true; } } @@ -152,8 +153,8 @@ public class GT_MetaTileEntity_EM_dequantizer extends GT_MetaTileEntity_Multiblo public String[] getDescription() { return new String[]{ CommonValues.TEC_MARK_EM, - "Transform quantum form back to...", - EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "regular one, but why?" + translateToLocal("gt.blockmachines.multimachine.em.emtomatter.desc.0"),//Transform quantum form back to... + EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + translateToLocal("gt.blockmachines.multimachine.em.emtomatter.desc.1")//regular one, but why? }; } -} +} \ No newline at end of file diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_junction.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_junction.java index 337afd4f32..9d431e3bc3 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_junction.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_junction.java @@ -22,6 +22,7 @@ import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.texture import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT; import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.*; import static gregtech.api.enums.GT_Values.E; +import static net.minecraft.util.StatCollector.translateToLocal; /** * Created by danie_000 on 17.12.2016. @@ -42,38 +43,38 @@ public class GT_MetaTileEntity_EM_junction extends GT_MetaTileEntity_MultiblockB {"A!!!", "!000!", "!000!", "!000!", "A!!!",}, {"A!!!", "!!!!!", "!!!!!", "!!!!!", "A!!!",}, }; - private static final Block[] blockType = new Block[]{sBlockCasingsTT,sBlockCasingsTT}; - private static final byte[] blockMeta = new byte[]{4,5}; + private static final Block[] blockType = new Block[]{sBlockCasingsTT, sBlockCasingsTT}; + private static final byte[] blockMeta = new byte[]{4, 5}; private final IHatchAdder[] addingMethods = new IHatchAdder[]{this::addClassicToMachineList, this::addElementalToMachineList}; private static final short[] casingTextures = new short[]{textureOffset, textureOffset + 4}; private static final Block[] blockTypeFallback = new Block[]{sBlockCasingsTT, sBlockCasingsTT}; private static final byte[] blockMetaFallback = new byte[]{0, 4}; private static final String[] description = new String[]{ - EnumChatFormatting.AQUA+"Hint Details:", - "1 - Classic Hatches or High Power Casing", - "2 - Elemental Hatches or Molecular Casing", + EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":", + translateToLocal("gt.blockmachines.multimachine.em.junction.hint.0"),//1 - Classic Hatches or High Power Casing + translateToLocal("gt.blockmachines.multimachine.em.junction.hint.1"),//2 - Elemental Hatches or Molecular Casing }; //endregion //region parameters - private static final INameFunction ROUTE_NAME= - (base,p)->(p.parameterId()==0?"Source ":"Destination ")+p.hatchId(); + private static final INameFunction ROUTE_NAME = + (base, p) -> (p.parameterId() == 0 ? translateToLocal("tt.keyword.Source") + " " : translateToLocal("tt.keyword.Destination") + " ") + p.hatchId(); private static final IStatusFunction SRC_STATUS = - (base,p)-> { + (base, p) -> { double v = p.get(); if (Double.isNaN(v)) return STATUS_WRONG; - v=(int)v; + v = (int) v; if (v < 0) return STATUS_TOO_LOW; if (v == 0) return STATUS_NEUTRAL; if (v >= base.eInputHatches.size()) return STATUS_TOO_HIGH; return STATUS_OK; }; private static final IStatusFunction DST_STATUS = - (base,p)->{ - if(base.src[p.hatchId()].getStatus(false)== STATUS_OK){ + (base, p) -> { + if (base.src[p.hatchId()].getStatus(false) == STATUS_OK) { double v = p.get(); if (Double.isNaN(v)) return STATUS_WRONG; - v=(int)v; + v = (int) v; if (v < 0) return STATUS_TOO_LOW; if (v == 0) return STATUS_LOW; if (v >= base.eInputHatches.size()) return STATUS_TOO_HIGH; @@ -95,8 +96,8 @@ public class GT_MetaTileEntity_EM_junction extends GT_MetaTileEntity_MultiblockB @Override protected void parametersInstantiation_EM() { - src=new Parameters.Group.ParameterIn[10]; - dst=new Parameters.Group.ParameterIn[10]; + src = new Parameters.Group.ParameterIn[10]; + dst = new Parameters.Group.ParameterIn[10]; for (int i = 0; i < 10; i++) { Parameters.Group hatch = parametrization.getGroup(i); src[i] = hatch.makeInParameter(0, i, ROUTE_NAME, SRC_STATUS); @@ -111,10 +112,10 @@ public class GT_MetaTileEntity_EM_junction extends GT_MetaTileEntity_MultiblockB @Override public boolean checkMachine_EM(IGregTechTileEntity iGregTechTileEntity, ItemStack itemStack) { - int meta=iGregTechTileEntity.getMetaIDAtSide(GT_Utility.getOppositeSide(iGregTechTileEntity.getFrontFacing())); - if(meta==4){ + int meta = iGregTechTileEntity.getMetaIDAtSide(GT_Utility.getOppositeSide(iGregTechTileEntity.getFrontFacing())); + if (meta == 4) { return structureCheck_EM(shape, blockType, blockMeta, addingMethods, casingTextures, blockTypeFallback, blockMetaFallback, 1, 1, 0); - }else if(meta==5){ + } else if (meta == 5) { return structureCheck_EM(shapeBig, blockType, blockMeta, addingMethods, casingTextures, blockTypeFallback, blockMetaFallback, 2, 2, 0); } return false; @@ -122,7 +123,7 @@ public class GT_MetaTileEntity_EM_junction extends GT_MetaTileEntity_MultiblockB @Override public void construct(int stackSize, boolean hintsOnly) { - StructureBuilderExtreme(shape, blockType, blockMeta,1, 1, 0, getBaseMetaTileEntity(),this,hintsOnly); + StructureBuilderExtreme(shape, blockType, blockMeta, 1, 1, 0, getBaseMetaTileEntity(), this, hintsOnly); } @Override @@ -134,8 +135,8 @@ public class GT_MetaTileEntity_EM_junction extends GT_MetaTileEntity_MultiblockB public String[] getDescription() { return new String[]{ CommonValues.TEC_MARK_EM, - "Reroutes Matter", - EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "Axis aligned movement!" + translateToLocal("gt.blockmachines.multimachine.em.junction.desc.0"),//Reroutes Matter + EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + translateToLocal("gt.blockmachines.multimachine.em.junction.desc.1")//Axis aligned movement! }; } @@ -155,18 +156,18 @@ public class GT_MetaTileEntity_EM_junction extends GT_MetaTileEntity_MultiblockB @Override public void outputAfterRecipe_EM() { - double src,dst; + double src, dst; for (int i = 0; i < 10; i++) { - src= this.src[i].get(); - dst= this.dst[i].get(); - if(Double.isNaN(src) || Double.isNaN(dst)) { + src = this.src[i].get(); + dst = this.dst[i].get(); + if (Double.isNaN(src) || Double.isNaN(dst)) { continue; } - int inIndex = (int)src - 1; + int inIndex = (int) src - 1; if (inIndex < 0 || inIndex >= eInputHatches.size()) { continue; } - int outIndex = (int)dst - 1; + int outIndex = (int) dst - 1; GT_MetaTileEntity_Hatch_InputElemental in = eInputHatches.get(inIndex); if (outIndex == -1) {//param==0 -> null the content cleanHatchContentEM_EM(in); @@ -180,4 +181,4 @@ public class GT_MetaTileEntity_EM_junction extends GT_MetaTileEntity_MultiblockB } } } -} +} \ No newline at end of file diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java index 7f983b798c..ee327bed51 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java @@ -40,6 +40,7 @@ import static com.github.technus.tectech.recipe.TT_recipeAdder.nullFluid; import static com.github.technus.tectech.recipe.TT_recipeAdder.nullItem; import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset; import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT; +import static net.minecraft.util.StatCollector.translateToLocal; /** * Created by danie_000 on 17.12.2016. @@ -63,10 +64,10 @@ public class GT_MetaTileEntity_EM_quantizer extends GT_MetaTileEntity_Multiblock private static final Block[] blockTypeFallback = new Block[]{sBlockCasingsTT, sBlockCasingsTT, sBlockCasingsTT}; private static final byte[] blockMetaFallback = new byte[]{0, 4, 4}; private static final String[] description = new String[]{ - EnumChatFormatting.AQUA+"Hint Details:", - "1 - Classic Hatches or High Power Casing", - "2 - Elemental Output Hatch", - "3 - Elemental Overflow Hatches or Molecular Casing", + EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":", + translateToLocal("gt.blockmachines.multimachine.em.mattertoem.hint.0"),//1 - Classic Hatches or High Power Casing + translateToLocal("gt.blockmachines.multimachine.em.mattertoem.hint.1"),//2 - Elemental Output Hatch + translateToLocal("gt.blockmachines.multimachine.em.mattertoem.hint.2"),//3 - Elemental Overflow Hatches or Molecular Casing }; //endregion @@ -78,11 +79,11 @@ public class GT_MetaTileEntity_EM_quantizer extends GT_MetaTileEntity_Multiblock super(aName); } - public final static ResourceLocation activitySound=new ResourceLocation(Reference.MODID+":fx_mid_freq"); + public final static ResourceLocation activitySound = new ResourceLocation(Reference.MODID + ":fx_mid_freq"); @Override @SideOnly(Side.CLIENT) - protected ResourceLocation getActivitySound(){ + protected ResourceLocation getActivitySound() { return activitySound; } @@ -98,7 +99,7 @@ public class GT_MetaTileEntity_EM_quantizer extends GT_MetaTileEntity_Multiblock @Override public void construct(int stackSize, boolean hintsOnly) { - StructureBuilderExtreme(shape, blockType, blockMeta, 1, 1, 0, getBaseMetaTileEntity(),this,hintsOnly); + StructureBuilderExtreme(shape, blockType, blockMeta, 1, 1, 0, getBaseMetaTileEntity(), this, hintsOnly); } @Override @@ -110,8 +111,8 @@ public class GT_MetaTileEntity_EM_quantizer extends GT_MetaTileEntity_Multiblock public String[] getDescription() { return new String[]{ CommonValues.TEC_MARK_EM, - "Conveniently convert regular stuff into quantum form.", - EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "To make it more inconvenient." + translateToLocal("gt.blockmachines.multimachine.em.mattertoem.desc.0"),//Conveniently convert regular stuff into quantum form. + EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + translateToLocal("gt.blockmachines.multimachine.em.mattertoem.desc.1")//To make it more inconvenient. }; } @@ -204,4 +205,4 @@ public class GT_MetaTileEntity_EM_quantizer extends GT_MetaTileEntity_Multiblock eOutputHatches.get(0).getContainerHandler().putUnifyAll(outputEM[0]); outputEM = null; } -} +} \ No newline at end of file diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java index 11be32f9a5..0a2e06ac7d 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java @@ -42,6 +42,7 @@ import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBloc import static com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_crafting.crafter; import static com.github.technus.tectech.thing.metaTileEntity.multi.em_machine.GT_MetaTileEntity_EM_machine.machine; import static gregtech.api.enums.GT_Values.E; +import static net.minecraft.util.StatCollector.translateToLocal; /** * Created by danie_000 on 17.12.2016. @@ -71,7 +72,7 @@ public class GT_MetaTileEntity_EM_research extends GT_MetaTileEntity_MultiblockB private static final Block[] blockTypeFallback = new Block[]{sBlockCasingsTT, Blocks.air}; private static final byte[] blockMetaFallback = new byte[]{1, 0}; private static final String[] description = new String[]{ - EnumChatFormatting.AQUA+"Hint Details:", + EnumChatFormatting.AQUA+translateToLocal("tt.keyphrase.Hint_Details") + ":", "1 - Classic/Data Hatches or Computer casing", "2 - Holder Hatch", }; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java index 96132a889e..a7f4c84f41 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java @@ -45,15 +45,16 @@ import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.texture import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT; import static com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_crafting.crafter; import static com.github.technus.tectech.thing.metaTileEntity.multi.em_machine.GT_MetaTileEntity_EM_machine.machine; +import static net.minecraft.util.StatCollector.translateToLocal; /** * Created by danie_000 on 17.12.2016. */ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBase_EM implements IConstructable { - public static final int SCAN_DO_NOTHING=0, - SCAN_GET_NOMENCLATURE=1,SCAN_GET_DEPTH_LEVEL=2,SCAN_GET_AMOUNT=4,SCAN_GET_CHARGE=8, - SCAN_GET_MASS=16,SCAN_GET_ENERGY_LEVEL=32,SCAN_GET_TIMESPAN_INFO=64,SCAN_GET_ENERGY_STATES=128, - SCAN_GET_COLOR=256,SCAN_GET_AGE=512,SCAN_GET_TIMESPAN_MULT=1024,SCAN_GET_CLASS_TYPE=2048; + public static final int SCAN_DO_NOTHING = 0, + SCAN_GET_NOMENCLATURE = 1, SCAN_GET_DEPTH_LEVEL = 2, SCAN_GET_AMOUNT = 4, SCAN_GET_CHARGE = 8, + SCAN_GET_MASS = 16, SCAN_GET_ENERGY_LEVEL = 32, SCAN_GET_TIMESPAN_INFO = 64, SCAN_GET_ENERGY_STATES = 128, + SCAN_GET_COLOR = 256, SCAN_GET_AGE = 512, SCAN_GET_TIMESPAN_MULT = 1024, SCAN_GET_CLASS_TYPE = 2048; private TT_recipe.TT_EMRecipe.TT_EMRecipe eRecipe; private cElementalDefinitionStack objectResearched; @@ -63,18 +64,18 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa private int[] scanComplexity; //region parameters - private static final INameFunction CONFIG_NAME= - (base,p)->"Config at Depth: "+(p.hatchId()*2+p.parameterId()); - private static final IStatusFunction CONFIG_STATUS= - (base,p)->{ - double v=p.get(); - if(Double.isNaN(v)){ + private static final INameFunction CONFIG_NAME = + (base, p) -> "Config at Depth: " + (p.hatchId() * 2 + p.parameterId()); + private static final IStatusFunction CONFIG_STATUS = + (base, p) -> { + double v = p.get(); + if (Double.isNaN(v)) { return LedStatus.STATUS_WRONG; } - v=(int)v; - if(v==0) return LedStatus.STATUS_NEUTRAL; - if(v>=SCAN_GET_CLASS_TYPE) return LedStatus.STATUS_TOO_HIGH; - if(v<0) return LedStatus.STATUS_TOO_LOW; + v = (int) v; + if (v == 0) return LedStatus.STATUS_NEUTRAL; + if (v >= SCAN_GET_CLASS_TYPE) return LedStatus.STATUS_TOO_HIGH; + if (v < 0) return LedStatus.STATUS_TOO_LOW; return LedStatus.STATUS_OK; }; protected Parameters.Group.ParameterIn[] scanConfiguration; @@ -102,31 +103,31 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa private static final Block[] blockTypeFallback = new Block[]{sBlockCasingsTT, sBlockCasingsTT, sBlockCasingsTT, sBlockCasingsTT}; private static final byte[] blockMetaFallback = new byte[]{0, 4, 4, 4}; private static final String[] description = new String[]{ - EnumChatFormatting.AQUA+"Hint Details:", - "1 - Classic Hatches or High Power Casing", - "2 - Elemental Input Hatches or Molecular Casing", - "3 - Elemental Output Hatches or Molecular Casing", - "4 - Elemental Overflow Hatches or Molecular Casing", + EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":", + translateToLocal("gt.blockmachines.multimachine.em.scanner.hint.0"),//1 - Classic Hatches or High Power Casing + translateToLocal("gt.blockmachines.multimachine.em.scanner.hint.1"),//2 - Elemental Input Hatches or Molecular Casing + translateToLocal("gt.blockmachines.multimachine.em.scanner.hint.2"),//3 - Elemental Output Hatches or Molecular Casing + translateToLocal("gt.blockmachines.multimachine.em.scanner.hint.3"),//4 - Elemental Overflow Hatches or Molecular Casing }; //endregion public GT_MetaTileEntity_EM_scanner(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional); - eDismantleBoom=true; + eDismantleBoom = true; } public GT_MetaTileEntity_EM_scanner(String aName) { super(aName); - eDismantleBoom=true; + eDismantleBoom = true; } @Override protected void parametersInstantiation_EM() { - scanConfiguration=new Parameters.Group.ParameterIn[20]; + scanConfiguration = new Parameters.Group.ParameterIn[20]; for (int i = 0; i < 10; i++) { Parameters.Group hatch = parametrization.getGroup(i); - scanConfiguration[i*2] = hatch.makeInParameter(0, 0, CONFIG_NAME, CONFIG_STATUS); - scanConfiguration[i*2+1] = hatch.makeInParameter(1, 0, CONFIG_NAME, CONFIG_STATUS); + scanConfiguration[i * 2] = hatch.makeInParameter(0, 0, CONFIG_NAME, CONFIG_STATUS); + scanConfiguration[i * 2 + 1] = hatch.makeInParameter(1, 0, CONFIG_NAME, CONFIG_STATUS); } } @@ -145,7 +146,7 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa @Override public void construct(int stackSize, boolean hintsOnly) { - StructureBuilderExtreme(shape, blockType, blockMeta,2, 2, 0, getBaseMetaTileEntity(),this,hintsOnly); + StructureBuilderExtreme(shape, blockType, blockMeta, 2, 2, 0, getBaseMetaTileEntity(), this, hintsOnly); } @Override @@ -157,8 +158,8 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa public String[] getDescription() { return new String[]{ CommonValues.TEC_MARK_EM, - "What is existing here?", - EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "I HAVE NO IDEA (yet)!" + "",//What is existing here? + EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + ""//I HAVE NO IDEA (yet)! }; } @@ -167,17 +168,17 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa super.saveNBTData(aNBT); aNBT.setLong("eComputationRemaining", totalComputationRemaining); aNBT.setLong("eComputationRequired", totalComputationRequired); - if(objectResearched!=null) { + if (objectResearched != null) { aNBT.setTag("eObject", objectResearched.toNBT()); } else { aNBT.removeTag("eObject"); } - if(scanComplexity!=null) { + if (scanComplexity != null) { aNBT.setIntArray("eScanComplexity", scanComplexity); } else { aNBT.removeTag("eScanComplexity"); } - if(objectsScanned!=null) { + if (objectsScanned != null) { aNBT.setTag("eScanObjects", objectsScanned.toNBT()); } else { aNBT.removeTag("eScanObjects"); @@ -187,17 +188,17 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa @Override public void loadNBTData(NBTTagCompound aNBT) { super.loadNBTData(aNBT); - totalComputationRemaining =aNBT.getLong("eComputationRemaining"); - totalComputationRequired =aNBT.getLong("eComputationRequired"); - if(aNBT.hasKey("eObject")) { + totalComputationRemaining = aNBT.getLong("eComputationRemaining"); + totalComputationRequired = aNBT.getLong("eComputationRequired"); + if (aNBT.hasKey("eObject")) { objectResearched = cElementalDefinitionStack.fromNBT(aNBT.getCompoundTag("eObject")); - if(objectResearched.definition==nbtE__) { + if (objectResearched.definition == nbtE__) { objectResearched = null; } - }else { + } else { objectResearched = null; } - if(aNBT.hasKey("eScanComplexity")) { + if (aNBT.hasKey("eScanComplexity")) { scanComplexity = aNBT.getIntArray("eScanComplexity"); } else { scanComplexity = null; @@ -206,25 +207,25 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa if (aNBT.hasKey("eScanObjects")) { objectsScanned = cElementalInstanceStackMap.fromNBT(aNBT.getCompoundTag("eScanObjects")); } - }catch (tElementalException e){ - objectsScanned=new cElementalInstanceStackMap(); + } catch (tElementalException e) { + objectsScanned = new cElementalInstanceStackMap(); } } @Override public void onPreTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { - if(aBaseMetaTileEntity.isActive() && (aTick & 0x2)==0 && aBaseMetaTileEntity.isClientSide()){ - int xDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetX*4+aBaseMetaTileEntity.getXCoord(); - int yDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetY*4+aBaseMetaTileEntity.getYCoord(); - int zDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetZ*4+aBaseMetaTileEntity.getZCoord(); - aBaseMetaTileEntity.getWorld().markBlockRangeForRenderUpdate(xDir,yDir,zDir,xDir,yDir,zDir); + if (aBaseMetaTileEntity.isActive() && (aTick & 0x2) == 0 && aBaseMetaTileEntity.isClientSide()) { + int xDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetX * 4 + aBaseMetaTileEntity.getXCoord(); + int yDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetY * 4 + aBaseMetaTileEntity.getYCoord(); + int zDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetZ * 4 + aBaseMetaTileEntity.getZCoord(); + aBaseMetaTileEntity.getWorld().markBlockRangeForRenderUpdate(xDir, yDir, zDir, xDir, yDir, zDir); } } @Override public void onFirstTick_EM(IGregTechTileEntity aBaseMetaTileEntity) { - if(aBaseMetaTileEntity.isServerSide()) { - if (totalComputationRemaining > 0 && objectResearched!=null) { + if (aBaseMetaTileEntity.isServerSide()) { + if (totalComputationRemaining > 0 && objectResearched != null) { eRecipe = null; if (ItemList.Tool_DataOrb.isStackEqual(mInventory[1], false, true)) { eRecipe = TT_recipe.TT_Recipe_Map_EM.sMachineRecipesEM.findRecipe(objectResearched.definition); @@ -240,7 +241,7 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa if (eRecipe == null) { quantumStuff(false); objectResearched = null; - eRequiredData=0; + eRequiredData = 0; totalComputationRequired = totalComputationRemaining = 0; mMaxProgresstime = 0; mEfficiencyIncrease = 0; @@ -253,27 +254,27 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa @Override public boolean checkRecipe_EM(ItemStack itemStack) { - eRecipe=null; - if(!eInputHatches.isEmpty() && eInputHatches.get(0).getContainerHandler().hasStacks() && !eOutputHatches.isEmpty()) { + eRecipe = null; + if (!eInputHatches.isEmpty() && eInputHatches.get(0).getContainerHandler().hasStacks() && !eOutputHatches.isEmpty()) { cElementalInstanceStackMap researchEM = eInputHatches.get(0).getContainerHandler(); - if(ItemList.Tool_DataOrb.isStackEqual(itemStack, false, true)) { - GT_Recipe scannerRecipe=null; - for(cElementalInstanceStack stackEM:researchEM.values()){ - objectsScanned=null; + if (ItemList.Tool_DataOrb.isStackEqual(itemStack, false, true)) { + GT_Recipe scannerRecipe = null; + for (cElementalInstanceStack stackEM : researchEM.values()) { + objectsScanned = null; eRecipe = TT_recipe.TT_Recipe_Map_EM.sMachineRecipesEM.findRecipe(stackEM.definition); - if(eRecipe!=null) { - scannerRecipe=eRecipe.scannerRecipe; - machineType= machine; - objectResearched=new cElementalDefinitionStack(stackEM.definition,1); + if (eRecipe != null) { + scannerRecipe = eRecipe.scannerRecipe; + machineType = machine; + objectResearched = new cElementalDefinitionStack(stackEM.definition, 1); //cleanMassEM_EM(objectResearched.getMass()); researchEM.remove(objectResearched.definition); break; } eRecipe = TT_recipe.TT_Recipe_Map_EM.sCrafterRecipesEM.findRecipe(stackEM.definition); - if(eRecipe!=null) { - scannerRecipe=eRecipe.scannerRecipe; - machineType= crafter; - objectResearched=new cElementalDefinitionStack(stackEM.definition,1); + if (eRecipe != null) { + scannerRecipe = eRecipe.scannerRecipe; + machineType = crafter; + objectResearched = new cElementalDefinitionStack(stackEM.definition, 1); //cleanMassEM_EM(objectResearched.getMass()); researchEM.remove(objectResearched.definition); break; @@ -281,7 +282,7 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa cleanStackEM_EM(stackEM); researchEM.remove(stackEM.definition); } - if(eRecipe!=null && scannerRecipe!=null){//todo make sure it werks + if (eRecipe != null && scannerRecipe != null) {//todo make sure it werks totalComputationRequired = totalComputationRemaining = scannerRecipe.mDuration * 20L; mMaxProgresstime = 20;//const mEfficiencyIncrease = 10000; @@ -291,39 +292,39 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa quantumStuff(true); return true; } - }else if(CustomItemList.scanContainer.isStackEqual(itemStack, false, true)) { - eRecipe=null; - if(researchEM.hasStacks()) { + } else if (CustomItemList.scanContainer.isStackEqual(itemStack, false, true)) { + eRecipe = null; + if (researchEM.hasStacks()) { objectsScanned = researchEM.takeAllToNewMap(); cleanMassEM_EM(objectsScanned.getMass()); - totalComputationRequired =0; - eRequiredData=0; - eAmpereFlow=objectsScanned.size() + TecTech.RANDOM.next(objectsScanned.size()); - mEUt=-(int)V[8]; + totalComputationRequired = 0; + eRequiredData = 0; + eAmpereFlow = objectsScanned.size() + TecTech.RANDOM.next(objectsScanned.size()); + mEUt = -(int) V[8]; //get depth scan complexity array { int[] scanComplexityTemp = new int[20]; for (int i = 0; i < 20; i++) { - scanComplexityTemp[i]=(int)scanConfiguration[i].get(); + scanComplexityTemp[i] = (int) scanConfiguration[i].get(); } int maxDepth = 0; for (int i = 0; i < 20; i++) { if (scanComplexityTemp[i] != SCAN_DO_NOTHING) { maxDepth = i; - if(!DEBUG_MODE) { + if (!DEBUG_MODE) { scanComplexityTemp[i] &= ~SCAN_GET_CLASS_TYPE; } - addComputationRequirements(i+1,scanComplexityTemp[i]); + addComputationRequirements(i + 1, scanComplexityTemp[i]); } } - maxDepth+=1;//from index to len + maxDepth += 1;//from index to len scanComplexity = new int[maxDepth]; - System.arraycopy(scanComplexityTemp,0,scanComplexity,0,maxDepth); + System.arraycopy(scanComplexityTemp, 0, scanComplexity, 0, maxDepth); } - totalComputationRemaining = totalComputationRequired*=20; + totalComputationRemaining = totalComputationRequired *= 20; mMaxProgresstime = 20;//const mEfficiencyIncrease = 10000; quantumStuff(true); @@ -332,96 +333,96 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa } } quantumStuff(false); - objectResearched=null; - totalComputationRemaining =0; + objectResearched = null; + totalComputationRemaining = 0; return false; } - private void addComputationRequirements(int depthPlus, int capabilities){ - if(areBitsSet(SCAN_GET_NOMENCLATURE,capabilities)){ - totalComputationRequired +=depthPlus*5L; - eRequiredData+=depthPlus; + private void addComputationRequirements(int depthPlus, int capabilities) { + if (areBitsSet(SCAN_GET_NOMENCLATURE, capabilities)) { + totalComputationRequired += depthPlus * 5L; + eRequiredData += depthPlus; } - if(areBitsSet(SCAN_GET_DEPTH_LEVEL,capabilities)){ - totalComputationRequired +=depthPlus*10L; - eRequiredData+=depthPlus; + if (areBitsSet(SCAN_GET_DEPTH_LEVEL, capabilities)) { + totalComputationRequired += depthPlus * 10L; + eRequiredData += depthPlus; } - if(areBitsSet(SCAN_GET_AMOUNT,capabilities)){ - totalComputationRequired +=depthPlus*64L; - eRequiredData+=depthPlus*8L; + if (areBitsSet(SCAN_GET_AMOUNT, capabilities)) { + totalComputationRequired += depthPlus * 64L; + eRequiredData += depthPlus * 8L; } - if(areBitsSet(SCAN_GET_CHARGE,capabilities)){ - totalComputationRequired +=depthPlus*128L; - eRequiredData+=depthPlus*4L; + if (areBitsSet(SCAN_GET_CHARGE, capabilities)) { + totalComputationRequired += depthPlus * 128L; + eRequiredData += depthPlus * 4L; } - if(areBitsSet(SCAN_GET_MASS,capabilities)){ - totalComputationRequired +=depthPlus*256L; - eRequiredData+=depthPlus*4L; + if (areBitsSet(SCAN_GET_MASS, capabilities)) { + totalComputationRequired += depthPlus * 256L; + eRequiredData += depthPlus * 4L; } - if(areBitsSet(SCAN_GET_ENERGY_LEVEL,capabilities)){ - totalComputationRequired +=depthPlus*512L; - eRequiredData+=depthPlus*16L; + if (areBitsSet(SCAN_GET_ENERGY_LEVEL, capabilities)) { + totalComputationRequired += depthPlus * 512L; + eRequiredData += depthPlus * 16L; } - if(areBitsSet(SCAN_GET_TIMESPAN_INFO,capabilities)){ - totalComputationRequired +=depthPlus*1024L; - eRequiredData+=depthPlus*32L; + if (areBitsSet(SCAN_GET_TIMESPAN_INFO, capabilities)) { + totalComputationRequired += depthPlus * 1024L; + eRequiredData += depthPlus * 32L; } - if(areBitsSet(SCAN_GET_ENERGY_STATES,capabilities)){ - totalComputationRequired +=depthPlus*2048L; - eRequiredData+=depthPlus*32L; + if (areBitsSet(SCAN_GET_ENERGY_STATES, capabilities)) { + totalComputationRequired += depthPlus * 2048L; + eRequiredData += depthPlus * 32L; } - if(areBitsSet(SCAN_GET_COLOR,capabilities)){ - totalComputationRequired +=depthPlus*1024L; - eRequiredData+=depthPlus*48L; + if (areBitsSet(SCAN_GET_COLOR, capabilities)) { + totalComputationRequired += depthPlus * 1024L; + eRequiredData += depthPlus * 48L; } - if(areBitsSet(SCAN_GET_AGE,capabilities)){ - totalComputationRequired +=depthPlus*2048L; - eRequiredData+=depthPlus*64L; + if (areBitsSet(SCAN_GET_AGE, capabilities)) { + totalComputationRequired += depthPlus * 2048L; + eRequiredData += depthPlus * 64L; } - if(areBitsSet(SCAN_GET_TIMESPAN_MULT,capabilities)){ - totalComputationRequired +=depthPlus*2048L; - eRequiredData+=depthPlus*64L; + if (areBitsSet(SCAN_GET_TIMESPAN_MULT, capabilities)) { + totalComputationRequired += depthPlus * 2048L; + eRequiredData += depthPlus * 64L; } } @Override public boolean onRunningTick(ItemStack aStack) { - if(totalComputationRemaining <=0) { - totalComputationRemaining =0; - mProgresstime=mMaxProgresstime; + if (totalComputationRemaining <= 0) { + totalComputationRemaining = 0; + mProgresstime = mMaxProgresstime; return true; - }else{ - totalComputationRemaining -=eAvailableData; - mProgresstime=1; + } else { + totalComputationRemaining -= eAvailableData; + mProgresstime = 1; return super.onRunningTick(aStack); } } @Override public void outputAfterRecipe_EM() { - if (eRecipe != null && ItemList.Tool_DataOrb.isStackEqual(mInventory[1], false, true)){ + if (eRecipe != null && ItemList.Tool_DataOrb.isStackEqual(mInventory[1], false, true)) { - mInventory[1].setStackDisplayName(GT_LanguageManager.getTranslation(eRecipe.mOutputs[0].getDisplayName()) + ' ' + machineType +" Construction Data"); + mInventory[1].setStackDisplayName(GT_LanguageManager.getTranslation(eRecipe.mOutputs[0].getDisplayName()) + ' ' + machineType + " Construction Data"); NBTTagCompound tNBT = mInventory[1].getTagCompound();//code above makes it not null tNBT.setString("eMachineType", machineType); tNBT.setTag(E_RECIPE_ID, objectResearched.toNBT()); - tNBT.setString("author", EnumChatFormatting.BLUE + "Tec" + EnumChatFormatting.DARK_BLUE + "Tech" + EnumChatFormatting.WHITE + ' ' + machineType+ " EM Recipe Generator"); - }else if(objectsScanned!=null && CustomItemList.scanContainer.isStackEqual(mInventory[1], false, true)){ - ElementalDefinitionScanStorage_EM.setContent(mInventory[1],objectsScanned,scanComplexity); + tNBT.setString("author", EnumChatFormatting.BLUE + "Tec" + EnumChatFormatting.DARK_BLUE + "Tech" + EnumChatFormatting.WHITE + ' ' + machineType + " EM Recipe Generator"); + } else if (objectsScanned != null && CustomItemList.scanContainer.isStackEqual(mInventory[1], false, true)) { + ElementalDefinitionScanStorage_EM.setContent(mInventory[1], objectsScanned, scanComplexity); } - objectResearched=null; - totalComputationRemaining =0; + objectResearched = null; + totalComputationRemaining = 0; quantumStuff(false); } @@ -460,7 +461,7 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa " Efficiency: " + EnumChatFormatting.YELLOW + mEfficiency / 100.0F + EnumChatFormatting.RESET + " %", "PowerPass: " + EnumChatFormatting.BLUE + ePowerPass + EnumChatFormatting.RESET + " SafeVoid: " + EnumChatFormatting.BLUE + eSafeVoid, - "Computation Available: " + EnumChatFormatting.GREEN + eAvailableData +EnumChatFormatting.RESET+" / "+EnumChatFormatting.YELLOW + eRequiredData + EnumChatFormatting.RESET, + "Computation Available: " + EnumChatFormatting.GREEN + eAvailableData + EnumChatFormatting.RESET + " / " + EnumChatFormatting.YELLOW + eRequiredData + EnumChatFormatting.RESET, "Computation Remaining:", EnumChatFormatting.GREEN + Long.toString(totalComputationRemaining / 20L) + EnumChatFormatting.RESET + " / " + EnumChatFormatting.YELLOW + totalComputationRequired / 20L @@ -477,20 +478,20 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa public void stopMachine() { quantumStuff(false); super.stopMachine(); - totalComputationRequired = totalComputationRemaining =0; - objectResearched=null; + totalComputationRequired = totalComputationRemaining = 0; + objectResearched = null; } - private void quantumStuff(boolean shouldExist){ - IGregTechTileEntity base=getBaseMetaTileEntity(); - if(base!=null && base.getWorld()!=null) { - int xDir = ForgeDirection.getOrientation(base.getBackFacing()).offsetX * 4+base.getXCoord(); - int yDir = ForgeDirection.getOrientation(base.getBackFacing()).offsetY * 4+base.getYCoord(); - int zDir = ForgeDirection.getOrientation(base.getBackFacing()).offsetZ * 4+base.getZCoord(); + private void quantumStuff(boolean shouldExist) { + IGregTechTileEntity base = getBaseMetaTileEntity(); + if (base != null && base.getWorld() != null) { + int xDir = ForgeDirection.getOrientation(base.getBackFacing()).offsetX * 4 + base.getXCoord(); + int yDir = ForgeDirection.getOrientation(base.getBackFacing()).offsetY * 4 + base.getYCoord(); + int zDir = ForgeDirection.getOrientation(base.getBackFacing()).offsetZ * 4 + base.getZCoord(); Block block = base.getWorld().getBlock(xDir, yDir, zDir); if (shouldExist) { - if(block != null && block.getMaterial()== Material.air) { + if (block != null && block.getMaterial() == Material.air) { base.getWorld().setBlock(xDir, yDir, zDir, QuantumStuffBlock.INSTANCE, 0, 2); } } else { @@ -500,4 +501,4 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa } } } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/tectech/lang/en_US.lang b/src/main/resources/assets/tectech/lang/en_US.lang index 755022d6a3..b9e7b21e4f 100644 --- a/src/main/resources/assets/tectech/lang/en_US.lang +++ b/src/main/resources/assets/tectech/lang/en_US.lang @@ -383,9 +383,30 @@ gt.blockmachines.multimachine.em.computer.cfgo.0=Current max. heat gt.blockmachines.multimachine.em.computer.cfgo.1=Produced computation gt.blockmachines.multimachine.em.databank.name=Data Bank +gt.blockmachines.multimachine.em.databank.hint.0=1 - Classic Hatches or high power casing +gt.blockmachines.multimachine.em.databank.hint.1=2 - Data Access/Data Bank Master Hatches or computer casing +gt.blockmachines.multimachine.em.databank.desc.0=Remote assembly data delivery +gt.blockmachines.multimachine.em.databank.desc.1=Apply directly to the forehead + gt.blockmachines.multimachine.em.junction.name=Matter Junction +gt.blockmachines.multimachine.em.junction.hint.0=1 - Classic Hatches or High Power Casing +gt.blockmachines.multimachine.em.junction.hint.1=2 - Elemental Hatches or Molecular Casing +gt.blockmachines.multimachine.em.junction.desc.0=Reroutes Matter +gt.blockmachines.multimachine.em.junction.desc.1=Axis aligned movement! + gt.blockmachines.multimachine.em.mattertoem.name=Matter Quantizer +gt.blockmachines.multimachine.em.mattertoem.hint.0=1 - Classic Hatches or High Power Casing +gt.blockmachines.multimachine.em.mattertoem.hint.1=2 - Elemental Output Hatch +gt.blockmachines.multimachine.em.mattertoem.hint.2=3 - Elemental Overflow Hatches or Molecular Casing +gt.blockmachines.multimachine.em.mattertoem.desc.0=Conveniently convert regular stuff into quantum form. +gt.blockmachines.multimachine.em.mattertoem.desc.1=To make it more inconvenient. + gt.blockmachines.multimachine.em.emtomatter.name=Matter Dequantizer +gt.blockmachines.multimachine.em.emtomatter.hint.0=1 - Classic Hatches or High Power Casing" +gt.blockmachines.multimachine.em.emtomatter.hint.1=2 - Elemental Input Hatch +gt.blockmachines.multimachine.em.emtomatter.hint.2=3 - Elemental Overflow Hatches or Molecular Casing +gt.blockmachines.multimachine.em.emtomatter.desc.0=Transform quantum form back to... +gt.blockmachines.multimachine.em.emtomatter.desc.1=regular one, but why? gt.blockmachines.multimachine.em.emtoessentia.name=Essentia Dequantizer gt.blockmachines.multimachine.em.emtoessentia.hint.0=1 - Classic Hatches or High Power Casing @@ -404,17 +425,34 @@ gt.blockmachines.multimachine.em.essentiatoem.desc.0=Conveniently convert regula gt.blockmachines.multimachine.em.essentiatoem.desc.1=To make it more inconvenient. gt.blockmachines.multimachine.em.scanner.name=Elemental Scanner +gt.blockmachines.multimachine.em.scanner.hint.0=1 - Classic Hatches or High Power Casing +gt.blockmachines.multimachine.em.scanner.hint.1=2 - Elemental Input Hatches or Molecular Casing +gt.blockmachines.multimachine.em.scanner.hint.2=3 - Elemental Output Hatches or Molecular Casing +gt.blockmachines.multimachine.em.scanner.hint.3=4 - Elemental Overflow Hatches or Molecular Casing +gt.blockmachines.multimachine.em.scanner.desc.0=What is existing here? +gt.blockmachines.multimachine.em.scanner.desc.1=I HAVE NO IDEA (yet)! + gt.blockmachines.multimachine.em.research.name=Research station + gt.blockmachines.multimachine.em.collider.name=Matter Collider + gt.blockmachines.multimachine.em.infuser.name=Energy Infuser + gt.blockmachines.multimachine.em.processing.name=Quantum Processing Machine + gt.blockmachines.multimachine.em.crafter.name=Matter Assembler + gt.blockmachines.multimachine.em.stabilizer.name=Elemental Stabilizer + gt.blockmachines.multimachine.em.wormhole.name=Wormhole + gt.blockmachines.multimachine.em.decay.name=Decay Generator + gt.blockmachines.multimachine.em.annihilation.name=Annihilation Generator + gt.blockmachines.multimachine.em.blackholegenerator.name=Black Hole Generator + #Keywords and phrases tt.keyword.Air=Air tt.keyword.Earth=Earth @@ -433,6 +471,7 @@ tt.keyword.BOOM=BOOM! tt.keyword.ID=ID tt.keyword.Destination=Destination tt.keyword.Weight=Weight +tt.keyword.Source=Source tt.keyphrase.LIFE_TIME=LIFE TIME tt.keyphrase.CARRIES_COLOR=CARRIES COLOR diff --git a/src/main/resources/assets/tectech/lang/ru_RU.lang b/src/main/resources/assets/tectech/lang/ru_RU.lang deleted file mode 100644 index 1d78cd54bf..0000000000 --- a/src/main/resources/assets/tectech/lang/ru_RU.lang +++ /dev/null @@ -1,448 +0,0 @@ -#Creative Tab Name -itemGroup.TecTech=TecTech Interdimensional -#Blocks -tile.quantumGlass.name=Quantum Glass -tile.quantumStuff.name=Quantum Stuff -#Items -item.em.debugContainer.name=Debug EM Container -item.em.definitionContainer.name=EM Recipe Hint -item.em.definitionScanStorage.name=EM Scan Storage -item.em.constructable.name=Multiblock Machine Blueprint -item.em.frontRotate.name=Front Rotation Scrench -item.em.parametrizerMemoryCard.name=Parametrizer Memory Card -item.em.EuMeterGT.name=GT EU meter -item.tm.teslaCover.0.name=Tesla Coil Cover -item.tm.teslaCover.1.name=Tesla Coil Cover Rich Edition -item.tm.teslaStaff.name=Tesla Staff - -item.tm.teslaCoilCapacitor.0.name=LV Tesla Capacitor -item.tm.teslaCoilCapacitor.1.name=MV Tesla Capacitor -item.tm.teslaCoilCapacitor.2.name=HV Tesla Capacitor -item.tm.teslaCoilCapacitor.3.name=EV Tesla Capacitor -item.tm.teslaCoilCapacitor.4.name=IV Tesla Capacitor - -item.tm.itemTeslaComponent.0.name=Electrum Tesla Windings -item.tm.itemTeslaComponent.1.name=Superconductive Tesla Windings -#Death Messages -death.attack.microwaving=%1$s was dehydrated by radiation. -death.attack.microwaving.player=%1$s was dehydrated by radiation while fighting %2$s. -death.attack.elementalPollution=%1$s was vaping from the wrong hole. -death.attack.elementalPollution.player=%1$s was vaping from the wrong hole while fighting %2$s. -death.attack.subspace=%1$s was N-th dimensionally displeased. -death.attack.subspace.player=%1$s N-th dimensionally displeased while fighting %2$s. -#Machine hulls -gt.blockmachines.hull.tier.10.name=UEV Machine Hull -gt.blockmachines.hull.tier.11.name=UIV Machine Hull -gt.blockmachines.hull.tier.12.name=UMV Machine Hull -gt.blockmachines.hull.tier.13.name=UXV Machine Hull -gt.blockmachines.hull.tier.14.name=OPV Machine Hull -gt.blockmachines.hull.tier.15.name=MAX Machine Hull -#Transformers -gt.blockmachines.wetransformer.tier.00.name=Ultra Low Voltage Power Transformer -gt.blockmachines.wetransformer.tier.00.desc=LV -> ULV (Use Soft Mallet to invert) -gt.blockmachines.wetransformer.tier.01.name=Low Voltage Power Transformer -gt.blockmachines.wetransformer.tier.01.desc=MV -> LV (Use Soft Mallet to invert) -gt.blockmachines.wetransformer.tier.02.name=Medium Voltage Power Transformer -gt.blockmachines.wetransformer.tier.02.desc=HV -> MV (Use Soft Mallet to invert) -gt.blockmachines.wetransformer.tier.03.name=High Voltage Power Transformer -gt.blockmachines.wetransformer.tier.03.desc=EV -> HV (Use Soft Mallet to invert) -gt.blockmachines.wetransformer.tier.04.name=Extreme Power Transformer -gt.blockmachines.wetransformer.tier.04.desc=IV -> EV (Use Soft Mallet to invert) -gt.blockmachines.wetransformer.tier.05.name=Insane Power Transformer -gt.blockmachines.wetransformer.tier.05.desc=LuV -> IV (Use Soft Mallet to invert) -gt.blockmachines.wetransformer.tier.06.name=Ludicrous Power Transformer -gt.blockmachines.wetransformer.tier.06.desc=ZPM -> LuV (Use Soft Mallet to invert) -gt.blockmachines.wetransformer.tier.07.name=ZPM Voltage Power Transformer -gt.blockmachines.wetransformer.tier.07.desc=UV -> ZPM (Use Soft Mallet to invert) -gt.blockmachines.wetransformer.tier.08.name=Ultimate Power Transformer -gt.blockmachines.wetransformer.tier.08.desc=UHV -> UV (Use Soft Mallet to invert) -gt.blockmachines.wetransformer.tier.09.name=Highly Ultimate Power Transformer -gt.blockmachines.wetransformer.tier.09.desc=UEV -> UHV (Use Soft Mallet to invert) -gt.blockmachines.wetransformer.tier.10.name=Extremely Ultimate Power Transformer -gt.blockmachines.wetransformer.tier.10.desc=UIV -> UEV (Use Soft Mallet to invert) -gt.blockmachines.wetransformer.tier.11.name=Insanely Ultimate Power Transformer -gt.blockmachines.wetransformer.tier.11.desc=UMV -> UIV (Use Soft Mallet to invert) -gt.blockmachines.wetransformer.tier.12.name=Mega Ultimate Power Transformer -gt.blockmachines.wetransformer.tier.12.desc=UXV -> UMV (Use Soft Mallet to invert) -gt.blockmachines.wetransformer.tier.13.name=Extended Mega Ultimate Power Transformer -gt.blockmachines.wetransformer.tier.13.desc=OPV -> UXV (Use Soft Mallet to invert) -gt.blockmachines.wetransformer.tier.14.name=Overpowered Power Transformer -gt.blockmachines.wetransformer.tier.14.desc=MAX -> OPV (Use Soft Mallet to invert) - -gt.blockmachines.tt.transformer.tier.09.name=Highly Ultimate Transformer -gt.blockmachines.tt.transformer.tier.09.desc=UEV -> UHV (Use Soft Mallet to invert) -gt.blockmachines.tt.transformer.tier.10.name=Extremely Ultimate Transformer -gt.blockmachines.tt.transformer.tier.10.desc=UIV -> UEV (Use Soft Mallet to invert) -gt.blockmachines.tt.transformer.tier.11.name=Insanely Ultimate Transformer -gt.blockmachines.tt.transformer.tier.11.desc=UMV -> UIV (Use Soft Mallet to invert) -gt.blockmachines.tt.transformer.tier.12.name=Mega Ultimate Transformer -gt.blockmachines.tt.transformer.tier.12.desc=UXV -> UMV (Use Soft Mallet to invert) -gt.blockmachines.tt.transformer.tier.13.name=Extended Mega Ultimate Transformer -gt.blockmachines.tt.transformer.tier.13.desc=OPV -> UXV (Use Soft Mallet to invert) -gt.blockmachines.tt.transformer.tier.14.name=Overpowered Transformer -gt.blockmachines.tt.transformer.tier.14.desc=MAX -> OPV (Use Soft Mallet to invert) - -gt.blockmachines.transformer.ha.tier.09.name=Highly Ultimate Hi-Amp Transformer -gt.blockmachines.transformer.ha.tier.09.desc=UEV -> UHV (Use Soft Mallet to invert -gt.blockmachines.transformer.ha.tier.10.name=Extremely Ultimate Hi-Amp Transformer -gt.blockmachines.transformer.ha.tier.10.desc=UIV -> UEV (Use Soft Mallet to invert) -gt.blockmachines.transformer.ha.tier.11.name=Insanely Ultimate Hi-Amp Transformer -gt.blockmachines.transformer.ha.tier.11.desc=UMV -> UIV (Use Soft Mallet to invert) -gt.blockmachines.transformer.ha.tier.12.name=Mega Ultimate Hi-Amp Transformer -gt.blockmachines.transformer.ha.tier.12.desc=UXV -> UMV (Use Soft Mallet to invert) -gt.blockmachines.transformer.ha.tier.13.name=Extended Mega Ultimate Hi-Amp Transformer -gt.blockmachines.transformer.ha.tier.13.desc=OPV -> UXV (Use Soft Mallet to invert) -gt.blockmachines.transformer.ha.tier.14.name=Overpowered Hi-Amp Transformer -gt.blockmachines.transformer.ha.tier.14.desc=MAX -> OPV (Use Soft Mallet to invert) -#Hatches -tt.base.emhatch.desc.0=Max stacks amount: -tt.base.emhatch.desc.1=Stack capacity: -tt.base.emhatch.desc.2=Place Overflow Hatch behind,on top or below -tt.base.emhatch.desc.3=to provide overflow protection while this block -tt.base.emhatch.desc.4=is not attached to multi block. -tt.base.emhatch.desc.5=Transport range can be extended in straight -tt.base.emhatch.desc.6=line up to 15 blocks with quantum tunnels. -tt.base.emhatch.desc.7=Must be painted to work - -gt.blockmachines.hatch.emmuffler.tier.08.name=UV Overflow Output Hatch -gt.blockmachines.hatch.emmuffler.tier.09.name=UHV Overflow Output Hatch -gt.blockmachines.hatch.emmuffler.tier.10.name=UEV Overflow Output Hatch -gt.blockmachines.hatch.emmuffler.tier.11.name=UIV Overflow Output Hatch -gt.blockmachines.hatch.emmuffler.tier.12.name=UMV Overflow Output Hatch -gt.blockmachines.hatch.emmuffler.tier.13.name=UXV Overflow Output Hatch -gt.blockmachines.hatch.emmuffler.desc.0=Disposes excess elemental Matter -gt.blockmachines.hatch.emmuffler.desc.1=Mass capacity -gt.blockmachines.hatch.emmuffler.desc.2=Disposal Speed -gt.blockmachines.hatch.emmuffler.desc.3=DO NOT OBSTRUCT THE OUTPUT! - -gt.blockmachines.hatch.energymulti04.tier.05.name=IV 4A Energy Hatch -gt.blockmachines.hatch.energymulti16.tier.05.name=IV 16A Energy Hatch -gt.blockmachines.hatch.energymulti64.tier.05.name=IV 64A Energy Hatch -gt.blockmachines.hatch.energymulti04.tier.06.name=LuV 4A Energy Hatch -gt.blockmachines.hatch.energymulti16.tier.06.name=LuV 16A Energy Hatch -gt.blockmachines.hatch.energymulti64.tier.06.name=LuV 64A Energy Hatch -gt.blockmachines.hatch.energymulti04.tier.07.name=ZPM 4A Energy Hatch -gt.blockmachines.hatch.energymulti16.tier.07.name=ZPM 16A Energy Hatch -gt.blockmachines.hatch.energymulti64.tier.07.name=ZPM 64A Energy Hatch -gt.blockmachines.hatch.energymulti04.tier.08.name=UV 4A Energy Hatch -gt.blockmachines.hatch.energymulti16.tier.08.name=UV 16A Energy Hatch -gt.blockmachines.hatch.energymulti64.tier.08.name=UV 64A Energy Hatch -gt.blockmachines.hatch.energymulti04.tier.09.name=UHV 4A Energy Hatch -gt.blockmachines.hatch.energymulti16.tier.09.name=UHV 16A Energy Hatch -gt.blockmachines.hatch.energymulti64.tier.09.name=UHV 64A Energy Hatch -gt.blockmachines.hatch.energymulti04.tier.10.name=UEV 4A Energy Hatch -gt.blockmachines.hatch.energymulti16.tier.10.name=UEV 16A Energy Hatch -gt.blockmachines.hatch.energymulti64.tier.10.name=UEV 64A Energy Hatch -gt.blockmachines.hatch.energymulti04.tier.11.name=UIV 4A Energy Hatch -gt.blockmachines.hatch.energymulti16.tier.11.name=UIV 16A Energy Hatch -gt.blockmachines.hatch.energymulti64.tier.11.name=UIV 64A Energy Hatch -gt.blockmachines.hatch.energymulti04.tier.12.name=UMV 4A Energy Hatch -gt.blockmachines.hatch.energymulti16.tier.12.name=UMV 16A Energy Hatch -gt.blockmachines.hatch.energymulti64.tier.12.name=UMV 64A Energy Hatch -gt.blockmachines.hatch.energymulti04.tier.13.name=UXV 4A Energy Hatch -gt.blockmachines.hatch.energymulti16.tier.13.name=UXV 16A Energy Hatch -gt.blockmachines.hatch.energymulti64.tier.13.name=UXV 64A Energy Hatch -gt.blockmachines.hatch.energymulti.desc.0=Multiple Ampere Energy Injector for Multiblocks -gt.blockmachines.hatch.energymulti.desc.1=Amperes In - -gt.blockmachines.hatch.energytunnel1.tier.05.name=IV 256/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel2.tier.05.name=IV 1024/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel3.tier.05.name=IV 4096/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel4.tier.05.name=IV 16384/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel5.tier.05.name=IV 65536/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel6.tier.05.name=IV 262144/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel7.tier.05.name=IV 1048576/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel1.tier.06.name=LuV 256/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel2.tier.06.name=LuV 1024/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel3.tier.06.name=LuV 4096/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel4.tier.06.name=LuV 16384/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel5.tier.06.name=LuV 65536/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel6.tier.06.name=LuV 262144/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel7.tier.06.name=LuV 1048576/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel1.tier.07.name=ZPM 256/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel2.tier.07.name=ZPM 1024/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel3.tier.07.name=ZPM 4096/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel4.tier.07.name=ZPM 16384/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel5.tier.07.name=ZPM 65536/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel6.tier.07.name=ZPM 262144/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel7.tier.07.name=ZPM 1048576/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel1.tier.08.name=UV 256/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel2.tier.08.name=UV 1024/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel3.tier.08.name=UV 4096/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel4.tier.08.name=UV 16384/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel5.tier.08.name=UV 65536/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel6.tier.08.name=UV 262144/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel7.tier.08.name=UV 1048576/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel1.tier.09.name=UHV 256/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel2.tier.09.name=UHV 1024/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel3.tier.09.name=UHV 4096/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel4.tier.09.name=UHV 16384/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel5.tier.09.name=UHV 65536/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel6.tier.09.name=UHV 262144/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel7.tier.09.name=UHV 1048576/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel1.tier.10.name=UEV 256/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel2.tier.10.name=UEV 1024/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel3.tier.10.name=UEV 4096/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel4.tier.10.name=UEV 16384/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel5.tier.10.name=UEV 65536/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel6.tier.10.name=UEV 262144/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel7.tier.10.name=UEV 1048576/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel1.tier.11.name=UIV 256/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel2.tier.11.name=UIV 1024/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel3.tier.11.name=UIV 4096/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel4.tier.11.name=UIV 16384/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel5.tier.11.name=UIV 65536/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel6.tier.11.name=UIV 262144/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel7.tier.11.name=UIV 1048576/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel1.tier.12.name=UMV 256/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel2.tier.12.name=UMV 1024/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel3.tier.12.name=UMV 4096/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel4.tier.12.name=UMV 16384/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel5.tier.12.name=UMV 65536/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel6.tier.12.name=UMV 262144/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel7.tier.12.name=UMV 1048576/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel1.tier.13.name=UXV 256/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel2.tier.13.name=UXV 1024/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel3.tier.13.name=UXV 4096/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel4.tier.13.name=UXV 16384/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel5.tier.13.name=UXV 65536/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel6.tier.13.name=UXV 262144/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel7.tier.13.name=UXV 1048576/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel.tier.14.name=Legendary Laser Target Hatch -gt.blockmachines.hatch.energytunnel.desc.0=Energy injecting terminal for Multiblocks -gt.blockmachines.hatch.energytunnel.desc.1=Throughput - -gt.blockmachines.hatch.dynamomulti04.tier.05.name=IV 4A Dynamo Hatch -gt.blockmachines.hatch.dynamomulti16.tier.05.name=IV 16A Dynamo Hatch -gt.blockmachines.hatch.dynamomulti64.tier.05.name=IV 64A Dynamo Hatch -gt.blockmachines.hatch.dynamomulti04.tier.06.name=LuV 4A Dynamo Hatch -gt.blockmachines.hatch.dynamomulti16.tier.06.name=LuV 16A Dynamo Hatch -gt.blockmachines.hatch.dynamomulti64.tier.06.name=LuV 64A Dynamo Hatch -gt.blockmachines.hatch.dynamomulti04.tier.07.name=ZPM 4A Dynamo Hatch -gt.blockmachines.hatch.dynamomulti16.tier.07.name=ZPM 16A Dynamo Hatch -gt.blockmachines.hatch.dynamomulti64.tier.07.name=ZPM 64A Dynamo Hatch -gt.blockmachines.hatch.dynamomulti04.tier.08.name=UV 4A Dynamo Hatch -gt.blockmachines.hatch.dynamomulti16.tier.08.name=UV 16A Dynamo Hatch -gt.blockmachines.hatch.dynamomulti64.tier.08.name=UV 64A Dynamo Hatch -gt.blockmachines.hatch.dynamomulti04.tier.09.name=UHV 4A Dynamo Hatch -gt.blockmachines.hatch.dynamomulti16.tier.09.name=UHV 16A Dynamo Hatch -gt.blockmachines.hatch.dynamomulti64.tier.09.name=UHV 64A Dynamo Hatch -gt.blockmachines.hatch.dynamomulti04.tier.10.name=UEV 4A Dynamo Hatch -gt.blockmachines.hatch.dynamomulti16.tier.10.name=UEV 16A Dynamo Hatch -gt.blockmachines.hatch.dynamomulti64.tier.10.name=UEV 64A Dynamo Hatch -gt.blockmachines.hatch.dynamomulti04.tier.11.name=UIV 4A Dynamo Hatch -gt.blockmachines.hatch.dynamomulti16.tier.11.name=UIV 16A Dynamo Hatch -gt.blockmachines.hatch.dynamomulti64.tier.11.name=UIV 64A Dynamo Hatch -gt.blockmachines.hatch.dynamomulti04.tier.12.name=UMV 4A Dynamo Hatch -gt.blockmachines.hatch.dynamomulti16.tier.12.name=UMV 16A Dynamo Hatch -gt.blockmachines.hatch.dynamomulti64.tier.12.name=UMV 64A Dynamo Hatch -gt.blockmachines.hatch.dynamomulti04.tier.13.name=IV 4A Dynamo Hatch -gt.blockmachines.hatch.dynamomulti16.tier.13.name=IV 16A Dynamo Hatch -gt.blockmachines.hatch.dynamomulti64.tier.13.name=IV 64A Dynamo Hatch -gt.blockmachines.hatch.dynamomulti.desc.0=Multiple Ampere Energy Extractor for Multiblocks -gt.blockmachines.hatch.dynamomulti.desc.1=Amperes Out - -gt.blockmachines.hatch.dynamotunnel1.tier.05=IV 256/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel2.tier.05=IV 1024/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel3.tier.05=IV 4096/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel4.tier.05=IV 16384/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel5.tier.05=IV 65536/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel6.tier.05=IV 262144/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel7.tier.05=IV 1048576/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel1.tier.06=LuV 256/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel2.tier.06=LuV 1024/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel3.tier.06=LuV 4096/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel4.tier.06=LuV 16384/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel5.tier.06=LuV 65536/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel6.tier.06=LuV 262144/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel7.tier.06=LuV 1048576/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel1.tier.07=ZPM 256/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel2.tier.07=ZPM 1024/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel3.tier.07=ZPM 4096/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel4.tier.07=ZPM 16384/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel5.tier.07=ZPM 65536/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel6.tier.07=ZPM 262144/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel7.tier.07=ZPM 1048576/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel1.tier.08=UV 256/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel2.tier.08=UV 1024/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel3.tier.08=UV 4096/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel4.tier.08=UV 16384/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel5.tier.08=UV 65536/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel6.tier.08=UV 262144/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel7.tier.08=UV 1048576/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel1.tier.09=UHV 256/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel2.tier.09=UHV 1024/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel3.tier.09=UHV 4096/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel4.tier.09=UHV 16384/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel5.tier.09=UHV 65536/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel6.tier.09=UHV 262144/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel7.tier.09=UHV 1048576/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel1.tier.10=UEV 256/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel2.tier.10=UEV 1024/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel3.tier.10=UEV 4096/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel4.tier.10=UEV 16384/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel5.tier.10=UEV 65536/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel6.tier.10=UEV 262144/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel7.tier.10=UEV 1048576/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel1.tier.11=UIV 256/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel2.tier.11=UIV 1024/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel3.tier.11=UIV 4096/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel4.tier.11=UIV 16384/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel5.tier.11=UIV 65536/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel6.tier.11=UIV 262144/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel7.tier.11=UIV 1048576/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel1.tier.12=UMV 256/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel2.tier.12=UMV 1024/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel3.tier.12=UMV 4096/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel4.tier.12=UMV 16384/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel5.tier.12=UMV 65536/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel6.tier.12=UMV 262144/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel7.tier.12=UMV 1048576/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel1.tier.13=UXV 256/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel2.tier.13=UXV 1024/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel3.tier.13=UXV 4096/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel4.tier.13=UXV 16384/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel5.tier.13=UXV 65536/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel6.tier.13=UXV 262144/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel7.tier.13=UXV 1048576/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel.tier.14=Legendary Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel.desc.0=Energy extracting terminal for Multiblocks -gt.blockmachines.hatch.dynamotunnel.desc.1=Throughput - -gt.blockmachines.emin.tier.08.name=UV Elemental Input Hatch -gt.blockmachines.emin.tier.09.name=UHV Elemental Input Hatch -gt.blockmachines.emin.tier.10.name=UEV Elemental Input Hatch -gt.blockmachines.emin.tier.11.name=UIV Elemental Input Hatch -gt.blockmachines.emin.tier.12.name=UMV Elemental Input Hatch -gt.blockmachines.emin.tier.13.name=UXV Elemental Input Hatch -gt.blockmachines.emin.desc=Elemental Input for Multiblocks - -gt.blockmachines.emout.tier.08.name=UV Elemental Output Hatch -gt.blockmachines.emout.tier.09.name=UHV Elemental Output Hatch -gt.blockmachines.emout.tier.10.name=UEV Elemental Output Hatch -gt.blockmachines.emout.tier.11.name=UIV Elemental Output Hatch -gt.blockmachines.emout.tier.12.name=UMV Elemental Output Hatch -gt.blockmachines.emout.tier.13.name=UXV Elemental Output Hatch -gt.blockmachines.emout.desc=Elemental Output for Multiblocks -#Multiblocks -gt.blockmachines.multimachine.em.transformer.name=Active Transformer -gt.blockmachines.multimachine.em.transformer.hint=1 - Energy IO Hatches or High Power Casing -gt.blockmachines.multimachine.em.transformer.desc.0=Power substation -gt.blockmachines.multimachine.em.transformer.desc.1=All the transformation! -gt.blockmachines.multimachine.em.transformer.desc.2=Only 0.78125% power loss, HAYO! - -gt.blockmachines.multimachine.tm.microwave.name=Microwave Grinder -gt.blockmachines.multimachine.tm.microwave.hint.0=1 - Classic Hatches or Clean Stainless Steel Casing -gt.blockmachines.multimachine.tm.microwave.hint.1=Also acts like a hopper so give it an Output Bus -gt.blockmachines.multimachine.tm.microwave.desc.0=High Frequency Oven -gt.blockmachines.multimachine.tm.microwave.desc.1=From live to done in seconds! -gt.blockmachines.multimachine.tm.microwave.desc.3=I said nuke the... I meant microwave supper! -gt.blockmachines.multimachine.tm.microwave.cfgi.0=Power setting -gt.blockmachines.multimachine.tm.microwave.cfgi.1=Timer setting -gt.blockmachines.multimachine.tm.microwave.cfgo.0=Timer value -gt.blockmachines.multimachine.tm.microwave.cfgo.1=Timer remaining - -gt.blockmachines.multimachine.tm.teslaCoil.name=Tesla Tower -gt.blockmachines.multimachine.tm.teslaCoil.hint.0=1 - Classic Hatches, Capacitor Hatches or Tesla Base Casing -gt.blockmachines.multimachine.tm.teslaCoil.hint.1=2 - Titanium Frames -gt.blockmachines.multimachine.tm.teslaCoil.desc.0=Tower of Wireless Power -gt.blockmachines.multimachine.tm.teslaCoil.desc.1=Fewer pesky cables! -gt.blockmachines.multimachine.tm.teslaCoil.desc.2=Survival chances might be affected -gt.blockmachines.multimachine.tm.teslaCoil.cfgi.0=Hysteresis low setting -gt.blockmachines.multimachine.tm.teslaCoil.cfgi.1=Hysteresis high setting -gt.blockmachines.multimachine.tm.teslaCoil.cfgi.2=Tesla Towers transfer radius setting -gt.blockmachines.multimachine.tm.teslaCoil.cfgi.3=Tesla Transceiver transfer radius setting -gt.blockmachines.multimachine.tm.teslaCoil.cfgi.4=Tesla Ultimate Cover transfer radius setting -gt.blockmachines.multimachine.tm.teslaCoil.cfgi.5=Output voltage setting -gt.blockmachines.multimachine.tm.teslaCoil.cfgi.6=Output current setting -gt.blockmachines.multimachine.tm.teslaCoil.cfgi.7=Scan time Min setting -gt.blockmachines.multimachine.tm.teslaCoil.cfgi.8=Overdrive setting -gt.blockmachines.multimachine.tm.teslaCoil.cfgi.9=Unused -gt.blockmachines.multimachine.tm.teslaCoil.cfgo.0=Tesla Towers transfer radius display -gt.blockmachines.multimachine.tm.teslaCoil.cfgo.1=Tesla Transceiver transfer radius display -gt.blockmachines.multimachine.tm.teslaCoil.cfgo.2=Tesla Ultimate Cover transfer radius display -gt.blockmachines.multimachine.tm.teslaCoil.cfgo.3=Output voltage display -gt.blockmachines.multimachine.tm.teslaCoil.cfgo.4=Output current display -gt.blockmachines.multimachine.tm.teslaCoil.cfgo.5=Energy Capacity display -gt.blockmachines.multimachine.tm.teslaCoil.cfgo.6=Energy Stored display -gt.blockmachines.multimachine.tm.teslaCoil.cfgo.7=Energy Fraction display -gt.blockmachines.multimachine.tm.teslaCoil.cfgo.8=Scan time display - -gt.blockmachines.multimachine.em.switch.name=Network Switch With QoS -gt.blockmachines.multimachine.em.switch.hint=1 - Classic/Data Hatches or Computer casing -gt.blockmachines.multimachine.em.switch.desc.0=User controlled computation power routing -gt.blockmachines.multimachine.em.switch.desc.1=Quality of service is a must - -gt.blockmachines.multimachine.em.computer.name=Quantum Computer -gt.blockmachines.multimachine.em.computer.hint.0=1 - Classic/Data Hatches or Computer casing -gt.blockmachines.multimachine.em.computer.hint.1=2 - Rack Hatches or Advanced computer casing -gt.blockmachines.multimachine.em.computer.desc=You need it to process the number above -gt.blockmachines.multimachine.em.computer.cfgi.0=Overclock ratio -gt.blockmachines.multimachine.em.computer.cfgi.1=Overvoltage ratio -gt.blockmachines.multimachine.em.computer.cfgo.0=Current max. heat -gt.blockmachines.multimachine.em.computer.cfgo.1=Produced computation - -gt.blockmachines.multimachine.em.databank.name=Data Bank -gt.blockmachines.multimachine.em.junction.name=Matter Junction -gt.blockmachines.multimachine.em.mattertoem.name=Matter Quantizer -gt.blockmachines.multimachine.em.emtomatter.name=Matter Dequantizer - -gt.blockmachines.multimachine.em.emtoessentia.name=Essentia Dequantizer -gt.blockmachines.multimachine.em.emtoessentia.hint.0=1 - Classic Hatches or High Power Casing -gt.blockmachines.multimachine.em.emtoessentia.hint.1=2 - Elemental Input Hatch -gt.blockmachines.multimachine.em.emtoessentia.hint.2=3 - Elemental Overflow Hatches or Elemental Casing -gt.blockmachines.multimachine.em.emtoessentia.hint.3=General - Some sort of Essentia Storage -gt.blockmachines.multimachine.em.emtoessentia.desc.0=Transform quantum form back to... -gt.blockmachines.multimachine.em.emtoessentia.desc.1=regular one, but why? - -gt.blockmachines.multimachine.em.essentiatoem.name=Essentia Quantizer -gt.blockmachines.multimachine.em.essentiatoem.hint.0=1 - Classic Hatches or High Power Casing -gt.blockmachines.multimachine.em.essentiatoem.hint.1=2 - Elemental Output Hatch -gt.blockmachines.multimachine.em.essentiatoem.hint.2=3 - Elemental Overflow Hatches or Elemental Casing -gt.blockmachines.multimachine.em.essentiatoem.hint.3=General - Some sort of Essentia Storage -gt.blockmachines.multimachine.em.essentiatoem.desc.0=Conveniently convert regular stuff into quantum form. -gt.blockmachines.multimachine.em.essentiatoem.desc.1=To make it more inconvenient. - -gt.blockmachines.multimachine.em.scanner.name=Elemental Scanner -gt.blockmachines.multimachine.em.research.name=Research station -gt.blockmachines.multimachine.em.collider.name=Matter Collider -gt.blockmachines.multimachine.em.infuser.name=Energy Infuser -gt.blockmachines.multimachine.em.processing.name=Quantum Processing Machine -gt.blockmachines.multimachine.em.crafter.name=Matter Assembler -gt.blockmachines.multimachine.em.stabilizer.name=Elemental Stabilizer -gt.blockmachines.multimachine.em.wormhole.name=Wormhole -gt.blockmachines.multimachine.em.decay.name=Decay Generator -gt.blockmachines.multimachine.em.annihilation.name=Annihilation Generator -gt.blockmachines.multimachine.em.blackholegenerator.name=Black Hole Generator - -#Keywords and phrases -tt.keyword.Air=Air -tt.keyword.Earth=Earth -tt.keyword.Fire=Fire -tt.keyword.Water=Water -tt.keyword.Order=Order -tt.keyword.Entropy=Entropy -tt.keyword.Primal=Primal -tt.keyword.Aspect=Aspect -tt.keyword.CLASS=CLASS -tt.keyword.NAME=NAME -tt.keyword.CHARGE=CHARGE -tt.keyword.COLORLESS=COLORLESS -tt.keyword.MASS=MASS -tt.keyword.BOOM=BOOM! -tt.keyword.ID=BLYADD -tt.keyword.Destination=Destination -tt.keyword.Weight=Weight - -tt.keyphrase.LIFE_TIME=LIFE TIME -tt.keyphrase.CARRIES_COLOR=CARRIES COLOR -tt.keyphrase.Hint_Details=Hint Details -tt.keyphrase.At_current_energy_level=At current energy level -tt.keyphrase.No_Stacks=No Stacks -tt.keyphrase.Contains_EM=Contains EM -tt.keyphrase.Contained_mass=Contained mass -tt.keyphrase.Mass_Disposal_speed=Mass Disposal speed -tt.keyphrase.Muffler_BOOM=Muffler BOOM! -#OpenTurrets compatibility -tile.turretHeadEM.name=Elemental Matter Turret -tile.turretBaseEM.name=Elemental Turret Base \ No newline at end of file -- cgit From 77a23fbedcc7d9799475a382c92e2cb6cad02e24 Mon Sep 17 00:00:00 2001 From: Bass Date: Sat, 31 Aug 2019 03:00:03 +0100 Subject: Lang continued --- .../multi/GT_MetaTileEntity_EM_collider.java | 22 ++--- .../multi/GT_MetaTileEntity_EM_research.java | 56 +++++++---- .../multi/GT_MetaTileEntity_EM_scanner.java | 106 +++++++++++++-------- src/main/resources/assets/tectech/lang/en_US.lang | 39 +++++++- 4 files changed, 151 insertions(+), 72 deletions(-) (limited to 'src/main/resources/assets/tectech') diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_collider.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_collider.java index 8e0cf294f3..2b0b0f8465 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_collider.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_collider.java @@ -283,13 +283,13 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB if (base_EM.isMaster()) { double mode = p.get(); if (mode == FUSE_MODE) { - return "Mode: Fuse"; + return translateToLocal("gt.blockmachines.multimachine.em.collider.mode.0");//Mode: Fuse } else if (mode == COLLIDE_MODE) { - return "Mode: Collide"; + return translateToLocal("gt.blockmachines.multimachine.em.collider.mode.1");//Mode: Collide } - return "Mode: Undefined"; + return translateToLocal("gt.blockmachines.multimachine.em.collider.mode.2");//Mode: Undefined } - return "Currently Slaves..."; + return translateToLocal("gt.blockmachines.multimachine.em.collider.mode.3");//Currently Slaves... }; //endregion @@ -338,11 +338,11 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB private static final byte[] blockMetaFallback = new byte[]{0, 4, 4, 4}; private static final String[] description = new String[]{ EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":", - "1 - Classic Hatches or High Power Casing", - "2 - Elemental Input Hatches or Molecular Casing", - "3 - Elemental Output Hatches or Molecular Casing", - "4 - Elemental Overflow Hatches or Molecular Casing", - "General - Another Controller facing opposite direction", + translateToLocal("gt.blockmachines.multimachine.em.collider.hint.0"),//1 - Classic Hatches or High Power Casing + translateToLocal("gt.blockmachines.multimachine.em.collider.hint.1"),//2 - Elemental Input Hatches or Molecular Casing + translateToLocal("gt.blockmachines.multimachine.em.collider.hint.2"),//3 - Elemental Output Hatches or Molecular Casing + translateToLocal("gt.blockmachines.multimachine.em.collider.hint.3"),//4 - Elemental Overflow Hatches or Molecular Casing + translateToLocal("gt.blockmachines.multimachine.em.collider.hint.4"),//General - Another Controller facing opposite direction }; //endregion @@ -573,8 +573,8 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB public String[] getDescription() { return new String[]{ CommonValues.TEC_MARK_EM, - "Collide matter at extreme velocities.", - EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "Faster than light*!!!" + translateToLocal("gt.blockmachines.multimachine.em.collider.desc.0"),//Collide matter at extreme velocities. + EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + translateToLocal("gt.blockmachines.multimachine.em.collider.desc.1")//Faster than light*!!! }; } diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java index 0690a30b8b..5b1c54695c 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java @@ -22,12 +22,15 @@ import gregtech.api.util.GT_LanguageManager; import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.nbt.NBTTagString; import net.minecraft.util.EnumChatFormatting; +import org.apache.commons.lang3.reflect.FieldUtils; import java.util.ArrayList; import java.util.LinkedHashMap; @@ -43,6 +46,7 @@ import static com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileE import static com.github.technus.tectech.thing.metaTileEntity.multi.em_machine.GT_MetaTileEntity_EM_machine.machine; import static gregtech.api.enums.GT_Values.E; import static net.minecraft.util.StatCollector.translateToLocal; +import static net.minecraft.util.StatCollector.translateToLocalFormatted; /** * Created by danie_000 on 17.12.2016. @@ -55,6 +59,10 @@ public class GT_MetaTileEntity_EM_research extends GT_MetaTileEntity_MultiblockB private String machineType; private ItemStack holdItem; private long computationRemaining, computationRequired; + + private static LinkedHashMap lServerNames; + + private String clientLocale = "en_US"; //endregion //region structure @@ -75,8 +83,8 @@ public class GT_MetaTileEntity_EM_research extends GT_MetaTileEntity_MultiblockB private static final byte[] blockMetaFallback = new byte[]{1, 0}; private static final String[] description = new String[]{ EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":", - "1 - Classic/Data Hatches or Computer casing", - "2 - Holder Hatch", + translateToLocal("gt.blockmachines.multimachine.em.research.hint.0"),//1 - Classic/Data Hatches or Computer casing + translateToLocal("gt.blockmachines.multimachine.em.research.hint.1"),//2 - Holder Hatch }; //endregion @@ -119,8 +127,6 @@ public class GT_MetaTileEntity_EM_research extends GT_MetaTileEntity_MultiblockB tNBT.setTag("pages", tNBTList); } - private static LinkedHashMap lServerNames; - static { try { Class GT_Assemblyline_Server = Class.forName("gregtech.api.util.GT_Assemblyline_Server"); @@ -339,8 +345,8 @@ public class GT_MetaTileEntity_EM_research extends GT_MetaTileEntity_MultiblockB public String[] getDescription() { return new String[]{ CommonValues.TEC_MARK_EM, - "Philosophers didn't even...", - EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "dream about it!" + translateToLocal("gt.blockmachines.multimachine.em.research.desc.0"),//Philosophers didn't even... + EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + translateToLocal("gt.blockmachines.multimachine.em.research.desc.0")//dream about it! }; } @@ -362,20 +368,20 @@ public class GT_MetaTileEntity_EM_research extends GT_MetaTileEntity_MultiblockB } return new String[]{ - "Energy Hatches:", + translateToLocalFormatted("tt.keyphrase.Energy_Hatches", clientLocale) + ":", EnumChatFormatting.GREEN + Long.toString(storedEnergy) + EnumChatFormatting.RESET + " EU / " + EnumChatFormatting.YELLOW + maxEnergy + EnumChatFormatting.RESET + " EU", - (mEUt <= 0 ? "Probably uses: " : "Probably makes: ") + - EnumChatFormatting.RED + Math.abs(mEUt) + EnumChatFormatting.RESET + " EU/t at " + + (mEUt <= 0 ? translateToLocalFormatted("tt.keyphrase.Probably_uses", clientLocale) + ": " : translateToLocalFormatted("tt.keyphrase.Probably_makes", clientLocale) + ": ") + + EnumChatFormatting.RED + Math.abs(mEUt) + EnumChatFormatting.RESET + " EU/t " + translateToLocalFormatted("tt.keyword.at", clientLocale) + " " + EnumChatFormatting.RED + eAmpereFlow + EnumChatFormatting.RESET + " A", - "Tier Rating: " + EnumChatFormatting.YELLOW + VN[getMaxEnergyInputTier_EM()] + EnumChatFormatting.RESET + " / " + EnumChatFormatting.GREEN + VN[getMinEnergyInputTier_EM()] + EnumChatFormatting.RESET + - " Amp Rating: " + EnumChatFormatting.GREEN + eMaxAmpereFlow + EnumChatFormatting.RESET + " A", - "Problems: " + EnumChatFormatting.RED + (getIdealStatus() - getRepairStatus()) + EnumChatFormatting.RESET + - " Efficiency: " + EnumChatFormatting.YELLOW + mEfficiency / 100.0F + EnumChatFormatting.RESET + " %", - "PowerPass: " + EnumChatFormatting.BLUE + ePowerPass + EnumChatFormatting.RESET + - " SafeVoid: " + EnumChatFormatting.BLUE + eSafeVoid, - "Computation Available: " + EnumChatFormatting.GREEN + eAvailableData + EnumChatFormatting.RESET, - "Computation Remaining:", + translateToLocalFormatted("tt.keyphrase.Tier_Rating", clientLocale) + ": " + EnumChatFormatting.YELLOW + VN[getMaxEnergyInputTier_EM()] + EnumChatFormatting.RESET + " / " + EnumChatFormatting.GREEN + VN[getMinEnergyInputTier_EM()] + EnumChatFormatting.RESET + + " " + translateToLocalFormatted("tt.keyphrase.Amp_Rating", clientLocale) + ": " + EnumChatFormatting.GREEN + eMaxAmpereFlow + EnumChatFormatting.RESET + " A", + translateToLocalFormatted("tt.keyword.Problems", clientLocale) + ": " + EnumChatFormatting.RED + (getIdealStatus() - getRepairStatus()) + EnumChatFormatting.RESET + + " " + translateToLocalFormatted("tt.keyword.Efficiency", clientLocale) + ": " + EnumChatFormatting.YELLOW + mEfficiency / 100.0F + EnumChatFormatting.RESET + " %", + translateToLocalFormatted("tt.keyword.PowerPass", clientLocale) + ": " + EnumChatFormatting.BLUE + ePowerPass + EnumChatFormatting.RESET + + " " + translateToLocalFormatted("tt.keyword.SafeVoid", clientLocale) + ": " + EnumChatFormatting.BLUE + eSafeVoid, + translateToLocalFormatted("tt.keyphrase.Computation_Available", clientLocale) + ": " + EnumChatFormatting.GREEN + eAvailableData + EnumChatFormatting.RESET + " / " + EnumChatFormatting.YELLOW + eRequiredData + EnumChatFormatting.RESET, + translateToLocalFormatted("tt.keyphrase.Computation_Remaining", clientLocale) + ":", EnumChatFormatting.GREEN + Long.toString(computationRemaining / 20L) + EnumChatFormatting.RESET + " / " + EnumChatFormatting.YELLOW + computationRequired / 20L }; @@ -519,6 +525,22 @@ public class GT_MetaTileEntity_EM_research extends GT_MetaTileEntity_MultiblockB return false; } + @Override + public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) { + if (!aBaseMetaTileEntity.isClientSide() && aPlayer instanceof EntityPlayerMP) { + try { + EntityPlayerMP player = (EntityPlayerMP) aPlayer; + clientLocale = (String) FieldUtils.readField(player, "translator", true); + } catch (Exception e) { + clientLocale = "en_US"; + } + } else { + return true; + } + System.out.println(clientLocale); + return true; + } + @Override public int getInventoryStackLimit() { return 1; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java index 20ba5eb57f..51d49b3653 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java @@ -23,11 +23,14 @@ import gregtech.api.util.GT_LanguageManager; import gregtech.api.util.GT_Recipe; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumChatFormatting; import net.minecraftforge.common.util.ForgeDirection; +import org.apache.commons.lang3.reflect.FieldUtils; import static com.github.technus.tectech.CommonValues.V; import static com.github.technus.tectech.CommonValues.VN; @@ -41,6 +44,7 @@ import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBloc import static com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_crafting.crafter; import static com.github.technus.tectech.thing.metaTileEntity.multi.em_machine.GT_MetaTileEntity_EM_machine.machine; import static net.minecraft.util.StatCollector.translateToLocal; +import static net.minecraft.util.StatCollector.translateToLocalFormatted; /** * Created by danie_000 on 17.12.2016. @@ -56,8 +60,10 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa private cElementalDefinitionStack objectResearched; private cElementalInstanceStackMap objectsScanned; private String machineType; - private long totalComputationRemaining, totalComputationRequired; + private long computationRemaining, computationRequired; private int[] scanComplexity; + + private String clientLocale = "en_US"; //endregion //region structure @@ -139,56 +145,56 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa private void addComputationRequirements(int depthPlus, int capabilities) { if (areBitsSet(SCAN_GET_NOMENCLATURE, capabilities)) { - totalComputationRequired += depthPlus * 5L; + computationRequired += depthPlus * 5L; eRequiredData += depthPlus; } if (areBitsSet(SCAN_GET_DEPTH_LEVEL, capabilities)) { - totalComputationRequired += depthPlus * 10L; + computationRequired += depthPlus * 10L; eRequiredData += depthPlus; } if (areBitsSet(SCAN_GET_AMOUNT, capabilities)) { - totalComputationRequired += depthPlus * 64L; + computationRequired += depthPlus * 64L; eRequiredData += depthPlus * 8L; } if (areBitsSet(SCAN_GET_CHARGE, capabilities)) { - totalComputationRequired += depthPlus * 128L; + computationRequired += depthPlus * 128L; eRequiredData += depthPlus * 4L; } if (areBitsSet(SCAN_GET_MASS, capabilities)) { - totalComputationRequired += depthPlus * 256L; + computationRequired += depthPlus * 256L; eRequiredData += depthPlus * 4L; } if (areBitsSet(SCAN_GET_ENERGY_LEVEL, capabilities)) { - totalComputationRequired += depthPlus * 512L; + computationRequired += depthPlus * 512L; eRequiredData += depthPlus * 16L; } if (areBitsSet(SCAN_GET_TIMESPAN_INFO, capabilities)) { - totalComputationRequired += depthPlus * 1024L; + computationRequired += depthPlus * 1024L; eRequiredData += depthPlus * 32L; } if (areBitsSet(SCAN_GET_ENERGY_STATES, capabilities)) { - totalComputationRequired += depthPlus * 2048L; + computationRequired += depthPlus * 2048L; eRequiredData += depthPlus * 32L; } if (areBitsSet(SCAN_GET_COLOR, capabilities)) { - totalComputationRequired += depthPlus * 1024L; + computationRequired += depthPlus * 1024L; eRequiredData += depthPlus * 48L; } if (areBitsSet(SCAN_GET_AGE, capabilities)) { - totalComputationRequired += depthPlus * 2048L; + computationRequired += depthPlus * 2048L; eRequiredData += depthPlus * 64L; } if (areBitsSet(SCAN_GET_TIMESPAN_MULT, capabilities)) { - totalComputationRequired += depthPlus * 2048L; + computationRequired += depthPlus * 2048L; eRequiredData += depthPlus * 64L; } @@ -238,7 +244,7 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa researchEM.remove(stackEM.definition); } if (eRecipe != null && scannerRecipe != null) {//todo make sure it werks - totalComputationRequired = totalComputationRemaining = scannerRecipe.mDuration * 20L; + computationRequired = computationRemaining = scannerRecipe.mDuration * 20L; mMaxProgresstime = 20;//const mEfficiencyIncrease = 10000; eRequiredData = (short) (scannerRecipe.mSpecialValue >>> 16); @@ -253,7 +259,7 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa objectsScanned = researchEM.takeAllToNewMap(); cleanMassEM_EM(objectsScanned.getMass()); - totalComputationRequired = 0; + computationRequired = 0; eRequiredData = 0; eAmpereFlow = objectsScanned.size() + TecTech.RANDOM.next(objectsScanned.size()); mEUt = -(int) V[8]; @@ -279,7 +285,7 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa System.arraycopy(scanComplexityTemp, 0, scanComplexity, 0, maxDepth); } - totalComputationRemaining = totalComputationRequired *= 20; + computationRemaining = computationRequired *= 20; mMaxProgresstime = 20;//const mEfficiencyIncrease = 10000; quantumStuff(true); @@ -289,7 +295,7 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa } quantumStuff(false); objectResearched = null; - totalComputationRemaining = 0; + computationRemaining = 0; return false; } @@ -307,7 +313,7 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa ElementalDefinitionScanStorage_EM.setContent(mInventory[1], objectsScanned, scanComplexity); } objectResearched = null; - totalComputationRemaining = 0; + computationRemaining = 0; quantumStuff(false); } @@ -315,8 +321,8 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa public String[] getDescription() { return new String[]{ CommonValues.TEC_MARK_EM, - "",//What is existing here? - EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + ""//I HAVE NO IDEA (yet)! + translateToLocal("gt.blockmachines.multimachine.em.scanner.desc.0"),//What is existing here? + EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + translateToLocal("gt.blockmachines.multimachine.em.scanner.desc.1")//I HAVE NO IDEA (yet)! }; } @@ -338,22 +344,22 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa } return new String[]{ - "Energy Hatches:", + translateToLocalFormatted("tt.keyphrase.Energy_Hatches", clientLocale) + ":", EnumChatFormatting.GREEN + Long.toString(storedEnergy) + EnumChatFormatting.RESET + " EU / " + EnumChatFormatting.YELLOW + maxEnergy + EnumChatFormatting.RESET + " EU", - (mEUt <= 0 ? "Probably uses: " : "Probably makes: ") + - EnumChatFormatting.RED + Math.abs(mEUt) + EnumChatFormatting.RESET + " EU/t at " + + (mEUt <= 0 ? translateToLocalFormatted("tt.keyphrase.Probably_uses", clientLocale) + ": " : translateToLocalFormatted("tt.keyphrase.Probably_makes", clientLocale) + ": ") + + EnumChatFormatting.RED + Math.abs(mEUt) + EnumChatFormatting.RESET + " EU/t " + translateToLocalFormatted("tt.keyword.at", clientLocale) + " " + EnumChatFormatting.RED + eAmpereFlow + EnumChatFormatting.RESET + " A", - "Tier Rating: " + EnumChatFormatting.YELLOW + VN[getMaxEnergyInputTier_EM()] + EnumChatFormatting.RESET + " / " + EnumChatFormatting.GREEN + VN[getMinEnergyInputTier_EM()] + EnumChatFormatting.RESET + - " Amp Rating: " + EnumChatFormatting.GREEN + eMaxAmpereFlow + EnumChatFormatting.RESET + " A", - "Problems: " + EnumChatFormatting.RED + (getIdealStatus() - getRepairStatus()) + EnumChatFormatting.RESET + - " Efficiency: " + EnumChatFormatting.YELLOW + mEfficiency / 100.0F + EnumChatFormatting.RESET + " %", - "PowerPass: " + EnumChatFormatting.BLUE + ePowerPass + EnumChatFormatting.RESET + - " SafeVoid: " + EnumChatFormatting.BLUE + eSafeVoid, - "Computation Available: " + EnumChatFormatting.GREEN + eAvailableData + EnumChatFormatting.RESET + " / " + EnumChatFormatting.YELLOW + eRequiredData + EnumChatFormatting.RESET, - "Computation Remaining:", - EnumChatFormatting.GREEN + Long.toString(totalComputationRemaining / 20L) + EnumChatFormatting.RESET + " / " + - EnumChatFormatting.YELLOW + totalComputationRequired / 20L + translateToLocalFormatted("tt.keyphrase.Tier_Rating", clientLocale) + ": " + EnumChatFormatting.YELLOW + VN[getMaxEnergyInputTier_EM()] + EnumChatFormatting.RESET + " / " + EnumChatFormatting.GREEN + VN[getMinEnergyInputTier_EM()] + EnumChatFormatting.RESET + + " " + translateToLocalFormatted("tt.keyphrase.Amp_Rating", clientLocale) + ": " + EnumChatFormatting.GREEN + eMaxAmpereFlow + EnumChatFormatting.RESET + " A", + translateToLocalFormatted("tt.keyword.Problems", clientLocale) + ": " + EnumChatFormatting.RED + (getIdealStatus() - getRepairStatus()) + EnumChatFormatting.RESET + + " " + translateToLocalFormatted("tt.keyword.Efficiency", clientLocale) + ": " + EnumChatFormatting.YELLOW + mEfficiency / 100.0F + EnumChatFormatting.RESET + " %", + translateToLocalFormatted("tt.keyword.PowerPass", clientLocale) + ": " + EnumChatFormatting.BLUE + ePowerPass + EnumChatFormatting.RESET + + " " + translateToLocalFormatted("tt.keyword.SafeVoid", clientLocale) + ": " + EnumChatFormatting.BLUE + eSafeVoid, + translateToLocalFormatted("tt.keyphrase.Computation_Available", clientLocale) + ": " + EnumChatFormatting.GREEN + eAvailableData + EnumChatFormatting.RESET + " / " + EnumChatFormatting.YELLOW + eRequiredData + EnumChatFormatting.RESET, + translateToLocalFormatted("tt.keyphrase.Computation_Remaining", clientLocale) + ":", + EnumChatFormatting.GREEN + Long.toString(computationRemaining / 20L) + EnumChatFormatting.RESET + " / " + + EnumChatFormatting.YELLOW + computationRequired / 20L }; } @@ -376,8 +382,8 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa @Override public void saveNBTData(NBTTagCompound aNBT) { super.saveNBTData(aNBT); - aNBT.setLong("eComputationRemaining", totalComputationRemaining); - aNBT.setLong("eComputationRequired", totalComputationRequired); + aNBT.setLong("eComputationRemaining", computationRemaining); + aNBT.setLong("eComputationRequired", computationRequired); if (objectResearched != null) { aNBT.setTag("eObject", objectResearched.toNBT()); } else { @@ -398,8 +404,8 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa @Override public void loadNBTData(NBTTagCompound aNBT) { super.loadNBTData(aNBT); - totalComputationRemaining = aNBT.getLong("eComputationRemaining"); - totalComputationRequired = aNBT.getLong("eComputationRequired"); + computationRemaining = aNBT.getLong("eComputationRemaining"); + computationRequired = aNBT.getLong("eComputationRequired"); if (aNBT.hasKey("eObject")) { objectResearched = cElementalDefinitionStack.fromNBT(aNBT.getCompoundTag("eObject")); if (objectResearched.definition == nbtE__) { @@ -426,7 +432,7 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa public void stopMachine() { quantumStuff(false); super.stopMachine(); - totalComputationRequired = totalComputationRemaining = 0; + computationRequired = computationRemaining = 0; objectResearched = null; } @@ -434,7 +440,7 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa @Override public void onFirstTick_EM(IGregTechTileEntity aBaseMetaTileEntity) { if (aBaseMetaTileEntity.isServerSide()) { - if (totalComputationRemaining > 0 && objectResearched != null) { + if (computationRemaining > 0 && objectResearched != null) { eRecipe = null; if (ItemList.Tool_DataOrb.isStackEqual(mInventory[1], false, true)) { eRecipe = TT_recipe.TT_Recipe_Map_EM.sMachineRecipesEM.findRecipe(objectResearched.definition); @@ -451,7 +457,7 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa quantumStuff(false); objectResearched = null; eRequiredData = 0; - totalComputationRequired = totalComputationRemaining = 0; + computationRequired = computationRemaining = 0; mMaxProgresstime = 0; mEfficiencyIncrease = 0; } else { @@ -463,17 +469,33 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa @Override public boolean onRunningTick(ItemStack aStack) { - if (totalComputationRemaining <= 0) { - totalComputationRemaining = 0; + if (computationRemaining <= 0) { + computationRemaining = 0; mProgresstime = mMaxProgresstime; return true; } else { - totalComputationRemaining -= eAvailableData; + computationRemaining -= eAvailableData; mProgresstime = 1; return super.onRunningTick(aStack); } } + @Override + public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) { + if (!aBaseMetaTileEntity.isClientSide() && aPlayer instanceof EntityPlayerMP) { + try { + EntityPlayerMP player = (EntityPlayerMP) aPlayer; + clientLocale = (String) FieldUtils.readField(player, "translator", true); + } catch (Exception e) { + clientLocale = "en_US"; + } + } else { + return true; + } + System.out.println(clientLocale); + return true; + } + @Override public void onPreTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { if (aBaseMetaTileEntity.isActive() && (aTick & 0x2) == 0 && aBaseMetaTileEntity.isClientSide()) { diff --git a/src/main/resources/assets/tectech/lang/en_US.lang b/src/main/resources/assets/tectech/lang/en_US.lang index b9e7b21e4f..c1ba86678c 100644 --- a/src/main/resources/assets/tectech/lang/en_US.lang +++ b/src/main/resources/assets/tectech/lang/en_US.lang @@ -324,6 +324,7 @@ gt.blockmachines.emout.tier.11.name=UIV Elemental Output Hatch gt.blockmachines.emout.tier.12.name=UMV Elemental Output Hatch gt.blockmachines.emout.tier.13.name=UXV Elemental Output Hatch gt.blockmachines.emout.desc=Elemental Output for Multiblocks + #Multiblocks gt.blockmachines.multimachine.em.transformer.name=Active Transformer gt.blockmachines.multimachine.em.transformer.hint=1 - Energy IO Hatches or High Power Casing @@ -433,8 +434,23 @@ gt.blockmachines.multimachine.em.scanner.desc.0=What is existing here? gt.blockmachines.multimachine.em.scanner.desc.1=I HAVE NO IDEA (yet)! gt.blockmachines.multimachine.em.research.name=Research station +gt.blockmachines.multimachine.em.research.hint.0=1 - Classic/Data Hatches or Computer casing +gt.blockmachines.multimachine.em.research.hint.1=2 - Holder Hatch +gt.blockmachines.multimachine.em.research.desc.0=Philosophers didn't even... +gt.blockmachines.multimachine.em.research.desc.1=dream about it! gt.blockmachines.multimachine.em.collider.name=Matter Collider +gt.blockmachines.multimachine.em.collider.hint.0=1 - Classic Hatches or High Power Casing +gt.blockmachines.multimachine.em.collider.hint.1=2 - Elemental Input Hatches or Molecular Casing +gt.blockmachines.multimachine.em.collider.hint.2=3 - Elemental Output Hatches or Molecular Casing +gt.blockmachines.multimachine.em.collider.hint.3=4 - Elemental Overflow Hatches or Molecular Casing +gt.blockmachines.multimachine.em.collider.hint.4=General - Another Controller facing opposite direction +gt.blockmachines.multimachine.em.collider.desc.0=Collide matter at extreme velocities. +gt.blockmachines.multimachine.em.collider.desc.1=Faster than light*!!! +gt.blockmachines.multimachine.em.collider.mode.0=Mode: Fuse +gt.blockmachines.multimachine.em.collider.mode.1=Mode: Collide +gt.blockmachines.multimachine.em.collider.mode.2=Mode: Undefined +gt.blockmachines.multimachine.em.collider.mode.3=Currently Slaves... gt.blockmachines.multimachine.em.infuser.name=Energy Infuser @@ -452,8 +468,12 @@ gt.blockmachines.multimachine.em.annihilation.name=Annihilation Generator gt.blockmachines.multimachine.em.blackholegenerator.name=Black Hole Generator - #Keywords and phrases +#Example: ID:3 +tt.keyword.ID=ID +#Example: 32EU at 1A +tt.keyword.at=at +#These are Thaumcraft aspects tt.keyword.Air=Air tt.keyword.Earth=Earth tt.keyword.Fire=Fire @@ -468,20 +488,35 @@ tt.keyword.CHARGE=CHARGE tt.keyword.COLORLESS=COLORLESS tt.keyword.MASS=MASS tt.keyword.BOOM=BOOM! -tt.keyword.ID=ID tt.keyword.Destination=Destination tt.keyword.Weight=Weight tt.keyword.Source=Source +#Problemns as in maintanance issues +tt.keyword.Problems=Problems +tt.keyword.Efficiency=Efficiency +#Button that allows to pass power to other machines +tt.keyword.PowerPass=PowerPass +#Button that vents EM +tt.keyword.SafeVoid=SafeVoid tt.keyphrase.LIFE_TIME=LIFE TIME tt.keyphrase.CARRIES_COLOR=CARRIES COLOR tt.keyphrase.Hint_Details=Hint Details tt.keyphrase.At_current_energy_level=At current energy level +#Used when 0 Elemental Matter Stacks tt.keyphrase.No_Stacks=No Stacks tt.keyphrase.Contains_EM=Contains EM tt.keyphrase.Contained_mass=Contained mass tt.keyphrase.Mass_Disposal_speed=Mass Disposal speed tt.keyphrase.Muffler_BOOM=Muffler BOOM! +tt.keyphrase.Energy_Hatches=Energy Hatches +tt.keyphrase.Probably_uses=Probably uses +tt.keyphrase.Probably_makes=Probably makes +tt.keyphrase.Tier_Rating=Tier Rating +tt.keyphrase.Amp_Rating=Amp Rating +tt.keyphrase.Computation_Available=Computation Available +tt.keyphrase.Computation_Remaining=Computation Remaining + #OpenTurrets compatibility tile.turretHeadEM.name=Elemental Matter Turret tile.turretBaseEM.name=Elemental Turret Base \ No newline at end of file -- cgit From 6ad6cb22dc70f64e213c07b4332b2095572b8646 Mon Sep 17 00:00:00 2001 From: Bass Date: Sun, 1 Sep 2019 09:16:43 +0100 Subject: Lang even more --- .../multi/GT_MetaTileEntity_EM_crafting.java | 11 +- .../multi/GT_MetaTileEntity_EM_infuser.java | 13 ++- .../multi/GT_MetaTileEntity_EM_stabilizer.java | 11 +- .../multi/GT_MetaTileEntity_EM_wormhole.java | 11 +- .../em_machine/GT_MetaTileEntity_EM_machine.java | 123 +++++++++++---------- src/main/resources/assets/tectech/lang/en_US.lang | 21 ++++ 6 files changed, 111 insertions(+), 79 deletions(-) (limited to 'src/main/resources/assets/tectech') diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_crafting.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_crafting.java index 8e55ba4988..263a46a9d3 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_crafting.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_crafting.java @@ -21,6 +21,7 @@ import static com.github.technus.tectech.Util.StructureBuilderExtreme; import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset; import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.texturePage; import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT; +import static net.minecraft.util.StatCollector.translateToLocal; /** * Created by danie_000 on 17.12.2016. @@ -54,9 +55,9 @@ public class GT_MetaTileEntity_EM_crafting extends GT_MetaTileEntity_MultiblockB private static final Block[] blockTypeFallback = new Block[]{sBlockCasingsTT, sBlockCasingsTT}; private static final byte[] blockMetaFallback = new byte[]{0, 4}; private static final String[] description = new String[]{ - EnumChatFormatting.AQUA + "Hint Details:", - "1 - Classic Hatches or High Power Casing", - "2 - Elemental Hatches or Molecular Casing", + EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":", + translateToLocal("gt.blockmachines.multimachine.em.crafter.hint.0"),//1 - Classic Hatches or High Power Casing + translateToLocal("gt.blockmachines.multimachine.em.crafter.hint.1"),//2 - Elemental Hatches or Molecular Casing }; //endregion @@ -90,8 +91,8 @@ public class GT_MetaTileEntity_EM_crafting extends GT_MetaTileEntity_MultiblockB public String[] getDescription() { return new String[]{ CommonValues.TEC_MARK_EM, - "The most precise way of making stuff.", - EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "(Trans-Planck process)" + translateToLocal("gt.blockmachines.multimachine.em.crafter.desc.0"),//The most precise way of making stuff. + EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + translateToLocal("gt.blockmachines.multimachine.em.crafter.desc.1")// }; } diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_infuser.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_infuser.java index 71be7013be..4e8e8d27ec 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_infuser.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_infuser.java @@ -27,6 +27,7 @@ import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE; import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset; import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT; import static gregtech.api.GregTech_API.mEUtoRF; +import static net.minecraft.util.StatCollector.translateToLocal; /** * Created by danie_000 on 17.12.2016. @@ -45,8 +46,8 @@ public class GT_MetaTileEntity_EM_infuser extends GT_MetaTileEntity_MultiblockBa private static final Block[] blockTypeFallback = new Block[]{sBlockCasingsTT}; private static final byte[] blockMetaFallback = new byte[]{0}; private static final String[] description = new String[]{ - EnumChatFormatting.AQUA + "Hint Details:", - "1 - Classic Hatches or High Power Casing", + EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":", + translateToLocal("gt.blockmachines.multimachine.em.infuser.hint"),//1 - Classic Hatches or High Power Casing }; //endregion @@ -155,10 +156,10 @@ public class GT_MetaTileEntity_EM_infuser extends GT_MetaTileEntity_MultiblockBa public String[] getDescription() { return new String[]{ CommonValues.TEC_MARK_GENERAL, - "Power Transfer Extreme!", - EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "Insanely fast charging!", - EnumChatFormatting.BLUE + "Doesn't work while broken!", - EnumChatFormatting.BLUE + "Power loss is a thing." + translateToLocal("gt.blockmachines.multimachine.em.infuser.desc.0"),//Power Transfer Extreme! + EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + translateToLocal("gt.blockmachines.multimachine.em.infuser.desc.1"), + EnumChatFormatting.BLUE + translateToLocal("gt.blockmachines.multimachine.em.infuser.desc.2"), + EnumChatFormatting.BLUE + translateToLocal("gt.blockmachines.multimachine.em.infuser.desc.3") }; } diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_stabilizer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_stabilizer.java index a51e8a781f..b159827012 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_stabilizer.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_stabilizer.java @@ -14,6 +14,7 @@ import net.minecraft.util.EnumChatFormatting; import static com.github.technus.tectech.Util.StructureBuilderExtreme; import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset; import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT; +import static net.minecraft.util.StatCollector.translateToLocal; /** * Created by danie_000 on 17.12.2016. @@ -34,9 +35,9 @@ public class GT_MetaTileEntity_EM_stabilizer extends GT_MetaTileEntity_Multibloc private static final Block[] blockTypeFallback = new Block[]{sBlockCasingsTT, sBlockCasingsTT}; private static final byte[] blockMetaFallback = new byte[]{0, 4}; private static final String[] description = new String[]{ - EnumChatFormatting.AQUA + "Hint Details:", - "1 - Classic Hatches or High Power Casing", - "2 - Elemental Hatches or Molecular Casing", + EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":", + translateToLocal("gt.blockmachines.multimachine.em.stabilizer.hint.0"),//1 - Classic Hatches or High Power Casing + translateToLocal("gt.blockmachines.multimachine.em.stabilizer.hint.1"),//2 - Elemental Hatches or Molecular Casing }; //endregion @@ -62,8 +63,8 @@ public class GT_MetaTileEntity_EM_stabilizer extends GT_MetaTileEntity_Multibloc public String[] getDescription() { return new String[]{ CommonValues.TEC_MARK_EM, - "Alters time to stabilize matter", - EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "Wibbly wobbly timey wimey, stuff." + translateToLocal("gt.blockmachines.multimachine.em.stabilizer.desc.0"),//Alters time to stabilize matter + EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + translateToLocal("gt.blockmachines.multimachine.em.stabilizer.desc.1")//Wibbly wobbly timey wimey, stuff. }; } diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_wormhole.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_wormhole.java index 20d20921d4..034fdca334 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_wormhole.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_wormhole.java @@ -22,6 +22,7 @@ import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.texture import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.texturePage; import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT; import static gregtech.api.enums.GT_Values.E; +import static net.minecraft.util.StatCollector.translateToLocal; /** * Created by danie_000 on 17.12.2016. @@ -53,9 +54,9 @@ public class GT_MetaTileEntity_EM_wormhole extends GT_MetaTileEntity_MultiblockB private static final Block[] blockTypeFallback = new Block[]{sBlockCasingsTT, sBlockCasingsTT}; private static final byte[] blockMetaFallback = new byte[]{0, 4}; private static final String[] description = new String[]{ - EnumChatFormatting.AQUA + "Hint Details:", - "1 - Classic Hatches or High Power Casing", - "2 - Elemental Hatches or Molecular Casing", + EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":", + translateToLocal("gt.blockmachines.multimachine.em.wormhole.hint.0"),//1 - Classic Hatches or High Power Casing + translateToLocal("gt.blockmachines.multimachine.em.wormhole.hint.1"),//2 - Elemental Hatches or Molecular Casing }; //endregion @@ -81,8 +82,8 @@ public class GT_MetaTileEntity_EM_wormhole extends GT_MetaTileEntity_MultiblockB public String[] getDescription() { return new String[]{ CommonValues.TEC_MARK_EM, - "It is not full of worms.", - EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "It is full of anti-worms!!!" + translateToLocal("gt.blockmachines.multimachine.em.wormhole.desc.0"),//It is not full of worms. + EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + translateToLocal("gt.blockmachines.multimachine.em.wormhole.desc.1")//It is full of anti-worms!!! }; } diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/GT_MetaTileEntity_EM_machine.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/GT_MetaTileEntity_EM_machine.java index f928e99925..d45fbc31d7 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/GT_MetaTileEntity_EM_machine.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/GT_MetaTileEntity_EM_machine.java @@ -25,6 +25,7 @@ import static com.github.technus.tectech.Util.StructureBuilderExtreme; import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset; import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT; import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.*; +import static net.minecraft.util.StatCollector.translateToLocal; /** * Created by danie_000 on 17.12.2016. @@ -48,35 +49,35 @@ public class GT_MetaTileEntity_EM_machine extends GT_MetaTileEntity_MultiblockBa {"B0", "A!!!", "0!!!0", "A!!!", "B0",},}; private static final Block[] blockType = new Block[]{sBlockCasingsTT, QuantumGlassBlock.INSTANCE, sBlockCasingsTT, sBlockCasingsTT}; private static final byte[] blockMeta = new byte[]{4, 0, 5, 6}; - private final IHatchAdder[] addingMethods = new IHatchAdder[]{this::addClassicToMachineList,this::addElementalToMachineList}; + private final IHatchAdder[] addingMethods = new IHatchAdder[]{this::addClassicToMachineList, this::addElementalToMachineList}; private static final short[] casingTextures = new short[]{textureOffset, textureOffset + 4}; private static final Block[] blockTypeFallback = new Block[]{sBlockCasingsTT, sBlockCasingsTT}; private static final byte[] blockMetaFallback = new byte[]{0, 4}; private static final String[] description = new String[]{ - EnumChatFormatting.AQUA + "Hint Details:", - "1 - Classic Hatches or High Power Casing", - "2 - Elemental Hatches or Molecular Casing",}; + EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":", + translateToLocal("gt.blockmachines.multimachine.em.processing.hint.0"),//1 - Classic Hatches or High Power Casing + translateToLocal("gt.blockmachines.multimachine.em.processing.hint.1"),};//2 - Elemental Hatches or Molecular Casing //endregion //region parameters protected Parameters.Group.ParameterIn[] inputMux; protected Parameters.Group.ParameterIn[] outputMux; private static final IStatusFunction SRC_STATUS = - (base,p)-> { + (base, p) -> { double v = p.get(); if (Double.isNaN(v)) return STATUS_WRONG; - v=(int)v; + v = (int) v; if (v < 0) return STATUS_TOO_LOW; if (v == 0) return STATUS_NEUTRAL; if (v >= base.eInputHatches.size()) return STATUS_TOO_HIGH; return STATUS_OK; }; private static final IStatusFunction DST_STATUS = - (base,p)->{ - if(base.inputMux[p.hatchId()].getStatus(false)== STATUS_OK){ + (base, p) -> { + if (base.inputMux[p.hatchId()].getStatus(false) == STATUS_OK) { double v = p.get(); if (Double.isNaN(v)) return STATUS_WRONG; - v=(int)v; + v = (int) v; if (v < 0) return STATUS_TOO_LOW; if (v == 0) return STATUS_LOW; if (v >= base.eInputHatches.size()) return STATUS_TOO_HIGH; @@ -84,8 +85,8 @@ public class GT_MetaTileEntity_EM_machine extends GT_MetaTileEntity_MultiblockBa } return STATUS_NEUTRAL; }; - private static final INameFunction ROUTE_NAME= - (base,p)->(p.parameterId()==0?"Source ":"Destination ")+p.hatchId(); + private static final INameFunction ROUTE_NAME = + (base, p) -> (p.parameterId() == 0 ? translateToLocal("tt.keyword.Source") + " " : translateToLocal("tt.keyword.Destination") + " ") + p.hatchId(); //endregion public GT_MetaTileEntity_EM_machine(int aID, String aName, String aNameRegional) { @@ -96,29 +97,29 @@ public class GT_MetaTileEntity_EM_machine extends GT_MetaTileEntity_MultiblockBa super(aName); } - private boolean setCurrentBehaviour(){ - ItemStack newMachine=mInventory[1]; - if(ItemStack.areItemStacksEqual(newMachine, loadedMachine)){ + private boolean setCurrentBehaviour() { + ItemStack newMachine = mInventory[1]; + if (ItemStack.areItemStacksEqual(newMachine, loadedMachine)) { return false; } - loadedMachine=newMachine; - Supplier behaviourSupplier=GT_MetaTileEntity_EM_machine.BEHAVIOUR_MAP.get(new Util.ItemStack_NoNBT(newMachine)); - if(currentBehaviour==null && behaviourSupplier==null) { + loadedMachine = newMachine; + Supplier behaviourSupplier = GT_MetaTileEntity_EM_machine.BEHAVIOUR_MAP.get(new Util.ItemStack_NoNBT(newMachine)); + if (currentBehaviour == null && behaviourSupplier == null) { return false; } - if(currentBehaviour!=null){ - for(int i=6;i<10;i++){ + if (currentBehaviour != null) { + for (int i = 6; i < 10; i++) { parametrization.removeGroup(i); } } - if(behaviourSupplier!=null){ - currentBehaviour=behaviourSupplier.get(); + if (behaviourSupplier != null) { + currentBehaviour = behaviourSupplier.get(); currentBehaviour.parametersInstantiation(this, parametrization); - for(int i=6;i<10;i++){ - parametrization.setToDefaults(i,true,true); + for (int i = 6; i < 10; i++) { + parametrization.setToDefaults(i, true, true); } } else { - currentBehaviour=null; + currentBehaviour = null; } return true; @@ -128,12 +129,13 @@ public class GT_MetaTileEntity_EM_machine extends GT_MetaTileEntity_MultiblockBa public static void registerBehaviour(Supplier behaviour, ItemStack is) { BEHAVIOUR_MAP.put(new Util.ItemStack_NoNBT(is), behaviour); - TecTech.LOGGER.info("Registered EM machine behaviour "+behaviour.get().getClass().getSimpleName()+' '+new Util.ItemStack_NoNBT(is).toString()); + TecTech.LOGGER.info("Registered EM machine behaviour " + behaviour.get().getClass().getSimpleName() + ' ' + new Util.ItemStack_NoNBT(is).toString()); } public interface IBehaviour { /** * instantiate parameters, u can also check machine tier here + * * @param te * @param parameters */ @@ -141,7 +143,8 @@ public class GT_MetaTileEntity_EM_machine extends GT_MetaTileEntity_MultiblockBa /** * handle parameters per recipe - * @param te this te instance + * + * @param te this te instance * @param parameters of this te * @return return true if machine can start with current parameters, false if not */ @@ -149,22 +152,23 @@ public class GT_MetaTileEntity_EM_machine extends GT_MetaTileEntity_MultiblockBa /** * do recipe handling - * @param inputs from muxed inputs + * + * @param inputs from muxed inputs * @param parameters array passed from previous method! * @return null if recipe should not start, control object to set machine state and start recipe */ MultiblockControl process(cElementalInstanceStackMap[] inputs, GT_MetaTileEntity_EM_machine te, Parameters parameters); } - private void quantumStuff(boolean shouldIExist){ - IGregTechTileEntity base=getBaseMetaTileEntity(); - if(base!=null && base.getWorld()!=null) { - int xDir = ForgeDirection.getOrientation(base.getBackFacing()).offsetX * 2+base.getXCoord(); - int yDir = ForgeDirection.getOrientation(base.getBackFacing()).offsetY * 2+base.getYCoord(); - int zDir = ForgeDirection.getOrientation(base.getBackFacing()).offsetZ * 2+base.getZCoord(); + private void quantumStuff(boolean shouldIExist) { + IGregTechTileEntity base = getBaseMetaTileEntity(); + if (base != null && base.getWorld() != null) { + int xDir = ForgeDirection.getOrientation(base.getBackFacing()).offsetX * 2 + base.getXCoord(); + int yDir = ForgeDirection.getOrientation(base.getBackFacing()).offsetY * 2 + base.getYCoord(); + int zDir = ForgeDirection.getOrientation(base.getBackFacing()).offsetZ * 2 + base.getZCoord(); Block block = base.getWorld().getBlock(xDir, yDir, zDir); if (shouldIExist) { - if(block != null && block.getMaterial()== Material.air) { + if (block != null && block.getMaterial() == Material.air) { base.getWorld().setBlock(xDir, yDir, zDir, QuantumStuffBlock.INSTANCE, 0, 2); } } else { @@ -188,7 +192,7 @@ public class GT_MetaTileEntity_EM_machine extends GT_MetaTileEntity_MultiblockBa @Override public void saveNBTData(NBTTagCompound aNBT) { super.saveNBTData(aNBT); - if(aNBT.hasKey("eLoadedMachine")){ + if (aNBT.hasKey("eLoadedMachine")) { loadedMachine = ItemStack.loadItemStackFromNBT(aNBT.getCompoundTag("eLoadedMachine")); } } @@ -196,31 +200,35 @@ public class GT_MetaTileEntity_EM_machine extends GT_MetaTileEntity_MultiblockBa @Override public void loadNBTData(NBTTagCompound aNBT) { super.loadNBTData(aNBT); - if(loadedMachine !=null) { + if (loadedMachine != null) { aNBT.setTag("eLoadedMachine", loadedMachine.writeToNBT(new NBTTagCompound())); } } @Override protected void parametersInstantiation_EM() { - inputMux=new Parameters.Group.ParameterIn[6]; - outputMux=new Parameters.Group.ParameterIn[6]; - for (int i=0;i<6;i++){ - Parameters.Group hatch=parametrization.getGroup(i); - inputMux[i]=hatch.makeInParameter(0,i,ROUTE_NAME,SRC_STATUS); - outputMux[i]=hatch.makeInParameter(1,i,ROUTE_NAME,DST_STATUS); + inputMux = new Parameters.Group.ParameterIn[6]; + outputMux = new Parameters.Group.ParameterIn[6]; + for (int i = 0; i < 6; i++) { + Parameters.Group hatch = parametrization.getGroup(i); + inputMux[i] = hatch.makeInParameter(0, i, ROUTE_NAME, SRC_STATUS); + outputMux[i] = hatch.makeInParameter(1, i, ROUTE_NAME, DST_STATUS); } } @Override public String[] getDescription() { - return new String[]{CommonValues.TEC_MARK_EM, "Processing quantum matter since...", EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "the time u started using it."}; + return new String[]{ + CommonValues.TEC_MARK_EM, + translateToLocal("gt.blockmachines.multimachine.em.processing.desc.0"),//Processing quantum matter since... + EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + translateToLocal("gt.blockmachines.multimachine.em.processing.desc.1")//the time u started using it. + }; } @Override public void onFirstTick_EM(IGregTechTileEntity aBaseMetaTileEntity) { setCurrentBehaviour(); - if(aBaseMetaTileEntity.isServerSide()) { + if (aBaseMetaTileEntity.isServerSide()) { quantumStuff(aBaseMetaTileEntity.isActive()); } } @@ -234,7 +242,7 @@ public class GT_MetaTileEntity_EM_machine extends GT_MetaTileEntity_MultiblockBa @Override public boolean checkRecipe_EM(ItemStack itemStack) { setCurrentBehaviour(); - if(currentBehaviour==null){ + if (currentBehaviour == null) { return false; } @@ -244,7 +252,7 @@ public class GT_MetaTileEntity_EM_machine extends GT_MetaTileEntity_MultiblockBa cElementalInstanceStackMap[] handles = new cElementalInstanceStackMap[6]; for (int i = 0; i < 6; i++) { - int pointer = (int)inputMux[i].get(); + int pointer = (int) inputMux[i].get(); if (pointer >= 0 && pointer < eInputHatches.size()) { handles[i] = eInputHatches.get(pointer).getContainerHandler(); } @@ -260,7 +268,7 @@ public class GT_MetaTileEntity_EM_machine extends GT_MetaTileEntity_MultiblockBa } } - MultiblockControl control = currentBehaviour.process(handles,this, parametrization); + MultiblockControl control = currentBehaviour.process(handles, this, parametrization); if (control == null) { return false; } @@ -276,12 +284,11 @@ public class GT_MetaTileEntity_EM_machine extends GT_MetaTileEntity_MultiblockBa mMaxProgresstime = control.getMaxProgressTime(); eRequiredData = control.getRequiredData(); mEfficiencyIncrease = control.getEffIncrease(); - boolean polluted=polluteEnvironment(control.getPollutionToAdd()); + boolean polluted = polluteEnvironment(control.getPollutionToAdd()); quantumStuff(polluted); return polluted; } - @Override public void stopMachine() { quantumStuff(false); @@ -302,7 +309,7 @@ public class GT_MetaTileEntity_EM_machine extends GT_MetaTileEntity_MultiblockBa cElementalInstanceStackMap[] handles = new cElementalInstanceStackMap[6]; for (int i = 0; i < 6; i++) { - int pointer = (int)outputMux[i].get(); + int pointer = (int) outputMux[i].get(); if (pointer >= 0 && pointer < eOutputHatches.size()) { handles[i] = eOutputHatches.get(pointer).getContainerHandler(); } @@ -328,22 +335,22 @@ public class GT_MetaTileEntity_EM_machine extends GT_MetaTileEntity_MultiblockBa @Override public void onPreTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { - if(aBaseMetaTileEntity.isClientSide() && (aTick & 0x2)==0){ - if((aTick&0x10)==0) { + if (aBaseMetaTileEntity.isClientSide() && (aTick & 0x2) == 0) { + if ((aTick & 0x10) == 0) { setCurrentBehaviour(); } - if(aBaseMetaTileEntity.isActive()){ - int xDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetX*2+aBaseMetaTileEntity.getXCoord(); - int yDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetY*2+aBaseMetaTileEntity.getYCoord(); - int zDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetZ*2+aBaseMetaTileEntity.getZCoord(); - aBaseMetaTileEntity.getWorld().markBlockRangeForRenderUpdate(xDir,yDir,zDir,xDir,yDir,zDir); + if (aBaseMetaTileEntity.isActive()) { + int xDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetX * 2 + aBaseMetaTileEntity.getXCoord(); + int yDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetY * 2 + aBaseMetaTileEntity.getYCoord(); + int zDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetZ * 2 + aBaseMetaTileEntity.getZCoord(); + aBaseMetaTileEntity.getWorld().markBlockRangeForRenderUpdate(xDir, yDir, zDir, xDir, yDir, zDir); } } } @Override public void construct(int stackSize, boolean hintsOnly) { - StructureBuilderExtreme(shape, blockType, blockMeta, 2, 2, 1, getBaseMetaTileEntity(), this,hintsOnly); + StructureBuilderExtreme(shape, blockType, blockMeta, 2, 2, 1, getBaseMetaTileEntity(), this, hintsOnly); } @Override diff --git a/src/main/resources/assets/tectech/lang/en_US.lang b/src/main/resources/assets/tectech/lang/en_US.lang index c1ba86678c..a80a03ed18 100644 --- a/src/main/resources/assets/tectech/lang/en_US.lang +++ b/src/main/resources/assets/tectech/lang/en_US.lang @@ -453,14 +453,35 @@ gt.blockmachines.multimachine.em.collider.mode.2=Mode: Undefined gt.blockmachines.multimachine.em.collider.mode.3=Currently Slaves... gt.blockmachines.multimachine.em.infuser.name=Energy Infuser +gt.blockmachines.multimachine.em.infuser.hint=1 - Classic Hatches or High Power Casing +gt.blockmachines.multimachine.em.infuser.desc.0=Power Transfer Extreme! +gt.blockmachines.multimachine.em.infuser.desc.1=Insanely fast charging! +gt.blockmachines.multimachine.em.infuser.desc.2=Doesn't work while broken! +gt.blockmachines.multimachine.em.infuser.desc.3=Power loss is a thing. gt.blockmachines.multimachine.em.processing.name=Quantum Processing Machine +gt.blockmachines.multimachine.em.processing.hint.0=1 - Classic Hatches or High Power Casing +gt.blockmachines.multimachine.em.processing.hint.1=2 - Elemental Hatches or Molecular Casing +gt.blockmachines.multimachine.em.processing.desc.0=Processing quantum matter since... +gt.blockmachines.multimachine.em.processing.desc.1=the time u started using it. gt.blockmachines.multimachine.em.crafter.name=Matter Assembler +gt.blockmachines.multimachine.em.crafter.hint.0=1 - Classic Hatches or High Power Casing +gt.blockmachines.multimachine.em.crafter.hint.1=2 - Elemental Hatches or Molecular Casing +gt.blockmachines.multimachine.em.crafter.desc.0=The most precise way of making stuff. +gt.blockmachines.multimachine.em.crafter.desc.1=(Trans-Planck process) gt.blockmachines.multimachine.em.stabilizer.name=Elemental Stabilizer +gt.blockmachines.multimachine.em.stabilizer.hint.0=1 - Classic Hatches or High Power Casing +gt.blockmachines.multimachine.em.stabilizer.hint.1=2 - Elemental Hatches or Molecular Casing +gt.blockmachines.multimachine.em.stabilizer.desc.0=Alters time to stabilize matter +gt.blockmachines.multimachine.em.stabilizer.desc.1=Wibbly wobbly timey wimey, stuff. gt.blockmachines.multimachine.em.wormhole.name=Wormhole +gt.blockmachines.multimachine.em.wormhole.hint.0=1 - Classic Hatches or High Power Casing +gt.blockmachines.multimachine.em.wormhole.hint.1=2 - Elemental Hatches or Molecular Casing +gt.blockmachines.multimachine.em.wormhole.desc.0=It is not full of worms. +gt.blockmachines.multimachine.em.wormhole.desc.1=It is full of anti-worms!!! gt.blockmachines.multimachine.em.decay.name=Decay Generator -- cgit From 01f376b9eed8c7789a0074084986e3b441aa97fc Mon Sep 17 00:00:00 2001 From: Bass Date: Sun, 1 Sep 2019 21:50:33 +0100 Subject: Even even more Lang + right click fix --- ...GT_MetaTileEntity_Hatch_ElementalContainer.java | 2 + .../GT_MetaTileEntity_Hatch_OverflowElemental.java | 2 + .../multi/GT_MetaTileEntity_EM_annihilation.java | 11 +++-- .../multi/GT_MetaTileEntity_EM_bhg.java | 11 +++-- .../multi/GT_MetaTileEntity_EM_decay.java | 57 ++++++++++++++++------ .../multi/GT_MetaTileEntity_EM_research.java | 2 + .../multi/GT_MetaTileEntity_EM_scanner.java | 2 + src/main/resources/assets/tectech/lang/en_US.lang | 16 ++++++ 8 files changed, 77 insertions(+), 26 deletions(-) (limited to 'src/main/resources/assets/tectech') 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 5439e3f6d6..1498dafecc 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 @@ -217,6 +217,8 @@ public abstract class GT_MetaTileEntity_Hatch_ElementalContainer extends GT_Meta @Override public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) { + super.onRightclick(aBaseMetaTileEntity, aPlayer); + if (!aBaseMetaTileEntity.isClientSide() && aPlayer instanceof EntityPlayerMP) { try { EntityPlayerMP player = (EntityPlayerMP) aPlayer; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OverflowElemental.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OverflowElemental.java index 6af2285e32..8000298443 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OverflowElemental.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OverflowElemental.java @@ -192,6 +192,8 @@ public class GT_MetaTileEntity_Hatch_OverflowElemental extends GT_MetaTileEntity @Override public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) { + super.onRightclick(aBaseMetaTileEntity, aPlayer); + if (!aBaseMetaTileEntity.isClientSide() && aPlayer instanceof EntityPlayerMP) { try { EntityPlayerMP player = (EntityPlayerMP) aPlayer; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_annihilation.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_annihilation.java index 023bcb3a20..21e020be01 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_annihilation.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_annihilation.java @@ -21,6 +21,7 @@ import static com.github.technus.tectech.Util.StructureBuilderExtreme; import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset; import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.texturePage; import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT; +import static net.minecraft.util.StatCollector.translateToLocal; /** * Created by danie_000 on 17.12.2016. @@ -52,9 +53,9 @@ public class GT_MetaTileEntity_EM_annihilation extends GT_MetaTileEntity_Multibl private static final Block[] blockTypeFallback = new Block[]{sBlockCasingsTT, sBlockCasingsTT}; private static final byte[] blockMetaFallback = new byte[]{0, 4}; private static final String[] description = new String[]{ - EnumChatFormatting.AQUA + "Hint Details:", - "1 - Classic Hatches or High Power Casing", - "2 - Elemental Hatches or Molecular Casing", + EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":", + translateToLocal("gt.blockmachines.multimachine.em.annihilation.hint.0"),//1 - Classic Hatches or High Power Casing + translateToLocal("gt.blockmachines.multimachine.em.annihilation.hint.1"),//2 - Elemental Hatches or Molecular Casing }; //endregion @@ -80,8 +81,8 @@ public class GT_MetaTileEntity_EM_annihilation extends GT_MetaTileEntity_Multibl public String[] getDescription() { return new String[]{ CommonValues.TEC_MARK_EM, - "Things+Anti Things don't like each other.", - EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "Matter into power!" + translateToLocal("gt.blockmachines.multimachine.em.annihilation.desc.0"),//Things+Anti Things don't like each other. + EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + translateToLocal("gt.blockmachines.multimachine.em.annihilation.desc.1")//Matter into power! }; } diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_bhg.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_bhg.java index 37e5beed5a..79ae424bcb 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_bhg.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_bhg.java @@ -24,6 +24,7 @@ import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBloc import static com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_decay.URANIUM_INGOT_MASS_DIFF; import static com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_decay.URANIUM_MASS_TO_EU_INSTANT; import static gregtech.api.enums.GT_Values.E; +import static net.minecraft.util.StatCollector.translateToLocal; /** * Created by danie_000 on 17.12.2016. @@ -88,9 +89,9 @@ public class GT_MetaTileEntity_EM_bhg extends GT_MetaTileEntity_MultiblockBase_E private static final Block[] blockTypeFallback = new Block[]{sBlockCasingsTT, sBlockCasingsTT}; private static final byte[] blockMetaFallback = new byte[]{0, 4}; private static final String[] description = new String[]{ - EnumChatFormatting.AQUA + "Hint Details:", - "1 - Classic Hatches or High Power Casing", - "2 - Elemental Hatches or Molecular Casing", + EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":", + translateToLocal("gt.blockmachines.multimachine.em.blackholegenerator.hint.0"),//1 - Classic Hatches or High Power Casing + translateToLocal("gt.blockmachines.multimachine.em.blackholegenerator.hint.1"),//2 - Elemental Hatches or Molecular Casing }; //endregion @@ -274,8 +275,8 @@ public class GT_MetaTileEntity_EM_bhg extends GT_MetaTileEntity_MultiblockBase_E public String[] getDescription() { return new String[]{ CommonValues.TEC_MARK_EM, - "Singularity based power generation.", - EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "Super unstable!!!" + translateToLocal("gt.blockmachines.multimachine.em.blackholegenerator.desc.0"),//Singularity based power generation. + EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + translateToLocal("gt.blockmachines.multimachine.em.blackholegenerator.desc.1")//Super unstable!!! }; } diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_decay.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_decay.java index 65f93d537c..ae9ee1c524 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_decay.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_decay.java @@ -20,8 +20,11 @@ import ic2.core.init.MainConfig; import ic2.core.util.ConfigUtil; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; +import org.apache.commons.lang3.reflect.FieldUtils; import static com.github.technus.tectech.CommonValues.VN; import static com.github.technus.tectech.Util.StructureBuilderExtreme; @@ -30,6 +33,8 @@ import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.texture import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT; import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.STATUS_OK; import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.STATUS_TOO_LOW; +import static net.minecraft.util.StatCollector.translateToLocal; +import static net.minecraft.util.StatCollector.translateToLocalFormatted; /** * Created by danie_000 on 17.12.2016. @@ -42,6 +47,8 @@ public class GT_MetaTileEntity_EM_decay extends GT_MetaTileEntity_MultiblockBase public static final double URANIUM_INGOT_MASS_DIFF = 1.6114516E10; private static final double URANIUM_MASS_TO_EU_PARTIAL = ConfigUtil.getFloat(MainConfig.get(), "balance/energy/generator/nuclear") * 3_000_000.0 / URANIUM_INGOT_MASS_DIFF; public static final double URANIUM_MASS_TO_EU_INSTANT = URANIUM_MASS_TO_EU_PARTIAL * 20; + + private String clientLocale = "en_US"; //endregion //region structure @@ -63,15 +70,15 @@ public class GT_MetaTileEntity_EM_decay extends GT_MetaTileEntity_MultiblockBase private static final Block[] blockTypeFallback = new Block[]{sBlockCasingsTT, sBlockCasingsTT}; private static final byte[] blockMetaFallback = new byte[]{0, 4}; private static final String[] description = new String[]{ - EnumChatFormatting.AQUA + "Hint Details:", - "1 - Classic Hatches or High Power Casing", - "2 - Elemental Hatches or Molecular Casing", + EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":", + translateToLocal("gt.blockmachines.multimachine.em.decay.hint.0"),//1 - Classic Hatches or High Power Casing + translateToLocal("gt.blockmachines.multimachine.em.decay.hint.1"),//2 - Elemental Hatches or Molecular Casing }; //endregion //region parameters protected Parameters.Group.ParameterIn ampereFlow; - private static final INameFunction FLOW_NAME = (base, p) -> "Ampere divider"; + private static final INameFunction FLOW_NAME = (base, p) -> translateToLocal("gt.blockmachines.multimachine.em.decay.conf");//Ampere divider private static final IStatusFunction FLOW_STATUS = (base, p) -> { if (base.eAmpereFlow <= 0) { return STATUS_TOO_LOW; @@ -154,8 +161,8 @@ public class GT_MetaTileEntity_EM_decay extends GT_MetaTileEntity_MultiblockBase public String[] getDescription() { return new String[]{ CommonValues.TEC_MARK_EM, - "Is life time too long?", - EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "Make it half-life (3) instead!" + translateToLocal("gt.blockmachines.multimachine.em.decay.desc.0"),//Is life time too long? + EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + translateToLocal("gt.blockmachines.multimachine.em.decay.desc.1")//Make it half-life (3) instead! }; } @@ -177,22 +184,22 @@ public class GT_MetaTileEntity_EM_decay extends GT_MetaTileEntity_MultiblockBase } return new String[]{ - "Progress:", + translateToLocalFormatted("tt.keyword.Progress", clientLocale) + ":", EnumChatFormatting.GREEN + Integer.toString(mProgresstime / 20) + EnumChatFormatting.RESET + " s / " + EnumChatFormatting.YELLOW + mMaxProgresstime / 20 + EnumChatFormatting.RESET + " s", - "Energy Hatches:", + translateToLocalFormatted("tt.keyphrase.Energy_Hatches", clientLocale) + ":", EnumChatFormatting.GREEN + Long.toString(storedEnergy) + EnumChatFormatting.RESET + " EU / " + EnumChatFormatting.YELLOW + maxEnergy + EnumChatFormatting.RESET + " EU", - (mEUt <= 0 ? "Probably uses: " : "Probably makes: ") + + (mEUt <= 0 ? translateToLocalFormatted("tt.keyphrase.Probably_uses", clientLocale) + ": " : translateToLocalFormatted("tt.keyphrase.Probably_makes", clientLocale) + ": ") + EnumChatFormatting.RED + Math.abs(mEUt) + EnumChatFormatting.RESET + " EU/t at " + EnumChatFormatting.RED + eAmpereFlow + EnumChatFormatting.RESET + " A", - "Tier Rating: " + EnumChatFormatting.YELLOW + VN[getMaxEnergyInputTier_EM()] + EnumChatFormatting.RESET + " / " + EnumChatFormatting.GREEN + VN[getMinEnergyInputTier_EM()] + EnumChatFormatting.RESET + - " Amp Rating: " + EnumChatFormatting.GREEN + eMaxAmpereFlow + EnumChatFormatting.RESET + " A", - "Problems: " + EnumChatFormatting.RED + (getIdealStatus() - getRepairStatus()) + EnumChatFormatting.RESET + - " Efficiency: " + EnumChatFormatting.YELLOW + mEfficiency / 100.0F + EnumChatFormatting.RESET + " %", - "PowerPass: " + EnumChatFormatting.BLUE + ePowerPass + EnumChatFormatting.RESET + - " SafeVoid: " + EnumChatFormatting.BLUE + eSafeVoid, - "Computation: " + EnumChatFormatting.GREEN + eAvailableData + EnumChatFormatting.RESET + " / " + EnumChatFormatting.YELLOW + eRequiredData + EnumChatFormatting.RESET, + translateToLocalFormatted("tt.keyphrase.Tier_Rating", clientLocale) + ": " + EnumChatFormatting.YELLOW + VN[getMaxEnergyInputTier_EM()] + EnumChatFormatting.RESET + " / " + EnumChatFormatting.GREEN + VN[getMinEnergyInputTier_EM()] + EnumChatFormatting.RESET + + " " + translateToLocalFormatted("tt.keyphrase.Amp_Rating", clientLocale) + ": " + EnumChatFormatting.GREEN + eMaxAmpereFlow + EnumChatFormatting.RESET + " A", + translateToLocalFormatted("tt.keyword.Problems", clientLocale) + ": " + EnumChatFormatting.RED + (getIdealStatus() - getRepairStatus()) + EnumChatFormatting.RESET + + " " + translateToLocalFormatted("tt.keyword.Efficiency", clientLocale) + ": " + EnumChatFormatting.YELLOW + mEfficiency / 100.0F + EnumChatFormatting.RESET + " %", + translateToLocalFormatted("tt.keyword.PowerPass", clientLocale) + ": " + EnumChatFormatting.BLUE + ePowerPass + EnumChatFormatting.RESET + + " " + translateToLocalFormatted("tt.keyword.SafeVoid", clientLocale) + ": " + EnumChatFormatting.BLUE + eSafeVoid, + translateToLocalFormatted("tt.keyword.Computation", clientLocale) + ": " + EnumChatFormatting.GREEN + eAvailableData + EnumChatFormatting.RESET + " / " + EnumChatFormatting.YELLOW + eRequiredData + EnumChatFormatting.RESET, }; } @@ -218,6 +225,24 @@ public class GT_MetaTileEntity_EM_decay extends GT_MetaTileEntity_MultiblockBase ampereFlow = hatch_0.makeInParameter(0, 1, FLOW_NAME, FLOW_STATUS); } + @Override + public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) { + super.onRightclick(aBaseMetaTileEntity, aPlayer); + + if (!aBaseMetaTileEntity.isClientSide() && aPlayer instanceof EntityPlayerMP) { + try { + EntityPlayerMP player = (EntityPlayerMP) aPlayer; + clientLocale = (String) FieldUtils.readField(player, "translator", true); + } catch (Exception e) { + clientLocale = "en_US"; + } + } else { + return true; + } + System.out.println(clientLocale); + return true; + } + @Override public void construct(int stackSize, boolean hintsOnly) { StructureBuilderExtreme(shape, blockType, blockMeta, 2, 2, 0, getBaseMetaTileEntity(), this, hintsOnly); diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java index 5b1c54695c..53dc178ef8 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java @@ -527,6 +527,8 @@ public class GT_MetaTileEntity_EM_research extends GT_MetaTileEntity_MultiblockB @Override public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) { + super.onRightclick(aBaseMetaTileEntity, aPlayer); + if (!aBaseMetaTileEntity.isClientSide() && aPlayer instanceof EntityPlayerMP) { try { EntityPlayerMP player = (EntityPlayerMP) aPlayer; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java index 51d49b3653..6170bd081f 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java @@ -482,6 +482,8 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa @Override public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) { + super.onRightclick(aBaseMetaTileEntity, aPlayer); + if (!aBaseMetaTileEntity.isClientSide() && aPlayer instanceof EntityPlayerMP) { try { EntityPlayerMP player = (EntityPlayerMP) aPlayer; diff --git a/src/main/resources/assets/tectech/lang/en_US.lang b/src/main/resources/assets/tectech/lang/en_US.lang index a80a03ed18..cf2405e570 100644 --- a/src/main/resources/assets/tectech/lang/en_US.lang +++ b/src/main/resources/assets/tectech/lang/en_US.lang @@ -483,11 +483,25 @@ gt.blockmachines.multimachine.em.wormhole.hint.1=2 - Elemental Hatches or Molecu gt.blockmachines.multimachine.em.wormhole.desc.0=It is not full of worms. gt.blockmachines.multimachine.em.wormhole.desc.1=It is full of anti-worms!!! +#GET INFODATA IS FUCKED! gt.blockmachines.multimachine.em.decay.name=Decay Generator +gt.blockmachines.multimachine.em.decay.hint.0=1 - Classic Hatches or High Power Casing +gt.blockmachines.multimachine.em.decay.hint.1=2 - Elemental Hatches or Molecular Casing +gt.blockmachines.multimachine.em.decay.desc.0=Is life time too long? +gt.blockmachines.multimachine.em.decay.desc.1=Make it half-life (3) instead! +gt.blockmachines.multimachine.em.decay.conf=Ampere divider gt.blockmachines.multimachine.em.annihilation.name=Annihilation Generator +gt.blockmachines.multimachine.em.annihilation.hint.0=1 - Classic Hatches or High Power Casing +gt.blockmachines.multimachine.em.annihilation.hint.1=2 - Elemental Hatches or Molecular Casing +gt.blockmachines.multimachine.em.annihilation.desc.0=Things+Anti Things don't like each other. +gt.blockmachines.multimachine.em.annihilation.desc.1=Matter into power! gt.blockmachines.multimachine.em.blackholegenerator.name=Black Hole Generator +gt.blockmachines.multimachine.em.blackholegenerator.hint.0=1 - Classic Hatches or High Power Casing +gt.blockmachines.multimachine.em.blackholegenerator.hint.1=2 - Elemental Hatches or Molecular Casing +gt.blockmachines.multimachine.em.blackholegenerator.desc.0=Singularity based power generation. +gt.blockmachines.multimachine.em.blackholegenerator.desc.1=Super unstable!!! #Keywords and phrases #Example: ID:3 @@ -512,6 +526,8 @@ tt.keyword.BOOM=BOOM! tt.keyword.Destination=Destination tt.keyword.Weight=Weight tt.keyword.Source=Source +tt.keyword.Progress=Progress +tt.keyword.Computation=Computation #Problemns as in maintanance issues tt.keyword.Problems=Problems tt.keyword.Efficiency=Efficiency -- cgit From 9ab14042bf3c9cb4244d799d6b088d678d63a0de Mon Sep 17 00:00:00 2001 From: Bass Date: Sat, 14 Sep 2019 09:54:37 +0100 Subject: okbuddy --- .../java/com/github/technus/tectech/loader/thing/MachineLoader.java | 2 +- src/main/resources/assets/tectech/lang/en_US.lang | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'src/main/resources/assets/tectech') diff --git a/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java b/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java index 803c19572e..856ba8dd13 100644 --- a/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java +++ b/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java @@ -647,4 +647,4 @@ public class MachineLoader implements Runnable { new NoDreamCraftMachineLoader().run(); } } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/tectech/lang/en_US.lang b/src/main/resources/assets/tectech/lang/en_US.lang index cf2405e570..483174e2f3 100644 --- a/src/main/resources/assets/tectech/lang/en_US.lang +++ b/src/main/resources/assets/tectech/lang/en_US.lang @@ -337,7 +337,7 @@ gt.blockmachines.multimachine.tm.microwave.hint.0=1 - Classic Hatches or Clean S gt.blockmachines.multimachine.tm.microwave.hint.1=Also acts like a hopper so give it an Output Bus gt.blockmachines.multimachine.tm.microwave.desc.0=High Frequency Oven gt.blockmachines.multimachine.tm.microwave.desc.1=From live to done in seconds! -gt.blockmachines.multimachine.tm.microwave.desc.3=I said nuke the... I meant microwave supper! +gt.blockmachines.multimachine.tm.microwave.desc.2=I said nuke the... I meant microwave supper! gt.blockmachines.multimachine.tm.microwave.cfgi.0=Power setting gt.blockmachines.multimachine.tm.microwave.cfgi.1=Timer setting gt.blockmachines.multimachine.tm.microwave.cfgo.0=Timer value @@ -483,7 +483,6 @@ gt.blockmachines.multimachine.em.wormhole.hint.1=2 - Elemental Hatches or Molecu gt.blockmachines.multimachine.em.wormhole.desc.0=It is not full of worms. gt.blockmachines.multimachine.em.wormhole.desc.1=It is full of anti-worms!!! -#GET INFODATA IS FUCKED! gt.blockmachines.multimachine.em.decay.name=Decay Generator gt.blockmachines.multimachine.em.decay.hint.0=1 - Classic Hatches or High Power Casing gt.blockmachines.multimachine.em.decay.hint.1=2 - Elemental Hatches or Molecular Casing -- cgit