From e36ba26c632f4387c4c6e8eca287f639d4b95b5f Mon Sep 17 00:00:00 2001 From: Bernhard Bonigl Date: Fri, 19 Sep 2014 15:25:43 +0200 Subject: [PATCH] Fix dynamically added block casting only requiring 1 ingot instead of 1 block worth. #990 --- changelog.txt | 29 ++++++++++++++++++ .../metal_machineblade_alumite.png | Bin 0 -> 958 bytes .../machineblade/metal_machineblade_gold.png | Bin 0 -> 411 bytes .../metal_machineblade_obsidian.png | Bin 0 -> 202 bytes .../template_machineblade_clay.png | Bin 0 -> 1024 bytes resources/materials/cast_machineblade.png | Bin 0 -> 564 bytes .../tconstruct/smeltery/TinkerSmeltery.java | 11 ++++--- 7 files changed, 36 insertions(+), 4 deletions(-) create mode 100644 changelog.txt create mode 100644 resources/machineblade/metal_machineblade_alumite.png create mode 100644 resources/machineblade/metal_machineblade_gold.png create mode 100644 resources/machineblade/metal_machineblade_obsidian.png create mode 100644 resources/machineblade/template_machineblade_clay.png create mode 100644 resources/materials/cast_machineblade.png diff --git a/changelog.txt b/changelog.txt new file mode 100644 index 00000000..161bce6a --- /dev/null +++ b/changelog.txt @@ -0,0 +1,29 @@ +New Smeltery stuff +Smelteries can have any rectangular size from 3x3 to 4x7 to 9x9 (from 5x5) +Smeltery capacity depends directly on size +Smelteries learned how to use Pyrotheum +Smeltery GUI shinyness +Some fixes +Ported many changes from the latest 1.6.4 version, that didn't make the jump to 1.7.10 +Redstone modifier changes +Fix heart rendering +Fix Arrow/Dagger/Bow rendering +Comparator output for fullness of smeltery and seared tank/glass + +Tool Blockbreaking has been reworked. Tinker tools should not cause any problems with other mod blocks anymore. +Armor Modifiers now have proper book pages. +Frying pans in the world are now colorable +Battlesigns can be placed +Dense Ore Support +More Localization stuff +Zombie Flesh can be molten into a small amount of blood +New slimecrystal graphics by baddaspig +Many small (liquid) rendering fixes +Tanks also display the liquids they contain in item form +Fix stuff derping when putting incorrect modifiers onto armor +Fix ExtraUtilities Compressed Block support +No more free toolrod pattern for you +Many fixes with autosmelting +Fix Achievements +Fix black armor slots +So many small fixes that I don't even know where to start \ No newline at end of file diff --git a/resources/machineblade/metal_machineblade_alumite.png b/resources/machineblade/metal_machineblade_alumite.png new file mode 100644 index 0000000000000000000000000000000000000000..8958c102ea7f545d091a5d5960f35e4cf0518735 GIT binary patch literal 958 zcmV;v13~wuxsX1f3X{{#dC1qB5L z1_lQQ2M7oV2?+@b3JMDg3k(bl4Gj$r4h|0w4-gO#5fKp*5)u;=6BHB_6%`d078Vy5 z7Z?~A85tQG8X6lL8yp-Q9UUDW9v&YbA0QwgAt50mA|fLrBP1jwB_$;$CMG8*CnzW= zDJdx`Dk>{0D=aK5EiElBE-o)GFEB7LF)=YRGBPtWGc+_bH8nLhHa0gmH#j&rIXO8x zIyyT$J3Kr*Jv}`>K0ZG`KR`f0K|w)6LPA4BLqtSGMMXtMMn*?RM@UFWNl8gcN=i#h zOH52mO-)TsPEJoxPf$=$QBhG+Qc_b>Q&dz`RaI41R#sP6S6EnBSy@?HT3TCMTU=aR zU0q#XUS3~cUtnNhVPRonVq#-sV`OAxWo2b%W@cw+XJ}|>X=!O{YHDk1Yiw+6ZEbCC zZf7mzbECnVFfInwp!No1C1Sot>SYo}QndpP-Ll?si~=|s;aB2tE{Z7t*x!DuCA}IuduMNv9YnTva++Y zv$V9dwY9ajwzjvox45{txw*Nzy1Ki&yS%)-y}iA@zP`V|zreu2!NI}8!otJD!^FhI z#l^+O#>U6T$H>UY$;rve%F4^j%goHo&CSiu&d$%z&(P4&(b3V;($dq@)6~?|)z#J3 z*4Ee8*Vx$D+1c6J+S=RO+uYpT-QC^Z-rnEe-{9cj;o;%p;^O1ulq(=H}<; z=jiC@>FMd}>gwz3>+J08?d|RE?(XmJ@9^;O@$vEU^78ZZ^Yrxe_4W1k_V)Mp_xSku z`T6l8Mm$n+`8`l?1A@-m*H2gI9|P+aO-Bw>le|F9;Cl` zUU>Ib+{3FbcW$SCe(8GahR@y8o=+Y+-oKZ5;atL(H}0oTC4Bf0_2FIQox2J5Z+kqw z=kfHc?Sp&XAKvFayYG78c<}%K|Nm9qCQ1T3SQz1U7b7pm+`VF*Z6j;y=ETYW`d>5gFjP)wI+`|tSrTX-gQu&X%Q~loCIH(3M0x-K literal 0 HcmV?d00001 diff --git a/resources/machineblade/template_machineblade_clay.png b/resources/machineblade/template_machineblade_clay.png new file mode 100644 index 0000000000000000000000000000000000000000..bce0196805887df79c02055e0dcba633eb3b717e GIT binary patch literal 1024 zcmb8u$!`*26aesv*raJ}swR!vi$*VMV(e9+P+(YwW!Q$Ylx=_+pezG)fMID%sn}Fo zYu%%#CVDZ(#H0QL#zSMzJylPhJ!s-ZA3j6A9-aJV=FNNGH

