diff --git a/mods/tinker/resources/lang/en_US.xml b/mods/tinker/resources/lang/en_US.xml index a56fefa..1843f2b 100644 --- a/mods/tinker/resources/lang/en_US.xml +++ b/mods/tinker/resources/lang/en_US.xml @@ -20,6 +20,7 @@ Slimy Mud Grout + Slimy Mud Netherack Slag Cobalt Ore @@ -77,4 +78,7 @@ Casting Table Seared Faucet + Blue Slime + Nitro Creeper + \ No newline at end of file diff --git a/mods/tinker/tconstruct/PHConstruct.java b/mods/tinker/tconstruct/PHConstruct.java index 4383c69..bebb7bc 100644 --- a/mods/tinker/tconstruct/PHConstruct.java +++ b/mods/tinker/tconstruct/PHConstruct.java @@ -57,7 +57,7 @@ public class PHConstruct { redCreeper = config.get("Mob Spawning", "Activate Nitro Creeper Spawns", true).getBoolean(true); blueSlime = config.get("Mob Spawning", "Activate Blue Slime Spawns", true).getBoolean(true); redCreeperWeight = config.get("Mob Spawning", "Spawn Weight for Nitro Creeper", 7).getInt(7); - blueSlimeWeight = config.get("Mob Spawning", "Spawn Weight for Blue Slime", 10).getInt(10); + blueSlimeWeight = config.get("Mob Spawning", "Spawn Weight for Blue Slime", 8).getInt(8); woodCrafter = config.getBlock("Wood Tool Station", 1471).getInt(1471); heldItemBlock = config.getBlock("Held Item Block", 1472).getInt(1472); diff --git a/mods/tinker/tconstruct/TConstruct.java b/mods/tinker/tconstruct/TConstruct.java index e904d16..6dffcde 100644 --- a/mods/tinker/tconstruct/TConstruct.java +++ b/mods/tinker/tconstruct/TConstruct.java @@ -25,7 +25,7 @@ import cpw.mods.fml.common.registry.GameRegistry; * @author: mDiyo */ -@Mod(modid = "TConstruct", name = "TConstruct", version = "1.5.1_1.2.15") +@Mod(modid = "TConstruct", name = "TConstruct", version = "1.5.1_1.2.16") @NetworkMod(serverSideRequired = false, clientSideRequired = true, channels = { "TConstruct" }, packetHandler = mods.tinker.tconstruct.TPacketHandler.class) public class TConstruct { diff --git a/mods/tinker/tconstruct/TContent.java b/mods/tinker/tconstruct/TContent.java index f127fc9..c3285e3 100644 --- a/mods/tinker/tconstruct/TContent.java +++ b/mods/tinker/tconstruct/TContent.java @@ -60,8 +60,7 @@ import mods.tinker.tconstruct.modifiers.ModBoolean; import mods.tinker.tconstruct.modifiers.ModDurability; import mods.tinker.tconstruct.modifiers.ModElectric; import mods.tinker.tconstruct.modifiers.ModInteger; -import mods.tinker.tconstruct.modifiers.ModLapisBase; -import mods.tinker.tconstruct.modifiers.ModLapisIncrease; +import mods.tinker.tconstruct.modifiers.ModLapis; import mods.tinker.tconstruct.modifiers.ModRedstone; import mods.tinker.tconstruct.modifiers.ModRepair; import mods.tinker.tconstruct.tools.Axe; @@ -233,7 +232,7 @@ public class TContent implements IFuelHandler GameRegistry.registerBlock(heldItemBlock, "HeldItemBlock"); GameRegistry.registerTileEntity(FrypanLogic.class, "FrypanLogic"); - String[] soilTypes = new String[] { "slimesand", "grout" }; + String[] soilTypes = new String[] { "slimesand", "grout", "slimesandblue" }; craftedSoil = new TConstructBlock(PHConstruct.craftedSoil, Material.sand, 3.0F, soilTypes); craftedSoil.stepSound = Block.soundGravelFootstep; GameRegistry.registerBlock(craftedSoil, CraftedSoilItemBlock.class, "CraftedSoil"); @@ -303,10 +302,10 @@ public class TContent implements IFuelHandler blankPattern = new CraftingItem(PHConstruct.blankPattern, blanks, blanks, "materials/").setUnlocalizedName("tconstruct.Pattern"); String[] craftingMaterials = new String[] { "PaperStack", "SlimeCrystal", "SearedBrick", "CobaltIngot", "ArditeIngot", "ManyullynIngot", "Mossball", "LavaCrystal", "NecroticBone", - "CopperIngot", "TinIngot", "AluminumIngot", "RawAluminum", "BronzeIngot", "AlBrassIngot", "AlumiteIngot", "SteelIngot" }; + "CopperIngot", "TinIngot", "AluminumIngot", "RawAluminum", "BronzeIngot", "AlBrassIngot", "AlumiteIngot", "SteelIngot", "BlueSlimeCrystal" }; String[] craftingTextures = new String[] { "material_paperstack", "material_slimecrystal", "material_searedbrick", "material_cobaltingot", "material_arditeingot", "material_manyullyningot", "material_mossball", "material_lavacrystal", "material_necroticbone", "material_copperingot", "material_tiningot", "material_aluminumingot", "material_aluminumraw", - "material_bronzeingot", "material_alubrassingot", "material_alumiteingot", "material_steelingot" }; + "material_bronzeingot", "material_alubrassingot", "material_alumiteingot", "material_steelingot", "material_blueslimecrystal" }; materials = new CraftingItem(PHConstruct.materials, craftingMaterials, craftingTextures, "materials/").setUnlocalizedName("tconstruct.Materials"); toolRod = new ToolPart(PHConstruct.toolRod, "ToolRod", "_rod").setUnlocalizedName("tconstruct.ToolRod"); @@ -314,7 +313,6 @@ public class TContent implements IFuelHandler toolShard = new ToolShard(PHConstruct.toolShard, "ToolShard", "_chunk").setUnlocalizedName("tconstruct.ToolShard"); woodPattern = new Pattern(PHConstruct.woodPattern, "WoodPattern", "pattern_", "materials/").setUnlocalizedName("tconstruct.Pattern"); metalPattern = new MetalPattern(PHConstruct.metalPattern, "MetalPattern", "cast_", "materials/").setUnlocalizedName("tconstruct.MetalPattern"); - //stonePattern = new Pattern(PHTools.stonePattern, 64, patternTexture).setUnlocalizedName("tconstruct.Pattern"); //netherPattern = new Pattern(PHTools.netherPattern, 128, patternTexture).setUnlocalizedName("tconstruct.Pattern"); manualBook = new PatternManual(PHConstruct.manual); @@ -373,9 +371,10 @@ public class TContent implements IFuelHandler TConstructRegistry.addToolMaterial(11, "Ardite", 2, 4, 600, 800, 3, 2.0F, 0, 0f, "\u00A74", ""); TConstructRegistry.addToolMaterial(12, "Manyullyn", 2, 5, 1200, 1000, 4, 2.5F, 0, 0f, "\u00A75", "Awareness"); TConstructRegistry.addToolMaterial(13, "Copper", 1, 1, 180, 500, 2, 1.15F, 0, 0f, "\u00A7c", ""); - TConstructRegistry.addToolMaterial(14, "Bronze", 1, 2, 250, 600, 2, 1.3F, 1, 0f, "\u00A76", ""); + TConstructRegistry.addToolMaterial(14, "Bronze", 1, 2, 350, 700, 2, 1.3F, 1, 0f, "\u00A76", ""); TConstructRegistry.addToolMaterial(15, "Alumite", 2, 4, 550, 800, 3, 1.3F, 2, 0f, "\u00A7d", ""); TConstructRegistry.addToolMaterial(16, "Steel", 2, 3, 750, 800, 3, 1.3F, 2, 0f); + TConstructRegistry.addToolMaterial(17, "BlueSlime", 1, 1, 500, 150, 0, 5.0F, 0, 0f, "\u00A7b", ""); //Thaumcraft TConstructRegistry.addToolMaterial(21, "Thaumium", 2, 2, 250, 600, 2, 1.3F, 1, 0f); @@ -435,6 +434,7 @@ public class TContent implements IFuelHandler pb.registerMaterialSet("Bronze", new ItemStack(toolShard, 1, 14), new ItemStack(toolRod, 1, 14), 14); pb.registerMaterialSet("Alumite", new ItemStack(toolShard, 1, 15), new ItemStack(toolRod, 1, 15), 15); pb.registerMaterialSet("Steel", new ItemStack(toolShard, 1, 16), new ItemStack(toolRod, 1, 16), 16); + pb.registerFullMaterial(new ItemStack(materials, 1, 17), 2, "BlueSlime", new ItemStack(toolShard, 1, 17), new ItemStack(toolRod, 1, 17), 17); pb.addToolPattern((IPattern) woodPattern); } @@ -510,12 +510,14 @@ public class TContent implements IFuelHandler tb.registerToolMod(modE); tb.registerToolMod(new ModRedstone(new ItemStack[] { new ItemStack(Item.redstone) }, 2, 1)); tb.registerToolMod(new ModRedstone(new ItemStack[] { new ItemStack(Item.redstone), new ItemStack(Item.redstone) }, 2, 2)); - tb.registerToolMod(new ModLapisIncrease(new ItemStack[] { new ItemStack(Item.dyePowder, 1, 4) }, 10, 1)); - tb.registerToolMod(new ModLapisIncrease(new ItemStack[] { new ItemStack(Item.dyePowder, 1, 4), new ItemStack(Item.dyePowder, 1, 4) }, 10, 2)); - tb.registerToolMod(new ModLapisIncrease(new ItemStack[] { new ItemStack(Block.blockLapis) }, 10, 9)); - tb.registerToolMod(new ModLapisIncrease(new ItemStack[] { new ItemStack(Item.dyePowder, 1, 4), new ItemStack(Block.blockLapis) }, 10, 10)); - tb.registerToolMod(new ModLapisIncrease(new ItemStack[] { new ItemStack(Block.blockLapis), new ItemStack(Block.blockLapis) }, 10, 18)); - tb.registerToolMod(new ModLapisBase(new ItemStack[] { new ItemStack(Block.blockLapis), new ItemStack(Block.blockLapis) }, 10)); + tb.registerToolMod(new ModRedstone(new ItemStack[] { new ItemStack(Block.blockRedstone) }, 2, 9)); + tb.registerToolMod(new ModRedstone(new ItemStack[] { new ItemStack(Block.blockRedstone), new ItemStack(Item.redstone) }, 2, 10)); + tb.registerToolMod(new ModRedstone(new ItemStack[] { new ItemStack(Block.blockRedstone), new ItemStack(Block.blockRedstone) }, 2, 18)); + tb.registerToolMod(new ModLapis(new ItemStack[] { new ItemStack(Item.dyePowder, 1, 4) }, 10, 1)); + tb.registerToolMod(new ModLapis(new ItemStack[] { new ItemStack(Item.dyePowder, 1, 4), new ItemStack(Item.dyePowder, 1, 4) }, 10, 2)); + tb.registerToolMod(new ModLapis(new ItemStack[] { new ItemStack(Block.blockLapis) }, 10, 9)); + tb.registerToolMod(new ModLapis(new ItemStack[] { new ItemStack(Item.dyePowder, 1, 4), new ItemStack(Block.blockLapis) }, 10, 10)); + tb.registerToolMod(new ModLapis(new ItemStack[] { new ItemStack(Block.blockLapis), new ItemStack(Block.blockLapis) }, 10, 18)); tb.registerToolMod(new ModInteger(new ItemStack[] { new ItemStack(materials, 1, 6) }, 4, "Moss", 3, "\u00a72", "Auto-Repair")); tb.registerToolMod(new ModBlaze(new ItemStack[] { new ItemStack(Item.blazePowder) }, 7, 1)); tb.registerToolMod(new ModBlaze(new ItemStack[] { new ItemStack(Item.blazePowder), new ItemStack(Item.blazePowder) }, 7, 2)); @@ -601,8 +603,6 @@ public class TContent implements IFuelHandler void addCraftingRecipes () { - /*GameRegistry.addRecipe(new ItemStack(woodCrafter, 1, 0), "c", 'c', Block.workbench); - GameRegistry.addRecipe(new ItemStack(woodCrafter, 1, 1), "cc", 'c', Block.workbench);*/ GameRegistry.addRecipe(new ItemStack(woodCrafter, 1, 0), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', Block.workbench); GameRegistry.addRecipe(new ItemStack(woodCrafter, 1, 1), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', new ItemStack(Block.wood, 1, 0)); GameRegistry.addRecipe(new ItemStack(woodCrafter, 1, 2), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', new ItemStack(Block.wood, 1, 1)); @@ -622,12 +622,14 @@ public class TContent implements IFuelHandler GameRegistry.addRecipe(new ItemStack(materials, 1, 0), "pp", "pp", 'p', Item.paper); //Paper stack GameRegistry.addRecipe(new ItemStack(materials, 1, 6), "ppp", "ppp", "ppp", 'p', Block.cobblestoneMossy); //Moss ball GameRegistry.addRecipe(new ItemStack(materials, 1, 7), "xcx", "cbc", "xcx", 'b', Item.bucketLava, 'c', Item.coal, 'x', Block.netherrack); //Auto-smelt - GameRegistry.addShapelessRecipe(new ItemStack(materials, 1, 8), Item.bone, Item.rottenFlesh, Item.chickenRaw, Item.beefRaw, Item.porkRaw, Item.fishRaw); //Necrotic bone + //GameRegistry.addShapelessRecipe(new ItemStack(materials, 1, 8), Item.bone, Item.rottenFlesh, Item.chickenRaw, Item.beefRaw, Item.porkRaw, Item.fishRaw); //Necrotic bone GameRegistry.addShapelessRecipe(new ItemStack(craftedSoil, 1, 0), Item.slimeBall, Item.slimeBall, Item.slimeBall, Item.slimeBall, Block.sand, Block.dirt); //Slimy sand + GameRegistry.addShapelessRecipe(new ItemStack(craftedSoil, 1, 2), strangeFood, strangeFood, strangeFood, strangeFood, Block.sand, Block.dirt); //Slimy sand GameRegistry.addShapelessRecipe(new ItemStack(craftedSoil, 1, 1), Item.clay, Block.sand, Block.gravel); //Grout, Add stone dust? FurnaceRecipes.smelting().addSmelting(craftedSoil.blockID, 0, new ItemStack(materials, 1, 1), 2f); //Slime FurnaceRecipes.smelting().addSmelting(craftedSoil.blockID, 1, new ItemStack(materials, 1, 2), 2f); //Seared brick item + FurnaceRecipes.smelting().addSmelting(craftedSoil.blockID, 2, new ItemStack(materials, 1, 17), 2f); //Blue Slime //GameRegistry.addRecipe(new ItemStack(oreSlag, 1, 0), "pp", "pp", 'p', new ItemStack(materials, 1, 2)); //Seared brick block FurnaceRecipes.smelting().addSmelting(oreSlag.blockID, 1, new ItemStack(materials, 1, 3), 3f); diff --git a/mods/tinker/tconstruct/TEventHandler.java b/mods/tinker/tconstruct/TEventHandler.java index af7f33e..4bd5d59 100644 --- a/mods/tinker/tconstruct/TEventHandler.java +++ b/mods/tinker/tconstruct/TEventHandler.java @@ -1,16 +1,20 @@ package mods.tinker.tconstruct; import java.util.ArrayList; +import java.util.Random; import mods.tinker.tconstruct.crafting.PatternBuilder; import mods.tinker.tconstruct.crafting.Smeltery; import mods.tinker.tconstruct.logic.LiquidTextureLogic; +import net.minecraft.entity.monster.EntitySkeleton; +import net.minecraft.entity.passive.EntityCow; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumMovingObjectType; import net.minecraftforge.client.event.sound.SoundLoadEvent; import net.minecraftforge.event.Event.Result; import net.minecraftforge.event.ForgeSubscribe; +import net.minecraftforge.event.entity.living.LivingDropsEvent; import net.minecraftforge.event.entity.player.FillBucketEvent; import net.minecraftforge.liquids.LiquidStack; import net.minecraftforge.oredict.OreDictionary; @@ -18,6 +22,7 @@ import net.minecraftforge.oredict.OreDictionary.OreRegisterEvent; public class TEventHandler { + Random random = new Random(); /* Sounds */ @ForgeSubscribe public void onSound(SoundLoadEvent event) @@ -34,6 +39,30 @@ public class TEventHandler } } + /* Drops */ + @ForgeSubscribe + public void onLivingDrop(LivingDropsEvent event) + { + if (event.entityLiving.getClass() == EntityCow.class) + { + int amount = random.nextInt(3) + random.nextInt(1 + event.lootingLevel) + random.nextInt(3) + random.nextInt(1 + event.lootingLevel) + 1; + + for (int iter = 0; iter < amount; ++iter) + { + event.entityLiving.dropItem(Item.leather.itemID, 1); + } + } + + else if (event.recentlyHit && event.entityLiving.getClass() == EntitySkeleton.class) + { + EntitySkeleton skeleton = (EntitySkeleton) event.entityLiving; + if (skeleton.getSkeletonType() == 1 && random.nextInt(Math.max(1, 5-event.lootingLevel)) == 0) + { + skeleton.entityDropItem(new ItemStack(TContent.materials, 1, 8), 0f); + } + } + } + /* Ore Dictionary */ @ForgeSubscribe public void registerOre (OreRegisterEvent evt) @@ -43,6 +72,11 @@ public class TEventHandler else if (evt.Name == "basicCircuit") TConstruct.content.modE.circuits.add(evt.Ore); + + else if (evt.Name == "plankWood") + { + PatternBuilder.instance.registerMaterial(evt.Ore, 2, "Wood"); + } //Ingots else if (evt.Name == "ingotCopper") diff --git a/mods/tinker/tconstruct/client/TProxyClient.java b/mods/tinker/tconstruct/client/TProxyClient.java index c863461..45e4f07 100644 --- a/mods/tinker/tconstruct/client/TProxyClient.java +++ b/mods/tinker/tconstruct/client/TProxyClient.java @@ -174,11 +174,9 @@ public class TProxyClient extends TProxyCommon //LanguageRegistry.addName(TContent.manualBook, "Tinker's Log"); - LanguageRegistry.instance().addStringLocalization("entity.TConstruct.UnstableCreeper.name", "en_US", "Nitro Creeper"); - LanguageRegistry.instance().addStringLocalization("entity.TConstruct.EdibleSlime.name", "en_US", "Blue Slime"); - LanguageRegistry.instance().addStringLocalization("entity.tconstruct.UnstableCreeper.name", "en_US", "Nitro Creeper"); - LanguageRegistry.instance().addStringLocalization("entity.tconstruct.EdibleSlime.name", "en_US", "Blue Slime"); - LanguageRegistry.instance().addStringLocalization("entity.TConstruct.MetalSlime.name", "en_US", "Metal Slime"); + //LanguageRegistry.instance().addStringLocalization("entity.TConstruct.UnstableCreeper.name", "en_US", "Nitro Creeper"); + //LanguageRegistry.instance().addStringLocalization("entity.TConstruct.EdibleSlime.name", "en_US", "Blue Slime"); + //LanguageRegistry.instance().addStringLocalization("entity.TConstruct.MetalSlime.name", "en_US", "Metal Slime"); //LanguageRegistry.instance().addStringLocalization("item.tconstruct.diary.diary.name", "en_US", "Tinker's Log"); LanguageRegistry.instance().addStringLocalization("item.tconstruct.Pattern.blank_pattern.name", "en_US", "Blank Pattern"); LanguageRegistry.instance().addStringLocalization("item.tconstruct.Pattern.blank_cast.name", "en_US", "Blank Cast"); @@ -199,16 +197,16 @@ public class TProxyClient extends TProxyCommon } public static final String[] shardNames = new String[] { "Wood", "Stone Shard", "Iron Chunk", "Flint Shard", "Cactus Shard", "Bone", "Obsidian Shard", "Netherrack Shard", - "Slime Crystal Fragment", "Paper", "Cobalt Chunk", "Ardite Chunk", "Manyullyn Chunk", "Copper Chunk", "Bronze Chunk", "Alumite Chunk", "Steel Chunk" }; + "Slime Crystal Fragment", "Paper", "Cobalt Chunk", "Ardite Chunk", "Manyullyn Chunk", "Copper Chunk", "Bronze Chunk", "Alumite Chunk", "Steel Chunk", "Slime Crystal Fragment" }; public static final String[] materialItemInternalNames = new String[] { "PaperStack", "SlimeCrystal", "SearedBrick", "CobaltIngot", "ArditeIngot", "ManyullynIngot", "Mossball", "LavaCrystal", - "NecroticBone", "CopperIngot", "TinIngot", "AluminumIngot", "RawAluminum", "BronzeIngot", "AlBrassIngot", "AlumiteIngot", "SteelIngot" }; + "NecroticBone", "CopperIngot", "TinIngot", "AluminumIngot", "RawAluminum", "BronzeIngot", "AlBrassIngot", "AlumiteIngot", "SteelIngot", "BlueSlimeCrystal" }; public static final String[] materialItemNames = new String[] { "Paper Stack", "Slime Crystal", "Seared Brick", "Cobalt Ingot", "Ardite Ingot", "Manyullyn Ingot", "Ball of Moss", "Lava Crystal", - "Necrotic Bone", "Copper Ingot", "Tin Ingot", "Aluminum Ingot", "Raw Aluminum", "Bronze Ingot", "Aluminum Brass Ingot", "Alumite Ingot", "Steel Ingot" }; + "Necrotic Bone", "Copper Ingot", "Tin Ingot", "Aluminum Ingot", "Raw Aluminum", "Bronze Ingot", "Aluminum Brass Ingot", "Alumite Ingot", "Steel Ingot", "Slime Crystal" }; public static final String[] toolMaterialNames = new String[] { "Wood", "Stone", "Iron", "Flint", "Cactus", "Bone", "Obsidian", "Netherrack", "Slime", "Paper", "Cobalt", "Ardite", "Manyullyn", - "Copper", "Bronze", "Alumite", "Steel" }; + "Copper", "Bronze", "Alumite", "Steel", "Blue Slime" }; public static final String[] materialTypes = new String[] { "ToolRod", "PickaxeHead", "ShovelHead", "AxeHead", "SwordBlade", "LargeGuard", "MediumGuard", "Crossbar", "Binding", "FrypanHead", "SignHead", "LumberHead" }; @@ -352,7 +350,7 @@ public class TProxyClient extends TProxyCommon void addRenderMappings () { - String[] partTypes = { "wood", "stone", "iron", "flint", "cactus", "bone", "obsidian", "netherrack", "slime", "paper", "cobalt", "ardite", "manyullyn", "copper", "bronze", "alumite", "steel" }; + String[] partTypes = { "wood", "stone", "iron", "flint", "cactus", "bone", "obsidian", "netherrack", "slime", "paper", "cobalt", "ardite", "manyullyn", "copper", "bronze", "alumite", "steel", "blueslime" }; String[] effectTypes = { "diamond", "emerald", "redstone", "glowstone", "moss", "ice", "lava", "blaze", "necrotic", "electric", "lapis" }; for (int partIter = 0; partIter < partTypes.length; partIter++) { diff --git a/mods/tinker/tconstruct/container/SmelteryContainer.java b/mods/tinker/tconstruct/container/SmelteryContainer.java index e3b20e1..8ae4548 100644 --- a/mods/tinker/tconstruct/container/SmelteryContainer.java +++ b/mods/tinker/tconstruct/container/SmelteryContainer.java @@ -197,10 +197,8 @@ public class SmelteryContainer extends Container slot = (Slot)this.inventorySlots.get(slotPos); slotStack = slot.getStack(); - //System.out.println("Boom"); if (slotStack != null && ItemStack.areItemStacksEqual(inputStack, slotStack) && !inputStack.getHasSubtypes()) { - //System.out.println("DeyadaBoomDeyada"); int totalSize = slotStack.stackSize + inputStack.stackSize; if (totalSize <= inputStack.getMaxStackSize()) @@ -219,7 +217,6 @@ public class SmelteryContainer extends Container } } - //System.out.println("Heyo~"); if (flag) { --slotPos; @@ -233,7 +230,6 @@ public class SmelteryContainer extends Container if (inputStack.stackSize > 0) { - //System.out.println("Boom"); if (flag) { slotPos = endSlot - 1; @@ -248,10 +244,8 @@ public class SmelteryContainer extends Container slot = (Slot)this.inventorySlots.get(slotPos); slotStack = slot.getStack(); - System.out.println("Boom"); if (slotStack == null) { - System.out.println("Deya"); slot.putStack(inputStack.copy()); slot.onSlotChanged(); inputStack.stackSize = 0; diff --git a/mods/tinker/tconstruct/entity/BlueSlime.java b/mods/tinker/tconstruct/entity/BlueSlime.java index 568ff66..88a454a 100644 --- a/mods/tinker/tconstruct/entity/BlueSlime.java +++ b/mods/tinker/tconstruct/entity/BlueSlime.java @@ -28,9 +28,13 @@ public class BlueSlime extends EntityLiving implements IMob { super(world); this.texture = "/mods/tinker/textures/mob/slimeedible.png"; - int offset = Math.max(1, this.rand.nextInt(4)); - if (offset >= 3) - offset--; + int offset = this.rand.nextInt(15); + if (offset < 7) + offset = 1; + else if (offset < 14) + offset = 2; + else + offset = 3; int size = 1 << offset; this.yOffset = 0.0F; this.slimeJumpDelay = this.rand.nextInt(120) + 40; diff --git a/mods/tinker/tconstruct/items/CraftedSoilItemBlock.java b/mods/tinker/tconstruct/items/CraftedSoilItemBlock.java index 87cd54f..261a67e 100644 --- a/mods/tinker/tconstruct/items/CraftedSoilItemBlock.java +++ b/mods/tinker/tconstruct/items/CraftedSoilItemBlock.java @@ -7,7 +7,7 @@ public class CraftedSoilItemBlock extends ItemBlock { public static final String blockType[] = { - "Slime", "Grout" + "Slime", "Grout", "BlueSlime" }; public CraftedSoilItemBlock(int id) diff --git a/mods/tinker/tconstruct/items/ToolPart.java b/mods/tinker/tconstruct/items/ToolPart.java index caa5c51..d213d8a 100644 --- a/mods/tinker/tconstruct/items/ToolPart.java +++ b/mods/tinker/tconstruct/items/ToolPart.java @@ -43,10 +43,10 @@ public class ToolPart extends CraftingItem }*/ public static final String[] toolMaterialNames = new String[] { - "Wood", "Stone", "Iron", "Flint", "Cactus", "Bone", "Obsidian", "Netherrack", "Slime", "Paper", "Cobalt", "Ardite", "Manyullyn", "Copper", "Bronze", "Alumite", "Steel" }; + "Wood", "Stone", "Iron", "Flint", "Cactus", "Bone", "Obsidian", "Netherrack", "Slime", "Paper", "Cobalt", "Ardite", "Manyullyn", "Copper", "Bronze", "Alumite", "Steel", "Blue Slime" }; public static final String[] toolTextureNames = new String[] { - "wood", "stone", "iron", "flint", "cactus", "bone", "obsidian", "netherrack", "slime", "paper", "cobalt", "ardite", "manyullyn", "copper", "bronze", "alumite", "steel" }; + "wood", "stone", "iron", "flint", "cactus", "bone", "obsidian", "netherrack", "slime", "paper", "cobalt", "ardite", "manyullyn", "copper", "bronze", "alumite", "steel", "blueslime" }; @Override public int getMaterialID (ItemStack stack) diff --git a/mods/tinker/tconstruct/library/ToolCore.java b/mods/tinker/tconstruct/library/ToolCore.java index 154402d..be3ade3 100644 --- a/mods/tinker/tconstruct/library/ToolCore.java +++ b/mods/tinker/tconstruct/library/ToolCore.java @@ -400,12 +400,12 @@ public abstract class ToolCore extends Item implements ICustomElectricItem, IBox } static String[] toolMaterialNames = { "Wooden ", "Stone ", "Iron ", "Flint ", "Cactus ", "Bone ", "Obsidian ", "Nethrrack ", "Slime ", "Paper ", "Cobalt ", "Ardite ", "Manyullyn ", "Copper ", - "Bronze ", "Alumite ", "Steel " }; + "Bronze ", "Alumite ", "Steel ", "Slime " }; /* Creative mode tools */ public void getSubItems (int id, CreativeTabs tab, List list) { - for (int i = 0; i < 17; i++) + for (int i = 0; i < 18; i++) { Item accessory = getAccessoryItem(); ItemStack accessoryStack = accessory != null ? new ItemStack(getAccessoryItem(), 1, i) : null; diff --git a/mods/tinker/tconstruct/logic/PatternShaperLogic.java b/mods/tinker/tconstruct/logic/PatternShaperLogic.java index 0939e87..f589350 100644 --- a/mods/tinker/tconstruct/logic/PatternShaperLogic.java +++ b/mods/tinker/tconstruct/logic/PatternShaperLogic.java @@ -44,7 +44,7 @@ public class PatternShaperLogic extends InventoryLogic public void setInventorySlotContents(int slot, ItemStack itemstack) { super.setInventorySlotContents(slot, itemstack); - if (slot == 0 && itemstack != null) + if (slot == 0 && itemstack != null && itemstack.getItem() instanceof mods.tinker.tconstruct.items.Pattern) { if (itemstack.getItemDamage() == 0) setInventorySlotContents(1, new ItemStack(TContent.woodPattern, 1, 1)); diff --git a/mods/tinker/tconstruct/modifiers/ModLapis.java b/mods/tinker/tconstruct/modifiers/ModLapis.java new file mode 100644 index 0000000..bd689e6 --- /dev/null +++ b/mods/tinker/tconstruct/modifiers/ModLapis.java @@ -0,0 +1,132 @@ +package mods.tinker.tconstruct.modifiers; + +import java.util.Iterator; +import java.util.Map; + +import mods.tinker.common.ToolMod; +import mods.tinker.tconstruct.library.Weapon; +import net.minecraft.enchantment.Enchantment; +import net.minecraft.enchantment.EnchantmentHelper; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; + +public class ModLapis extends ToolMod +{ + String tooltipName; + int increase; + int max; + + public ModLapis(ItemStack[] items, int effect, int inc) + { + super(items, effect, "Lapis"); + tooltipName = "\u00a79Luck"; + increase = inc; + max = 100; + } + + @Override + protected boolean canModify (ItemStack tool, ItemStack[] input) + { + NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool"); + if (!tags.hasKey(key)) + return tags.getInteger("Modifiers") > 0; + + int keyPair[] = tags.getIntArray(key); + if (keyPair[0] + increase <= 100) + return true; + else + return false; + } + + @Override + public void modify (ItemStack[] input, ItemStack tool) + { + NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool"); + if (tags.hasKey(key)) + { + + int keyPair[] = tags.getIntArray(key); + keyPair[0] += increase; + tags.setIntArray(key, keyPair); + if (tool.getItem() instanceof Weapon) + { + if (keyPair[0] >= 100) + addEnchantment(tool, Enchantment.looting, 3); + else if (keyPair[0] >= 50) + addEnchantment(tool, Enchantment.looting, 2); + else if (keyPair[0] >= 20) + addEnchantment(tool, Enchantment.looting, 1); + } + else + { + if (keyPair[0] >= 100) + addEnchantment(tool, Enchantment.fortune, 3); + else if (keyPair[0] >= 50) + addEnchantment(tool, Enchantment.fortune, 2); + else if (keyPair[0] >= 20) + addEnchantment(tool, Enchantment.fortune, 1); + } + + updateModTag(tool, keyPair); + } + else + { + tags.setBoolean(key, true); + + String modName = "\u00a79Lapis (0/100)"; + int tooltipIndex = addToolTip(tool, "\u00a79Luck", modName); + int[] keyPair = new int[] { 0, tooltipIndex }; + tags.setIntArray(key, keyPair); + + int modifiers = tags.getInteger("Modifiers"); + modifiers -= 1; + tags.setInteger("Modifiers", modifiers); + } + } + + public void addEnchantment(ItemStack tool, Enchantment enchant, int level) + { + NBTTagList tags = new NBTTagList("ench"); + Map enchantMap = EnchantmentHelper.getEnchantments(tool); + Iterator iterator = enchantMap.keySet().iterator(); + int index; + int lvl; + boolean hasEnchant = false; + while (iterator.hasNext()) + { + NBTTagCompound enchantTag = new NBTTagCompound(); + index = ((Integer)iterator.next()).intValue(); + lvl = (Integer) enchantMap.get(index); + if (index == enchant.effectId) + { + hasEnchant = true; + enchantTag.setShort("id", (short)index); + enchantTag.setShort("lvl", (short)((byte)level)); + tags.appendTag(enchantTag); + } + else + { + enchantTag.setShort("id", (short)index); + enchantTag.setShort("lvl", (short)((byte)lvl)); + tags.appendTag(enchantTag); + } + } + if (!hasEnchant) + { + NBTTagCompound enchantTag = new NBTTagCompound(); + enchantTag.setShort("id", (short)enchant.effectId); + enchantTag.setShort("lvl", (short)((byte)level)); + tags.appendTag(enchantTag); + } + tool.stackTagCompound.setTag("ench", tags); + } + + void updateModTag (ItemStack tool, int[] keys) + { + NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool"); + String tip = "ModifierTip"+keys[1]; + String modName = "\u00a79Lapis ("+keys[0]+"/100)"; + tags.setString(tip, modName); + } +} diff --git a/mods/tinker/tconstruct/modifiers/ModLapisIncrease.java b/mods/tinker/tconstruct/modifiers/ModLapisIncrease.java index ee0d14c..2cb4d0b 100644 --- a/mods/tinker/tconstruct/modifiers/ModLapisIncrease.java +++ b/mods/tinker/tconstruct/modifiers/ModLapisIncrease.java @@ -68,12 +68,6 @@ public class ModLapisIncrease extends ToolMod public void addEnchantment(ItemStack tool, Enchantment enchant, int level) { - /*if (!tool.stackTagCompound.hasKey("ench")) - { - tool.stackTagCompound.setTag("ench", new NBTTagList("ench")); - }*/ - - //NBTTagList tags = (NBTTagList)tool.stackTagCompound.getTag("ench"); NBTTagList tags = new NBTTagList("ench"); Map enchantMap = EnchantmentHelper.getEnchantments(tool); Iterator iterator = enchantMap.keySet().iterator(); @@ -106,17 +100,7 @@ public class ModLapisIncrease extends ToolMod enchantTag.setShort("lvl", (short)((byte)level)); tags.appendTag(enchantTag); } - //this.stackTagCompound.setTag("ench", new NBTTagList("ench")); tool.stackTagCompound.setTag("ench", tags); - /*if (enchantMap.containsKey(enchant.effectId)) - { - map. - }*/ - //NBTTagList enchantTags = (NBTTagList)tool.stackTagCompound.getTag("ench"); - /*NBTTagCompound var4 = new NBTTagCompound(); - var4.setShort("id", (short)par1Enchantment.effectId); - var4.setShort("lvl", (short)((byte)par2)); - enchantTags.appendTag(var4);*/ } void updateModTag (ItemStack tool, int[] keys) diff --git a/mods/tinker/tconstruct/tools/PotionLauncher.java b/mods/tinker/tconstruct/tools/PotionLauncher.java index 82eeafb..b1a4540 100644 --- a/mods/tinker/tconstruct/tools/PotionLauncher.java +++ b/mods/tinker/tconstruct/tools/PotionLauncher.java @@ -155,7 +155,6 @@ public class PotionLauncher extends Item list.add(stack); } - @Override public boolean swingItem (EntityPlayer player, ItemStack stack) { NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool"); diff --git a/mods/tinker/textures/blocks/slimesandblue.png b/mods/tinker/textures/blocks/slimesandblue.png new file mode 100644 index 0000000..a947b66 Binary files /dev/null and b/mods/tinker/textures/blocks/slimesandblue.png differ diff --git a/mods/tinker/textures/items/axe/blueslime_axe_handle.png b/mods/tinker/textures/items/axe/blueslime_axe_handle.png new file mode 100644 index 0000000..ff66e65 Binary files /dev/null and b/mods/tinker/textures/items/axe/blueslime_axe_handle.png differ diff --git a/mods/tinker/textures/items/axe/blueslime_axe_head.png b/mods/tinker/textures/items/axe/blueslime_axe_head.png new file mode 100644 index 0000000..2b09f63 Binary files /dev/null and b/mods/tinker/textures/items/axe/blueslime_axe_head.png differ diff --git a/mods/tinker/textures/items/axe/blueslime_axe_head_broken.png b/mods/tinker/textures/items/axe/blueslime_axe_head_broken.png new file mode 100644 index 0000000..d725187 Binary files /dev/null and b/mods/tinker/textures/items/axe/blueslime_axe_head_broken.png differ diff --git a/mods/tinker/textures/items/battlesign/blueslime_battlesign_handle.png b/mods/tinker/textures/items/battlesign/blueslime_battlesign_handle.png new file mode 100644 index 0000000..6b24f2f Binary files /dev/null and b/mods/tinker/textures/items/battlesign/blueslime_battlesign_handle.png differ diff --git a/mods/tinker/textures/items/battlesign/blueslime_battlesign_head.png b/mods/tinker/textures/items/battlesign/blueslime_battlesign_head.png new file mode 100644 index 0000000..c6477ad Binary files /dev/null and b/mods/tinker/textures/items/battlesign/blueslime_battlesign_head.png differ diff --git a/mods/tinker/textures/items/battlesign/blueslime_battlesign_head_broken.png b/mods/tinker/textures/items/battlesign/blueslime_battlesign_head_broken.png new file mode 100644 index 0000000..f74b208 Binary files /dev/null and b/mods/tinker/textures/items/battlesign/blueslime_battlesign_head_broken.png differ diff --git a/mods/tinker/textures/items/battlesign/slime_battlesign_handle.png b/mods/tinker/textures/items/battlesign/slime_battlesign_handle.png index 512d78e..991ef86 100644 Binary files a/mods/tinker/textures/items/battlesign/slime_battlesign_handle.png and b/mods/tinker/textures/items/battlesign/slime_battlesign_handle.png differ diff --git a/mods/tinker/textures/items/broadsword/blueslime_sword_accessory.png b/mods/tinker/textures/items/broadsword/blueslime_sword_accessory.png new file mode 100644 index 0000000..7330fbc Binary files /dev/null and b/mods/tinker/textures/items/broadsword/blueslime_sword_accessory.png differ diff --git a/mods/tinker/textures/items/broadsword/blueslime_sword_blade.png b/mods/tinker/textures/items/broadsword/blueslime_sword_blade.png new file mode 100644 index 0000000..6cd3a1b Binary files /dev/null and b/mods/tinker/textures/items/broadsword/blueslime_sword_blade.png differ diff --git a/mods/tinker/textures/items/broadsword/blueslime_sword_blade_broken.png b/mods/tinker/textures/items/broadsword/blueslime_sword_blade_broken.png new file mode 100644 index 0000000..e9988b4 Binary files /dev/null and b/mods/tinker/textures/items/broadsword/blueslime_sword_blade_broken.png differ diff --git a/mods/tinker/textures/items/broadsword/blueslime_sword_handle.png b/mods/tinker/textures/items/broadsword/blueslime_sword_handle.png new file mode 100644 index 0000000..ce2addd Binary files /dev/null and b/mods/tinker/textures/items/broadsword/blueslime_sword_handle.png differ diff --git a/mods/tinker/textures/items/frypan/blueslime_frypan_handle.png b/mods/tinker/textures/items/frypan/blueslime_frypan_handle.png new file mode 100644 index 0000000..65cb31f Binary files /dev/null and b/mods/tinker/textures/items/frypan/blueslime_frypan_handle.png differ diff --git a/mods/tinker/textures/items/frypan/blueslime_frypan_head.png b/mods/tinker/textures/items/frypan/blueslime_frypan_head.png new file mode 100644 index 0000000..f637dae Binary files /dev/null and b/mods/tinker/textures/items/frypan/blueslime_frypan_head.png differ diff --git a/mods/tinker/textures/items/frypan/blueslime_frypan_head_broken.png b/mods/tinker/textures/items/frypan/blueslime_frypan_head_broken.png new file mode 100644 index 0000000..477df4a Binary files /dev/null and b/mods/tinker/textures/items/frypan/blueslime_frypan_head_broken.png differ diff --git a/mods/tinker/textures/items/longsword/blueslime_longsword_accessory.png b/mods/tinker/textures/items/longsword/blueslime_longsword_accessory.png new file mode 100644 index 0000000..971db07 Binary files /dev/null and b/mods/tinker/textures/items/longsword/blueslime_longsword_accessory.png differ diff --git a/mods/tinker/textures/items/longsword/blueslime_longsword_blade.png b/mods/tinker/textures/items/longsword/blueslime_longsword_blade.png new file mode 100644 index 0000000..87cb534 Binary files /dev/null and b/mods/tinker/textures/items/longsword/blueslime_longsword_blade.png differ diff --git a/mods/tinker/textures/items/longsword/blueslime_longsword_blade_broken.png b/mods/tinker/textures/items/longsword/blueslime_longsword_blade_broken.png new file mode 100644 index 0000000..1645910 Binary files /dev/null and b/mods/tinker/textures/items/longsword/blueslime_longsword_blade_broken.png differ diff --git a/mods/tinker/textures/items/longsword/blueslime_longsword_handle.png b/mods/tinker/textures/items/longsword/blueslime_longsword_handle.png new file mode 100644 index 0000000..1a37e0e Binary files /dev/null and b/mods/tinker/textures/items/longsword/blueslime_longsword_handle.png differ diff --git a/mods/tinker/textures/items/materials/bucket_alubrass.png b/mods/tinker/textures/items/materials/bucket_alubrass.png index a71eafd..c738e56 100644 Binary files a/mods/tinker/textures/items/materials/bucket_alubrass.png and b/mods/tinker/textures/items/materials/bucket_alubrass.png differ diff --git a/mods/tinker/textures/items/materials/bucket_aluminum.png b/mods/tinker/textures/items/materials/bucket_aluminum.png index c881a4d..8f11b3a 100644 Binary files a/mods/tinker/textures/items/materials/bucket_aluminum.png and b/mods/tinker/textures/items/materials/bucket_aluminum.png differ diff --git a/mods/tinker/textures/items/materials/bucket_alumite.png b/mods/tinker/textures/items/materials/bucket_alumite.png index 8573ad5..73b70ae 100644 Binary files a/mods/tinker/textures/items/materials/bucket_alumite.png and b/mods/tinker/textures/items/materials/bucket_alumite.png differ diff --git a/mods/tinker/textures/items/materials/bucket_angmallen.png b/mods/tinker/textures/items/materials/bucket_angmallen.png index a71eafd..e2692a4 100644 Binary files a/mods/tinker/textures/items/materials/bucket_angmallen.png and b/mods/tinker/textures/items/materials/bucket_angmallen.png differ diff --git a/mods/tinker/textures/items/materials/bucket_ardite.png b/mods/tinker/textures/items/materials/bucket_ardite.png index 2c4d4b5..db8c6ce 100644 Binary files a/mods/tinker/textures/items/materials/bucket_ardite.png and b/mods/tinker/textures/items/materials/bucket_ardite.png differ diff --git a/mods/tinker/textures/items/materials/bucket_bronze.png b/mods/tinker/textures/items/materials/bucket_bronze.png index 7d268ef..1dc00e0 100644 Binary files a/mods/tinker/textures/items/materials/bucket_bronze.png and b/mods/tinker/textures/items/materials/bucket_bronze.png differ diff --git a/mods/tinker/textures/items/materials/bucket_cobalt.png b/mods/tinker/textures/items/materials/bucket_cobalt.png index 1ce80bb..5f5735a 100644 Binary files a/mods/tinker/textures/items/materials/bucket_cobalt.png and b/mods/tinker/textures/items/materials/bucket_cobalt.png differ diff --git a/mods/tinker/textures/items/materials/bucket_copper.png b/mods/tinker/textures/items/materials/bucket_copper.png index 5fd9df9..ed62cab 100644 Binary files a/mods/tinker/textures/items/materials/bucket_copper.png and b/mods/tinker/textures/items/materials/bucket_copper.png differ diff --git a/mods/tinker/textures/items/materials/bucket_dsteel.png b/mods/tinker/textures/items/materials/bucket_dsteel.png index a71eafd..43b5cb9 100644 Binary files a/mods/tinker/textures/items/materials/bucket_dsteel.png and b/mods/tinker/textures/items/materials/bucket_dsteel.png differ diff --git a/mods/tinker/textures/items/materials/bucket_gold.png b/mods/tinker/textures/items/materials/bucket_gold.png index 16c139e..ec0f0fa 100644 Binary files a/mods/tinker/textures/items/materials/bucket_gold.png and b/mods/tinker/textures/items/materials/bucket_gold.png differ diff --git a/mods/tinker/textures/items/materials/bucket_heptazion.png b/mods/tinker/textures/items/materials/bucket_heptazion.png index a71eafd..ac1383f 100644 Binary files a/mods/tinker/textures/items/materials/bucket_heptazion.png and b/mods/tinker/textures/items/materials/bucket_heptazion.png differ diff --git a/mods/tinker/textures/items/materials/bucket_iron.png b/mods/tinker/textures/items/materials/bucket_iron.png index 2dceaec..81129fc 100644 Binary files a/mods/tinker/textures/items/materials/bucket_iron.png and b/mods/tinker/textures/items/materials/bucket_iron.png differ diff --git a/mods/tinker/textures/items/materials/bucket_obsidian.png b/mods/tinker/textures/items/materials/bucket_obsidian.png index 60339f3..b386f46 100644 Binary files a/mods/tinker/textures/items/materials/bucket_obsidian.png and b/mods/tinker/textures/items/materials/bucket_obsidian.png differ diff --git a/mods/tinker/textures/items/materials/bucket_steel.png b/mods/tinker/textures/items/materials/bucket_steel.png index 8a65d80..453467d 100644 Binary files a/mods/tinker/textures/items/materials/bucket_steel.png and b/mods/tinker/textures/items/materials/bucket_steel.png differ diff --git a/mods/tinker/textures/items/materials/bucket_tin.png b/mods/tinker/textures/items/materials/bucket_tin.png index 62dacb9..2048e43 100644 Binary files a/mods/tinker/textures/items/materials/bucket_tin.png and b/mods/tinker/textures/items/materials/bucket_tin.png differ diff --git a/mods/tinker/textures/items/materials/material_blueslimecrystal.png b/mods/tinker/textures/items/materials/material_blueslimecrystal.png new file mode 100644 index 0000000..5e73a91 Binary files /dev/null and b/mods/tinker/textures/items/materials/material_blueslimecrystal.png differ diff --git a/mods/tinker/textures/items/mattock/blueslime_mattock_back.png b/mods/tinker/textures/items/mattock/blueslime_mattock_back.png new file mode 100644 index 0000000..02ae7af Binary files /dev/null and b/mods/tinker/textures/items/mattock/blueslime_mattock_back.png differ diff --git a/mods/tinker/textures/items/mattock/blueslime_mattock_handle.png b/mods/tinker/textures/items/mattock/blueslime_mattock_handle.png new file mode 100644 index 0000000..8bd7804 Binary files /dev/null and b/mods/tinker/textures/items/mattock/blueslime_mattock_handle.png differ diff --git a/mods/tinker/textures/items/mattock/blueslime_mattock_head.png b/mods/tinker/textures/items/mattock/blueslime_mattock_head.png new file mode 100644 index 0000000..a446f63 Binary files /dev/null and b/mods/tinker/textures/items/mattock/blueslime_mattock_head.png differ diff --git a/mods/tinker/textures/items/mattock/blueslime_mattock_head_broken.png b/mods/tinker/textures/items/mattock/blueslime_mattock_head_broken.png new file mode 100644 index 0000000..afff7fc Binary files /dev/null and b/mods/tinker/textures/items/mattock/blueslime_mattock_head_broken.png differ diff --git a/mods/tinker/textures/items/parts/blueslime_axe_head.png b/mods/tinker/textures/items/parts/blueslime_axe_head.png new file mode 100644 index 0000000..361c1c7 Binary files /dev/null and b/mods/tinker/textures/items/parts/blueslime_axe_head.png differ diff --git a/mods/tinker/textures/items/parts/blueslime_battlesign_head.png b/mods/tinker/textures/items/parts/blueslime_battlesign_head.png new file mode 100644 index 0000000..94c6638 Binary files /dev/null and b/mods/tinker/textures/items/parts/blueslime_battlesign_head.png differ diff --git a/mods/tinker/textures/items/parts/blueslime_binding.png b/mods/tinker/textures/items/parts/blueslime_binding.png new file mode 100644 index 0000000..735fa3a Binary files /dev/null and b/mods/tinker/textures/items/parts/blueslime_binding.png differ diff --git a/mods/tinker/textures/items/parts/blueslime_chunk.png b/mods/tinker/textures/items/parts/blueslime_chunk.png new file mode 100644 index 0000000..a4a0ab3 Binary files /dev/null and b/mods/tinker/textures/items/parts/blueslime_chunk.png differ diff --git a/mods/tinker/textures/items/parts/blueslime_crossbar.png b/mods/tinker/textures/items/parts/blueslime_crossbar.png new file mode 100644 index 0000000..fb3496e Binary files /dev/null and b/mods/tinker/textures/items/parts/blueslime_crossbar.png differ diff --git a/mods/tinker/textures/items/parts/blueslime_frypan_head.png b/mods/tinker/textures/items/parts/blueslime_frypan_head.png new file mode 100644 index 0000000..4d44588 Binary files /dev/null and b/mods/tinker/textures/items/parts/blueslime_frypan_head.png differ diff --git a/mods/tinker/textures/items/parts/blueslime_large_guard.png b/mods/tinker/textures/items/parts/blueslime_large_guard.png new file mode 100644 index 0000000..a01e6f3 Binary files /dev/null and b/mods/tinker/textures/items/parts/blueslime_large_guard.png differ diff --git a/mods/tinker/textures/items/parts/blueslime_medium_guard.png b/mods/tinker/textures/items/parts/blueslime_medium_guard.png new file mode 100644 index 0000000..4517e47 Binary files /dev/null and b/mods/tinker/textures/items/parts/blueslime_medium_guard.png differ diff --git a/mods/tinker/textures/items/parts/blueslime_pickaxe_head.png b/mods/tinker/textures/items/parts/blueslime_pickaxe_head.png new file mode 100644 index 0000000..6a7563f Binary files /dev/null and b/mods/tinker/textures/items/parts/blueslime_pickaxe_head.png differ diff --git a/mods/tinker/textures/items/parts/blueslime_rod.png b/mods/tinker/textures/items/parts/blueslime_rod.png new file mode 100644 index 0000000..264616f Binary files /dev/null and b/mods/tinker/textures/items/parts/blueslime_rod.png differ diff --git a/mods/tinker/textures/items/parts/blueslime_shovel_head.png b/mods/tinker/textures/items/parts/blueslime_shovel_head.png new file mode 100644 index 0000000..f104489 Binary files /dev/null and b/mods/tinker/textures/items/parts/blueslime_shovel_head.png differ diff --git a/mods/tinker/textures/items/parts/blueslime_sword_blade.png b/mods/tinker/textures/items/parts/blueslime_sword_blade.png new file mode 100644 index 0000000..f2851c7 Binary files /dev/null and b/mods/tinker/textures/items/parts/blueslime_sword_blade.png differ diff --git a/mods/tinker/textures/items/pickaxe/blueslime_pickaxe_accessory.png b/mods/tinker/textures/items/pickaxe/blueslime_pickaxe_accessory.png new file mode 100644 index 0000000..8cdec1d Binary files /dev/null and b/mods/tinker/textures/items/pickaxe/blueslime_pickaxe_accessory.png differ diff --git a/mods/tinker/textures/items/pickaxe/blueslime_pickaxe_handle.png b/mods/tinker/textures/items/pickaxe/blueslime_pickaxe_handle.png new file mode 100644 index 0000000..8231e9f Binary files /dev/null and b/mods/tinker/textures/items/pickaxe/blueslime_pickaxe_handle.png differ diff --git a/mods/tinker/textures/items/pickaxe/blueslime_pickaxe_head.png b/mods/tinker/textures/items/pickaxe/blueslime_pickaxe_head.png new file mode 100644 index 0000000..a12236e Binary files /dev/null and b/mods/tinker/textures/items/pickaxe/blueslime_pickaxe_head.png differ diff --git a/mods/tinker/textures/items/pickaxe/blueslime_pickaxe_head_broken.png b/mods/tinker/textures/items/pickaxe/blueslime_pickaxe_head_broken.png new file mode 100644 index 0000000..e2ae4fc Binary files /dev/null and b/mods/tinker/textures/items/pickaxe/blueslime_pickaxe_head_broken.png differ diff --git a/mods/tinker/textures/items/rapier/blueslime_rapier_accessory.png b/mods/tinker/textures/items/rapier/blueslime_rapier_accessory.png new file mode 100644 index 0000000..96f0025 Binary files /dev/null and b/mods/tinker/textures/items/rapier/blueslime_rapier_accessory.png differ diff --git a/mods/tinker/textures/items/rapier/blueslime_rapier_blade.png b/mods/tinker/textures/items/rapier/blueslime_rapier_blade.png new file mode 100644 index 0000000..cd0e064 Binary files /dev/null and b/mods/tinker/textures/items/rapier/blueslime_rapier_blade.png differ diff --git a/mods/tinker/textures/items/rapier/blueslime_rapier_blade_broken.png b/mods/tinker/textures/items/rapier/blueslime_rapier_blade_broken.png new file mode 100644 index 0000000..6a44713 Binary files /dev/null and b/mods/tinker/textures/items/rapier/blueslime_rapier_blade_broken.png differ diff --git a/mods/tinker/textures/items/rapier/blueslime_rapier_handle.png b/mods/tinker/textures/items/rapier/blueslime_rapier_handle.png new file mode 100644 index 0000000..3a1e25b Binary files /dev/null and b/mods/tinker/textures/items/rapier/blueslime_rapier_handle.png differ diff --git a/mods/tinker/textures/items/shovel/blueslime_shovel_handle.png b/mods/tinker/textures/items/shovel/blueslime_shovel_handle.png new file mode 100644 index 0000000..26675ef Binary files /dev/null and b/mods/tinker/textures/items/shovel/blueslime_shovel_handle.png differ diff --git a/mods/tinker/textures/items/shovel/blueslime_shovel_head.png b/mods/tinker/textures/items/shovel/blueslime_shovel_head.png new file mode 100644 index 0000000..b7fa7de Binary files /dev/null and b/mods/tinker/textures/items/shovel/blueslime_shovel_head.png differ diff --git a/mods/tinker/textures/items/shovel/blueslime_shovel_head_broken.png b/mods/tinker/textures/items/shovel/blueslime_shovel_head_broken.png new file mode 100644 index 0000000..5f93733 Binary files /dev/null and b/mods/tinker/textures/items/shovel/blueslime_shovel_head_broken.png differ diff --git a/test/XinStick.java b/test/XinStick.java index 6745052..617efbc 100644 --- a/test/XinStick.java +++ b/test/XinStick.java @@ -1,6 +1,6 @@ package test; -import mods.tinker.tconstruct.entity.UnstableCreeper; +import mods.tinker.tconstruct.entity.BlueSlime; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; @@ -28,7 +28,7 @@ public class XinStick extends Item //spawnItem(player.posX, player.posY, player.posZ, tool, world); //CartEntity cart = new CartEntity(world, 1); //cart.cartType = 1; - spawnEntity(player.posX, player.posY+1, player.posZ, new UnstableCreeper(world), world, player); + spawnEntity(player.posX, player.posY+1, player.posZ, new BlueSlime(world), world, player); return stack; } @@ -59,6 +59,7 @@ public class XinStick extends Item { entity.setPosition(x, y, z); entity.setAngles(player.cameraYaw, player.cameraYaw); + ((BlueSlime) entity).initCreature(); world.spawnEntityInWorld(entity); } }