From 49f612485d2f4a61f182f9a264a891436bd1c71d Mon Sep 17 00:00:00 2001 From: Bass Date: Tue, 23 Jul 2019 00:35:00 +0100 Subject: Capacitor Textures --- .../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 5 files changed, 0 insertions(+), 0 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/textures') 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/textures') 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 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/textures') 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 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/textures') 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