mirror of
https://github.com/GTNewHorizons/TinkersConstruct.git
synced 2026-11-19 03:49:29 +00:00
Another step at cleaning up integration
This commit is contained in:
1 parent
73b25d19f0
commit
4bb32da4c8
60 files changed
+185
-178
No files matched your search
@@ -41,6 +41,7 @@ import tconstruct.util.IMCHandler;
|
||||
import tconstruct.util.config.DimensionBlacklist;
|
||||
import tconstruct.util.config.PHConstruct;
|
||||
import tconstruct.util.network.PacketPipeline;
|
||||
import tconstruct.weaponry.TinkerWeaponry;
|
||||
import tconstruct.world.TinkerWorld;
|
||||
import tconstruct.world.gen.SlimeIslandGen;
|
||||
import tconstruct.world.village.ComponentSmeltery;
|
||||
@@ -127,6 +128,7 @@ public class TConstruct
|
||||
pulsar.registerPulse(new TinkerSmeltery());
|
||||
pulsar.registerPulse(new TinkerMechworks());
|
||||
pulsar.registerPulse(new TinkerArmor());
|
||||
pulsar.registerPulse(new TinkerWeaponry());
|
||||
pulsar.registerPulse(new TinkerThaumcraft());
|
||||
pulsar.registerPulse(new TinkerWaila());
|
||||
pulsar.registerPulse(new TinkerBuildCraft());
|
||||
|
||||
@@ -1,29 +1,20 @@
|
||||
package boni.tinkersweaponry;
|
||||
package tconstruct.weaponry;
|
||||
|
||||
|
||||
import boni.tinkersweaponry.ammo.ArrowAmmo;
|
||||
import boni.tinkersweaponry.ammo.BoltAmmo;
|
||||
import boni.tinkersweaponry.items.DualMaterialToolPart;
|
||||
import boni.tinkersweaponry.items.WeaponryPattern;
|
||||
import boni.tinkersweaponry.items.WeaponryToolPart;
|
||||
import boni.tinkersweaponry.library.weaponry.AmmoItem;
|
||||
import boni.tinkersweaponry.library.weaponry.AmmoWeapon;
|
||||
import boni.tinkersweaponry.library.weaponry.ArrowShaftMaterial;
|
||||
import boni.tinkersweaponry.library.weaponry.ProjectileWeapon;
|
||||
import boni.tinkersweaponry.util.Reference;
|
||||
import boni.tinkersweaponry.weapons.*;
|
||||
import cpw.mods.fml.common.Mod;
|
||||
import cpw.mods.fml.common.SidedProxy;
|
||||
import cpw.mods.fml.common.event.FMLInitializationEvent;
|
||||
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
|
||||
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import mantle.pulsar.pulse.Handler;
|
||||
import mantle.pulsar.pulse.Pulse;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import net.minecraftforge.fluids.Fluid;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
import tconstruct.TConstruct;
|
||||
import tconstruct.library.TConstructCreativeTab;
|
||||
import tconstruct.library.TConstructRegistry;
|
||||
@@ -34,21 +25,26 @@ import tconstruct.library.util.IToolPart;
|
||||
import tconstruct.smeltery.TinkerSmeltery;
|
||||
import tconstruct.tools.TinkerTools;
|
||||
import tconstruct.tools.items.Pattern;
|
||||
import tconstruct.weaponry.ammo.ArrowAmmo;
|
||||
import tconstruct.weaponry.ammo.BoltAmmo;
|
||||
import tconstruct.weaponry.items.DualMaterialToolPart;
|
||||
import tconstruct.weaponry.items.WeaponryPattern;
|
||||
import tconstruct.weaponry.items.WeaponryToolPart;
|
||||
import tconstruct.weaponry.library.weaponry.AmmoItem;
|
||||
import tconstruct.weaponry.library.weaponry.AmmoWeapon;
|
||||
import tconstruct.weaponry.library.weaponry.ArrowShaftMaterial;
|
||||
import tconstruct.weaponry.library.weaponry.ProjectileWeapon;
|
||||
import tconstruct.weaponry.weapons.*;
|
||||
|
||||
import java.util.Map;
|
||||
import java.util.Random;
|
||||
|
||||
import static tconstruct.tools.TinkerTools.MaterialID;
|
||||
|
||||
@GameRegistry.ObjectHolder(Reference.MOD_ID)
|
||||
@Mod(modid = Reference.MOD_ID, name = Reference.MOD_NAME, dependencies = "required-after:" + Reference.TCON_MOD_ID, version = "${version}")
|
||||
@GameRegistry.ObjectHolder(TConstruct.modID)
|
||||
@Pulse(id = "Tinkers' Weaponry", description = "The main core of the mod! All of the tools, the tables, and the patterns are here.", pulsesRequired="Tinkers' Tools")
|
||||
public class TinkerWeaponry {
|
||||
public static Logger Log;
|
||||
|
||||
@Mod.Instance(Reference.MOD_ID)
|
||||
public static TinkerWeaponry instance;
|
||||
|
||||
@SidedProxy(clientSide = "boni.tinkersweaponry.ClientProxy", serverSide = "boni.tinkersweaponry.CommonProxy")
|
||||
@SidedProxy(clientSide = "tconstruct.weaponry.WeaponryClientProxy", serverSide = "tconstruct.weaponry.WeaponryCommonProxy")
|
||||
public static WeaponryCommonProxy proxy;
|
||||
|
||||
// Throwing Weapons
|
||||
@@ -83,16 +79,14 @@ public class TinkerWeaponry {
|
||||
public static Random random = new Random();
|
||||
|
||||
|
||||
@Mod.EventHandler
|
||||
@Handler
|
||||
public void preInit(FMLPreInitializationEvent event)
|
||||
{
|
||||
Log = event.getModLog();
|
||||
|
||||
registerItems();
|
||||
registerMaterials();
|
||||
}
|
||||
|
||||
@Mod.EventHandler
|
||||
@Handler
|
||||
public void init(FMLInitializationEvent event)
|
||||
{
|
||||
addPartRecipies();
|
||||
@@ -100,7 +94,7 @@ public class TinkerWeaponry {
|
||||
registerBoltCasting();
|
||||
}
|
||||
|
||||
@Mod.EventHandler
|
||||
@Handler
|
||||
public void postInit(FMLPostInitializationEvent event)
|
||||
{
|
||||
// this handler takes care that ammo weapons get ammo.
|
||||
@@ -208,7 +202,7 @@ public class TinkerWeaponry {
|
||||
// Bow Materials: Material ID, durability, drawspeed, arrow speed
|
||||
// speed 3.0 == exactly the vanilla bow if 2 parts of speed 3 are used
|
||||
// Wooden stuff is flexible, therefore good
|
||||
TConstructRegistry.addBowMaterial(MaterialID.Wood, 0, 18, 3.0f); // Wood
|
||||
TConstructRegistry.addBowMaterial(TinkerTools.MaterialID.Wood, 0, 18, 3.0f); // Wood
|
||||
// other organic materials also are good
|
||||
TConstructRegistry.addBowMaterial(MaterialID.Cactus, 0, 20, 2.4f); // Cactus
|
||||
TConstructRegistry.addBowMaterial(MaterialID.Bone, 0, 38, 2.0f); // Bone
|
||||
@@ -253,7 +247,7 @@ public class TinkerWeaponry {
|
||||
TConstructRegistry.addArrowMaterial(MaterialID.PigIron, 3.6F, 0.5F, 100F); //Pigiron
|
||||
|
||||
// Arrow Shaft Materials: Material ID, crafting item, durability-medifier, mass, fragility
|
||||
TConstructRegistry.addCustomMaterial(ArrowShaftMaterial.createMaterial(0, Items.stick, 1.0f, 1.0f, 0.15f, 0x866526)); // wood: reference material, 10% break chance
|
||||
TConstructRegistry.addCustomMaterial(ArrowShaftMaterial.createMaterial(0, Items.stick, 1.0f, 1.0f, 0.15f, 0x866526)); // wood: reference material, 10% break chance
|
||||
TConstructRegistry.addCustomMaterial(ArrowShaftMaterial.createMaterial(1, Items.bone, 0.95f, 1.2f, 0.05f, 0xede6bf)); // bone: heavier, but durable
|
||||
TConstructRegistry.addCustomMaterial(ArrowShaftMaterial.createMaterial(2, Items.reeds, 1.5f, 0.8f, 0.66f, 0xc7ff87)); // reed: light, but less durable
|
||||
TConstructRegistry.addCustomMaterial(ArrowShaftMaterial.createMaterial(3, Items.blaze_rod, 1.2f, 0.9f, 0.08f, 0xfff32d)); // blaze: tad lighter, tad more durable, fieryyyy
|
||||
|
||||
@@ -1,15 +1,15 @@
|
||||
package boni.tinkersweaponry;
|
||||
package tconstruct.weaponry;
|
||||
|
||||
import boni.tinkersweaponry.client.AmmoSlotHandler;
|
||||
import boni.tinkersweaponry.client.CrosshairHandler;
|
||||
import boni.tinkersweaponry.client.RenderEventHandler;
|
||||
import boni.tinkersweaponry.client.entityrenderer.ArrowEntityRenderer;
|
||||
import boni.tinkersweaponry.client.entityrenderer.JavelinEntityRenderer;
|
||||
import boni.tinkersweaponry.client.entityrenderer.ProjectileBaseRenderer;
|
||||
import boni.tinkersweaponry.client.entityrenderer.ShurikenEntityRenderer;
|
||||
import boni.tinkersweaponry.client.renderer.*;
|
||||
import boni.tinkersweaponry.entity.*;
|
||||
import boni.tinkersweaponry.util.Reference;
|
||||
import tconstruct.weaponry.client.AmmoSlotHandler;
|
||||
import tconstruct.weaponry.client.CrosshairHandler;
|
||||
import tconstruct.weaponry.client.RenderEventHandler;
|
||||
import tconstruct.weaponry.client.entityrenderer.ArrowEntityRenderer;
|
||||
import tconstruct.weaponry.client.entityrenderer.JavelinEntityRenderer;
|
||||
import tconstruct.weaponry.client.entityrenderer.ProjectileBaseRenderer;
|
||||
import tconstruct.weaponry.client.entityrenderer.ShurikenEntityRenderer;
|
||||
import tconstruct.weaponry.client.renderer.*;
|
||||
import tconstruct.weaponry.entity.*;
|
||||
import tconstruct.weaponry.util.Reference;
|
||||
import cpw.mods.fml.client.registry.RenderingRegistry;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraftforge.client.MinecraftForgeClient;
|
||||
|
||||
@@ -1,14 +1,15 @@
|
||||
package boni.tinkersweaponry;
|
||||
package tconstruct.weaponry;
|
||||
|
||||
import boni.tinkersweaponry.entity.*;
|
||||
import tconstruct.TConstruct;
|
||||
import tconstruct.weaponry.entity.*;
|
||||
import cpw.mods.fml.common.registry.EntityRegistry;
|
||||
|
||||
public class WeaponryCommonProxy {
|
||||
public void init() {
|
||||
EntityRegistry.registerModEntity(ShurikenEntity.class, "Shuriken", 0, TinkerWeaponry.instance, 32, 5, true);
|
||||
EntityRegistry.registerModEntity(ThrowingKnifeEntity.class, "ThrowingKnife", 1, TinkerWeaponry.instance, 32, 5, true);
|
||||
EntityRegistry.registerModEntity(JavelinEntity.class, "Javelin", 2, TinkerWeaponry.instance, 32, 5, true);
|
||||
EntityRegistry.registerModEntity(ArrowEntity.class, "Arrow", 3, TinkerWeaponry.instance, 32, 5, true);
|
||||
EntityRegistry.registerModEntity(BoltEntity.class, "Bolt", 4, TinkerWeaponry.instance, 32, 5, true);
|
||||
EntityRegistry.registerModEntity(ShurikenEntity.class, "Shuriken", 0, TConstruct.instance, 32, 5, true);
|
||||
EntityRegistry.registerModEntity(ThrowingKnifeEntity.class, "ThrowingKnife", 1, TConstruct.instance, 32, 5, true);
|
||||
EntityRegistry.registerModEntity(JavelinEntity.class, "Javelin", 2, TConstruct.instance, 32, 5, true);
|
||||
EntityRegistry.registerModEntity(ArrowEntity.class, "Arrow", 3, TConstruct.instance, 32, 5, true);
|
||||
EntityRegistry.registerModEntity(BoltEntity.class, "Bolt", 4, TConstruct.instance, 32, 5, true);
|
||||
}
|
||||
}
|
||||
@@ -1,13 +1,13 @@
|
||||
package boni.tinkersweaponry;
|
||||
package tconstruct.weaponry;
|
||||
|
||||
import boni.tinkersweaponry.ammo.ArrowAmmo;
|
||||
import boni.tinkersweaponry.ammo.BoltAmmo;
|
||||
import boni.tinkersweaponry.items.DualMaterialToolPart;
|
||||
import boni.tinkersweaponry.library.weaponry.ArrowShaftMaterial;
|
||||
import boni.tinkersweaponry.library.weaponry.BowBaseAmmo;
|
||||
import boni.tinkersweaponry.library.weaponry.ProjectileWeapon;
|
||||
import boni.tinkersweaponry.library.weaponry.IAmmo;
|
||||
import boni.tinkersweaponry.weapons.Crossbow;
|
||||
import tconstruct.weaponry.ammo.ArrowAmmo;
|
||||
import tconstruct.weaponry.ammo.BoltAmmo;
|
||||
import tconstruct.weaponry.items.DualMaterialToolPart;
|
||||
import tconstruct.weaponry.library.weaponry.ArrowShaftMaterial;
|
||||
import tconstruct.weaponry.library.weaponry.BowBaseAmmo;
|
||||
import tconstruct.weaponry.library.weaponry.ProjectileWeapon;
|
||||
import tconstruct.weaponry.library.weaponry.IAmmo;
|
||||
import tconstruct.weaponry.weapons.Crossbow;
|
||||
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
@@ -1,8 +1,9 @@
|
||||
package boni.tinkersweaponry.ammo;
|
||||
package tconstruct.weaponry.ammo;
|
||||
|
||||
import boni.tinkersweaponry.TinkerWeaponry;
|
||||
import boni.tinkersweaponry.library.weaponry.AmmoItem;
|
||||
import boni.tinkersweaponry.util.Reference;
|
||||
import tconstruct.TConstruct;
|
||||
import tconstruct.weaponry.TinkerWeaponry;
|
||||
import tconstruct.weaponry.library.weaponry.AmmoItem;
|
||||
import tconstruct.weaponry.util.Reference;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
@@ -119,6 +120,6 @@ public class ArrowAmmo extends AmmoItem {
|
||||
vanillaArrow = tool;
|
||||
}
|
||||
else
|
||||
TinkerWeaponry.Log.error("Couldn't build vanilla equivalent of Tinker Arrow");
|
||||
TConstruct.logger.error("Couldn't build vanilla equivalent of Tinker Arrow");
|
||||
}
|
||||
}
|
||||
@@ -1,8 +1,8 @@
|
||||
package boni.tinkersweaponry.ammo;
|
||||
package tconstruct.weaponry.ammo;
|
||||
|
||||
import boni.tinkersweaponry.TinkerWeaponry;
|
||||
import boni.tinkersweaponry.items.DualMaterialToolPart;
|
||||
import boni.tinkersweaponry.library.weaponry.AmmoItem;
|
||||
import tconstruct.weaponry.TinkerWeaponry;
|
||||
import tconstruct.weaponry.items.DualMaterialToolPart;
|
||||
import tconstruct.weaponry.library.weaponry.AmmoItem;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import tconstruct.library.crafting.ToolBuilder;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package boni.tinkersweaponry.client;
|
||||
package tconstruct.weaponry.client;
|
||||
|
||||
import boni.tinkersweaponry.library.weaponry.ProjectileWeapon;
|
||||
import tconstruct.weaponry.library.weaponry.ProjectileWeapon;
|
||||
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.gui.Gui;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package boni.tinkersweaponry.client;
|
||||
package tconstruct.weaponry.client;
|
||||
|
||||
import boni.tinkersweaponry.util.Reference;
|
||||
import boni.tinkersweaponry.library.weaponry.IWindup;
|
||||
import tconstruct.weaponry.util.Reference;
|
||||
import tconstruct.weaponry.library.weaponry.IWindup;
|
||||
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.OpenGlHelper;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package boni.tinkersweaponry.client;
|
||||
package tconstruct.weaponry.client;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package boni.tinkersweaponry.client;
|
||||
package tconstruct.weaponry.client;
|
||||
|
||||
import net.minecraft.util.IIcon;
|
||||
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package boni.tinkersweaponry.client;
|
||||
package tconstruct.weaponry.client;
|
||||
|
||||
import boni.tinkersweaponry.TinkerWeaponry;
|
||||
import boni.tinkersweaponry.library.weaponry.BowBaseAmmo;
|
||||
import boni.tinkersweaponry.library.weaponry.IWindup;
|
||||
import tconstruct.weaponry.TinkerWeaponry;
|
||||
import tconstruct.weaponry.library.weaponry.BowBaseAmmo;
|
||||
import tconstruct.weaponry.library.weaponry.IWindup;
|
||||
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraftforge.client.event.FOVUpdateEvent;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package boni.tinkersweaponry.client.entityrenderer;
|
||||
package tconstruct.weaponry.client.entityrenderer;
|
||||
|
||||
import boni.tinkersweaponry.entity.ArrowEntity;
|
||||
import tconstruct.weaponry.entity.ArrowEntity;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
public class ArrowEntityRenderer extends ProjectileBaseRenderer<ArrowEntity> {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package boni.tinkersweaponry.client.entityrenderer;
|
||||
package tconstruct.weaponry.client.entityrenderer;
|
||||
|
||||
import boni.tinkersweaponry.entity.JavelinEntity;
|
||||
import tconstruct.weaponry.entity.JavelinEntity;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
public class JavelinEntityRenderer extends ProjectileBaseRenderer<JavelinEntity> {
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package boni.tinkersweaponry.client.entityrenderer;
|
||||
package tconstruct.weaponry.client.entityrenderer;
|
||||
|
||||
import boni.tinkersweaponry.client.renderer.FlexibleToolRenderer;
|
||||
import boni.tinkersweaponry.entity.ProjectileBase;
|
||||
import tconstruct.weaponry.client.renderer.FlexibleToolRenderer;
|
||||
import tconstruct.weaponry.entity.ProjectileBase;
|
||||
import net.minecraft.client.renderer.entity.Render;
|
||||
import net.minecraft.client.renderer.texture.TextureMap;
|
||||
import net.minecraft.entity.Entity;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package boni.tinkersweaponry.client.entityrenderer;
|
||||
package tconstruct.weaponry.client.entityrenderer;
|
||||
|
||||
import boni.tinkersweaponry.entity.ShurikenEntity;
|
||||
import tconstruct.weaponry.entity.ShurikenEntity;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
public class ShurikenEntityRenderer extends ProjectileBaseRenderer<ShurikenEntity> {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package boni.tinkersweaponry.client.renderer;
|
||||
package tconstruct.weaponry.client.renderer;
|
||||
|
||||
import boni.tinkersweaponry.library.weaponry.IAmmo;
|
||||
import tconstruct.weaponry.library.weaponry.IAmmo;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.gui.FontRenderer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
package boni.tinkersweaponry.client.renderer;
|
||||
package tconstruct.weaponry.client.renderer;
|
||||
|
||||
import boni.tinkersweaponry.TinkerWeaponry;
|
||||
import boni.tinkersweaponry.ammo.ArrowAmmo;
|
||||
import boni.tinkersweaponry.entity.ArrowEntity;
|
||||
import boni.tinkersweaponry.library.weaponry.ProjectileWeapon;
|
||||
import boni.tinkersweaponry.library.weaponry.IWindup;
|
||||
import tconstruct.weaponry.TinkerWeaponry;
|
||||
import tconstruct.weaponry.ammo.ArrowAmmo;
|
||||
import tconstruct.weaponry.entity.ArrowEntity;
|
||||
import tconstruct.weaponry.library.weaponry.ProjectileWeapon;
|
||||
import tconstruct.weaponry.library.weaponry.IWindup;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.entity.Render;
|
||||
import net.minecraft.client.renderer.entity.RenderManager;
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package boni.tinkersweaponry.client.renderer;
|
||||
package tconstruct.weaponry.client.renderer;
|
||||
|
||||
import boni.tinkersweaponry.entity.ArrowEntity;
|
||||
import boni.tinkersweaponry.entity.BoltEntity;
|
||||
import boni.tinkersweaponry.weapons.Crossbow;
|
||||
import tconstruct.weaponry.entity.ArrowEntity;
|
||||
import tconstruct.weaponry.entity.BoltEntity;
|
||||
import tconstruct.weaponry.weapons.Crossbow;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.entity.Render;
|
||||
import net.minecraft.client.renderer.entity.RenderManager;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package boni.tinkersweaponry.client.renderer;
|
||||
package tconstruct.weaponry.client.renderer;
|
||||
|
||||
import net.minecraft.client.renderer.Tessellator;
|
||||
import net.minecraft.entity.Entity;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package boni.tinkersweaponry.client.renderer;
|
||||
package tconstruct.weaponry.client.renderer;
|
||||
|
||||
import boni.tinkersweaponry.library.weaponry.IWindup;
|
||||
import tconstruct.weaponry.library.weaponry.IWindup;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package boni.tinkersweaponry.client.renderer;
|
||||
package tconstruct.weaponry.client.renderer;
|
||||
|
||||
import boni.tinkersweaponry.library.weaponry.IWindup;
|
||||
import tconstruct.weaponry.library.weaponry.IWindup;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.entity.RenderManager;
|
||||
import net.minecraft.client.renderer.entity.RenderPlayer;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package boni.tinkersweaponry.entity;
|
||||
package tconstruct.weaponry.entity;
|
||||
|
||||
import boni.tinkersweaponry.library.util.PiercingArrowDamage;
|
||||
import tconstruct.weaponry.library.util.PiercingArrowDamage;
|
||||
import cpw.mods.fml.common.network.ByteBufUtils;
|
||||
import io.netty.buffer.ByteBuf;
|
||||
import net.minecraft.client.Minecraft;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package boni.tinkersweaponry.entity;
|
||||
package tconstruct.weaponry.entity;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package boni.tinkersweaponry.entity;
|
||||
package tconstruct.weaponry.entity;
|
||||
|
||||
import boni.tinkersweaponry.TinkerWeaponry;
|
||||
import tconstruct.weaponry.TinkerWeaponry;
|
||||
import io.netty.buffer.ByteBuf;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package boni.tinkersweaponry.entity;
|
||||
package tconstruct.weaponry.entity;
|
||||
|
||||
import boni.tinkersweaponry.library.weaponry.AmmoItem;
|
||||
import boni.tinkersweaponry.util.Reference;
|
||||
import tconstruct.weaponry.library.weaponry.AmmoItem;
|
||||
import tconstruct.weaponry.util.Reference;
|
||||
import cpw.mods.fml.common.network.ByteBufUtils;
|
||||
import cpw.mods.fml.common.registry.IEntityAdditionalSpawnData;
|
||||
import io.netty.buffer.ByteBuf;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package boni.tinkersweaponry.entity;
|
||||
package tconstruct.weaponry.entity;
|
||||
|
||||
import boni.tinkersweaponry.TinkerWeaponry;
|
||||
import tconstruct.weaponry.TinkerWeaponry;
|
||||
import io.netty.buffer.ByteBuf;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package boni.tinkersweaponry.entity;
|
||||
package tconstruct.weaponry.entity;
|
||||
|
||||
import boni.tinkersweaponry.TinkerWeaponry;
|
||||
import tconstruct.weaponry.TinkerWeaponry;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package boni.tinkersweaponry.items;
|
||||
package tconstruct.weaponry.items;
|
||||
|
||||
import net.minecraft.item.ItemStack;
|
||||
import tconstruct.TConstruct;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package boni.tinkersweaponry.items;
|
||||
package tconstruct.weaponry.items;
|
||||
|
||||
import boni.tinkersweaponry.TinkerWeaponry;
|
||||
import boni.tinkersweaponry.util.Reference;
|
||||
import tconstruct.weaponry.TinkerWeaponry;
|
||||
import tconstruct.weaponry.util.Reference;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package boni.tinkersweaponry.items;
|
||||
package tconstruct.weaponry.items;
|
||||
|
||||
import boni.tinkersweaponry.util.Reference;
|
||||
import tconstruct.weaponry.util.Reference;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package boni.tinkersweaponry.items;
|
||||
package tconstruct.weaponry.items;
|
||||
|
||||
import boni.tinkersweaponry.TinkerWeaponry;
|
||||
import boni.tinkersweaponry.util.Reference;
|
||||
import tconstruct.weaponry.TinkerWeaponry;
|
||||
import tconstruct.weaponry.util.Reference;
|
||||
import tconstruct.library.tools.DynamicToolPart;
|
||||
|
||||
public class WeaponryToolPart extends DynamicToolPart {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package boni.tinkersweaponry.library.util;
|
||||
package tconstruct.weaponry.library.util;
|
||||
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.util.EntityDamageSourceIndirect;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package boni.tinkersweaponry.library.weaponry;
|
||||
package tconstruct.weaponry.library.weaponry;
|
||||
|
||||
import boni.tinkersweaponry.TinkerWeaponry;
|
||||
import boni.tinkersweaponry.util.Reference;
|
||||
import tconstruct.weaponry.TinkerWeaponry;
|
||||
import tconstruct.weaponry.util.Reference;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package boni.tinkersweaponry.library.weaponry;
|
||||
package tconstruct.weaponry.library.weaponry;
|
||||
|
||||
import boni.tinkersweaponry.client.CrosshairType;
|
||||
import tconstruct.weaponry.client.CrosshairType;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import net.minecraft.entity.Entity;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package boni.tinkersweaponry.library.weaponry;
|
||||
package tconstruct.weaponry.library.weaponry;
|
||||
|
||||
import boni.tinkersweaponry.TinkerWeaponry;
|
||||
import tconstruct.weaponry.TinkerWeaponry;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import tconstruct.library.tools.CustomMaterial;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package boni.tinkersweaponry.library.weaponry;
|
||||
package tconstruct.weaponry.library.weaponry;
|
||||
|
||||
import boni.tinkersweaponry.ammo.ArrowAmmo;
|
||||
import boni.tinkersweaponry.entity.ArrowEntity;
|
||||
import tconstruct.weaponry.ammo.ArrowAmmo;
|
||||
import tconstruct.weaponry.entity.ArrowEntity;
|
||||
import net.minecraft.enchantment.Enchantment;
|
||||
import net.minecraft.enchantment.EnchantmentHelper;
|
||||
import net.minecraft.entity.Entity;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package boni.tinkersweaponry.library.weaponry;
|
||||
package tconstruct.weaponry.library.weaponry;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package boni.tinkersweaponry.library.weaponry;
|
||||
package tconstruct.weaponry.library.weaponry;
|
||||
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package boni.tinkersweaponry.library.weaponry;
|
||||
package tconstruct.weaponry.library.weaponry;
|
||||
|
||||
import boni.tinkersweaponry.client.CrosshairType;
|
||||
import tconstruct.weaponry.client.CrosshairType;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package boni.tinkersweaponry.library.weaponry;
|
||||
package tconstruct.weaponry.library.weaponry;
|
||||
|
||||
import boni.tinkersweaponry.TinkerWeaponry;
|
||||
import boni.tinkersweaponry.client.CrosshairType;
|
||||
import boni.tinkersweaponry.util.Reference;
|
||||
import tconstruct.weaponry.TinkerWeaponry;
|
||||
import tconstruct.weaponry.client.CrosshairType;
|
||||
import tconstruct.weaponry.util.Reference;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package boni.tinkersweaponry.util;
|
||||
package tconstruct.weaponry.util;
|
||||
|
||||
public class Config {
|
||||
}
|
||||
@@ -1,4 +1,4 @@
|
||||
package boni.tinkersweaponry.util;
|
||||
package tconstruct.weaponry.util;
|
||||
|
||||
public final class Reference {
|
||||
private Reference() {}
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
package boni.tinkersweaponry.weapons;
|
||||
package tconstruct.weaponry.weapons;
|
||||
|
||||
import boni.tinkersweaponry.TinkerWeaponry;
|
||||
import boni.tinkersweaponry.ammo.BoltAmmo;
|
||||
import boni.tinkersweaponry.entity.BoltEntity;
|
||||
import boni.tinkersweaponry.library.weaponry.AmmoItem;
|
||||
import boni.tinkersweaponry.library.weaponry.ProjectileWeapon;
|
||||
import boni.tinkersweaponry.util.Reference;
|
||||
import boni.tinkersweaponry.library.weaponry.IAmmo;
|
||||
import tconstruct.weaponry.TinkerWeaponry;
|
||||
import tconstruct.weaponry.ammo.BoltAmmo;
|
||||
import tconstruct.weaponry.entity.BoltEntity;
|
||||
import tconstruct.weaponry.library.weaponry.AmmoItem;
|
||||
import tconstruct.weaponry.library.weaponry.ProjectileWeapon;
|
||||
import tconstruct.weaponry.util.Reference;
|
||||
import tconstruct.weaponry.library.weaponry.IAmmo;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.entity.projectile.EntityArrow;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package boni.tinkersweaponry.weapons;
|
||||
package tconstruct.weaponry.weapons;
|
||||
|
||||
import boni.tinkersweaponry.entity.JavelinEntity;
|
||||
import boni.tinkersweaponry.library.weaponry.AmmoWeapon;
|
||||
import tconstruct.weaponry.entity.JavelinEntity;
|
||||
import tconstruct.weaponry.library.weaponry.AmmoWeapon;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.Item;
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package boni.tinkersweaponry.weapons;
|
||||
package tconstruct.weaponry.weapons;
|
||||
|
||||
import boni.tinkersweaponry.TinkerWeaponry;
|
||||
import boni.tinkersweaponry.ammo.ArrowAmmo;
|
||||
import boni.tinkersweaponry.library.weaponry.BowBaseAmmo;
|
||||
import tconstruct.weaponry.TinkerWeaponry;
|
||||
import tconstruct.weaponry.ammo.ArrowAmmo;
|
||||
import tconstruct.weaponry.library.weaponry.BowBaseAmmo;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.Item;
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package boni.tinkersweaponry.weapons;
|
||||
package tconstruct.weaponry.weapons;
|
||||
|
||||
import boni.tinkersweaponry.TinkerWeaponry;
|
||||
import boni.tinkersweaponry.ammo.ArrowAmmo;
|
||||
import boni.tinkersweaponry.library.weaponry.BowBaseAmmo;
|
||||
import tconstruct.weaponry.TinkerWeaponry;
|
||||
import tconstruct.weaponry.ammo.ArrowAmmo;
|
||||
import tconstruct.weaponry.library.weaponry.BowBaseAmmo;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.Item;
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
package boni.tinkersweaponry.weapons;
|
||||
package tconstruct.weaponry.weapons;
|
||||
|
||||
import boni.tinkersweaponry.TinkerWeaponry;
|
||||
import boni.tinkersweaponry.client.CrosshairType;
|
||||
import boni.tinkersweaponry.client.IconFlipped;
|
||||
import boni.tinkersweaponry.entity.ShurikenEntity;
|
||||
import boni.tinkersweaponry.library.weaponry.AmmoWeapon;
|
||||
import tconstruct.weaponry.TinkerWeaponry;
|
||||
import tconstruct.weaponry.client.CrosshairType;
|
||||
import tconstruct.weaponry.client.IconFlipped;
|
||||
import tconstruct.weaponry.entity.ShurikenEntity;
|
||||
import tconstruct.weaponry.library.weaponry.AmmoWeapon;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package boni.tinkersweaponry.weapons;
|
||||
package tconstruct.weaponry.weapons;
|
||||
|
||||
import boni.tinkersweaponry.entity.ArrowEntity;
|
||||
import boni.tinkersweaponry.library.weaponry.AmmoWeapon;
|
||||
import tconstruct.weaponry.entity.ArrowEntity;
|
||||
import tconstruct.weaponry.library.weaponry.AmmoWeapon;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.Item;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package boni.tinkersweaponry.weapons;
|
||||
package tconstruct.weaponry.weapons;
|
||||
|
||||
import boni.tinkersweaponry.entity.ArrowEntity;
|
||||
import boni.tinkersweaponry.util.Reference;
|
||||
import tconstruct.weaponry.entity.ArrowEntity;
|
||||
import tconstruct.weaponry.util.Reference;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.entity.projectile.EntityArrow;
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package boni.tinkersweaponry.weapons;
|
||||
package tconstruct.weaponry.weapons;
|
||||
|
||||
import boni.tinkersweaponry.client.CrosshairType;
|
||||
import boni.tinkersweaponry.entity.ThrowingKnifeEntity;
|
||||
import boni.tinkersweaponry.library.weaponry.AmmoWeapon;
|
||||
import tconstruct.weaponry.client.CrosshairType;
|
||||
import tconstruct.weaponry.entity.ThrowingKnifeEntity;
|
||||
import tconstruct.weaponry.library.weaponry.AmmoWeapon;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import net.minecraft.entity.Entity;
|
||||
|
||||
Reference in new issue
Block a user