v8*bJzJ~lN*QPenN zrM+-JIXFjEaJ_tO!Uwl=vMDJ0BvEegRe{o{rKE6yDe@V?EAZ)N<&&VHC>7;)aHjc0 zB@`{8XmSxm_-ZUw8)RYJu=OMrtmhoZ}_Cgh6NDfy1U5t-| zQcQ}c>+lF~8&)BJjkt1o?dc7T1>Kyn0=1Sw8l4Tz%-WGw@6;Js(yY-1^t4+~dq@V8 z*J$<)(H0JwtbSy+1uXU;$?6CJ#u;Xu^CTM^vAd!qhdTzGo;YH?JaYMx$jzlZ{`66T z$1iy2L|-67;(}R!Cg7snXhFJ#^5yn%eT_=^~4XJhqlw&zEa_S@3TtWE$Z_2!()4f zRPR~)Fv6c|aNXxyzed)7_J2?Y)yp?i<%`0X_q$!SeD&MM{qNV$w~wEt-j$8EGdtQB O@D++NvGiL*qW1^aYMfmF literal 0 HcmV?d00001 diff --git a/resources/materials/cast_machineblade.png b/resources/materials/cast_machineblade.png new file mode 100644 index 0000000000000000000000000000000000000000..646b7997ec0987df604f5053910ff173f4461fc7 GIT binary patch literal 564 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!WQl7;NpOBzNqJ&XDuZK6ep0G} zXKrG8YEWuoN@d~6R2!h8GXXv!u5V69oLOb`_Dsaf6QSR3mwvnu`{ioln={c54g|bE z7yI!-{Li~Jr>zd0NE?N<5el}4{mg`Zw#@cmBZ&%2c$FU9@3 zS9@xu$?M~xXIB{geOUMVUiF7FQ9tgKpI>Y7?p*Aj`!yFxQ|TVwwJN!`1%G3VEs{kT(cdZo$#|Ns9u<;(~A%cUg9FBr(B6fhKC z>K6iL_&W{eG|7|J(onCnGKP&Deg&_$0?ybEnY1 zm#&$VH`+^^UN%#xO@H>JHnbTBPgT(0`DeMt;s)am<;sgd#y@%D>fIJl^%Zh2Z1XuRE)VbuwP zSA`i&5fV4}r~6Lp*u>m0_rhb-Luagn;~48dizYCfU1PXr4$GH2K$kOky85}Sb4q9e E0GIncx&QzG literal 0 HcmV?d00001 diff --git a/src/main/java/tconstruct/smeltery/TinkerSmeltery.java b/src/main/java/tconstruct/smeltery/TinkerSmeltery.java index aaac7097..a88a574a 100644 --- a/src/main/java/tconstruct/smeltery/TinkerSmeltery.java +++ b/src/main/java/tconstruct/smeltery/TinkerSmeltery.java @@ -1252,7 +1252,7 @@ public class TinkerSmeltery { for (ItemStack ore : OreDictionary.getOres(name)) { - TConstructRegistry.getBasinCasting().addCastingRecipe(new ItemStack(ore.getItem(), 1, ore.getItemDamage()), new FluidStack(ft.fluid, TConstruct.ingotLiquidValue), 100); + TConstructRegistry.getBasinCasting().addCastingRecipe(new ItemStack(ore.getItem(), 1, ore.getItemDamage()), new FluidStack(ft.fluid, TConstruct.blockLiquidValue), 100); } } @@ -1265,10 +1265,13 @@ public class TinkerSmeltery GameRegistry.addShapelessRecipe(new ItemStack(TinkerTools.craftedSoil, 2, 6), Items.nether_wart, taintedSoil, heatSand); ItemStack ingotcast = new ItemStack(TinkerSmeltery.metalPattern, 1, 0); - LiquidCasting tableCasting = TConstructRegistry.instance.getTableCasting(); - LiquidCasting basinCasting = TConstructRegistry.instance.getBasinCasting(); + LiquidCasting tableCasting = TConstructRegistry.getTableCasting(); + LiquidCasting basinCasting = TConstructRegistry.getBasinCasting(); + ArrayList ores; + // TE is handled by the oredicted variant already /* Thermal Expansion 3 Metals */ + /* ArrayList ores = OreDictionary.getOres("ingotNickel"); if (ores.size() > 0) { @@ -1332,7 +1335,7 @@ public class TinkerSmeltery { basinCasting.addCastingRecipe(ores.get(0), new FluidStack(TinkerSmeltery.moltenElectrumFluid, TConstruct.blockLiquidValue), null, 100); } - +*/ /* Extra Utilities */ ores = OreDictionary.getOres("compressedGravel1x"); if (ores.size() > 0)