From 95af0b1c6d957226e9ba564c22033368f98ef12d Mon Sep 17 00:00:00 2001 From: "[MMKP]Puyo061" Date: Thu, 16 Oct 2014 22:43:11 +0900 Subject: [PATCH 1/8] Update ko_KR.lang --- resources/assets/tinker/lang/ko_KR.lang | 27 ++++++------------------- 1 file changed, 6 insertions(+), 21 deletions(-) diff --git a/resources/assets/tinker/lang/ko_KR.lang b/resources/assets/tinker/lang/ko_KR.lang index a6b2c4c1..04000bfa 100644 --- a/resources/assets/tinker/lang/ko_KR.lang +++ b/resources/assets/tinker/lang/ko_KR.lang @@ -545,26 +545,6 @@ death.four.smeltery=%1$s는 뜨거운 액체 속에서 수영하는 것을 그 death.attack.Landmine=%1$s의 다리가 지뢰에 의해 파괴되었습니다 death.attack.FireworkExplode=%1$s가 불꽃놀이 폭발에 의해 거열당했습니다 -parttype.wood=나무 -parttype.stone=돌 -parttype.iron=철 -parttype.flint=부싯돌 -parttype.cactus=선인장 -parttype.bone=뼈 -parttype.obsidian=흑요석 -parttype.slime=슬라임 -parttype.paper=종이 -parttype.netherrack=네더랙 -parttype.cobalt=코발트 -parttype.ardite=아르다이트 -parttype.manyullyn=마뉼린 -parttype.copper=구리 -parttype.bronze=청동 -parttype.alumite=알루마이트 -parttype.steel=강철 -parttype.blueslime=푸른 슬라임 -parttype.thaumium=사우뮴 -parttype.pigiron=돼지 선철 toolpart.ToolRod=%%material 도구 막대기 toolpart.PickaxeHead=%%material 곡괭이 머리 @@ -595,6 +575,8 @@ toolpart.Fletching=%%material 화살 깃 # Now with translations of specific material and part combinations: #toolpart.ToolRod.wood=Wooden Tool Rod +# If only the material part has to be specific, you can use this +#toolpart.material.wood=Wooden fluid.iron.molten=녹은 철 fluid.gold.molten=녹은 금 @@ -718,6 +700,8 @@ smeltery.drain.tooltip1=제련소 안의 액체를 smeltery.drain.tooltip2=빼내거나 다시 집어넣을 수 있음 smeltery.brick.tooltip1=제련소 구성 블럭 smeltery.brick.tooltip2=(장식용으로 사용 가능) +#Dear translators, only translate this line if the joke is applicable in your language. +grout.tooltip=I am Grout! gui.smeltery.fuel=연료 gui.smeltery.emerald=에메랄드 수: @@ -765,6 +749,8 @@ gui.toolstation15=채광 수준: gui.toolstation16=사용 속도: gui.toolstation17=업그레이드 gui.toolstation18=남은 업그레이드 횟수: +gui.toolstation19=데미지 감소: +gui.toolstation20=보호: material.wood=나무 material.wood.display=나무 @@ -794,7 +780,6 @@ material.bronze=청동 material.alumite=알루마이트 material.steel=강철 material.pigiron=돼지 선철 -material.pigiron.display=선철 material.pigiron.ability=뫄이쩡! material.thaumium=사우뮴 material.thaumium.ability=사우믹 From 54e11b8a4708b129c517239fe9d04756879ac2ca Mon Sep 17 00:00:00 2001 From: Ondra Moravek Date: Fri, 17 Oct 2014 23:54:17 +0200 Subject: [PATCH 2/8] Fix NPE for some (at least Mekanism) pipes connected to unfinished smeltery drains. --- .../java/tconstruct/smeltery/logic/SmelteryDrainLogic.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/tconstruct/smeltery/logic/SmelteryDrainLogic.java b/src/main/java/tconstruct/smeltery/logic/SmelteryDrainLogic.java index 7361f6f2..0c5d80c2 100644 --- a/src/main/java/tconstruct/smeltery/logic/SmelteryDrainLogic.java +++ b/src/main/java/tconstruct/smeltery/logic/SmelteryDrainLogic.java @@ -72,6 +72,9 @@ public class SmelteryDrainLogic extends MultiServantLogic implements IFluidHandl { // Check that the drain is coming from the from the front of the block // and that the fluid to be drained is in the smeltery. + if(!hasValidMaster()) + return false; + boolean containsFluid = fluid == null; if (fluid != null) { From 9672f95efc3d338722185d63c3038c68759e3bcd Mon Sep 17 00:00:00 2001 From: Bernhard Bonigl Date: Sat, 18 Oct 2014 17:02:43 +0200 Subject: [PATCH 3/8] Give ToolShards the DynamicToolPart treatment --- .../tinker/textures/items/parts/_chunk.png | Bin 263 -> 349 bytes .../library/TConstructRegistry.java | 9 +++ .../java/tconstruct/tools/TinkerTools.java | 30 +++++++- .../tconstruct/tools/items/ToolShard.java | 69 ++++-------------- 4 files changed, 53 insertions(+), 55 deletions(-) diff --git a/resources/assets/tinker/textures/items/parts/_chunk.png b/resources/assets/tinker/textures/items/parts/_chunk.png index 127fd678344410cdc4c343c351008d306b3b105f..ffea177daa916f544823c226891e6fa519925cc1 100644 GIT binary patch delta 289 zcmV++0p9+H0^I_TF%Je}OGiWi{{a60|De66laW3ce+P6)O+^RZ3K9+_D1(>t<8 z-AP12R5;76lCh12Fc3r^cMdGk2oX(Cf+hDs2X|ESJ$eSW4-rdx*05`lv>WY_ZY%uES6Gwk04#Hwe~7PXo`doUVv4I*c1W4|0|-) zX0|d1unOQMm@NSu0{MfM%M1~PP|n7+b%1<3j_! toolMaterials = new HashMap(40); public static HashMap toolMaterialStrings = new HashMap(40); public static List defaultToolPartMaterials = new LinkedList(); + public static List defaultShardMaterials = new LinkedList(); public static void addDefaultToolPartMaterial(int materialID) { @@ -229,6 +230,14 @@ public class TConstructRegistry defaultToolPartMaterials.add(materialID); } + public static void addDefaultShardMaterial(int materialID) + { + if(!toolMaterials.containsKey(materialID)) + logger.error("[TCon API] Can't add default shard: Material ID " + materialID + " is unknown."); + else + defaultShardMaterials.add(materialID); + } + /** * Adds a tool material to the registry * diff --git a/src/main/java/tconstruct/tools/TinkerTools.java b/src/main/java/tconstruct/tools/TinkerTools.java index 69191943..2e9e6a62 100644 --- a/src/main/java/tconstruct/tools/TinkerTools.java +++ b/src/main/java/tconstruct/tools/TinkerTools.java @@ -171,7 +171,7 @@ public class TinkerTools TinkerTools.materials = new MaterialItem().setUnlocalizedName("tconstruct.Materials"); TinkerTools.toolRod = new DynamicToolPart("_rod", "ToolRod"); - TinkerTools.toolShard = new ToolShard("_chunk").setUnlocalizedName("tconstruct.ToolShard"); + TinkerTools.toolShard = new ToolShard("_chunk", "ToolShard"); TinkerTools.woodPattern = new Pattern("pattern_", "materials/").setUnlocalizedName("tconstruct.Pattern"); GameRegistry.registerItem(TinkerTools.materials, "materials"); GameRegistry.registerItem(TinkerTools.woodPattern, "woodPattern"); @@ -698,6 +698,9 @@ public class TinkerTools TConstructRegistry.addBowstringMaterial(1, 2, new ItemStack((Item) obj, 1, 7), new ItemStack(TinkerTools.bowstring, 1, 1), 1F, 1F, 0.9f, 0x63bcd9); TConstructRegistry.addBowMaterial(31, 576, 40, 1.2f); TConstructRegistry.addArrowMaterial(31, 1.8F, 0.5F, 100F); + + TConstructRegistry.addDefaultToolPartMaterial(MaterialID.Thaumium); + TConstructRegistry.addDefaultShardMaterial(MaterialID.Thaumium); } else { @@ -809,6 +812,31 @@ public class TinkerTools TConstructRegistry.addDefaultToolPartMaterial(MaterialID.BlueSlime ); TConstructRegistry.addDefaultToolPartMaterial(MaterialID.PigIron); + // Register all the materials for default toolparts + //TConstructRegistry.addDefaultShardMaterial(MaterialID.Wood); + TConstructRegistry.addDefaultShardMaterial(MaterialID.Stone); + TConstructRegistry.addDefaultShardMaterial(MaterialID.Flint); + TConstructRegistry.addDefaultShardMaterial(MaterialID.Cactus); + //TConstructRegistry.addDefaultShardMaterial(MaterialID.Bone); + TConstructRegistry.addDefaultShardMaterial(MaterialID.Obsidian); + TConstructRegistry.addDefaultShardMaterial(MaterialID.Netherrack); + TConstructRegistry.addDefaultShardMaterial(MaterialID.Slime); + //TConstructRegistry.addDefaultShardMaterial(MaterialID.Paper); + TConstructRegistry.addDefaultShardMaterial(MaterialID.BlueSlime ); + + if(PHConstruct.craftMetalTools) + { + TConstructRegistry.addDefaultShardMaterial(MaterialID.Iron); + TConstructRegistry.addDefaultShardMaterial(MaterialID.Cobalt); + TConstructRegistry.addDefaultShardMaterial(MaterialID.Ardite); + TConstructRegistry.addDefaultShardMaterial(MaterialID.Manyullyn); + TConstructRegistry.addDefaultShardMaterial(MaterialID.Copper); + TConstructRegistry.addDefaultShardMaterial(MaterialID.Bronze); + TConstructRegistry.addDefaultShardMaterial(MaterialID.Alumite); + TConstructRegistry.addDefaultShardMaterial(MaterialID.Steel); + TConstructRegistry.addDefaultShardMaterial(MaterialID.PigIron); + } + PatternBuilder pb = PatternBuilder.instance; if (PHConstruct.enableTWood) pb.registerFullMaterial(Blocks.planks, 2, "Wood", new ItemStack(Items.stick), new ItemStack(Items.stick), 0); diff --git a/src/main/java/tconstruct/tools/items/ToolShard.java b/src/main/java/tconstruct/tools/items/ToolShard.java index 02af9f94..e8265af6 100644 --- a/src/main/java/tconstruct/tools/items/ToolShard.java +++ b/src/main/java/tconstruct/tools/items/ToolShard.java @@ -1,68 +1,29 @@ package tconstruct.tools.items; -import cpw.mods.fml.relauncher.*; -import java.util.List; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.*; -import net.minecraft.util.IIcon; -import tconstruct.tools.TinkerTools; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import tconstruct.library.TConstructRegistry; +import tconstruct.library.tools.DynamicToolPart; -public class ToolShard extends ToolPart +import java.util.List; + +public class ToolShard extends DynamicToolPart { - public ToolShard(String tex) + public ToolShard(String tex, String name) { - super(tex, "ToolShard"); - this.setHasSubtypes(true); - this.setMaxDamage(0); - } - - private static String[] buildTextureNames (String textureType) - { - String[] names = new String[toolMaterialNames.length]; - for (int i = 0; i < toolMaterialNames.length; i++) - { - if (!toolTextureNames[i].equals("")) - names[i] = toolTextureNames[i] + textureType; - } - return names; + super(tex, name); } @Override - @SideOnly(Side.CLIENT) - public void registerIcons (IIconRegister iconRegister) + public void getSubItems (Item item, CreativeTabs tab, List list) { - this.icons = new IIcon[textureNames.length]; - - for (int i = 0; i < 5; ++i) - { - this.icons[i] = iconRegister.registerIcon("tinker:" + folder + textureNames[i]); + // material id == metadata + for(Integer matID : TConstructRegistry.defaultShardMaterials) { + ItemStack stack = new ItemStack(item, 1, matID); + if (this.getMaterialID(stack) != -1) + list.add(stack); } - icons[5] = icons[4]; - for (int i = 6; i < 9; ++i) - { - this.icons[i] = iconRegister.registerIcon("tinker:" + folder + textureNames[i]); - } - icons[9] = icons[8]; - for (int i = 10; i < icons.length; ++i) - { - if (!toolTextureNames[i].equals("")) - this.icons[i] = iconRegister.registerIcon("tinker:" + folder + textureNames[i]); - } - } - - @Override - public void getSubItems (Item b, CreativeTabs tab, List list) - { - for (int i = 1; i < 5; i++) - list.add(new ItemStack(b, 1, i)); - for (int i = 6; i < 9; i++) - list.add(new ItemStack(b, 1, i)); - for (int i = 10; i < 19; i++) - list.add(new ItemStack(b, 1, i)); - - if (TinkerTools.thaumcraftAvailable) - list.add(new ItemStack(b, 1, 31)); } } From c05cdf03c62354fd87d26ae5f3e937c579d10114 Mon Sep 17 00:00:00 2001 From: Bernhard Bonigl Date: Sat, 18 Oct 2014 17:04:35 +0200 Subject: [PATCH 4/8] Register a dynamic tool shard if no shard is present in the PatternBuilder IMC --- src/main/java/tconstruct/util/IMCHandler.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/main/java/tconstruct/util/IMCHandler.java b/src/main/java/tconstruct/util/IMCHandler.java index 61b3d39f..dcb1621e 100644 --- a/src/main/java/tconstruct/util/IMCHandler.java +++ b/src/main/java/tconstruct/util/IMCHandler.java @@ -78,6 +78,13 @@ public final class IMCHandler { ItemStack shard = ItemStack.loadItemStackFromNBT(tag.getCompoundTag("Shard")); // optional ItemStack rod = new ItemStack(TinkerTools.toolRod, 1, matID); + // default shard if none present. Has to exist because old code. + if(shard == null) + { + TConstructRegistry.addDefaultShardMaterial(matID); + shard = new ItemStack(TinkerTools.toolShard, 1, matID); + } + // register the material PatternBuilder.instance.registerFullMaterial(item, value, TConstructRegistry.getMaterial(matID).materialName, shard, rod, matID); From 8cdd0e5306cc1a888432068c2231446d72d1f3bd Mon Sep 17 00:00:00 2001 From: Bernhard Bonigl Date: Sat, 18 Oct 2014 17:16:37 +0200 Subject: [PATCH 5/8] Fix wings not calling ArmorMod ticks. Fixes Wing Moss Repair. #1093 --- src/main/java/tconstruct/armor/items/TravelWings.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/tconstruct/armor/items/TravelWings.java b/src/main/java/tconstruct/armor/items/TravelWings.java index ab5cb66a..53bfa001 100644 --- a/src/main/java/tconstruct/armor/items/TravelWings.java +++ b/src/main/java/tconstruct/armor/items/TravelWings.java @@ -37,6 +37,7 @@ public class TravelWings extends TravelGear @Override public void onArmorTick (World world, EntityPlayer player, ItemStack itemStack) { + super.onArmorTick(world, player, itemStack); NBTTagCompound tag = itemStack.getTagCompound().getCompoundTag(getBaseTagName()); int feather = tag.getInteger("Feather Fall"); if (feather > 0) From c6e24f851146f4eff01ddd7e2c6e75d84dfb0622 Mon Sep 17 00:00:00 2001 From: Bernhard Bonigl Date: Sat, 18 Oct 2014 17:16:50 +0200 Subject: [PATCH 6/8] Fix Traveller Gear Repair #1093 --- .../java/tconstruct/modifiers/armor/TravelModRepair.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/tconstruct/modifiers/armor/TravelModRepair.java b/src/main/java/tconstruct/modifiers/armor/TravelModRepair.java index 47221e94..5750cc0c 100644 --- a/src/main/java/tconstruct/modifiers/armor/TravelModRepair.java +++ b/src/main/java/tconstruct/modifiers/armor/TravelModRepair.java @@ -3,6 +3,7 @@ package tconstruct.modifiers.armor; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import tconstruct.armor.items.TravelGear; +import tconstruct.library.modifier.IModifyable; import tconstruct.library.modifier.ItemModifier; public class TravelModRepair extends ItemModifier @@ -110,4 +111,9 @@ public class TravelModRepair extends ItemModifier { //Nope } + + @Override + public boolean validType(IModifyable input) { + return input.getModifyType().equals("Clothing"); + } } From dec1cb42185e5982947aeaeb2835004b3fe8598d Mon Sep 17 00:00:00 2001 From: Bernhard Bonigl Date: Sun, 19 Oct 2014 14:03:24 +0200 Subject: [PATCH 7/8] Fix arrows with minimal textures crashing. #1101 --- src/main/java/tconstruct/items/tools/Arrow.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/tconstruct/items/tools/Arrow.java b/src/main/java/tconstruct/items/tools/Arrow.java index 35e61029..e5677a87 100644 --- a/src/main/java/tconstruct/items/tools/Arrow.java +++ b/src/main/java/tconstruct/items/tools/Arrow.java @@ -11,6 +11,7 @@ import net.minecraft.world.World; import tconstruct.library.TConstructRegistry; import tconstruct.library.crafting.ToolBuilder; import tconstruct.library.tools.BowstringMaterial; +import tconstruct.library.tools.CustomMaterial; import tconstruct.library.tools.FletchingMaterial; import tconstruct.library.tools.ToolCore; import tconstruct.tools.TinkerTools; @@ -47,8 +48,11 @@ public class Arrow extends ToolCore @Override protected int getDefaultColor(int renderPass, int materialID) { // fletchling uses custom material - if(renderPass == 2) - return TConstructRegistry.getCustomMaterial(materialID, FletchingMaterial.class).color; + if(renderPass == 2) { + CustomMaterial mat = TConstructRegistry.getCustomMaterial(materialID, FletchingMaterial.class); + if(mat != null) + return mat.color; + } return super.getDefaultColor(renderPass, materialID); } From 14078c4092debce3056395f8ad0f334b1d8610b2 Mon Sep 17 00:00:00 2001 From: Bernhard Bonigl Date: Sun, 19 Oct 2014 14:08:58 +0200 Subject: [PATCH 8/8] Fix AOE-Tools not calling tinkers own callbacks for AOE broken blocks (e.g. autosmelt) #1099 --- src/main/java/tconstruct/library/tools/AOEHarvestTool.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/tconstruct/library/tools/AOEHarvestTool.java b/src/main/java/tconstruct/library/tools/AOEHarvestTool.java index 47976555..78b8502c 100644 --- a/src/main/java/tconstruct/library/tools/AOEHarvestTool.java +++ b/src/main/java/tconstruct/library/tools/AOEHarvestTool.java @@ -66,7 +66,9 @@ public abstract class AOEHarvestTool extends HarvestTool { // don't break the originally already broken block, duh if (xPos == x && yPos == y && zPos == z) continue; - breakExtraBlock(player.worldObj, xPos, yPos, zPos, sideHit, player, x,y,z); + + if(!super.onBlockStartBreak(stack, xPos, yPos, zPos, player)) + breakExtraBlock(player.worldObj, xPos, yPos, zPos, sideHit, player, x,y,z); }