From dd789c8acadad399da9e0a1e51278557264ceea7 Mon Sep 17 00:00:00 2001 From: Calclavia Date: Sat, 4 Jan 2014 22:48:03 +0800 Subject: [PATCH] Added machine part block --- .../resonantinduction/ResonantInduction.java | 8 ++++---- .../machine/BlockMachinePart.java | 18 ++++++++++++++++++ .../languages/en_US.properties | 1 + .../textures/blocks/machinePart.png | Bin 0 -> 708 bytes .../textures/blocks/machinePart2.png | Bin 0 -> 830 bytes 5 files changed, 23 insertions(+), 4 deletions(-) create mode 100644 src/main/java/resonantinduction/machine/BlockMachinePart.java create mode 100644 src/main/resources/assets/resonantinduction/textures/blocks/machinePart.png create mode 100644 src/main/resources/assets/resonantinduction/textures/blocks/machinePart2.png diff --git a/src/main/java/resonantinduction/ResonantInduction.java b/src/main/java/resonantinduction/ResonantInduction.java index 90aa84dde..51aeb4b43 100644 --- a/src/main/java/resonantinduction/ResonantInduction.java +++ b/src/main/java/resonantinduction/ResonantInduction.java @@ -20,6 +20,7 @@ import net.minecraftforge.oredict.ShapelessOreRecipe; import org.modstats.ModstatInfo; import org.modstats.Modstats; +import resonantinduction.machine.BlockMachinePart; import resonantinduction.machine.crusher.ItemDust; import resonantinduction.machine.furnace.BlockAdvancedFurnace; import resonantinduction.machine.furnace.TileAdvancedFurnace; @@ -149,10 +150,8 @@ public class ResonantInduction public static Item itemDust; // Blocks - public static Block blockTesla; - public static Block blockEMContractor; - public static Block blockBattery; - public static Block blockAdvancedFurnace; + public static Block blockTesla, blockEMContractor, blockBattery, blockAdvancedFurnace, + blockMachinePart; /** * Packets @@ -193,6 +192,7 @@ public class ResonantInduction blockTesla = new BlockTesla(getNextBlockID()); blockEMContractor = new BlockEMContractor(getNextBlockID()); blockBattery = new BlockBattery(getNextBlockID()); + blockMachinePart = new BlockMachinePart(getNextBlockID()); if (REPLACE_FURNACE) { diff --git a/src/main/java/resonantinduction/machine/BlockMachinePart.java b/src/main/java/resonantinduction/machine/BlockMachinePart.java new file mode 100644 index 000000000..173b8833c --- /dev/null +++ b/src/main/java/resonantinduction/machine/BlockMachinePart.java @@ -0,0 +1,18 @@ +package resonantinduction.machine; + +import resonantinduction.core.base.BlockBase; +import universalelectricity.api.UniversalElectricity; + +/** + * A block used to build machines. + * + * @author Calclavia + * + */ +public class BlockMachinePart extends BlockBase +{ + public BlockMachinePart(int id) + { + super("machinePart", id); + } +} diff --git a/src/main/resources/assets/resonantinduction/languages/en_US.properties b/src/main/resources/assets/resonantinduction/languages/en_US.properties index 6b6aa3534..ceb4660d1 100644 --- a/src/main/resources/assets/resonantinduction/languages/en_US.properties +++ b/src/main/resources/assets/resonantinduction/languages/en_US.properties @@ -11,6 +11,7 @@ meta.resonantinduction.credits=Thanks to Archadia for the awesome assets! tile.resonantinduction\:tesla.name=Tesla Coil tile.resonantinduction\:contractor.name=Electromagnetic Levitator tile.resonantinduction\:battery.name=Battery +tile.resonantinduction\:machinePart.name=Machine Part ## Items item.resonantinduction\:quantumEntangler.name=Quantum Entangler diff --git a/src/main/resources/assets/resonantinduction/textures/blocks/machinePart.png b/src/main/resources/assets/resonantinduction/textures/blocks/machinePart.png new file mode 100644 index 0000000000000000000000000000000000000000..117ab7d7f2e869aec0bedada83a8d4ea513f013b GIT binary patch literal 708 zcmV;#0z3VQP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02*{fSaefwW^{L9 za%BKeVQFr3E>1;MAa*k@H7+qRNAp5A0006rNklsQIym&GV|y0%QzOiUax<5pgfT0-=#Vl7zNiF4WkxNW8`5OHn5Z>Suna1s( z5p0d=+17%26rj+(fK*s20;`f@9&o$B!iGu!4mMk*csj3K3smj52I9mH+HTczw4DU# z3~Pajvy8x=nF`Z@fvxJ9Apr4qfw2)&1nBTmV2UmjyMPjl*8RPhT&dwZOz4tkW$lWgt35Wn$BB3;c!PU_`H&&-omh zd3#glYk@gFakx(390xXqF7VmnG~%_uJj@15@ra@Xf2rKK7Ff#x(?BNotGg^fwt_4mPsG5xU q>~yHy4+XT*rHxdSt_8n{$KyY=9$;X~GPmvk0000P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02*{fSaefwW^{L9 za%BKeVQFr3E>1;MAa*k@H7+qRNAp5A00085Nkl0<~_R7DS6YS}H>o*DRd^`CJGxV^po@g9_$o1444J4D?HJsydx-w(u_^2Px`6o6>5)Gh6{R)ET~*ZD*PG0}^|gkeDHy0Tyzv zra)ttL%u&aw6vNHhx0nq3aANo>_p8yKH`qDXQaa+umYw>0`UtlxVz_be#rVx3dCOr zo}QkbpPye|UR3+gm>Hc|iTF5no?le;&vMDMkj)RMkSQk;Xe~ zSOKd$Faen!*SG{Qsycp4kOF%^@YV7jD?p!n&=QR`&nVNebGgVa8tK!9$QiI-3R-x4 zd^G08kphq$p&Phd@nEEbj(a}m4O$39Z*7ce0m5=b1Y`{zqDyC*1LBodK&nlXM9jC0 zj+}427(i_B21d*>z1aW73aBZjN;I5%G1@YKX#pzHU2QYcY$njP&Kp#_1Tj0qTzU{~ zXJ?mn!Jsu_aBje@Ypu^9cbI_2_V>}MO#667j~nT$nH8TiV5F9T=)1_Bm*KD*Viqb0rfC^ zZWHJqFd4N&3P}0n27vGG!|6?C4Wn1-kradPZjjNx2cQ2I`+QuTsUhkpD*)pHsqF|Y zCCvrbP@!T