From aed07c317d5347e4050e0fa6b089207b4c76c509 Mon Sep 17 00:00:00 2001 From: Servek Date: Thu, 5 Apr 2018 02:56:52 +0400 Subject: [PATCH] FEATURE - Added Extruder recipe for Small Gear --- src/main/java/gregtech/api/enums/ItemList.java | 1 + .../common/items/GT_MetaGenerated_Item_01.java | 2 ++ .../oreprocessing/ProcessingShaping.java | 1 + .../textures/items/gt.metaitem.01/374.png | Bin 0 -> 14823 bytes 4 files changed, 4 insertions(+) create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/374.png diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java index e10437cf8b..8dfbbe73b6 100644 --- a/src/main/java/gregtech/api/enums/ItemList.java +++ b/src/main/java/gregtech/api/enums/ItemList.java @@ -169,6 +169,7 @@ public enum ItemList implements IItemContainer { Shape_Extruder_File, Shape_Extruder_Saw, Shape_Extruder_Gear, + Shape_Extruder_Gear_Small, Crate_Empty, Credit_Copper, Credit_Iron, diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java index 4b7e2f8025..fe253c19cf 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java @@ -224,6 +224,7 @@ public GT_MetaGenerated_Item_01() { ItemList.Shape_Extruder_Saw.set(addItem(tLastID = 371, "Extruder Shape (Saw Blade)", "Extruder Shape for making Saws", new Object[0])); ItemList.Shape_Extruder_Gear.set(addItem(tLastID = 372, "Extruder Shape (Gear)", "Extruder Shape for making Gears", new Object[0])); ItemList.Shape_Extruder_Bottle.set(addItem(tLastID = 373, "Extruder Shape (Bottle)", "Extruder Shape for making Bottles", new Object[0])); + ItemList.Shape_Extruder_Gear_Small.set(addItem(tLastID = 374, "Extruder Shape (Small Gear)", "Extruder Shape for making Small Gears", new Object[0])); GT_ModHandler.addCraftingRecipe(ItemList.Shape_Extruder_Bolt.get(1L, new Object[0]), GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"x ", aTextShape, aTextEmptyRow, 'P', ItemList.Shape_Empty}); GT_ModHandler.addCraftingRecipe(ItemList.Shape_Extruder_Cell.get(1L, new Object[0]), GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{" x ", aTextShape, aTextEmptyRow, 'P', ItemList.Shape_Empty}); @@ -247,6 +248,7 @@ public GT_MetaGenerated_Item_01() { GT_ModHandler.addCraftingRecipe(ItemList.Shape_Extruder_File.get(1L, new Object[0]), GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"x ", aTextEmptyRow, " P", 'P', ItemList.Shape_Empty}); GT_ModHandler.addCraftingRecipe(ItemList.Shape_Extruder_Saw.get(1L, new Object[0]), GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{" x ", aTextEmptyRow, " P", 'P', ItemList.Shape_Empty}); GT_ModHandler.addCraftingRecipe(ItemList.Shape_Extruder_Gear.get(1L, new Object[0]), GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"x ", aTextEmptyRow, "P ", 'P', ItemList.Shape_Empty}); + GT_ModHandler.addCraftingRecipe(ItemList.Shape_Extruder_Gear_Small.get(1L, new Object[0]), GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{aTextEmptyRow, "x ", "P ", 'P', ItemList.Shape_Empty}); GT_ModHandler.addCraftingRecipe(ItemList.Shape_Extruder_Pipe_Tiny.get(1L, new Object[0]), GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{" x ", aTextEmptyRow, "P ", 'P', ItemList.Shape_Empty}); GT_ModHandler.addCraftingRecipe(ItemList.Shape_Extruder_Pipe_Huge.get(1L, new Object[0]), GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{" x", aTextEmptyRow, "P ", 'P', ItemList.Shape_Empty}); GT_ModHandler.addCraftingRecipe(ItemList.Shape_Extruder_Bottle.get(1L, new Object[0]), GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{aTextEmptyRow, " x", "P ", 'P', ItemList.Shape_Empty}); diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java index 80ea8a5452..a0d40dac88 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java @@ -64,6 +64,7 @@ public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDic GT_Values.RA.addExtruderRecipe(GT_Utility.copyAmount(2L, new Object[]{aStack}), ItemList.Shape_Extruder_File.get(0L, new Object[0]), GT_OreDictUnificator.get(OrePrefixes.toolHeadFile, aMaterial.mSmeltInto, tAmount), (int) Math.max(aMaterialMass * 2L * tAmount, tAmount), 8 * tVoltageMultiplier); GT_Values.RA.addExtruderRecipe(GT_Utility.copyAmount(2L, new Object[]{aStack}), ItemList.Shape_Extruder_Saw.get(0L, new Object[0]), GT_OreDictUnificator.get(OrePrefixes.toolHeadSaw, aMaterial.mSmeltInto, tAmount), (int) Math.max(aMaterialMass * 2L * tAmount, tAmount), 8 * tVoltageMultiplier); GT_Values.RA.addExtruderRecipe(GT_Utility.copyAmount(4L, new Object[]{aStack}), ItemList.Shape_Extruder_Gear.get(0L, new Object[0]), GT_OreDictUnificator.get(OrePrefixes.gearGt, aMaterial.mSmeltInto, tAmount), (int) Math.max(aMaterialMass * 5L * tAmount, tAmount), 8 * tVoltageMultiplier); + GT_Values.RA.addExtruderRecipe(GT_Utility.copyAmount(1L, new Object[]{aStack}), ItemList.Shape_Extruder_Gear_Small.get(0L, new Object[0]), GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, aMaterial.mSmeltInto, tAmount), (int) Math.max(aMaterialMass * 0.2 * tAmount, tAmount), (int)(8 * tVoltageMultiplier)); GT_Values.RA.addAlloySmelterRecipe(GT_Utility.copyAmount(2L, new Object[]{aStack}), ItemList.Shape_Mold_Plate.get(0L, new Object[0]), GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial.mSmeltInto, tAmount), (int) Math.max(aMaterialMass * 2L * tAmount, tAmount), 2 * tVoltageMultiplier); GT_Values.RA.addAlloySmelterRecipe(GT_Utility.copyAmount(8L, new Object[]{aStack}), ItemList.Shape_Mold_Gear.get(0L, new Object[0]), GT_OreDictUnificator.get(OrePrefixes.gearGt, aMaterial.mSmeltInto, tAmount), (int) Math.max(aMaterialMass * 10L * tAmount, tAmount), 2 * tVoltageMultiplier); diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/374.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/374.png new file mode 100644 index 0000000000000000000000000000000000000000..35c2a31410ba20fb43d4a56ffe4a231e4a93ad9b GIT binary patch literal 14823 zcmeI3eQXnD9LH}432vYgMF=6`a=Zj^?Y(r})=OKQ>u?1+#u(7?lI*y9+FjP(mEM(h zGr>jv5Jbb21XPH`AVE+BvOg3tq6q|oAVx=~4k1c>i2)HYB4Whn+OB=pbv$7B^J&uF zZ_o4n{(jGWo|oM}x1q7&sWGJ!ODT#Pf0CGZ>gJ%6il;Df%j4Peo%;O;PUIshA|U1Cw3_!m8$Bt{gtX(5m8L zmO2AmAXW?7)cVdiSk&3jEO)lcE`^!xEp?|vm>>#FiB3f$njxk2E=(NOa z_b@e9K{^;{q-*s!pq=(go6I|^=_;3VywCzgmu(nC{Z z7DPZ4Xr=*ud{JMlO*eI;O&_LYu6x+Ra83e&THq5#;5J47cQK!+|5d&-! zF!V%R26b!TtxPF)_of=kPtKrBR?o0w2Pt(Jo7I!CrI$ixhTQO8#o9QKOg-ML>k)5e zl{F3^q-$%fRaHgLSgLA@o-}5<*+NTxzVq3DPcnfQI;(9QT#Q1qAc$PG$X7kiRfrsi zB*`cXas+fm4RsXBA#kD~pg9m_VGg)|6v>qCC=04Z@+h(x(&JId^r}%Q4A__!cC-0L zM44MvVyzz0<8WBO>u|Hhnh{rerHOvcFeOa}exDaM*i}^#d52S}7DAlOCG(Pvb5?|G zlEWd{c!x`=Qh+3Ip{g{*KmfH5N$u0+gtc3;sg=7-jo62zUJzH|Nhd`RjWznaEm0)R zkW%%k0oP{-vTot(O`m0p!0N%R104}HeI~`ExB;vk=V1o6T<#Fdol%x2y>mrLwoWsz zY;6djxY)X4nbyJcGq7TZ&ZpZt)I_)z;JBpp9Pn;-NL#*gMjy21G?GZ`s{{^y zSl;^0TG8%8Ys>AeXm_DC?_8{@rdP;TD`-Ys*2$YW78b#W1mLZ7Ivq|oTi9IaXjD@m z67;EX{~Fe+Tyr?9yPmBEvo+X(kK$luXD zPK>4_MNk^pnBc-9LIngDN&_1cTv$Y?fZ#%DU}J&{iwG4ETqq4}OmJZlp#p*nrGbqJ zE-WHcKyaZnura}fMT80nE|dl~Cb+POPyxY((!j<97ZwpJAh=K(*qGqLB0>cO7fJ&g z6I@tCsDR)?X<%c53yTO95L_q?Y)o)r5upNt3#EaL2`(%mR6uZ{G_Wzjg++u42riTc zHYT{Rh)@B+h0?&r1Q!+&Dj>K}8rYcN!XiQi1Q$vJ8xveuM5ut^LTO-Qf(wfX6%bq~ z4QzZ{T&4L}|9}SH_e;VT`zE|PZU=lRke2J40uvk?=UJ@&M|2Vhq z3&-CxKRlmU-_2Z|)^7XsTKLDOE9*w=@102RI=c4AL-S6|ac$jSVUst$^TOiK*sb%P zAGPF(lI3M5=Ga>ow4QF2w_TUkw|sKy95?s-lzV#D>PfZ2@4e;W2>aNw-@c30Q#%fS z>z?G_e&(kUT;#a}^LlpGfY%=^`KV!c^Yw8ndOw)4g*rKUFAEN~zcTslD>vV2ojvQo zwM#czR_^Z`@p)q9KTWOSskd%kJ{t@!EqnQ|3CFvSCNCb^cXCC~fm0uUIr`G>)~^1` zTgs=fXWrlII`Lw8*T4HVZ8`L-aeBk@vX-wv^u7M>ji-+Fd>yG=cxBH)?tXtyY5%dE zb$yA26Z_V0JRY7uwr1|0spU5p^h`Tnw|L3bXO3Jb`}6FD8)0ht#ZAgD?McRZ71LkW L;CuJU)@T0%zDzvm literal 0 HcmV?d00001