From 85e690c6b759cacdf287ada699f1c7a2b251a8bb Mon Sep 17 00:00:00 2001 From: DrParadox7 <47131096+DrParadox7@users.noreply.github.com> Date: Thu, 29 Dec 2022 19:50:06 +0100 Subject: [PATCH] Misc Additions (#62) * Fix Tinker Addons Fixed clay cast taking over the registry name of standard casts Added missing resources for molten quartz item (used by Iguana Tinker Tweaks) * Prevent casting recipes of invalid clay casts * Seared Channel * Blank Clay Cast * Enhance readability --- .../tconstruct/smeltery/TinkerSmeltery.java | 10 ++++- .../smeltery/blocks/CastingChannelBlock.java | 40 ++++++++++++++++-- .../java/tconstruct/tools/TinkerTools.java | 2 +- .../tconstruct/weaponry/TinkerWeaponry.java | 9 +++- .../resources/assets/tinker/lang/en_US.lang | 1 + .../items/materials/blank_clay_cast.png | Bin 0 -> 2062 bytes 6 files changed, 55 insertions(+), 7 deletions(-) create mode 100644 src/main/resources/assets/tinker/textures/items/materials/blank_clay_cast.png diff --git a/src/main/java/tconstruct/smeltery/TinkerSmeltery.java b/src/main/java/tconstruct/smeltery/TinkerSmeltery.java index f3f13b49..c13148cd 100644 --- a/src/main/java/tconstruct/smeltery/TinkerSmeltery.java +++ b/src/main/java/tconstruct/smeltery/TinkerSmeltery.java @@ -765,7 +765,7 @@ public class TinkerSmeltery { GameRegistry.addRecipe( new ItemStack(TinkerSmeltery.searedBlockNether, 1, 2), "b b", "b b", "bbb", 'b', searedBrick); // Basin GameRegistry.addRecipe( - new ItemStack(TinkerSmeltery.castingChannel, 4, 0), "b b", "bbb", 'b', searedBrick); // Channel + new ItemStack(TinkerSmeltery.castingChannel, 4, 1), "b b", "bbb", 'b', searedBrick); // Channel // Slab Smeltery Components Recipes for (int i = 0; i < 7; i++) { @@ -1088,7 +1088,9 @@ public class TinkerSmeltery { / 2; ItemStack metalCast = new ItemStack(TinkerTools.patternOutputs[iter], 1, liquidDamage[iterTwo]); tableCasting.addCastingRecipe(metalCast, new FluidStack(fs, fluidAmount), cast, 50); - tableCasting.addCastingRecipe(metalCast, new FluidStack(fs, fluidAmount), clay_cast, true, 50); + if (isValidClayCast(iter)) { + tableCasting.addCastingRecipe(metalCast, new FluidStack(fs, fluidAmount), clay_cast, true, 50); + } Smeltery.addMelting(FluidType.getFluidType(fs), metalCast, 0, fluidAmount); } } @@ -2033,4 +2035,8 @@ public class TinkerSmeltery { return fluid; } + + public boolean isValidClayCast(int meta) { + return meta < 14 || meta == 22 || meta == 25; + } } diff --git a/src/main/java/tconstruct/smeltery/blocks/CastingChannelBlock.java b/src/main/java/tconstruct/smeltery/blocks/CastingChannelBlock.java index b9e6417b..f8d7250e 100644 --- a/src/main/java/tconstruct/smeltery/blocks/CastingChannelBlock.java +++ b/src/main/java/tconstruct/smeltery/blocks/CastingChannelBlock.java @@ -1,11 +1,16 @@ package tconstruct.smeltery.blocks; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import java.util.List; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.*; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IIcon; import net.minecraft.world.*; import tconstruct.library.TConstructRegistry; import tconstruct.smeltery.TinkerSmeltery; @@ -25,6 +30,14 @@ public class CastingChannelBlock extends BlockContainer { setCreativeTab(TConstructRegistry.blockTab); } + public String[] textureNames = new String[] {"searedstone", "nether_searedstone"}; + public IIcon[] icons; + + /* Rendering */ + public String[] getTextureNames() { + return textureNames; + } + @Override public boolean onBlockActivated( World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { @@ -71,13 +84,34 @@ public class CastingChannelBlock extends BlockContainer { return BlockRenderCastingChannel.renderID; } - @Override public void registerBlockIcons(IIconRegister iconRegister) { - this.blockIcon = iconRegister.registerIcon("tinker:searedstone"); + this.icons = new IIcon[textureNames.length]; + + for (int i = 0; i < this.icons.length; ++i) { + this.icons[i] = iconRegister.registerIcon("tinker:" + textureNames[i]); + } } @Override - public TileEntity createNewTileEntity(World var1, int var2) { + public int damageDropped(int meta) { + return meta; + } + + @Override + public TileEntity createNewTileEntity(World var1, int metadata) { return new CastingChannelLogic(); } + + @Override + public void getSubBlocks(Item id, CreativeTabs tab, List list) { + list.add(new ItemStack(id, 1, 0)); + list.add(new ItemStack(id, 1, 1)); + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getIcon(int side, int meta) { + if (meta == 0) return icons[0]; + else return icons[1]; + } } diff --git a/src/main/java/tconstruct/tools/TinkerTools.java b/src/main/java/tconstruct/tools/TinkerTools.java index 56b3e253..c0d35461 100644 --- a/src/main/java/tconstruct/tools/TinkerTools.java +++ b/src/main/java/tconstruct/tools/TinkerTools.java @@ -186,7 +186,7 @@ public class TinkerTools { // Items TinkerTools.titleIcon = new TitleIcon().setUnlocalizedName("tconstruct.titleicon"); GameRegistry.registerItem(TinkerTools.titleIcon, "titleIcon"); - String[] blanks = new String[] {"blank_pattern", "blank_cast", "blank_cast"}; + String[] blanks = new String[] {"blank_pattern", "blank_cast", "blank_cast", "blank_clay_cast"}; TinkerTools.blankPattern = new CraftAchievementItem( blanks, blanks, "materials/", "tinker", TConstructRegistry.materialTab, "tconstruct.pattern") .setUnlocalizedName("tconstruct.Pattern"); diff --git a/src/main/java/tconstruct/weaponry/TinkerWeaponry.java b/src/main/java/tconstruct/weaponry/TinkerWeaponry.java index 59c49c47..2399662b 100644 --- a/src/main/java/tconstruct/weaponry/TinkerWeaponry.java +++ b/src/main/java/tconstruct/weaponry/TinkerWeaponry.java @@ -278,10 +278,17 @@ public class TinkerWeaponry { int fluidAmount = metalPattern.getPatternCost(cast) * TConstruct.ingotLiquidValue / 2; ItemStack metalCast = new ItemStack(patternOutputs[i], 1, liquidDamage[iterTwo]); tableCasting.addCastingRecipe(metalCast, new FluidStack(fs, fluidAmount), cast, 50); - tableCasting.addCastingRecipe(metalCast, new FluidStack(fs, fluidAmount), clay_cast, true, 50); Smeltery.addMelting(FluidType.getFluidType(fs), metalCast, 0, fluidAmount); } } + //Register clay part casting for BowLimbs + for (int iterTwo = 0; iterTwo < TinkerSmeltery.liquids.length; iterTwo++) { + Fluid fs = TinkerSmeltery.liquids[iterTwo].getFluid(); + ItemStack clay_cast = new ItemStack(clayPattern, 1, 3); + int fluidAmount = clayPattern.getPatternCost(clay_cast) * TConstruct.ingotLiquidValue / 2; + + tableCasting.addCastingRecipe(new ItemStack(patternOutputs[3], 1, liquidDamage[iterTwo]), new FluidStack(fs, fluidAmount), clay_cast, true, 50); + } ItemStack cast = new ItemStack(TinkerSmeltery.metalPattern, 1, 25); ItemStack clay_cast = new ItemStack(TinkerSmeltery.clayPattern, 1, 25); diff --git a/src/main/resources/assets/tinker/lang/en_US.lang b/src/main/resources/assets/tinker/lang/en_US.lang index 4773dcec..3912445d 100644 --- a/src/main/resources/assets/tinker/lang/en_US.lang +++ b/src/main/resources/assets/tinker/lang/en_US.lang @@ -491,6 +491,7 @@ block.slime.congealed.purple.name=Congealed Purple Slime item.tconstruct.storage.knapsack.name=Knapsack item.tconstruct.blankpattern.pattern.name=Blank Pattern item.tconstruct.blankpattern.cast.name=Blank Cast +item.tconstruct.Pattern.blank_clay_cast.name=Blank Clay Cast item.tconstruct.Bowstring.string.name=Bowstring item.tconstruct.Bowstring.enchantedfabric.name=Enchanted Bowstring diff --git a/src/main/resources/assets/tinker/textures/items/materials/blank_clay_cast.png b/src/main/resources/assets/tinker/textures/items/materials/blank_clay_cast.png new file mode 100644 index 0000000000000000000000000000000000000000..d8c74cae0276c95140fd9a7f307ff4c9d3621857 GIT binary patch literal 2062 zcmV+p2=VucP) zaB^>EX>4U6ba`-PAZ2)IW&i+q+O1Yu66+`o{MRYw2uMOK$H4}w-VNsXBQW5EIB%=5 zD+UXprCZ2>^6!rd|L8@=1+e0Si_RInY_yS*PJ+3vYeZxFbG(>2d6UChAQiEWe7(9d z^pncv-r((!AMbMT=dcroAzX(0#m#e@=Mm&E#B|AVyh9utl6y&K{OBBJhw=U0dIckk z+G7GLjBNUoE>GNk#7W1fPh_u($WG@xU%D6s9uN*1 ztyr-8jm@7r3+g$eY7(k3?99I0unYe7elt{SD|18>7FHS;wffR98guQbT1p7kfvI$S z5w5}PS0k2{LFq6DO)#0`GI0prwZ)xhHUg?@&2?VT=V3r0Qs1J%AS(mLAqzS*p2#CA zjzRfJ8ac70Lm5B;p{!AoWp+wVpypfmcbd)S>#X3E2K}#rs zuvigs;w4Cw8XwlRU|qK_fQn36h8 zHmR+o`bh-`9emhB4tMw?9Pvn}md|NVIo;{caKyiwss5%bI_=J zVeXT+2i9`x?Up-1?G!4e+96qwpDL7)D5UmX`l}KCcH^fZjn(zJc1-IsT4~?BoVtQG zk)dygz|4iCDe9+|uT(TOKR4H@lZOt;SUJZE$Ke36GWC5D;}KK|nj%&yeUBt;x}KMfzdr`Qd(_+|zxw_(lT+%p#N%wx9(Rb>SQODZMbLGcI*r#*JNr@7HBjO-5I z3V4oXYSf|Od8W_ByS@qsb6QkZt;ogTIUvT{P~P%fV2Op@ncZkrrJeZcwz!e6^=Ad? z`}Bm`m34LIfkXVtM~4F1PW~vvsiQ4oqt)(d4!qz3>_TD3%RS%~cSeSDxKo}Lj#CF0 zre%leqbdr#0_Gp^lH;ko^3I5d-6^@RIDG;}H?c4d<8dFxIuB!B=fh`z1*6TEoE^@? zi=6;(r*f`@KksrdYb#Bt0zO7`%!rH=c_<`!J5(Rst};(snSUe!cfF@y&{tQvWAuBI zX_fule!d2|YmO0a9N6Ejp*~i6x+{IMyikE1jcM2B-#e^R0I!=@P)2czPdJ?~WiD@? z;Ac#@VIj!Z&bE#&eC<|7|5^SDsdOU+?}oqCkNs$_dra_AjGpBN>ZyO)d>2%hlo;4L z%|3p9b-#Sf;RWLl(A%GwK0VJ8%+Fnd`Gvyoj^7Qj{-KImvHt<8mb$;l0y(_^00D(* zLqkwWLqi~Na&Km7Y-Iodc$|HaJxIeq9K~N##Sbb{>>%P0usT@~6>*d*7QsSkE41oh za_JW|X-HCB90k{cgCC1k2N!2u9b5%L@B_rr$w|>gO8j3^Xc6PVaX;SOd)&PPgnF5& zX2%4eYL=0VMa4{ZRqT324}u6_1VM?JdOWq5hUfUYhmWs!5uW9J?$6PuBbKWNov7)39pA(N8bV1@ruFEdJaV|J4@XU~rPR=HgIv>(&Rnhat9cE(j`N3BtK0dp9kL0=$o>@z%9_b=JwXy$LRx* zrmmK6fP+I|tU%f89`EjM@9p0+&HjD>a8z=po{lGC00006VoOIv0RI600RN!9r;`8x z010qNS#tmYE+YT{E+YYWr9XB6000McNliru<_QrFAOLn|2^;_b0ar;xK~y-)rISH! z-7pM9A4$n^kOKdPUGxaKT2D}*$0*WvFh9GDB2}2x_hTc=^fmm(P*_B7(oKuPadmRYgRIh<3p@_}()N z0{{s?MR51l=psJV|{o~^Sn3tu=%{e0?hzR32wpvOF5n)$cN;v?1 z-_!T~>VMC{o!jl!lr76bt(AyCRj+_)nwh3)^Gt)3Qb{S1b0+5u&}^F70dTJ@OKJXc z&ZsI~*HLSwl)^Mk)LL7J7X_+{sB|~&vUl$Kj4SfKmU*i9?D3iYXATM07*qoM6N<$f;$Y_jQ{`u literal 0 HcmV?d00001