diff --git a/src/sparrow/ISparrow.java b/src/sparrow/ISparrow.java deleted file mode 100644 index cff294f0..00000000 --- a/src/sparrow/ISparrow.java +++ /dev/null @@ -1,75 +0,0 @@ -package sparrow; - -import net.minecraft.entity.Entity; - -/** A comprehensive class for - * - * @author RaustBlackDragon - */ - -public interface ISparrow -{ - /**Is this thing like a creeper, in that engaging it in combat has unexpected consequences? - * Would this entity and its allies be better off not fighting it at all? - * Set this to true if the attacker's combat abilities are basically a non-factor in what will happen to it if it fights this. - */ - public boolean isStupidToAttack (); - - /**When a mod triggers an event that would set an entity to be dead with no reference to damage, should this entity be spared?*/ - public boolean doNotVaporize (); - - /**Does this entity attack non-player entities on sight?*/ - public boolean isPredator (); - - /**Does this entity attack the player on sight?*/ - public boolean isHostile (); - - /**Is this entity incapable of combat?*/ - public boolean isPeaceful (); - - /**Is this entity viable prey for a predator?*/ - public boolean isPrey (); - - /**Will this entity attack, but only when provoked?*/ - public boolean isNeutral (); - - /**Is this entity incapable of taking damage, and thus pointless to attack?*/ - public boolean isUnkillable (); - - /**Should this entity be considered a threat to par1entity?*/ - public boolean isThreatTo (Entity par1entity); - - /**Should this entity be considered a friend of par1entity?*/ - public boolean isFriendOf (Entity par1entity); - - /**Is this entity what people would generally consider to be an NPC?*/ - public boolean isNPC (); - - /**Is this a pet? 0 if not, 1 if it can be but isn't currently, 2 if it is.*/ - public int isPet (); - - /**Who is this pet's owner?*/ - public Entity getPetOwner (); - - /**What is the name of this individual entity?*/ - public String getName (); - - /**What is this entity currently targeting with intent to kill? Used to differentiate between the attack method monsters use and the attack method used for breeding and following*/ - public Entity getAttackingTarget (); - - /**What is the size of this entity? Multiply its two dimensions (X and Z are considered the same) in terms of blocks and put in the result ( a chicken would be .3 * .7, which is roughly .2)*/ - public float getSize (); - - /**What should this entity be referred to as? (Dog, Cat, Human, Enderman, etc.)*/ - public String getSpecies (); - - /**What is this entity's gender? 1 for male, 2 for female, 0 for neither*/ - public int getGender (); - - /**This is for mod-specific features. A mod can search for a response to a custom string, and you can add in whether or not they'll respond to it here, and what the response will be.*/ - public String customStringAndResponse (String s); - - /**Have this return the string you store your simplyID in. Use the function SimplyID.getNextSimplyID(this) to assign a simplyID to your entities that implement Sparrow.*/ - public String getSimplyID (); - -} diff --git a/src/tconstruct/TConstruct.java b/src/tconstruct/TConstruct.java index ca5831ef..80e1e7b4 100644 --- a/src/tconstruct/TConstruct.java +++ b/src/tconstruct/TConstruct.java @@ -43,7 +43,7 @@ import cpw.mods.fml.relauncher.Side; * @dependencies: IC2 API, MFR API */ -@Mod(modid = "TConstruct", name = "TConstruct", version = "1.6.3_1.4.6d1", dependencies = "required-after:Forge@[7.7.1.687,)") +@Mod(modid = "TConstruct", name = "TConstruct", version = "1.6.3_1.4.6d1", dependencies = "required-after:Forge@[9.11.0.873,)") @NetworkMod(serverSideRequired = false, clientSideRequired = true, channels = { "TConstruct" }, packetHandler = tconstruct.util.network.TPacketHandler.class) public class TConstruct { diff --git a/src/tconstruct/worldgen/village/ComponentSmeltery.java b/src/tconstruct/worldgen/village/ComponentSmeltery.java index 014e27f6..ab2a6765 100644 --- a/src/tconstruct/worldgen/village/ComponentSmeltery.java +++ b/src/tconstruct/worldgen/village/ComponentSmeltery.java @@ -9,12 +9,15 @@ import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraft.world.gen.structure.ComponentVillage; import net.minecraft.world.gen.structure.ComponentVillageStartPiece; +import net.minecraft.world.gen.structure.MapGenStructureIO; import net.minecraft.world.gen.structure.StructureBoundingBox; import net.minecraft.world.gen.structure.StructureComponent; public class ComponentSmeltery extends ComponentVillage { private int averageGroundLevel = -1; + + public ComponentSmeltery() {} public ComponentSmeltery(ComponentVillageStartPiece par1ComponentVillageStartPiece, int par2, Random par3Random, StructureBoundingBox par4StructureBoundingBox, int par5) { diff --git a/src/tconstruct/worldgen/village/ComponentToolWorkshop.java b/src/tconstruct/worldgen/village/ComponentToolWorkshop.java index 84d7cc94..33bf566f 100644 --- a/src/tconstruct/worldgen/village/ComponentToolWorkshop.java +++ b/src/tconstruct/worldgen/village/ComponentToolWorkshop.java @@ -11,12 +11,15 @@ import net.minecraft.util.WeightedRandomChestContent; import net.minecraft.world.World; import net.minecraft.world.gen.structure.ComponentVillage; import net.minecraft.world.gen.structure.ComponentVillageStartPiece; +import net.minecraft.world.gen.structure.MapGenStructureIO; import net.minecraft.world.gen.structure.StructureBoundingBox; import net.minecraft.world.gen.structure.StructureComponent; public class ComponentToolWorkshop extends ComponentVillage { private int averageGroundLevel = -1; + + public ComponentToolWorkshop() {} public ComponentToolWorkshop(ComponentVillageStartPiece par1ComponentVillageStartPiece, int par2, Random par3Random, StructureBoundingBox par4StructureBoundingBox, int par5) { diff --git a/src/tconstruct/worldgen/village/VillageSmelteryHandler.java b/src/tconstruct/worldgen/village/VillageSmelteryHandler.java index 2eb94752..93115ae2 100644 --- a/src/tconstruct/worldgen/village/VillageSmelteryHandler.java +++ b/src/tconstruct/worldgen/village/VillageSmelteryHandler.java @@ -4,11 +4,16 @@ import java.util.List; import java.util.Random; import net.minecraft.world.gen.structure.ComponentVillageStartPiece; +import net.minecraft.world.gen.structure.MapGenStructureIO; import net.minecraft.world.gen.structure.StructureVillagePieceWeight; import cpw.mods.fml.common.registry.VillagerRegistry.IVillageCreationHandler; public class VillageSmelteryHandler implements IVillageCreationHandler { + public VillageSmelteryHandler() + { + MapGenStructureIO.func_143036_a(new ComponentSmeltery()); + } @Override public StructureVillagePieceWeight getVillagePieceWeight (Random random, int i) diff --git a/src/tconstruct/worldgen/village/VillageToolStationHandler.java b/src/tconstruct/worldgen/village/VillageToolStationHandler.java index 7c9784b1..42444396 100644 --- a/src/tconstruct/worldgen/village/VillageToolStationHandler.java +++ b/src/tconstruct/worldgen/village/VillageToolStationHandler.java @@ -4,11 +4,17 @@ import java.util.List; import java.util.Random; import net.minecraft.world.gen.structure.ComponentVillageStartPiece; +import net.minecraft.world.gen.structure.MapGenStructureIO; import net.minecraft.world.gen.structure.StructureVillagePieceWeight; import cpw.mods.fml.common.registry.VillagerRegistry.IVillageCreationHandler; public class VillageToolStationHandler implements IVillageCreationHandler { + public VillageToolStationHandler() + { + MapGenStructureIO.func_143036_a(new ComponentToolWorkshop()); + } + @Override public StructureVillagePieceWeight getVillagePieceWeight (Random random, int i) {