This commit is contained in:
Kam committed 2025-01-28 13:39:48 -05:00
commit 17eac9a690
98 files changed
+1896 -532

No files matched your search

+5 -3
View File
@@ -17,7 +17,7 @@ import noppes.npcs.containers.*;
import noppes.npcs.controllers.data.PlayerData;
import noppes.npcs.entity.EntityNPCInterface;
public class CommonProxy implements IGuiHandler {
public abstract class CommonProxy implements IGuiHandler {
public boolean newVersionAvailable = false;
public int revision = 1;
@@ -159,11 +159,13 @@ public class CommonProxy implements IGuiHandler {
}
public String getAchievementDesc(Achievement achievement) {
public abstract void generateBigSmokeParticles(World world, int x, int y, int z, boolean signalFire);
public String getAchievementDesc(Achievement achievement) {
return "";
}
public boolean isGUIOpen(){
return false;
}
}
}
@@ -11,6 +11,7 @@ import net.minecraft.entity.passive.EntityVillager;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
@@ -255,11 +256,23 @@ public class ServerEventsHandler {
}
if(!player.worldObj.isRemote){
if(block == CustomItems.banner || block == CustomItems.wallBanner){
// If sneaking and using shear
if(player.isSneaking() && item.getItem() == Items.shears){
int currentVariantIndex = tile.variant.ordinal();
int nextVariantIndex = (currentVariantIndex + 1) % EnumBannerVariant.values().length;
tile.variant = EnumBannerVariant.values()[nextVariantIndex];
player.worldObj.markBlockForUpdate(event.x, y, event.z);
event.setCanceled(true);
return;
}
}
tile.icon = item.copy();
player.worldObj.markBlockForUpdate(event.x, y, event.z);
event.setCanceled(true);
}
}
}
@@ -14,10 +14,13 @@ import noppes.npcs.CustomItems;
import noppes.npcs.CustomNpcs;
import noppes.npcs.NoppesUtilServer;
import noppes.npcs.blocks.tiles.TileCampfire;
import noppes.npcs.config.ConfigClient;
import org.lwjgl.opengl.GL11;
import java.util.Random;
import static noppes.npcs.client.ClientProxy.RAND;
public class BlockCampfire extends BlockLightable{
public BlockCampfire(boolean lit) {
@@ -31,14 +34,14 @@ public class BlockCampfire extends BlockLightable{
public TileEntity createNewTileEntity(World var1, int var2) {
return new TileCampfire();
}
@Override
@Override
public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int par6, float par7, float par8, float par9){
ItemStack item = player.inventory.getCurrentItem();
if(item == null)
return true;
int meta = world.getBlockMetadata(x, y, z);
if((item.getItem() == Items.flint || item.getItem() == Items.flint_and_steel) && unlitBlock() == this){
if(world.rand.nextInt(3) == 0 && !world.isRemote)
super.onBlockActivated(world, x, y, z, player, par6, par7, par8, par9);
@@ -49,11 +52,11 @@ public class BlockCampfire extends BlockLightable{
item.damageItem(1, player);
return true;
}
if(item.getItem() == Item.getItemFromBlock(Blocks.sand) && litBlock() == this){
super.onBlockActivated(world, x, y, z, player, par6, par7, par8, par9);
}
return true;
}
@@ -68,24 +71,28 @@ public class BlockCampfire extends BlockLightable{
int meta = world.getBlockMetadata(x, y, z);
if(meta == 1)
return;
if(random.nextInt(36) == 0){
world.playSound(x + 0.5F, y + 0.5F, z + 0.5F, "fire.fire", 1.0F + random.nextFloat(), 0.3F + random.nextFloat() * 0.7f , false);
}
TileCampfire tile = (TileCampfire) world.getTileEntity(x, y, z);
float xOffset = 0.5f, yOffset = 0.7f, zOffset = 0.5f;
double d0 = (double)((float)x + xOffset);
double d1 = (double)((float)y + yOffset);
double d2 = (double)((float)z + zOffset);
GL11.glPushMatrix();
CustomNpcs.proxy.spawnParticle("largesmoke", d0, d1, d2, 0.0D, 0.0D, 0.0D, 2);
CustomNpcs.proxy.spawnParticle("flame", d0, d1, d2, 0.0D, 0.0D, 0.0D, 4);
GL11.glPushMatrix();
if(ConfigClient.LegacyCampfire){
CustomNpcs.proxy.spawnParticle("largesmoke", d0, d1, d2, 0.0D, 0.0D, 0.0D, 2);
CustomNpcs.proxy.spawnParticle("flame", d0, d1, d2, 0.0D, 0.0D, 0.0D, 4);
}
else {
tile.updateEntity();
}
GL11.glPopMatrix();
}
@@ -3,29 +3,39 @@ package noppes.npcs.blocks.tiles;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.AxisAlignedBB;
import noppes.npcs.constants.EnumBannerVariant;
public class TileBanner extends TileColorable {
public ItemStack icon;
public EnumBannerVariant variant = EnumBannerVariant.Normal;
public long time = 0;
public void readFromNBT(NBTTagCompound compound){
super.readFromNBT(compound);
icon = ItemStack.loadItemStackFromNBT(compound.getCompoundTag("BannerIcon"));
int variantIndex = compound.getInteger("BannerVariant");
if (variantIndex >= 0 && variantIndex < EnumBannerVariant.values().length) {
variant = EnumBannerVariant.values()[variantIndex];
} else {
variant = EnumBannerVariant.Normal;
}
}
public void writeToNBT(NBTTagCompound compound){
super.writeToNBT(compound);
if(icon != null)
compound.setTag("BannerIcon", icon.writeToNBT(new NBTTagCompound()));
compound.setInteger("BannerVariant", variant.ordinal());
}
@Override
public AxisAlignedBB getRenderBoundingBox(){
return AxisAlignedBB.getBoundingBox(xCoord, yCoord, zCoord, xCoord + 1, yCoord + 2, zCoord + 1);
}
public boolean canEdit(){
return System.currentTimeMillis() - time < 10000;
return System.currentTimeMillis() - time < 20000;
}
}
@@ -1,7 +1,58 @@
package noppes.npcs.blocks.tiles;
import noppes.npcs.CustomNpcs;
import java.util.Random;
public class TileCampfire extends TileColorable {
public static final Random RAND = new Random();
private boolean rainAndSky = false;
private boolean previousTickLit = false;
@Override
public void updateEntity()
{
if (getWorldObj().isRemote)
{
if (isLit())
{
if (!previousTickLit || distributedInterval(50L))
rainAndSky = isBeingRainedOn();
addParticles();
}
previousTickLit = isLit();
}
}
public boolean distributedInterval(long interval)
{
if (hasWorldObj())
return (getWorldObj().getTotalWorldTime() + (long) (xCoord + yCoord + zCoord)) % interval == 0L;
else
return false;
}
protected void addParticles()
{
CustomNpcs.proxy.generateBigSmokeParticles(getWorldObj(), xCoord, yCoord, zCoord, false);
if (rainAndSky)
{
for (int i = 0; i < RAND.nextInt(3); ++i)
getWorldObj().spawnParticle("smoke", xCoord + RAND.nextDouble(), yCoord + 0.9, zCoord + RAND.nextDouble(), 0.0, 0.0, 0.0);
}
}
public boolean isBeingRainedOn()
{
return getWorldObj().isRaining() && getWorldObj().getPrecipitationHeight(xCoord, zCoord) <= yCoord + 1
&& getWorldObj().getBiomeGenForCoords(xCoord, zCoord).canSpawnLightningBolt();
}
public boolean isLit()
{
return this.getBlockMetadata() == 0;
}
}
@@ -6,6 +6,7 @@ import cpw.mods.fml.client.registry.RenderingRegistry;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.ObfuscationReflectionHelper;
import kamkeel.addon.client.DBCClient;
import net.minecraft.block.Block;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiScreen;
import net.minecraft.client.model.ModelBiped;
@@ -32,6 +33,7 @@ import noppes.npcs.*;
import noppes.npcs.api.IWorld;
import noppes.npcs.blocks.tiles.*;
import noppes.npcs.client.controllers.*;
import noppes.npcs.client.fx.EntityBigSmokeFX;
import noppes.npcs.client.fx.EntityElementalStaffFX;
import noppes.npcs.client.fx.EntityEnderFX;
import noppes.npcs.client.fx.EntityRainbowFX;
@@ -76,7 +78,7 @@ import java.util.Random;
public class ClientProxy extends CommonProxy {
public static KeyBinding NPCButton;
public static final Random RAND = new Random();
public static FontContainer Font;
public void load() {
@@ -541,6 +543,17 @@ public class ClientProxy extends CommonProxy {
}
}
@Override
public void generateBigSmokeParticles(World world, int x, int y, int z, boolean signalFire)
{
if (RAND.nextFloat() < 0.11F)
{
float[] colours = new float[0];
for (int i = 0; i < RAND.nextInt(2) + 1; ++i)
Minecraft.getMinecraft().effectRenderer.addEffect(new EntityBigSmokeFX(world, x, y, z, signalFire, colours));
}
}
@Override
public String getAchievementDesc(Achievement achievement) {
return achievement.getDescription();
@@ -0,0 +1,218 @@
package noppes.npcs.client.fx;
import org.lwjgl.opengl.GL11;
import cpw.mods.fml.common.eventhandler.Cancelable;
import cpw.mods.fml.relauncher.Side;
import net.minecraft.client.Minecraft;
import net.minecraft.client.particle.EntityFX;
import net.minecraft.client.renderer.ActiveRenderInfo;
import net.minecraft.client.renderer.OpenGlHelper;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.init.Blocks;
import net.minecraft.util.MathHelper;
import net.minecraft.util.ResourceLocation;
import net.minecraft.world.World;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.entity.EntityEvent.EntityConstructing;
public class EntityBigSmokeFX extends EntityFX
{
/** there are 12 smoke textures. */
public static final int TEXTURE_COUNT = 12;
public static final ResourceLocation[] TEXTURES = new ResourceLocation[TEXTURE_COUNT];
static
{
for (int i = 0; i < TEXTURE_COUNT; i++)
TEXTURES[i] = new ResourceLocation("customnpcs" + ":" + "textures/particle/big_smoke_" + i + ".png");
}
protected final int texIndex;
protected boolean alphaFading = false;
protected float alphaFadePerTick = -0.015F;
protected boolean localizedCombustion = true;
protected boolean isColored = false;
/**
* Posts a {@link EntityBigSmokeFXConstructingEvent}.
*/
public EntityBigSmokeFX(World world, int x, int y, int z, boolean signalFire, float[] colours) {
super(world, x, y, z);
// Position: Centered above the spawn point with slight randomness
this.setPosition(
x + 0.5 + (rand.nextDouble() / 10.0 * (rand.nextBoolean() ? 1 : -1)), // Small horizontal offset
y + 0.1 + (rand.nextDouble() * 0.1), // Start slightly above y
z + 0.5 + (rand.nextDouble() / 10.0 * (rand.nextBoolean() ? 1 : -1))
);
// Scale: Smoke size
this.particleScale = 4.0F * (rand.nextFloat() * 0.5F + 0.5F); // Smaller size
this.setSize(0.25F, 0.25F);
// Gravity: Slows upward motion gradually
this.particleGravity = 0.005F;
// Upward motion: Slow, with slight randomness
this.motionX = 0; // No horizontal motion
this.motionY = 0.02F + rand.nextFloat() * 0.01F;
this.motionZ = 0; // No horizontal motion
this.particleMaxAge = rand.nextInt(50) + 100; // Shorter lifetime for normal smoke
this.particleAlpha = 0.8F;
if (colours.length == 3) {
this.setRBGColorF(colours[0], colours[1], colours[2]);
}
// Smoke appearance
this.texIndex = rand.nextInt(TEXTURE_COUNT);
this.isColored = this.particleRed != 1.0F || this.particleGreen != 1.0F || this.particleBlue != 1.0F;
}
@Override
public void renderParticle(Tessellator tess, float partialTicks, float rotX, float rotXZ, float rotZ, float rotYZ, float rotXY)
{
rotX = ActiveRenderInfo.rotationX;
rotXZ = ActiveRenderInfo.rotationXZ;
rotZ = ActiveRenderInfo.rotationZ;
rotYZ = ActiveRenderInfo.rotationYZ;
rotXY = ActiveRenderInfo.rotationXY;
EntityLivingBase view = Minecraft.getMinecraft().renderViewEntity;
double interpX = view.lastTickPosX + (view.posX - view.lastTickPosX) * partialTicks;
double interpY = view.lastTickPosY + (view.posY - view.lastTickPosY) * partialTicks;
double interpZ = view.lastTickPosZ + (view.posZ - view.lastTickPosZ) * partialTicks;
float partialPosX = (float) (prevPosX + (posX - prevPosX) * partialTicks - interpX);
float partialPosY = (float) (prevPosY + (posY - prevPosY) * partialTicks - interpY);
float partialPosZ = (float) (prevPosZ + (posZ - prevPosZ) * partialTicks - interpZ);
float scale = 0.1F * particleScale;
double minU = this.particleTextureIndexX * 0.25;
double maxU = minU + 0.25;
double minV = this.particleTextureIndexY * 0.125;
double maxV = minV + 0.125;
GL11.glEnable(GL11.GL_BLEND);
OpenGlHelper.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ZERO);
GL11.glDepthMask(true);
GL11.glEnable(GL11.GL_ALPHA_TEST);
GL11.glAlphaFunc(GL11.GL_GREATER, 0.003921569F);
Minecraft.getMinecraft().renderEngine.bindTexture(TEXTURES[this.texIndex % TEXTURES.length]);
tess.startDrawingQuads();
tess.setColorRGBA_F(particleRed, particleGreen, particleBlue, particleAlpha);
tess.setBrightness(15 << 20 | 14 << 4); // slightly less than MiscUtil.MAX_LIGHT_BRIGHTNESS so that smoke doesn't glow super bright with shaders
tess.addVertexWithUV(partialPosX - rotX * scale - rotYZ * scale, partialPosY - rotXZ * scale, partialPosZ - rotZ * scale - rotXY * scale, 1, 1);
tess.addVertexWithUV(partialPosX - rotX * scale + rotYZ * scale, partialPosY + rotXZ * scale, partialPosZ - rotZ * scale + rotXY * scale, 1, 0);
tess.addVertexWithUV(partialPosX + rotX * scale + rotYZ * scale, partialPosY + rotXZ * scale, partialPosZ + rotZ * scale + rotXY * scale, 0, 0);
tess.addVertexWithUV(partialPosX + rotX * scale - rotYZ * scale, partialPosY - rotXZ * scale, partialPosZ + rotZ * scale - rotXY * scale, 0, 1);
tess.draw();
GL11.glDisable(GL11.GL_BLEND);
GL11.glDepthMask(false);
GL11.glAlphaFunc(GL11.GL_GREATER, 0.1F);
}
@Override
public int getFXLayer()
{
return 3;
}
@Override
public void onUpdate() {
this.prevPosX = this.posX;
this.prevPosY = this.posY;
this.prevPosZ = this.posZ;
// Age-based behavior: Fade out near the end of lifetime
if (this.particleAge++ >= this.particleMaxAge - 40) {
this.alphaFading = true;
}
if (this.particleAge < this.particleMaxAge && this.particleAlpha > 0.0F) {
// Minimal horizontal drift for slight randomness
float horizontalMotionScale = 0.001F; // Very small horizontal movement
this.motionX += this.rand.nextFloat() * horizontalMotionScale * (this.rand.nextBoolean() ? 1 : -1);
this.motionZ += this.rand.nextFloat() * horizontalMotionScale * (this.rand.nextBoolean() ? 1 : -1);
// Move the particle
this.moveEntity(this.motionX, this.motionY, this.motionZ);
// Fade out alpha if needed
if (this.alphaFading) {
this.particleAlpha = MathHelper.clamp_float(this.particleAlpha + this.alphaFadePerTick, 0.0F, 1.0F);
}
} else {
// Kill the particle if it has faded out or reached max age
this.setDead();
}
}
/**
* Allows you to change various aspects of campfire smoke particles:<br>
* - {@link #particleRed}, {@link #particleGreen}, and {@link #particleBlue} are the float r, g, b values of the smoke. <br>
* - {@link #motionX}, {@link #motionY}, and {@link #motionZ} are the x, y, z motion of the smoke.<br>
* - {@link #particleGravity} is the amount the smoke's y motion changes per tick. <br>
* - {@link #particleAlpha} is the smoke's initial alpha. <br>
* - {@link #alphaFading} is whether the smoke's alpha should currently be changing (fading in or out). <br>
* - {@link #alphaFadePerTick} is the amount the smoke's alpha changes per tick if {@link #alphaFading} is true. Negative values make it fade out, positive values make it fade
* back in. <br>
* - {@link #particleMaxAge} is the maximum number of ticks the particle will live for. <br>
* <br>
* You're also given {@link #campfirePosition}, which is the x, y, z position of the campfire tile entity where the smoke was created. <br>
* <br>
* Also, {@link EntityBigSmokeFX} are only created on the client side, so you should mark your subscribe event with {@link Side#CLIENT}. <br>
* <br>
* This event is posted from {@link EntityBigSmokeFX#EntityBigSmokeFX} on the {@link MinecraftForge#EVENT_BUS}.<br>
* This event is {@link Cancelable}. If canceled, the entity will be removed.<br>
*/
@Cancelable
public static class EntityBigSmokeFXConstructingEvent extends EntityConstructing
{
public final int[] campfirePosition;
public float particleRed;
public float particleGreen;
public float particleBlue;
public double motionX;
public double motionY;
public double motionZ;
public float particleGravity;
public float particleAlpha;
public boolean alphaFading;
public float alphaFadePerTick;
public int particleMaxAge;
public EntityBigSmokeFXConstructingEvent(EntityBigSmokeFX entity, int x, int y, int z)
{
super(entity);
campfirePosition = new int[] { x, y, z };
particleRed = entity.particleRed;
particleGreen = entity.particleGreen;
particleBlue = entity.particleBlue;
motionX = entity.motionX;
motionY = entity.motionY;
motionZ = entity.motionZ;
particleGravity = entity.particleGravity;
particleAlpha = entity.particleAlpha;
alphaFading = entity.alphaFading;
alphaFadePerTick = entity.alphaFadePerTick;
particleMaxAge = entity.particleMaxAge;
}
}
}
@@ -1,83 +1,37 @@
package noppes.npcs.client.model.blocks;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelBox;
import net.minecraft.client.model.ModelRenderer;
import net.minecraft.entity.Entity;
public class ModelStool extends ModelBase {
ModelRenderer Base;
ModelRenderer Leg1;
ModelRenderer Leg2;
ModelRenderer Leg3;
ModelRenderer Leg4;
ModelRenderer Shape1;
ModelRenderer Shape2;
ModelRenderer Shape3;
ModelRenderer Shape4;
private final ModelRenderer stool;
public ModelStool() {
Base = new ModelRenderer(this, 9, 3);
Base.addBox(-5F, 0F, -5F, 10, 1, 10);
Base.setRotationPoint(0F, 16F, 0F);
Leg1 = new ModelRenderer(this, 0, 12);
Leg1.addBox(-1F, 0F, 0F, 2, 8, 1);
Leg1.setRotationPoint(2F, 17F, 2F);
setRotation(Leg1, 0.3316126F, 0.7853982F, 0F);
Leg2 = new ModelRenderer(this, 0, 12);
Leg2.addBox(-1F, 0F, 0F, 2, 8, 1);
Leg2.setRotationPoint(2F, 17F, -2F);
setRotation(Leg2, 0.3316126F, 2.356194F, -0.0081449F);
Leg3 = new ModelRenderer(this, 0, 12);
Leg3.addBox(-1F, 0F, 0F, 2, 8, 1);
Leg3.setRotationPoint(-2F, 17F, 2F);
setRotation(Leg3, 0.3316126F, -0.7853982F, 0F);
Leg4 = new ModelRenderer(this, 0, 12);
Leg4.addBox(-1F, 0F, 0F, 2, 8, 1);
Leg4.setRotationPoint(-2F, 17F, -2F);
setRotation(Leg4, 0.3316126F, -2.356194F, 0F);
Shape1 = new ModelRenderer(this, 0, 11);
Shape1.addBox(-3F, 0F, 0F, 6, 1, 1);
Shape1.setRotationPoint(2.4F, 19F, 0F);
setRotation(Shape1, 0F, 1.570796F, 0F);
Shape2 = new ModelRenderer(this, 0, 11);
Shape2.addBox(-3F, 0F, 0F, 6, 1, 1);
Shape2.setRotationPoint(0F, 19F, 2.4F);
Shape3 = new ModelRenderer(this, 0, 11);
Shape3.addBox(-3F, 0F, 0F, 6, 1, 1);
Shape3.setRotationPoint(0F, 19F, -3.4F);
Shape4 = new ModelRenderer(this, 0, 11);
Shape4.addBox(-3F, 0F, 0F, 6, 1, 1);
Shape4.setRotationPoint(-3.4F, 19F, 0F);
setRotation(Shape4, 0F, 1.570796F, 0F);
textureWidth = 64;
textureHeight = 32;
stool = new ModelRenderer(this);
stool.setRotationPoint(0.0F, 24.0F, 0.0F);
stool.cubeList.add(new ModelBox(stool, 0, 0, -5.0F, -9.0F, -5.0F, 10, 2, 10, 0.0F));
stool.cubeList.add(new ModelBox(stool, 0, 12, 2.0F, -7.0F, -4.0F, 2, 7, 2, 0.0F));
stool.cubeList.add(new ModelBox(stool, 8, 8, 3.0F, -5.0F, -2.0F, 0, 2, 4, 0.0F));
stool.cubeList.add(new ModelBox(stool, 8, 12, -2.0F, -5.0F, -3.0F, 4, 2, 0, 0.0F));
stool.cubeList.add(new ModelBox(stool, 0, 12, -4.0F, -7.0F, -4.0F, 2, 7, 2, 0.0F));
stool.cubeList.add(new ModelBox(stool, 0, 12, -4.0F, -7.0F, 2.0F, 2, 7, 2, 0.0F));
stool.cubeList.add(new ModelBox(stool, 8, 8, -3.0F, -5.0F, -2.0F, 0, 2, 4, 0.0F));
stool.cubeList.add(new ModelBox(stool, 0, 12, 2.0F, -7.0F, 2.0F, 2, 7, 2, 0.0F));
stool.cubeList.add(new ModelBox(stool, 8, 12, -2.0F, -5.0F, 3.0F, 4, 2, 0, 0.0F)); }
@Override
public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) {
stool.render(f5);
}
public void render(Entity entity, float f, float f1, float f2, float f3,
float f4, float f5) {
super.render(entity, f, f1, f2, f3, f4, f5);
Base.render(f5);
Leg1.render(f5);
Leg2.render(f5);
Leg3.render(f5);
Leg4.render(f5);
Shape1.render(f5);
Shape2.render(f5);
Shape3.render(f5);
Shape4.render(f5);
public void setRotationAngle(ModelRenderer modelRenderer, float x, float y, float z) {
modelRenderer.rotateAngleX = x;
modelRenderer.rotateAngleY = y;
modelRenderer.rotateAngleZ = z;
}
private void setRotation(ModelRenderer model, float x, float y, float z) {
model.rotateAngleX = x;
model.rotateAngleY = y;
model.rotateAngleZ = z;
}
}
@@ -0,0 +1,69 @@
package noppes.npcs.client.model.blocks.banner;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelBox;
import net.minecraft.client.model.ModelRenderer;
import net.minecraft.entity.Entity;
public class ModelBannerFloor extends ModelBase {
private final ModelRenderer FloorBanner;
private final ModelRenderer Leg4_r1;
private final ModelRenderer Leg3_r1;
private final ModelRenderer Leg2_r1;
private final ModelRenderer Leg1_r1;
private final ModelRenderer Point1_r1;
public ModelBannerFloor() {
textureWidth = 64;
textureHeight = 64;
FloorBanner = new ModelRenderer(this);
FloorBanner.setRotationPoint(0.0F, 24.0F, 0.0F);
FloorBanner.cubeList.add(new ModelBox(FloorBanner, 0, 0, -8.0F, -32.0F, -1.0F, 16, 3, 3, 0.0F));
FloorBanner.cubeList.add(new ModelBox(FloorBanner, 0, 8, -6.0F, -36.0F, 0.5F, 4, 4, 0, 0.0F));
FloorBanner.cubeList.add(new ModelBox(FloorBanner, 0, 13, -1.0F, -29.0F, -0.5F, 2, 26, 2, 0.0F));
FloorBanner.cubeList.add(new ModelBox(FloorBanner, 18, 28, -6.0F, -2.0F, -5.0F, 12, 2, 11, 0.0F));
FloorBanner.cubeList.add(new ModelBox(FloorBanner, 26, 19, -4.0F, -4.0F, -3.0F, 8, 2, 7, 0.0F));
Leg4_r1 = new ModelRenderer(this);
Leg4_r1.setRotationPoint(-3.5F, -2.1F, 0.5F);
FloorBanner.addChild(Leg4_r1);
setRotationAngle(Leg4_r1, 0.0F, 0.0F, 1.1781F);
Leg4_r1.cubeList.add(new ModelBox(Leg4_r1, 10, 29, -1.0F, -3.0F, -1.0F, 2, 6, 2, 0.0F));
Leg3_r1 = new ModelRenderer(this);
Leg3_r1.setRotationPoint(0.0F, -2.1F, 4.0F);
FloorBanner.addChild(Leg3_r1);
setRotationAngle(Leg3_r1, 1.1781F, 0.0F, 0.0F);
Leg3_r1.cubeList.add(new ModelBox(Leg3_r1, 10, 29, -1.0F, -3.0F, -1.0F, 2, 6, 2, 0.0F));
Leg2_r1 = new ModelRenderer(this);
Leg2_r1.setRotationPoint(0.0F, -2.1F, -3.0F);
FloorBanner.addChild(Leg2_r1);
setRotationAngle(Leg2_r1, -1.1781F, 0.0F, 0.0F);
Leg2_r1.cubeList.add(new ModelBox(Leg2_r1, 10, 29, -1.0F, -3.0F, -1.0F, 2, 6, 2, 0.0F));
Leg1_r1 = new ModelRenderer(this);
Leg1_r1.setRotationPoint(3.5F, -2.1F, 0.5F);
FloorBanner.addChild(Leg1_r1);
setRotationAngle(Leg1_r1, 0.0F, 0.0F, -1.1781F);
Leg1_r1.cubeList.add(new ModelBox(Leg1_r1, 10, 29, -1.0F, -3.0F, -1.0F, 2, 6, 2, 0.0F));
Point1_r1 = new ModelRenderer(this);
Point1_r1.setRotationPoint(4.0F, -34.0F, 0.5F);
FloorBanner.addChild(Point1_r1);
setRotationAngle(Point1_r1, 0.0F, 3.1416F, 0.0F);
Point1_r1.cubeList.add(new ModelBox(Point1_r1, 0, 8, -2.0F, -2.0F, 0.0F, 4, 4, 0, 0.0F));
}
@Override
public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) {
FloorBanner.render(f5);
}
public void setRotationAngle(ModelRenderer modelRenderer, float x, float y, float z) {
modelRenderer.rotateAngleX = x;
modelRenderer.rotateAngleY = y;
modelRenderer.rotateAngleZ = z;
}
}
@@ -0,0 +1,31 @@
package noppes.npcs.client.model.blocks.banner;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelBox;
import net.minecraft.client.model.ModelRenderer;
import net.minecraft.entity.Entity;
public class ModelBannerFloorFlag extends ModelBase {
public final ModelRenderer BannerFlag;
public ModelBannerFloorFlag() {
textureWidth = 32;
textureHeight = 32;
BannerFlag = new ModelRenderer(this);
BannerFlag.setRotationPoint(0.0F, -8.0F, 5.0F);
BannerFlag.cubeList.add(new ModelBox(BannerFlag, 2, 0, -7.0F, 0.4F, -6.05F, 14, 29, 0, 0.0F));
}
@Override
public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) {
// Render the flag
BannerFlag.render(f5);
}
public void setRotationAngle(ModelRenderer modelRenderer, float x, float y, float z) {
modelRenderer.rotateAngleX = x;
modelRenderer.rotateAngleY = y;
modelRenderer.rotateAngleZ = z;
}
}
@@ -0,0 +1,37 @@
package noppes.npcs.client.model.blocks.banner;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelBox;
import net.minecraft.client.model.ModelRenderer;
import net.minecraft.entity.Entity;
public class ModelBannerWall extends ModelBase {
private final ModelRenderer bb_main;
private final ModelRenderer cube_r1;
public ModelBannerWall() {
textureWidth = 64;
textureHeight = 64;
bb_main = new ModelRenderer(this);
bb_main.setRotationPoint(0.0F, 24.0F, 0.0F);
bb_main.cubeList.add(new ModelBox(bb_main, 0, 0, -8.0F, -32.0F, 5.0F, 16, 3, 3, 0.0F));
bb_main.cubeList.add(new ModelBox(bb_main, 0, 8, -6.0F, -36.0F, 6.5F, 4, 4, 0, 0.0F));
cube_r1 = new ModelRenderer(this);
cube_r1.setRotationPoint(4.0F, -34.0F, 6.5F);
bb_main.addChild(cube_r1);
setRotationAngle(cube_r1, 0.0F, 3.1416F, 0.0F);
cube_r1.cubeList.add(new ModelBox(cube_r1, 0, 8, -2.0F, -2.0F, 0.0F, 4, 4, 0, 0.0F));}
@Override
public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) {
bb_main.render(f5);
}
public void setRotationAngle(ModelRenderer modelRenderer, float x, float y, float z) {
modelRenderer.rotateAngleX = x;
modelRenderer.rotateAngleY = y;
modelRenderer.rotateAngleZ = z;
}
}
@@ -0,0 +1,31 @@
package noppes.npcs.client.model.blocks.banner;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelBox;
import net.minecraft.client.model.ModelRenderer;
import net.minecraft.entity.Entity;
public class ModelBannerWallFlag extends ModelBase {
public final ModelRenderer BannerFlag;
public ModelBannerWallFlag() {
textureWidth = 32;
textureHeight = 32;
BannerFlag = new ModelRenderer(this);
BannerFlag.setRotationPoint(0.0F, -8.0F, 5.0F);
BannerFlag.cubeList.add(new ModelBox(BannerFlag, 2, 0, -7.0F, 0.4F, -0.05F, 14, 29, 0, 0.0F));
}
@Override
public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) {
// Render the flag
BannerFlag.render(f5);
}
public void setRotationAngle(ModelRenderer modelRenderer, float x, float y, float z) {
modelRenderer.rotateAngleX = x;
modelRenderer.rotateAngleY = y;
modelRenderer.rotateAngleZ = z;
}
}
@@ -1,69 +0,0 @@
package noppes.npcs.client.model.blocks.barrel;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelBox;
import net.minecraft.client.model.ModelRenderer;
import net.minecraft.entity.Entity;
public class BarrelCore extends ModelBase {
private final ModelRenderer bb_main;
private final ModelRenderer cube_r1;
private final ModelRenderer cube_r2;
private final ModelRenderer cube_r3;
private final ModelRenderer cube_r4;
private final ModelRenderer cube_r5;
public BarrelCore() {
textureWidth = 64;
textureHeight = 32;
bb_main = new ModelRenderer(this);
bb_main.setRotationPoint(0.0F, 24.0F, 0.0F);
cube_r1 = new ModelRenderer(this);
cube_r1.setRotationPoint(0.0F, 0.0F, 0.0F);
bb_main.addChild(cube_r1);
setRotationAngle(cube_r1, 1.5708F, 0.0F, -1.5708F);
cube_r1.cubeList.add(new ModelBox(cube_r1, 6, -6, 0.0F, -5.0F, -5.0F, 0, 10, 10, 0.0F));
cube_r2 = new ModelRenderer(this);
cube_r2.setRotationPoint(0.0F, -14.5F, 0.0F);
bb_main.addChild(cube_r2);
setRotationAngle(cube_r2, 0.0F, 0.0F, 1.5708F);
cube_r2.cubeList.add(new ModelBox(cube_r2, 0, 2, 2.5F, -5.5F, 5.5F, 8, 11, 0, 0.0F));
cube_r2.cubeList.add(new ModelBox(cube_r2, 8, 2, 2.5F, -5.5F, -5.5F, 8, 11, 0, 0.0F));
cube_r2.cubeList.add(new ModelBox(cube_r2, 0, 3, -1.5F, -5.0F, -5.0F, 16, 10, 0, 0.0F));
cube_r3 = new ModelRenderer(this);
cube_r3.setRotationPoint(0.0F, -14.5F, 0.0F);
bb_main.addChild(cube_r3);
setRotationAngle(cube_r3, 1.5708F, 0.0F, 1.5708F);
cube_r3.cubeList.add(new ModelBox(cube_r3, 8, 2, 2.5F, -5.5F, -5.5F, 8, 11, 0, 0.0F));
cube_r3.cubeList.add(new ModelBox(cube_r3, 0, 2, 2.5F, -5.5F, 5.5F, 8, 11, 0, 0.0F));
cube_r3.cubeList.add(new ModelBox(cube_r3, 6, -5, -1.5F, -5.0F, -5.0F, 0, 10, 10, 0.0F));
cube_r3.cubeList.add(new ModelBox(cube_r3, 0, 5, -1.5F, -5.0F, -5.0F, 16, 10, 0, 0.0F));
cube_r4 = new ModelRenderer(this);
cube_r4.setRotationPoint(0.0F, -14.5F, 0.0F);
bb_main.addChild(cube_r4);
setRotationAngle(cube_r4, -1.5708F, 0.0F, 1.5708F);
cube_r4.cubeList.add(new ModelBox(cube_r4, 0, 4, -1.5F, -5.0F, -5.0F, 16, 10, 0, 0.0F));
cube_r5 = new ModelRenderer(this);
cube_r5.setRotationPoint(0.0F, -8.0F, 5.0F);
bb_main.addChild(cube_r5);
setRotationAngle(cube_r5, 3.1416F, 0.0F, 1.5708F);
cube_r5.cubeList.add(new ModelBox(cube_r5, 0, 3, -8.0F, -5.0F, 0.0F, 16, 10, 0, 0.0F));
}
@Override
public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) {
bb_main.render(f5);
}
public void setRotationAngle(ModelRenderer modelRenderer, float x, float y, float z) {
modelRenderer.rotateAngleX = x;
modelRenderer.rotateAngleY = y;
modelRenderer.rotateAngleZ = z;
}
}
@@ -1,47 +0,0 @@
package noppes.npcs.client.model.blocks.barrel;// Made with Blockbench 4.9.4
// Exported for Minecraft version 1.7 - 1.12
// Paste this class into your mod and generate all required imports
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelBox;
import net.minecraft.client.model.ModelRenderer;
import net.minecraft.entity.Entity;
public class BarrelTrim extends ModelBase {
private final ModelRenderer bb_main;
private final ModelRenderer cube_r1;
private final ModelRenderer cube_r2;
public BarrelTrim() {
textureWidth = 32;
textureHeight = 32;
bb_main = new ModelRenderer(this);
bb_main.setRotationPoint(0.0F, 24.0F, 0.0F);
bb_main.cubeList.add(new ModelBox(bb_main, 0, 7, 0.0F, -16.5F, -4.0F, 2, 1, 2, 0.0F));
cube_r1 = new ModelRenderer(this);
cube_r1.setRotationPoint(0.0F, -8.0F, 0.0F);
bb_main.addChild(cube_r1);
setRotationAngle(cube_r1, -1.5708F, 0.0F, 1.5708F);
cube_r1.cubeList.add(new ModelBox(cube_r1, 0, 0, -6.0F, -6.0F, -6.0F, 2, 12, 12, 0.0F));
cube_r2 = new ModelRenderer(this);
cube_r2.setRotationPoint(0.0F, -3.0F, 0.0F);
bb_main.addChild(cube_r2);
setRotationAngle(cube_r2, 1.5708F, 0.0F, 1.5708F);
cube_r2.cubeList.add(new ModelBox(cube_r2, 0, 0, -1.0F, -6.0F, -6.0F, 2, 12, 12, 0.0F));
}
@Override
public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) {
bb_main.render(f5);
}
public void setRotationAngle(ModelRenderer modelRenderer, float x, float y, float z) {
modelRenderer.rotateAngleX = x;
modelRenderer.rotateAngleY = y;
modelRenderer.rotateAngleZ = z;
}
}
@@ -0,0 +1,80 @@
package noppes.npcs.client.model.blocks.barrel;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelBox;
import net.minecraft.client.model.ModelRenderer;
import net.minecraft.entity.Entity;
public class ModelBarrel extends ModelBase {
private final ModelRenderer Wall;
private final ModelRenderer cube_r1;
private final ModelRenderer cube_r2;
private final ModelRenderer cube_r3;
private final ModelRenderer Trim;
private final ModelRenderer Base;
public ModelBarrel() {
textureWidth = 64;
textureHeight = 32;
Wall = new ModelRenderer(this);
Wall.setRotationPoint(0.0F, 24.0F, 0.0F);
Wall.cubeList.add(new ModelBox(Wall, 0, 0, 5.0F, -16.0F, 5.0F, 1, 16, 1, 0.0F));
Wall.cubeList.add(new ModelBox(Wall, 0, 0, 5.0F, -16.0F, -6.0F, 1, 16, 1, 0.0F));
Wall.cubeList.add(new ModelBox(Wall, 0, 0, -6.0F, -16.0F, -6.0F, 1, 16, 1, 0.0F));
Wall.cubeList.add(new ModelBox(Wall, 0, 0, -6.0F, -16.0F, 5.0F, 1, 16, 1, 0.0F));
cube_r1 = new ModelRenderer(this);
cube_r1.setRotationPoint(-6.5F, -8.0F, 0.0F);
Wall.addChild(cube_r1);
setRotationAngle(cube_r1, 1.5708F, 0.0F, 0.0F);
cube_r1.cubeList.add(new ModelBox(cube_r1, 0, 0, -0.5F, -6.0F, -8.0F, 1, 12, 16, 0.0F));
cube_r2 = new ModelRenderer(this);
cube_r2.setRotationPoint(0.0F, -8.0F, 6.5F);
Wall.addChild(cube_r2);
setRotationAngle(cube_r2, 0.0F, 0.0F, 1.5708F);
cube_r2.cubeList.add(new ModelBox(cube_r2, 0, 14, -8.0F, -6.0F, -0.5F, 16, 12, 1, 0.0F));
cube_r2.cubeList.add(new ModelBox(cube_r2, 0, 14, -8.0F, -6.0F, -13.5F, 16, 12, 1, 0.0F));
cube_r3 = new ModelRenderer(this);
cube_r3.setRotationPoint(6.5F, -8.0F, 0.0F);
Wall.addChild(cube_r3);
setRotationAngle(cube_r3, -1.5708F, 0.0F, 0.0F);
cube_r3.cubeList.add(new ModelBox(cube_r3, 0, 0, -0.5F, -6.0F, -8.0F, 1, 12, 16, 0.0F));
Trim = new ModelRenderer(this);
Trim.setRotationPoint(0.0F, 24.0F, 0.0F);
Trim.cubeList.add(new ModelBox(Trim, 4, 28, -6.5F, -5.0F, 5.5F, 13, 2, 2, 0.0F));
Trim.cubeList.add(new ModelBox(Trim, 34, 17, 5.5F, -5.0F, -6.5F, 2, 2, 13, 0.0F));
Trim.cubeList.add(new ModelBox(Trim, 4, 28, -6.5F, -5.0F, -7.5F, 13, 2, 2, 0.0F));
Trim.cubeList.add(new ModelBox(Trim, 34, 17, -7.5F, -5.0F, -6.5F, 2, 2, 13, 0.0F));
Trim.cubeList.add(new ModelBox(Trim, 4, 28, -6.5F, -13.0F, -7.5F, 13, 2, 2, 0.0F));
Trim.cubeList.add(new ModelBox(Trim, 4, 28, -6.5F, -13.0F, 5.5F, 13, 2, 2, 0.0F));
Trim.cubeList.add(new ModelBox(Trim, 34, 17, -7.5F, -13.0F, -6.5F, 2, 2, 13, 0.0F));
Trim.cubeList.add(new ModelBox(Trim, 34, 17, 5.5F, -13.0F, -6.5F, 2, 2, 13, 0.0F));
Base = new ModelRenderer(this);
Base.setRotationPoint(0.0F, 24.0F, 0.0F);
Base.cubeList.add(new ModelBox(Base, 16, 2, -6.0F, -15.0F, -6.0F, 12, 1, 12, 0.0F));
Base.cubeList.add(new ModelBox(Base, 16, 2, -6.0F, -2.0F, -6.0F, 12, 1, 12, 0.0F));
}
public void renderBase(float f5){
Base.render(f5);
}
public void renderTrim(float f5){
Trim.render(f5);
}
public void renderWall(float f5){
Wall.render(f5);
}
public void setRotationAngle(ModelRenderer modelRenderer, float x, float y, float z) {
modelRenderer.rotateAngleX = x;
modelRenderer.rotateAngleY = y;
modelRenderer.rotateAngleZ = z;
}
}
@@ -0,0 +1,30 @@
package noppes.npcs.client.model.blocks.campfire;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelBox;
import net.minecraft.client.model.ModelRenderer;
import net.minecraft.entity.Entity;
public class ModelCampfireCoals extends ModelBase {
private final ModelRenderer bb_main;
public ModelCampfireCoals() {
textureWidth = 64;
textureHeight = 64;
bb_main = new ModelRenderer(this);
bb_main.setRotationPoint(0.0F, 24.0F, 0.0F);
bb_main.cubeList.add(new ModelBox(bb_main, -10, 0, -5.0F, -0.02F, -5.0F, 10, 0, 10, 0.0F));
}
@Override
public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) {
bb_main.render(f5);
}
public void setRotationAngle(ModelRenderer modelRenderer, float x, float y, float z) {
modelRenderer.rotateAngleX = x;
modelRenderer.rotateAngleY = y;
modelRenderer.rotateAngleZ = z;
}
}
@@ -0,0 +1,57 @@
package noppes.npcs.client.model.blocks.campfire;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelBox;
import net.minecraft.client.model.ModelRenderer;
import net.minecraft.entity.Entity;
public class ModelCampfireFlame extends ModelBase {
private final ModelRenderer[] frames;
private static int frameDuration = 2;
public ModelCampfireFlame() {
textureWidth = 16;
textureHeight = 144;
frames = new ModelRenderer[9];
// Create frames and add them to the array
frames[0] = new ModelRenderer(this);
frames[0].setRotationPoint(0.0F, 16.5F, 0.0F);
frames[0].cubeList.add(new ModelBox(frames[0], 0, 0, -8.0F, -8.5F, 0.0F, 16, 16, 0, 0.0F));
ModelRenderer cube_r1 = new ModelRenderer(this);
cube_r1.setRotationPoint(0.0F, 0.0F, 0.0F);
frames[0].addChild(cube_r1);
setRotationAngle(cube_r1, 0.0F, -1.5708F, 0.0F);
cube_r1.cubeList.add(new ModelBox(cube_r1, 0, 0, -8.0F, -8.5F, 0.0F, 16, 16, 0, 0.0F));
// Repeat the above for all frames, incrementing texture offsets for each frame
for (int i = 1; i < 9; i++) {
frames[i] = new ModelRenderer(this);
frames[i].setRotationPoint(0.0F, 16.5F, 0.0F);
frames[i].cubeList.add(new ModelBox(frames[i], 0, i * 16 + 1, -8.0F, -8.5F, 0.0F, 16, 16, 0, 0.0F));
ModelRenderer cube_r = new ModelRenderer(this);
cube_r.setRotationPoint(0.0F, 0.0F, 0.0F);
frames[i].addChild(cube_r);
setRotationAngle(cube_r, 0.0F, -1.5708F, 0.0F);
cube_r.cubeList.add(new ModelBox(cube_r, 0, i * 16 + 1, -8.0F, -8.5F, 0.0F, 16, 16, 0, 0.0F));
}
}
@Override
public void render(Entity entity, float world_time, float f1, float f2, float f3, float f4, float f5) {
// Calculate the current frame directly using modulo arithmetic
int frameIndex = ((int) world_time / frameDuration) % frames.length;
// Render only the current frame
frames[frameIndex].render(f5);
}
public void setRotationAngle(ModelRenderer modelRenderer, float x, float y, float z) {
modelRenderer.rotateAngleX = x;
modelRenderer.rotateAngleY = y;
modelRenderer.rotateAngleZ = z;
}
}
@@ -0,0 +1,51 @@
package noppes.npcs.client.model.blocks.campfire;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelBox;
import net.minecraft.client.model.ModelRenderer;
import net.minecraft.entity.Entity;
public class ModelCampfireLog extends ModelBase {
private final ModelRenderer bb_main;
private final ModelRenderer cube_r1;
private final ModelRenderer cube_r2;
private final ModelRenderer cube_r3;
public ModelCampfireLog() {
textureWidth = 16;
textureHeight = 16;
bb_main = new ModelRenderer(this);
bb_main.setRotationPoint(0.0F, 24.0F, 0.0F);
cube_r1 = new ModelRenderer(this);
cube_r1.setRotationPoint(1.25F, -6.3F, 1.25F);
bb_main.addChild(cube_r1);
setRotationAngle(cube_r1, 0.5449F, -1.0854F, -0.744F);
cube_r1.cubeList.add(new ModelBox(cube_r1, 0, 0, -1.0F, -2.0F, -1.0F, 3, 8, 3, 0.0F));
cube_r2 = new ModelRenderer(this);
cube_r2.setRotationPoint(-1.5F, -6.0F, -0.25F);
bb_main.addChild(cube_r2);
setRotationAngle(cube_r2, 0.0F, 0.0F, 0.3927F);
cube_r2.cubeList.add(new ModelBox(cube_r2, 0, 0, -2.0F, -2.0F, -1.0F, 3, 8, 3, 0.0F));
cube_r3 = new ModelRenderer(this);
cube_r3.setRotationPoint(1.5F, -6.0F, -2.25F);
bb_main.addChild(cube_r3);
setRotationAngle(cube_r3, -0.3295F, 0.7268F, -0.4754F);
cube_r3.cubeList.add(new ModelBox(cube_r3, 0, 0, -2.0F, -2.5F, -1.0F, 3, 8, 3, 0.0F));
}
@Override
public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) {
bb_main.render(f5);
}
public void setRotationAngle(ModelRenderer modelRenderer, float x, float y, float z) {
modelRenderer.rotateAngleX = x;
modelRenderer.rotateAngleY = y;
modelRenderer.rotateAngleZ = z;
}
}
@@ -0,0 +1,57 @@
package noppes.npcs.client.model.blocks.campfire;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelBox;
import net.minecraft.client.model.ModelRenderer;
import net.minecraft.entity.Entity;
public class ModelCampfireStone extends ModelBase {
private final ModelRenderer bb_main;
private final ModelRenderer cube_r1;
private final ModelRenderer cube_r2;
private final ModelRenderer cube_r3;
public ModelCampfireStone() {
textureWidth = 16;
textureHeight = 16;
bb_main = new ModelRenderer(this);
bb_main.setRotationPoint(0.0F, 24.0F, 0.0F);
bb_main.cubeList.add(new ModelBox(bb_main, 18, 5, 4.0F, -2.0F, 1.0F, 3, 2, 4, 0.0F));
bb_main.cubeList.add(new ModelBox(bb_main, 18, 2, -4.0F, -3.0F, -7.0F, 4, 3, 3, 0.0F));
bb_main.cubeList.add(new ModelBox(bb_main, 17, 0, -3.0F, -3.0F, 5.0F, 4, 3, 3, 0.0F));
bb_main.cubeList.add(new ModelBox(bb_main, 18, 2, -8.0F, -3.0F, -1.0F, 3, 3, 4, 0.0F));
bb_main.cubeList.add(new ModelBox(bb_main, 18, 11, -6.0F, -2.0F, 3.0F, 3, 2, 3, 0.0F));
bb_main.cubeList.add(new ModelBox(bb_main, 16, 0, -7.0F, -2.0F, -5.0F, 3, 2, 4, 0.0F));
bb_main.cubeList.add(new ModelBox(bb_main, 18, 11, 4.0F, -2.0F, -6.0F, 3, 2, 3, 0.0F));
cube_r1 = new ModelRenderer(this);
cube_r1.setRotationPoint(6.5F, -1.5F, -1.0F);
bb_main.addChild(cube_r1);
setRotationAngle(cube_r1, 0.0F, -1.5708F, 0.0F);
cube_r1.cubeList.add(new ModelBox(cube_r1, 18, 2, -2.0F, -1.5F, -1.5F, 4, 3, 3, 0.0F));
cube_r2 = new ModelRenderer(this);
cube_r2.setRotationPoint(2.5F, -1.5F, -6.0F);
bb_main.addChild(cube_r2);
setRotationAngle(cube_r2, 0.0F, 1.5708F, 0.0F);
cube_r2.cubeList.add(new ModelBox(cube_r2, 18, 5, -1.0F, -0.5F, -2.5F, 3, 2, 4, 0.0F));
cube_r3 = new ModelRenderer(this);
cube_r3.setRotationPoint(3.5F, -1.5F, 5.5F);
bb_main.addChild(cube_r3);
setRotationAngle(cube_r3, 0.0F, -1.5708F, 0.0F);
cube_r3.cubeList.add(new ModelBox(cube_r3, 20, 1, -0.5F, -0.5F, -1.5F, 2, 2, 4, 0.0F));
}
@Override
public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) {
bb_main.render(f5);
}
public void setRotationAngle(ModelRenderer modelRenderer, float x, float y, float z) {
modelRenderer.rotateAngleX = x;
modelRenderer.rotateAngleY = y;
modelRenderer.rotateAngleZ = z;
}
}
@@ -0,0 +1,41 @@
package noppes.npcs.client.model.blocks.chair;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelBox;
import net.minecraft.client.model.ModelRenderer;
import net.minecraft.entity.Entity;
public class ModelChair extends ModelBase {
private final ModelRenderer bb_main;
public ModelChair(){
textureWidth = 64;
textureHeight = 32;
bb_main = new ModelRenderer(this);
bb_main.setRotationPoint(0.0F, 24.0F, 0.0F);
bb_main.cubeList.add(new ModelBox(bb_main, 0, 17, 4.0F, -6.0F, 4.0F, 2, 6, 2, 0.0F));
bb_main.cubeList.add(new ModelBox(bb_main, 0, 17, -6.0F, -6.0F, 4.0F, 2, 6, 2, 0.0F));
bb_main.cubeList.add(new ModelBox(bb_main, 0, 17, -6.0F, -6.0F, -6.0F, 2, 6, 2, 0.0F));
bb_main.cubeList.add(new ModelBox(bb_main, 0, 17, 4.0F, -6.0F, -6.0F, 2, 6, 2, 0.0F));
bb_main.cubeList.add(new ModelBox(bb_main, 0, 0, -6.0F, -8.0F, -6.0F, 12, 2, 12, 0.0F));
bb_main.cubeList.add(new ModelBox(bb_main, 8, 17, 4.0F, -20.0F, 4.0F, 2, 12, 2, 0.0F));
bb_main.cubeList.add(new ModelBox(bb_main, 8, 17, -6.0F, -20.0F, 4.0F, 2, 12, 2, 0.0F));
bb_main.cubeList.add(new ModelBox(bb_main, 16, 18, -4.0F, -19.0F, 5.0F, 8, 11, 0, 0.0F));
bb_main.cubeList.add(new ModelBox(bb_main, 16, 8, 5.0F, -4.0F, -4.0F, 0, 2, 8, 0.0F));
bb_main.cubeList.add(new ModelBox(bb_main, 16, 16, -4.0F, -4.0F, -5.0F, 8, 2, 0, 0.0F));
bb_main.cubeList.add(new ModelBox(bb_main, 16, 8, -5.0F, -4.0F, -4.0F, 0, 2, 8, 0.0F));
bb_main.cubeList.add(new ModelBox(bb_main, 16, 16, -4.0F, -4.0F, 5.0F, 8, 2, 0, 0.0F));
}
@Override
public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) {
bb_main.render(f5);
}
public void setRotationAngle(ModelRenderer modelRenderer, float x, float y, float z) {
modelRenderer.rotateAngleX = x;
modelRenderer.rotateAngleY = y;
modelRenderer.rotateAngleZ = z;
}
}
@@ -1,4 +1,4 @@
package noppes.npcs.client.model.blocks;
package noppes.npcs.client.model.blocks.chair;
import net.minecraft.client.model.ModelBase;
@@ -6,11 +6,11 @@ import net.minecraft.client.model.ModelBox;
import net.minecraft.client.model.ModelRenderer;
import net.minecraft.entity.Entity;
public class ModelChair extends ModelBase {
public class ModelChairSpoof extends ModelBase {
private final ModelRenderer chairBase;
public ModelChair() {
public ModelChairSpoof() {
textureWidth = 64;
textureHeight = 32;
@@ -1,11 +1,11 @@
package noppes.npcs.client.model.blocks;
package noppes.npcs.client.model.blocks.legacy;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;
import net.minecraft.entity.Entity;
public class ModelBanner extends ModelBase
public class ModelLegacyBanner extends ModelBase
{
//fields
ModelRenderer Base;
@@ -18,50 +18,50 @@ public class ModelBanner extends ModelBase
ModelRenderer BaseDeco2;
ModelRenderer BaseDeco3;
ModelRenderer BaseDeco4;
public ModelBanner()
public ModelLegacyBanner()
{
Base = new ModelRenderer(this, 3, 1);
Base.addBox(-7F, 0F, -7F, 14, 1, 14);
Base.setRotationPoint(0F, 23F, 0F);
MiddleStick = new ModelRenderer(this, 12, 2);
MiddleStick.addBox(-1F, 0F, -1F, 2, 32, 2);
MiddleStick.setRotationPoint(0F, -9F, 0F);
StickDecoration = new ModelRenderer(this, 11, 12);
StickDecoration.addBox(0F, 0F, 0F, 16, 3, 3);
StickDecoration.setRotationPoint(-8F, -7.5F, -1.5F);
TopDecoration = new ModelRenderer(this, 45, 19);
TopDecoration.addBox(0F, 0F, 0F, 1, 1, 1);
TopDecoration.setRotationPoint(-0.5F, -10F, -0.5F);
FlagPole1 = new ModelRenderer(this, 45, 19);
FlagPole1.addBox(0F, 0F, 0F, 1, 1, 1);
FlagPole1.setRotationPoint(-7F, -6.5F, -2.5F);
FlagPole2 = new ModelRenderer(this, 45, 19);
FlagPole2.addBox(0F, 0F, 0F, 1, 1, 1);
FlagPole2.setRotationPoint(6F, -6.5F, -2.5F);
BaseDeco1 = new ModelRenderer(this, 1, 14);
BaseDeco1.addBox(0F, 0F, 0F, 12, 1, 1);
BaseDeco1.setRotationPoint(-6F, 23F, -8F);
BaseDeco2 = new ModelRenderer(this, 1, 14);
BaseDeco2.addBox(0F, 0F, 0F, 12, 1, 1);
BaseDeco2.setRotationPoint(-6F, 23F, 7F);
BaseDeco3 = new ModelRenderer(this, 2, 2);
BaseDeco3.addBox(0F, 0F, 0F, 1, 1, 12);
BaseDeco3.setRotationPoint(-8F, 23F, -6F);
BaseDeco4 = new ModelRenderer(this, 2, 2);
BaseDeco4.addBox(0F, 0F, 0F, 1, 1, 12);
BaseDeco4.setRotationPoint(7F, 23F, -6F);
}
public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5)
{
super.render(entity, f, f1, f2, f3, f4, f5);
@@ -76,7 +76,7 @@ public class ModelBanner extends ModelBase
BaseDeco3.render(f5);
BaseDeco4.render(f5);
}
private void setRotation(ModelRenderer model, float x, float y, float z)
{
model.rotateAngleX = x;
@@ -1,31 +1,31 @@
package noppes.npcs.client.model.blocks;
package noppes.npcs.client.model.blocks.legacy;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;
import net.minecraft.entity.Entity;
public class ModelBannerFlag extends ModelBase
public class ModelLegacyBannerFlag extends ModelBase
{
ModelRenderer Flag;
public ModelBannerFlag()
public ModelLegacyBannerFlag()
{
textureWidth = 32;
textureHeight = 32;
Flag = new ModelRenderer(this, 0, 0);
Flag.addBox(0F, 0F, 0F, 15, 27, 0);
Flag.setRotationPoint(-7.5F, -7F, -2F);
Flag.setTextureSize(32, 32);
}
public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5)
{
super.render(entity, f, f1, f2, f3, f4, f5);
Flag.render(f5);
}
private void setRotation(ModelRenderer model, float x, float y, float z)
{
model.rotateAngleX = x;
@@ -1,10 +1,10 @@
package noppes.npcs.client.model.blocks;
package noppes.npcs.client.model.blocks.legacy;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;
import net.minecraft.entity.Entity;
public class ModelBarrel extends ModelBase
public class ModelLegacyBarrel extends ModelBase
{
ModelRenderer Plank1;
ModelRenderer Plank2;
@@ -18,70 +18,70 @@ public class ModelBarrel extends ModelBase
ModelRenderer Plank10;
ModelRenderer Plank11;
ModelRenderer Plank12;
public ModelBarrel()
{
public ModelLegacyBarrel()
{
Plank1 = new ModelRenderer(this, 10, 0);
Plank1.addBox(0F, 6.5F, -2F, 17, 1, 4);
Plank1.setRotationPoint(0F, 7.01F, 0F);
setRotation(Plank1, 0F, 0F, 1.570796F);
Plank2 = new ModelRenderer(this, 10, 8);
Plank2.addBox(0F, 6.5F, -2F, 17, 1, 4);
Plank2.setRotationPoint(0F, 7F, 0F);
setRotation(Plank2, 0F, 0.5235988F, 1.570796F);
Plank3 = new ModelRenderer(this, 10, 0);
Plank3.addBox(0F, 6.5F, -2F, 17, 1, 4);
Plank3.setRotationPoint(0F, 7.01F, 0F);
setRotation(Plank3, 0F, 1.047198F, 1.570796F);
Plank4 = new ModelRenderer(this, 10, 8);
Plank4.addBox(0F, 6.5F, -2F, 17, 1, 4);
Plank4.setRotationPoint(0F, 7F, 0F);
setRotation(Plank4, 0F, 1.570796F, 1.570796F);
Plank5 = new ModelRenderer(this, 10, 0);
Plank5.addBox(0F, 6.5F, -2F, 17, 1, 4);
Plank5.setRotationPoint(0F, 7.01F, 0F);
setRotation(Plank5, 0F, 2.094395F, 1.570796F);
Plank6 = new ModelRenderer(this, 10, 8);
Plank6.addBox(0F, 6.5F, -2F, 17, 1, 4);
Plank6.setRotationPoint(0F, 7F, 0F);
setRotation(Plank6, 0F, 2.617994F, 1.570796F);
Plank7 = new ModelRenderer(this, 10, 0);
Plank7.addBox(0F, 6.5F, -2F, 17, 1, 4);
Plank7.setRotationPoint(0F, 7.01F, 0F);
setRotation(Plank7, 0F, 3.150901F, 1.570796F);
Plank8 = new ModelRenderer(this, 10, 8);
Plank8.addBox(0F, 6.5F, -2F, 17, 1, 4);
Plank8.setRotationPoint(0F, 7F, 0F);
setRotation(Plank8, 0F, -2.617994F, 1.570796F);
Plank9 = new ModelRenderer(this, 10, 0);
Plank9.addBox(0F, 6.5F, -2F, 17, 1, 4);
Plank9.setRotationPoint(0F, 7.01F, 0F);
setRotation(Plank9, 0F, -2.094395F, 1.570796F);
Plank10 = new ModelRenderer(this, 10, 8);
Plank10.addBox(0F, 6.5F, -2F, 17, 1, 4);
Plank10.setRotationPoint(0F, 7F, 0F);
setRotation(Plank10, 0F, -1.570796F, 1.570796F);
Plank11 = new ModelRenderer(this, 10, 0);
Plank11.addBox(0F, 6.5F, -2F, 17, 1, 4);
Plank11.setRotationPoint(0F, 7.01F, 0F);
setRotation(Plank11, 0F, -1.047198F, 1.570796F);
Plank12 = new ModelRenderer(this, 10, 0);
Plank12.addBox(0F, 6.5F, -2F, 17, 1, 4);
Plank12.setRotationPoint(0F, 7F, 0F);
setRotation(Plank12, 0F, -0.5235988F, 1.570796F);
}
public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5)
{
super.render(entity, f, f1, f2, f3, f4, f5);
@@ -98,13 +98,13 @@ public class ModelBarrel extends ModelBase
Plank11.render(f5);
Plank12.render(f5);
}
private void setRotation(ModelRenderer model, float x, float y, float z)
{
model.rotateAngleX = y;
model.rotateAngleY = x;
model.rotateAngleZ = z;
}
}
@@ -1,38 +1,38 @@
package noppes.npcs.client.model.blocks;
package noppes.npcs.client.model.blocks.legacy;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;
import net.minecraft.entity.Entity;
public class ModelBarrelLit extends ModelBase
public class ModelLegacyBarrelLid extends ModelBase
{
ModelRenderer Top;
ModelRenderer Bottom;
public ModelBarrelLit()
public ModelLegacyBarrelLid()
{
Top = new ModelRenderer(this, 0, 0);
Top.addBox(0F, 0F, 0F, 16, 0, 16);
Top.setRotationPoint(-8F, 9F, -8F);
Bottom = new ModelRenderer(this, 0, 0);
Bottom.addBox(0F, 0F, 0F, 16, 0, 16);
Bottom.setRotationPoint(-8F, 23F, -8F);
}
public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5)
{
super.render(entity, f, f1, f2, f3, f4, f5);
Bottom.render(f5);
Top.render(f5);
}
private void setRotation(ModelRenderer model, float x, float y, float z)
{
model.rotateAngleX = y;
model.rotateAngleY = x;
model.rotateAngleZ = z;
}
}
@@ -0,0 +1,113 @@
package noppes.npcs.client.model.blocks.legacy;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;
import net.minecraft.entity.Entity;
public class ModelLegacyCarpentryBench extends ModelBase {
// fields
ModelRenderer Leg1;
ModelRenderer Leg2;
ModelRenderer Leg3;
ModelRenderer Leg4;
ModelRenderer Bottom_plate;
ModelRenderer Desktop;
ModelRenderer Backboard;
ModelRenderer Vice_Jaw1;
ModelRenderer Vice_Jaw2;
ModelRenderer Vice_Base1;
ModelRenderer Vice_Base2;
ModelRenderer Vice_Crank;
ModelRenderer Vice_Screw;
ModelRenderer Blueprint;
public ModelLegacyCarpentryBench() {
this.textureWidth = 128;
this.textureHeight = 64;
Leg1 = new ModelRenderer(this, 0, 0);
Leg1.addBox(0F, 0F, 0F, 2, 14, 2);
Leg1.setRotationPoint(6F, 10F, 5F);
Leg2 = new ModelRenderer(this, 0, 0);
Leg2.addBox(0F, 0F, 0F, 2, 14, 2);
Leg2.setRotationPoint(6F, 10F, -5F);
Leg3 = new ModelRenderer(this, 0, 0);
Leg3.addBox(0F, 0F, 0F, 2, 14, 2);
Leg3.setRotationPoint(-8F, 10F, 5F);
Leg4 = new ModelRenderer(this, 0, 0);
Leg4.addBox(0F, 0F, 0F, 2, 14, 2);
Leg4.setRotationPoint(-8F, 10F, -5F);
Bottom_plate = new ModelRenderer(this, 0, 24);
Bottom_plate.addBox(0F, 0F, 0F, 14, 1, 10);
Bottom_plate.setRotationPoint(-7F, 21F, -4F);
Bottom_plate.setTextureSize(130, 64);
Desktop = new ModelRenderer(this, 0, 3);
Desktop.addBox(0F, 0F, 0F, 18, 2, 13);
Desktop.setRotationPoint(-9F, 9F, -6F);
Backboard = new ModelRenderer(this, 0, 18);
Backboard.addBox(-1F, 0F, 0F, 18, 5, 1);
Backboard.setRotationPoint(-8F, 7F, 7F);
Vice_Jaw1 = new ModelRenderer(this, 54, 18);
Vice_Jaw1.addBox(0F, 0F, 0F, 3, 2, 1);
Vice_Jaw1.setRotationPoint(3F, 6F, -8F);
Vice_Jaw2 = new ModelRenderer(this, 54, 21);
Vice_Jaw2.addBox(0F, 0F, 0F, 3, 2, 1);
Vice_Jaw2.setRotationPoint(3F, 6F, -6F);
Vice_Base1 = new ModelRenderer(this, 38, 30);
Vice_Base1.addBox(0F, 0F, 0F, 3, 1, 3);
Vice_Base1.setRotationPoint(3F, 8F, -5F);
Vice_Base2 = new ModelRenderer(this, 38, 25);
Vice_Base2.addBox(0F, 0F, 0F, 1, 2, 2);
Vice_Base2.setRotationPoint(4F, 7F, -5F);
Vice_Crank = new ModelRenderer(this, 54, 24);
Vice_Crank.addBox(0F, 0F, 0F, 1, 5, 1);
Vice_Crank.setRotationPoint(6F, 6F, -9F);
Vice_Screw = new ModelRenderer(this, 44, 25);
Vice_Screw.addBox(0F, 0F, 0F, 1, 1, 4);
Vice_Screw.setRotationPoint(4F, 8F, -8F);
Blueprint = new ModelRenderer(this, 31, 18);
Blueprint.addBox(0F, 0F, 0F, 8, 0, 7);
Blueprint.setRotationPoint(0F, 9F, 1F);
setRotation(Blueprint, 0.3271718F, 0.1487144F, 0F);
}
public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) {
super.render(entity, f, f1, f2, f3, f4, f5);
setRotationAngles(f, f1, f2, f3, f4, f5,entity);
Leg1.render(f5);
Leg2.render(f5);
Leg3.render(f5);
Leg4.render(f5);
Bottom_plate.render(f5);
Desktop.render(f5);
Backboard.render(f5);
Vice_Jaw1.render(f5);
Vice_Jaw2.render(f5);
Vice_Base1.render(f5);
Vice_Base2.render(f5);
Vice_Crank.render(f5);
Vice_Screw.render(f5);
Blueprint.render(f5);
}
private void setRotation(ModelRenderer model, float x, float y, float z) {
model.rotateAngleX = x;
model.rotateAngleY = y;
model.rotateAngleZ = z;
}
}
@@ -0,0 +1,126 @@
package noppes.npcs.client.model.blocks.legacy;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;
import net.minecraft.entity.Entity;
public class ModelLegacyChair extends ModelBase
{
//fields
ModelRenderer Leg1;
ModelRenderer Leg2;
ModelRenderer Leg3;
ModelRenderer Leg4;
ModelRenderer Shape1;
ModelRenderer Shape2;
ModelRenderer Shape3;
ModelRenderer Shape4;
ModelRenderer Shape5;
ModelRenderer Shape6;
ModelRenderer Shape7;
ModelRenderer Shape8;
ModelRenderer Shape9;
ModelRenderer Shape10;
ModelRenderer Shape11;
public ModelLegacyChair()
{
Leg1 = new ModelRenderer(this, 0, 0);
Leg1.mirror = true;
Leg1.addBox(0F, 0F, 0F, 1, 18, 1);
Leg1.setRotationPoint(4.01F, 6F, 5.01F);
Leg2 = new ModelRenderer(this, 0, 0);
Leg2.mirror = true;
Leg2.addBox(0F, 0F, 0F, 1, 9, 1);
Leg2.setRotationPoint(4.01F, 15.5F, -5.01F);
Leg3 = new ModelRenderer(this, 0, 0);
Leg3.addBox(0F, 0F, 0F, 1, 18, 1);
Leg3.setRotationPoint(-5.01F, 6F, 5.01F);
Leg4 = new ModelRenderer(this, 0, 0);
Leg4.addBox(0F, 0F, 0F, 1, 9, 1);
Leg4.setRotationPoint(-5.01F, 15.5F, -5.01F);
Shape1 = new ModelRenderer(this, 8, 2);
Shape1.addBox(0F, 0F, 0F, 10, 1, 11);
Shape1.setRotationPoint(-5F, 16F, -5F);
Shape2 = new ModelRenderer(this, 4, 4);
Shape2.addBox(0F, 0F, 0F, 3, 2, 1);
Shape2.setRotationPoint(-1.5F, 6.51F, 5.5F);
Shape3 = new ModelRenderer(this, 4, 4);
Shape3.mirror = true;
Shape3.addBox(-3F, 0F, 0F, 3, 2, 1);
Shape3.setRotationPoint(4F, 6.5F, 5F);
setRotation(Shape3, 0F, 0.2094395F, 0F);
Shape4 = new ModelRenderer(this, 4, 4);
Shape4.addBox(0F, 0F, 0F, 3, 2, 1);
Shape4.setRotationPoint(-4F, 6.5F, 5F);
setRotation(Shape4, 0F, -0.2094395F, 0F);
Shape5 = new ModelRenderer(this, 46, 0);
Shape5.addBox(0F, 0F, 0F, 9, 1, 1);
Shape5.setRotationPoint(-4F, 19F, 5F);
Shape6 = new ModelRenderer(this, 46, 0);
Shape6.addBox(0F, 0F, 0F, 8, 1, 1);
Shape6.setRotationPoint(-4F, 19F, -5F);
Shape7 = new ModelRenderer(this, 11, 13);
Shape7.addBox(0F, 0F, 0F, 1, 1, 9);
Shape7.setRotationPoint(-5F, 20F, -4F);
Shape8 = new ModelRenderer(this, 11, 13);
Shape8.mirror = true;
Shape8.addBox(0F, 0F, 0F, 1, 1, 9);
Shape8.setRotationPoint(4F, 20F, -4F);
Shape9 = new ModelRenderer(this, 0, 0);
Shape9.mirror = true;
Shape9.addBox(0F, 0F, 0F, 1, 8, 1);
Shape9.setRotationPoint(2F, 8F, 5.5F);
setRotation(Shape9, -0.0523599F, 0F, 0F);
Shape10 = new ModelRenderer(this, 0, 0);
Shape10.addBox(0F, 0F, 0F, 1, 8, 1);
Shape10.setRotationPoint(-3F, 8F, 5.5F);
setRotation(Shape10, -0.0523599F, 0F, 0F);
Shape11 = new ModelRenderer(this, 0, 0);
Shape11.addBox(0F, 0F, 0F, 1, 8, 1);
Shape11.setRotationPoint(-0.5F, 8F, 5.6F);
setRotation(Shape11, -0.0698132F, 0F, 0F);
}
public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5)
{
super.render(entity, f, f1, f2, f3, f4, f5);
Leg1.render(f5);
Leg2.render(f5);
Leg3.render(f5);
Leg4.render(f5);
Shape1.render(f5);
Shape2.render(f5);
Shape3.render(f5);
Shape4.render(f5);
Shape5.render(f5);
Shape6.render(f5);
Shape7.render(f5);
Shape8.render(f5);
Shape9.render(f5);
Shape10.render(f5);
Shape11.render(f5);
}
private void setRotation(ModelRenderer model, float x, float y, float z)
{
model.rotateAngleX = x;
model.rotateAngleY = y;
model.rotateAngleZ = z;
}
}
@@ -0,0 +1,83 @@
package noppes.npcs.client.model.blocks.legacy;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;
import net.minecraft.entity.Entity;
public class ModelLegacyStool extends ModelBase {
ModelRenderer Base;
ModelRenderer Leg1;
ModelRenderer Leg2;
ModelRenderer Leg3;
ModelRenderer Leg4;
ModelRenderer Shape1;
ModelRenderer Shape2;
ModelRenderer Shape3;
ModelRenderer Shape4;
public ModelLegacyStool() {
Base = new ModelRenderer(this, 9, 3);
Base.addBox(-5F, 0F, -5F, 10, 1, 10);
Base.setRotationPoint(0F, 16F, 0F);
Leg1 = new ModelRenderer(this, 0, 12);
Leg1.addBox(-1F, 0F, 0F, 2, 8, 1);
Leg1.setRotationPoint(2F, 17F, 2F);
setRotation(Leg1, 0.3316126F, 0.7853982F, 0F);
Leg2 = new ModelRenderer(this, 0, 12);
Leg2.addBox(-1F, 0F, 0F, 2, 8, 1);
Leg2.setRotationPoint(2F, 17F, -2F);
setRotation(Leg2, 0.3316126F, 2.356194F, -0.0081449F);
Leg3 = new ModelRenderer(this, 0, 12);
Leg3.addBox(-1F, 0F, 0F, 2, 8, 1);
Leg3.setRotationPoint(-2F, 17F, 2F);
setRotation(Leg3, 0.3316126F, -0.7853982F, 0F);
Leg4 = new ModelRenderer(this, 0, 12);
Leg4.addBox(-1F, 0F, 0F, 2, 8, 1);
Leg4.setRotationPoint(-2F, 17F, -2F);
setRotation(Leg4, 0.3316126F, -2.356194F, 0F);
Shape1 = new ModelRenderer(this, 0, 11);
Shape1.addBox(-3F, 0F, 0F, 6, 1, 1);
Shape1.setRotationPoint(2.4F, 19F, 0F);
setRotation(Shape1, 0F, 1.570796F, 0F);
Shape2 = new ModelRenderer(this, 0, 11);
Shape2.addBox(-3F, 0F, 0F, 6, 1, 1);
Shape2.setRotationPoint(0F, 19F, 2.4F);
Shape3 = new ModelRenderer(this, 0, 11);
Shape3.addBox(-3F, 0F, 0F, 6, 1, 1);
Shape3.setRotationPoint(0F, 19F, -3.4F);
Shape4 = new ModelRenderer(this, 0, 11);
Shape4.addBox(-3F, 0F, 0F, 6, 1, 1);
Shape4.setRotationPoint(-3.4F, 19F, 0F);
setRotation(Shape4, 0F, 1.570796F, 0F);
}
public void render(Entity entity, float f, float f1, float f2, float f3,
float f4, float f5) {
super.render(entity, f, f1, f2, f3, f4, f5);
Base.render(f5);
Leg1.render(f5);
Leg2.render(f5);
Leg3.render(f5);
Leg4.render(f5);
Shape1.render(f5);
Shape2.render(f5);
Shape3.render(f5);
Shape4.render(f5);
}
private void setRotation(ModelRenderer model, float x, float y, float z) {
model.rotateAngleX = x;
model.rotateAngleY = y;
model.rotateAngleZ = z;
}
}
@@ -1,16 +1,10 @@
// Date: 21-2-2014 11:50:33
// Template version 1.1
// Java generated by Techne
// Keep in mind that you still need to fill in some blanks
// - ZeuX
package noppes.npcs.client.model.blocks;
package noppes.npcs.client.model.blocks.legacy;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;
import net.minecraft.entity.Entity;
public class ModelWallBanner extends ModelBase {
public class ModelLegacyWallBanner extends ModelBase {
// fields
ModelRenderer MiddleStick;
ModelRenderer StickDecoration;
@@ -18,24 +12,24 @@ public class ModelWallBanner extends ModelBase {
ModelRenderer FlagPole1;
ModelRenderer FlagPole2;
public ModelWallBanner() {
public ModelLegacyWallBanner() {
MiddleStick = new ModelRenderer(this, 56, 0);
MiddleStick.addBox(-1F, 0F, -1F, 2, 3, 2);
MiddleStick.setRotationPoint(0F, -9F, 6.5F);
StickDecoration = new ModelRenderer(this, 11, 12);
StickDecoration.addBox(0F, 0F, 0F, 16, 3, 3);
StickDecoration.setRotationPoint(-8F, -7.5F, 5F);
TopDecoration = new ModelRenderer(this, 45, 19);
TopDecoration.addBox(0F, 0F, 0F, 1, 1, 1);
TopDecoration.setRotationPoint(-0.5F, -10F, 6F);
FlagPole1 = new ModelRenderer(this, 45, 19);
FlagPole1.addBox(0F, 0F, 0F, 1, 1, 1);
FlagPole1.setRotationPoint(-7F, -6.5F, 4F);
FlagPole2 = new ModelRenderer(this, 45, 19);
FlagPole2.addBox(0F, 0F, 0F, 1, 1, 1);
FlagPole2.setRotationPoint(6F, -6.5F, 4F);
@@ -1,13 +1,13 @@
package noppes.npcs.client.model.blocks;
package noppes.npcs.client.model.blocks.legacy;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;
import net.minecraft.entity.Entity;
public class ModelWallBannerFlag extends ModelBase {
public class ModelLegacyWallBannerFlag extends ModelBase {
ModelRenderer Flag;
public ModelWallBannerFlag() {
public ModelLegacyWallBannerFlag() {
textureWidth = 32;
textureHeight = 32;
Flag = new ModelRenderer(this, 0, 0);
@@ -1,4 +1,4 @@
package noppes.npcs.client.model.blocks;
package noppes.npcs.client.model.blocks.legacy.couch;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;
@@ -19,35 +19,35 @@ public class ModelCouchCorner extends ModelBase {
Leg1 = new ModelRenderer(this, 0, 0);
Leg1.addBox(0F, 0F, 0F, 1, 1, 2);
Leg1.setRotationPoint(7F, 23F, 6F);
Leg2 = new ModelRenderer(this, 0, 0);
Leg2.addBox(0F, 0F, 0F, 2, 1, 1);
Leg2.setRotationPoint(4F, 23F, -8F);
Leg3 = new ModelRenderer(this, 0, 0);
Leg3.addBox(0F, 0F, 0F, 2, 1, 1);
Leg3.setRotationPoint(-8F, 23F, -8F);
Leg4 = new ModelRenderer(this, 0, 0);
Leg4.addBox(0F, 0F, 0F, 2, 1, 2);
Leg4.setRotationPoint(-8F, 23F, 6F);
Leg5 = new ModelRenderer(this, 0, 0);
Leg5.addBox(0F, 0F, 0F, 1, 1, 2);
Leg5.setRotationPoint(7F, 23F, -6F);
Back = new ModelRenderer(this, 1, 1);
Back.addBox(0F, 0F, 0F, 1, 15, 15);
Back.setRotationPoint(-8F, 6F, -8F);
Back2 = new ModelRenderer(this, 14, 15);
Back2.addBox(0F, 0F, 0F, 16, 15, 1);
Back2.setRotationPoint(-8F, 6F, 7F);
Bottom = new ModelRenderer(this, 4, 0);
Bottom.addBox(0F, 0F, 0F, 16, 2, 14);
Bottom.setRotationPoint(-8F, 21F, -6F);
Bottom2 = new ModelRenderer(this, 0, 0);
Bottom2.addBox(0F, 0F, 0F, 14, 2, 2);
Bottom2.setRotationPoint(-8F, 21F, -8F);
@@ -1,4 +1,4 @@
package noppes.npcs.client.model.blocks;
package noppes.npcs.client.model.blocks.legacy.couch;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;
@@ -10,19 +10,19 @@ public class ModelCouchCornerWool extends ModelBase {
ModelRenderer Wool3;
ModelRenderer Wool4;
public ModelCouchCornerWool() {
public ModelCouchCornerWool() {
Wool1 = new ModelRenderer(this, 11, 3);
Wool1.addBox(0F, 0F, 0F, 13, 5, 2);
Wool1.setRotationPoint(-7F, 16F, -8F);
Wool2 = new ModelRenderer(this, 2, 4);
Wool2.addBox(0F, 0F, 0F, 2, 10, 13);
Wool2.setRotationPoint(-7F, 6F, -8F);
Wool3 = new ModelRenderer(this, 14, 15);
Wool3.addBox(0F, 0F, 0F, 15, 10, 2);
Wool3.setRotationPoint(-7F, 6F, 5F);
Wool4 = new ModelRenderer(this, 0, 45);
Wool4.addBox(0F, 0F, 0F, 15, 5, 13);
Wool4.setRotationPoint(-7F, 16F, -6F);
@@ -1,4 +1,4 @@
package noppes.npcs.client.model.blocks;
package noppes.npcs.client.model.blocks.legacy.couch;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;
@@ -17,27 +17,27 @@ public class ModelCouchLeft extends ModelBase {
Leg1 = new ModelRenderer(this, 0, 0);
Leg1.addBox(0F, 0F, 0F, 2, 1, 2);
Leg1.setRotationPoint(-8F, 23F, 6F);
Leg2 = new ModelRenderer(this, 0, 0);
Leg2.addBox(0F, 0F, 0F, 1, 1, 2);
Leg2.setRotationPoint(7F, 23F, -6F);
Leg3 = new ModelRenderer(this, 0, 0);
Leg3.addBox(0F, 0F, 0F, 2, 1, 2);
Leg3.setRotationPoint(-8F, 23F, -6F);
Leg4 = new ModelRenderer(this, 0, 0);
Leg4.addBox(0F, 0F, 0F, 1, 1, 2);
Leg4.setRotationPoint(7F, 23F, 6F);
Back = new ModelRenderer(this, 1, 15);
Back.addBox(0F, 0F, 0F, 14, 15, 1);
Back.setRotationPoint(-6F, 6F, 7F);
Side = new ModelRenderer(this, 1, 28);
Side.addBox(0F, 0F, 0F, 2, 11, 14);
Side.setRotationPoint(-8F, 12F, -6F);
Bottom = new ModelRenderer(this, 3, 1);
Bottom.addBox(0F, 0F, 0F, 14, 2, 14);
Bottom.setRotationPoint(-6F, 21F, -6F);
@@ -1,4 +1,4 @@
package noppes.npcs.client.model.blocks;
package noppes.npcs.client.model.blocks.legacy.couch;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;
@@ -12,7 +12,7 @@ public class ModelCouchLeftWool extends ModelBase {
Wool1 = new ModelRenderer(this, 3, 0);
Wool1.addBox(0F, 0F, 0F, 14, 5, 13);
Wool1.setRotationPoint(-6F, 16F, -6F);
Wool2 = new ModelRenderer(this, 14, 0);
Wool2.addBox(0F, 0F, 0F, 14, 10, 2);
Wool2.setRotationPoint(-6F, 6F, 5F);
@@ -1,4 +1,4 @@
package noppes.npcs.client.model.blocks;
package noppes.npcs.client.model.blocks.legacy.couch;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;
@@ -13,33 +13,33 @@ public class ModelCouchMiddle extends ModelBase
ModelRenderer Leg4;
ModelRenderer Bottom;
ModelRenderer Back;
public ModelCouchMiddle(){
Leg1 = new ModelRenderer(this, 0, 0);
Leg1.addBox(0F, 0F, 0F, 1, 1, 2);
Leg1.setRotationPoint(7F, 23F, 6F);
Leg2 = new ModelRenderer(this, 0, 0);
Leg2.addBox(0F, 0F, 0F, 1, 1, 2);
Leg2.setRotationPoint(7F, 23F, -6F);
Leg3 = new ModelRenderer(this, 0, 0);
Leg3.addBox(0F, 0F, 0F, 1, 1, 2);
Leg3.setRotationPoint(-8F, 23F, -6F);
Leg4 = new ModelRenderer(this, 0, 0);
Leg4.addBox(0F, 0F, 0F, 1, 1, 2);
Leg4.setRotationPoint(-8F, 23F, 6F);
Bottom = new ModelRenderer(this, 2, 0);
Bottom.addBox(0F, 0F, 0F, 16, 2, 14);
Bottom.setRotationPoint(-8F, 21F, -6F);
Back = new ModelRenderer(this, 14, 15);
Back.addBox(0F, 0F, 0F, 16, 15, 1);
Back.setRotationPoint(-8F, 6F, 7F);
}
public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5)
{
super.render(entity, f, f1, f2, f3, f4, f5);
@@ -50,7 +50,7 @@ public class ModelCouchMiddle extends ModelBase
Bottom.render(f5);
Back.render(f5);
}
private void setRotation(ModelRenderer model, float x, float y, float z)
{
model.rotateAngleX = x;
@@ -1,4 +1,4 @@
package noppes.npcs.client.model.blocks;
package noppes.npcs.client.model.blocks.legacy.couch;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;
@@ -8,24 +8,24 @@ public class ModelCouchMiddleWool extends ModelBase
{
ModelRenderer Wool1;
ModelRenderer Wool2;
public ModelCouchMiddleWool(){
public ModelCouchMiddleWool(){
Wool1 = new ModelRenderer(this, 3, 0);
Wool1.addBox(0F, 0F, 0F, 16, 5, 13);
Wool1.setRotationPoint(-8F, 16F, -6F);
Wool2 = new ModelRenderer(this, 14, 0);
Wool2.addBox(0F, 0F, 0F, 16, 10, 2);
Wool2.setRotationPoint(-8F, 6F, 5F);
}
public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5)
{
super.render(entity, f, f1, f2, f3, f4, f5);
Wool1.render(f5);
Wool2.render(f5);
}
private void setRotation(ModelRenderer model, float x, float y, float z)
{
model.rotateAngleX = x;
@@ -1,4 +1,4 @@
package noppes.npcs.client.model.blocks;
package noppes.npcs.client.model.blocks.legacy.couch;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;
@@ -18,29 +18,29 @@ public class ModelCouchRight extends ModelBase {
Leg1 = new ModelRenderer(this, 0, 0);
Leg1.addBox(0F, 0F, 0F, 2, 1, 2);
Leg1.setRotationPoint(6F, 23F, 6F);
Leg2 = new ModelRenderer(this, 0, 0);
Leg2.addBox(0F, 0F, 0F, 1, 1, 2);
Leg2.setRotationPoint(-8F, 23F, -6F);
Leg3 = new ModelRenderer(this, 0, 0);
Leg3.addBox(0F, 0F, 0F, 2, 1, 2);
Leg3.setRotationPoint(6F, 23F, -6F);
Leg4 = new ModelRenderer(this, 0, 0);
Leg4.addBox(0F, 0F, 0F, 1, 1, 2);
Leg4.setRotationPoint(-8F, 23F, 6F);
Back = new ModelRenderer(this, 1, 15);
Back.mirror = true;
Back.addBox(0F, 0F, 0F, 14, 15, 1);
Back.setRotationPoint(-8F, 6F, 7F);
Bottom = new ModelRenderer(this, 3, 1);
Bottom.mirror = true;
Bottom.addBox(0F, 0F, 0F, 14, 2, 14);
Bottom.setRotationPoint(-8F, 21F, -6F);
Side = new ModelRenderer(this, 1, 28);
Side.mirror = true;
Side.addBox(0F, 0F, 0F, 2, 11, 14);
@@ -1,4 +1,4 @@
package noppes.npcs.client.model.blocks;
package noppes.npcs.client.model.blocks.legacy.couch;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;
@@ -13,7 +13,7 @@ public class ModelCouchRightWool extends ModelBase {
Wool1.mirror = true;
Wool1.addBox(0F, 0F, 0F, 14, 5, 13);
Wool1.setRotationPoint(-8F, 16F, -6F);
Wool2 = new ModelRenderer(this, 14, 0);
Wool2.mirror = true;
Wool2.addBox(0F, 0F, 0F, 14, 10, 2);
@@ -1,4 +1,4 @@
package noppes.npcs.client.model.blocks;
package noppes.npcs.client.model.blocks.legacy.couch;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;
@@ -29,77 +29,77 @@ public class ModelCouchWoodLeft extends ModelBase {
Shape1.mirror = true;
Shape1.addBox(0F, 0F, 0F, 2, 3, 10);
Shape1.setRotationPoint(-8F, 18F, -4F);
Shape2 = new ModelRenderer(this, 0, 0);
Shape2.addBox(0F, 0F, 0F, 1, 3, 2);
Shape2.setRotationPoint(7F, 21F, -6F);
Shape3 = new ModelRenderer(this, 0, 0);
Shape3.mirror = true;
Shape3.addBox(0F, 0F, 0F, 2, 4, 1);
Shape3.setRotationPoint(-8F, 14F, 0.5F);
Shape4 = new ModelRenderer(this, 0, 0);
Shape4.mirror = true;
Shape4.addBox(0F, 0F, 0F, 14, 2, 1);
Shape4.setRotationPoint(-6F, 7F, 7F);
Shape5 = new ModelRenderer(this, 0, 0);
Shape5.mirror = true;
Shape5.addBox(0F, 0F, 0F, 14, 2, 2);
Shape5.setRotationPoint(-6F, 19F, 6F);
Shape6 = new ModelRenderer(this, 0, 0);
Shape6.mirror = true;
Shape6.addBox(0F, 0F, 0F, 2, 1, 13);
Shape6.setRotationPoint(-8F, 13F, -7F);
Shape7 = new ModelRenderer(this, 0, 0);
Shape7.addBox(0F, 0F, 0F, 1, 1, 10);
Shape7.setRotationPoint(-6F, 19F, -4F);
Shape8 = new ModelRenderer(this, 0, 0);
Shape8.addBox(0F, 0F, 0F, 1, 3, 2);
Shape8.setRotationPoint(7F, 21F, 6F);
Shape9 = new ModelRenderer(this, 0, 0);
Shape9.addBox(0F, 0F, 0F, 2, 1, 10);
Shape9.setRotationPoint(5F, 19F, -4F);
Shape10 = new ModelRenderer(this, 0, 0);
Shape10.addBox(0F, 0F, 0F, 1, 10, 1);
Shape10.setRotationPoint(-6F, 9F, 7F);
Shape11 = new ModelRenderer(this, 0, 0);
Shape11.mirror = true;
Shape11.addBox(0F, 0F, 0F, 14, 2, 2);
Shape11.setRotationPoint(-6F, 19F, -6F);
Shape12 = new ModelRenderer(this, 0, 0);
Shape12.addBox(0F, 0F, 0F, 2, 1, 10);
Shape12.setRotationPoint(-3F, 19F, -4F);
Shape13 = new ModelRenderer(this, 0, 0);
Shape13.addBox(0F, 0F, 0F, 2, 1, 10);
Shape13.setRotationPoint(1F, 19F, -4F);
Shape14 = new ModelRenderer(this, 0, 0);
Shape14.addBox(0F, 0F, 0F, 2, 10, 1);
Shape14.setRotationPoint(-3F, 9F, 7F);
Shape15 = new ModelRenderer(this, 0, 0);
Shape15.addBox(0F, 0F, 0F, 2, 10, 1);
Shape15.setRotationPoint(1F, 9F, 7F);
Shape16 = new ModelRenderer(this, 0, 0);
Shape16.addBox(0F, 0F, 0F, 2, 10, 1);
Shape16.setRotationPoint(5F, 9F, 7F);
Shape17 = new ModelRenderer(this, 0, 0);
Shape17.mirror = true;
Shape17.addBox(0F, 0F, 0F, 2, 10, 2);
Shape17.setRotationPoint(-8F, 14F, -6F);
Shape18 = new ModelRenderer(this, 0, 0);
Shape18.mirror = true;
Shape18.addBox(0F, 0F, 0F, 2, 18, 2);
@@ -1,4 +1,4 @@
package noppes.npcs.client.model.blocks;
package noppes.npcs.client.model.blocks.legacy.couch;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;
@@ -26,7 +26,7 @@ public class ModelCouchWoodMiddle extends ModelBase {
Shape2 = new ModelRenderer(this, 0, 0);
Shape2.addBox(0F, 0F, 0F, 1, 3, 2);
Shape2.setRotationPoint(-8F, 21F, -6F);
Shape4 = new ModelRenderer(this, 0, 0);
Shape4.addBox(0F, 0F, 0F, 16, 2, 1);
Shape4.setRotationPoint(-8F, 7F, 7F);
@@ -1,4 +1,4 @@
package noppes.npcs.client.model.blocks;
package noppes.npcs.client.model.blocks.legacy.couch;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;
@@ -1,4 +1,4 @@
package noppes.npcs.client.model.blocks;
package noppes.npcs.client.model.blocks.legacy.couch;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;
@@ -33,30 +33,30 @@ public class ModelCouchWoodSingle extends ModelBase {
Shape1.mirror = true;
Shape1.addBox(0F, 0F, 0F, 2, 3, 10);
Shape1.setRotationPoint(-8F, 18F, -4F);
Shape2 = new ModelRenderer(this, 0, 0);
Shape2.mirror = true;
Shape2.addBox(0F, 0F, 0F, 2, 10, 2);
Shape2.setRotationPoint(-8F, 14F, -6F);
Shape3 = new ModelRenderer(this, 0, 0);
Shape3.mirror = true;
Shape3.addBox(0F, 0F, 0F, 2, 4, 1);
Shape3.setRotationPoint(-8F, 14F, 0.5F);
Shape4 = new ModelRenderer(this, 0, 0);
Shape4.addBox(0F, 0F, 0F, 12, 2, 1);
Shape4.setRotationPoint(-6F, 7F, 7F);
Shape5 = new ModelRenderer(this, 0, 0);
Shape5.addBox(0F, 0F, 0F, 12, 2, 2);
Shape5.setRotationPoint(-6F, 19F, 6F);
Shape6 = new ModelRenderer(this, 0, 0);
Shape6.mirror = true;
Shape6.addBox(0F, 0F, 0F, 2, 1, 13);
Shape6.setRotationPoint(-8F, 13F, -7F);
Shape7 = new ModelRenderer(this, 0, 0);
Shape7.addBox(0F, 0F, 0F, 1, 1, 10);
Shape7.setRotationPoint(-6F, 19F, -4F);
@@ -109,11 +109,11 @@ public class ModelCouchWoodSingle extends ModelBase {
Shape19 = new ModelRenderer(this, 0, 0);
Shape19.addBox(0F, 0F, 0F, 2, 10, 2);
Shape19.setRotationPoint(6F, 14F, -6F);
Shape20 = new ModelRenderer(this, 0, 0);
Shape20.addBox(0F, 0F, 0F, 2, 3, 10);
Shape20.setRotationPoint(6F, 18F, -4F);
Shape21 = new ModelRenderer(this, 0, 0);
Shape21.addBox(0F, 0F, 0F, 2, 4, 1);
Shape21.setRotationPoint(6F, 14F, 0.5F);
@@ -10,23 +10,41 @@ import net.minecraft.client.renderer.texture.TextureMap;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.IIcon;
import net.minecraft.util.MathHelper;
import net.minecraft.util.ResourceLocation;
import noppes.npcs.CustomItems;
import noppes.npcs.blocks.BlockBanner;
import noppes.npcs.blocks.tiles.TileBanner;
import noppes.npcs.client.model.blocks.ModelBanner;
import noppes.npcs.client.model.blocks.ModelBannerFlag;
import noppes.npcs.client.model.blocks.banner.ModelBannerFloor;
import noppes.npcs.client.model.blocks.banner.ModelBannerFloorFlag;
import noppes.npcs.client.model.blocks.legacy.ModelLegacyBanner;
import noppes.npcs.client.model.blocks.legacy.ModelLegacyBannerFlag;
import noppes.npcs.config.ConfigClient;
import noppes.npcs.constants.EnumBannerVariant;
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL12;
public class BlockBannerRenderer extends BlockRendererInterface{
private final ModelBanner model = new ModelBanner();
private final ModelBannerFlag flag = new ModelBannerFlag();
private final ModelLegacyBanner legacyBanner = new ModelLegacyBanner();
private final ModelLegacyBannerFlag legacyFlag = new ModelLegacyBannerFlag();
public static final ResourceLocation resourceFlag = new ResourceLocation("customnpcs","textures/models/BannerFlag.png");
private final ModelBannerFloor banner = new ModelBannerFloor();
private final ModelBannerFloorFlag flag = new ModelBannerFloorFlag();
public static final ResourceLocation legacyFlagResource = new ResourceLocation("customnpcs","textures/models/legacy/banner.png");
public static final ResourceLocation normalFlag = new ResourceLocation("customnpcs","textures/models/banner/flag/normal.png");
public static final ResourceLocation pointyFlag = new ResourceLocation("customnpcs","textures/models/banner/flag/pointy.png");
public static final ResourceLocation triangleFlag = new ResourceLocation("customnpcs","textures/models/banner/flag/triangle.png");
public static final ResourceLocation tornFlag = new ResourceLocation("customnpcs","textures/models/banner/flag/torn.png");
public static final ResourceLocation curvedFlag = new ResourceLocation("customnpcs","textures/models/banner/flag/curved.png");
protected static final ResourceLocation BannerWood = new ResourceLocation("customnpcs","textures/models/banner/BannerFloorWood.png");
protected static final ResourceLocation BannerStone = new ResourceLocation("customnpcs","textures/models/banner/BannerFloorStone.png");
protected static final ResourceLocation BannerIron = new ResourceLocation("customnpcs","textures/models/banner/BannerFloorIron.png");
protected static final ResourceLocation BannerGold = new ResourceLocation("customnpcs","textures/models/banner/BannerFloorGold.png");
protected static final ResourceLocation BannerDiamond = new ResourceLocation("customnpcs","textures/models/banner/BannerFloorDiamond.png");
public BlockBannerRenderer(){
((BlockBanner)CustomItems.banner).renderId = RenderingRegistry.getNextAvailableRenderId();
@@ -46,28 +64,64 @@ public class BlockBannerRenderer extends BlockRendererInterface{
GL11.glRotatef(90 * tile.rotation, 0, 1, 0);
GL11.glColor3f(1, 1, 1);
setMaterialTexture(var1.getBlockMetadata());
model.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
if(ConfigClient.LegacyBanner){
setMaterialTexture(var1.getBlockMetadata());
legacyBanner.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
this.bindTexture(resourceFlag);
float[] color = colorTable[tile.color];
GL11.glColor3f(color[0], color[1], color[2]);
flag.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
this.bindTexture(legacyFlagResource);
float[] color = colorTable[tile.color];
GL11.glColor3f(color[0], color[1], color[2]);
legacyFlag.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
GL11.glPopMatrix();
GL11.glColor3f(1, 1, 1);
if(tile.icon != null && !this.playerTooFar(tile)){
doRender(var2, var4, var6, tile.rotation, tile.icon);
GL11.glPopMatrix();
GL11.glColor3f(1, 1, 1);
if(tile.icon != null && !this.playerTooFar(tile)){
doRender(var2, var4, var6, tile.rotation, tile.icon, 0);
}
}
else {
long worldTime = tile.getWorldObj() != null ? tile.getWorldObj().getTotalWorldTime() : 0;
// 100 is one full revolution, so we can just mod by 100 without affecting the result
int animationProgress100 = (((tile.xCoord % 100) * 7 + (tile.yCoord % 100) * 9 + (tile.zCoord % 100) * 13) + (int) (worldTime % 100)) % 100;
float f3 = (float) animationProgress100 + var8;
float angle_x = (-0.0125F + 0.01F * MathHelper.cos(f3 * 0.01F * 2F * (float) Math.PI)) * (float) Math.PI;
flag.BannerFlag.rotateAngleX = angle_x;
setBannerMaterial(var1.getBlockMetadata());
banner.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
setFlagType(tile.variant);
float[] color = colorTable[tile.color];
GL11.glPushMatrix();
GL11.glColor3f(color[0], color[1], color[2]);
flag.render(null, 0, 0, 0, f3, 0.0F, 0.0625F);
GL11.glPopMatrix();
GL11.glPopMatrix();
GL11.glColor3f(1, 1, 1);
if(tile.icon != null && !this.playerTooFar(tile)){
doRender(var2, var4, var6, tile.rotation, tile.icon, angle_x);
}
}
}
public void doRender(double par2, double par4, double par6, int meta, ItemStack iicon)
public void doRender(double par2, double par4, double par6, int meta, ItemStack iicon, float rotate)
{
GL11.glPushMatrix();
bindTexture(TextureMap.locationItemsTexture);
GL11.glTranslatef((float)par2 + 0.5f, (float)par4 +1.3f, (float)par6 + 0.5f);
GL11.glRotatef(180, 0, 0, 1);
GL11.glRotatef(90 * meta, 0, 1, 0);
GL11.glTranslatef(0, 0, -0.14f);
if(ConfigClient.LegacyBanner){
GL11.glTranslatef(0, 0, -0.14f);
}
else {
GL11.glTranslatef(0, 0, -0.075f);
GL11.glTranslatef(0, -0.6f, 0); // Translate to pivot point
GL11.glRotatef((float) Math.toDegrees(rotate), 1, 0, 0); // Apply sway rotation
GL11.glTranslatef(0, 0.6f, 0); // Translate back after rotation
}
GL11.glDepthMask(false);
float f2 = 0.05f;
Minecraft mc = Minecraft.getMinecraft();
@@ -133,14 +187,26 @@ public class BlockBannerRenderer extends BlockRendererInterface{
GL11.glRotatef(180, 0, 0, 1);
GL11.glRotatef(180, 0, 1, 0);
setMaterialTexture(metadata);
GL11.glColor3f(1, 1, 1);
model.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
if(ConfigClient.LegacyBanner){
setMaterialTexture(metadata);
GL11.glColor3f(1, 1, 1);
legacyBanner.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
this.bindTexture(legacyFlagResource);
float[] color = colorTable[15 - metadata];
GL11.glColor3f(color[0], color[1], color[2]);
legacyFlag.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
}
else {
setBannerMaterial(metadata);
banner.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
this.bindTexture(normalFlag);
float[] color = colorTable[15 - metadata];
GL11.glColor3f(color[0], color[1], color[2]);
flag.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
}
this.bindTexture(resourceFlag);
float[] color = colorTable[15 - metadata];
GL11.glColor3f(color[0], color[1], color[2]);
flag.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
GL11.glPopMatrix();
}
@@ -152,4 +218,39 @@ public class BlockBannerRenderer extends BlockRendererInterface{
public int specialRenderDistance(){
return 26;
}
public static void setBannerMaterial(int meta){
TextureManager manager = Minecraft.getMinecraft().getTextureManager();
if(meta == 1)
manager.bindTexture(BannerStone);
else if(meta == 2)
manager.bindTexture(BannerIron);
else if(meta == 3)
manager.bindTexture(BannerGold);
else if(meta == 4)
manager.bindTexture(BannerDiamond);
else
manager.bindTexture(BannerWood);
}
public static void setFlagType(EnumBannerVariant variant){
TextureManager manager = Minecraft.getMinecraft().getTextureManager();
switch (variant){
case Pointy:
manager.bindTexture(pointyFlag);
break;
case Triangle:
manager.bindTexture(triangleFlag);
break;
case Torn:
manager.bindTexture(tornFlag);
break;
case Curved:
manager.bindTexture(curvedFlag);
break;
default:
manager.bindTexture(normalFlag);
break;
}
}
}
@@ -4,28 +4,37 @@ import cpw.mods.fml.client.registry.RenderingRegistry;
import net.minecraft.block.Block;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.texture.TextureManager;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ResourceLocation;
import noppes.npcs.CustomItems;
import noppes.npcs.blocks.BlockBarrel;
import noppes.npcs.blocks.tiles.TileColorable;
import noppes.npcs.client.model.blocks.ModelBarrel;
import noppes.npcs.client.model.blocks.ModelBarrelLit;
import noppes.npcs.client.model.blocks.barrel.BarrelCore;
import noppes.npcs.client.model.blocks.barrel.BarrelTrim;
import noppes.npcs.client.model.blocks.barrel.ModelBarrel;
import noppes.npcs.client.model.blocks.legacy.ModelLegacyBarrel;
import noppes.npcs.client.model.blocks.legacy.ModelLegacyBarrelLid;
import noppes.npcs.config.ConfigClient;
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL12;
public class BlockBarrelRenderer extends BlockRendererInterface{
private final ModelBarrel model = new ModelBarrel();
private final ModelBarrelLit modelLit = new ModelBarrelLit();
private static final ResourceLocation resource1 = new ResourceLocation("customnpcs","textures/models/Barrel.png");
// Legacy
private final ModelLegacyBarrel legacyModel = new ModelLegacyBarrel();
private final ModelLegacyBarrelLid legacyLid = new ModelLegacyBarrelLid();
private static final ResourceLocation legacy_texture = new ResourceLocation("customnpcs","textures/models/Barrel.png");
private final BarrelCore core = new BarrelCore();
private final BarrelTrim trim = new BarrelTrim();
private static final ResourceLocation trimTexture = new ResourceLocation("customnpcs","textures/models/BarrelTrim.png");
// Modern
private final ModelBarrel barrel = new ModelBarrel();
private static final ResourceLocation trimTexture = new ResourceLocation("customnpcs","textures/models/barrel/trim.png");
private static final ResourceLocation oak_lid = new ResourceLocation("customnpcs","textures/models/barrel/oak_lid.png");
private static final ResourceLocation spruce_lid = new ResourceLocation("customnpcs","textures/models/barrel/oak_lid.png");
private static final ResourceLocation birch_lid = new ResourceLocation("customnpcs","textures/models/barrel/oak_lid.png");
private static final ResourceLocation jungle_lid = new ResourceLocation("customnpcs","textures/models/barrel/oak_lid.png");
private static final ResourceLocation acacia_lid = new ResourceLocation("customnpcs","textures/models/barrel/oak_lid.png");
private static final ResourceLocation dark_oak_lid = new ResourceLocation("customnpcs","textures/models/barrel/oak_lid.png");
public BlockBarrelRenderer(){
((BlockBarrel)CustomItems.barrel).renderId = RenderingRegistry.getNextAvailableRenderId();
@@ -39,17 +48,38 @@ public class BlockBarrelRenderer extends BlockRendererInterface{
GL11.glDisable(GL12.GL_RESCALE_NORMAL);
GL11.glEnable(GL11.GL_ALPHA_TEST);
GL11.glPushMatrix();
GL11.glTranslatef((float)var2 + 0.5f, (float)var4 + 1.42f, (float)var6 + 0.5f);
GL11.glScalef(1.2f, 0.94f,1.2f);
GL11.glRotatef(180, 0, 0, 1);
GL11.glRotatef(45 * tile.rotation, 0, 1, 0);
GL11.glColor3f(1, 1, 1);
GL11.glEnable(GL11.GL_CULL_FACE);
setWoodTexture(var1.getBlockMetadata());
core.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
Minecraft.getMinecraft().getTextureManager().bindTexture(trimTexture);
trim.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
if(ConfigClient.LegacyBarrel){
GL11.glTranslatef((float)var2 + 0.5f, (float)var4 + 1.42f, (float)var6 + 0.5f);
GL11.glScalef(1.2f, 0.94f,1.2f);
GL11.glRotatef(180, 0, 0, 1);
GL11.glRotatef(45 * tile.rotation, 0, 1, 0);
GL11.glColor3f(1, 1, 1);
GL11.glEnable(GL11.GL_CULL_FACE);
setWoodTexture(var1.getBlockMetadata());
legacyModel.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
Minecraft.getMinecraft().getTextureManager().bindTexture(legacy_texture);
legacyLid.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
}
else {
GL11.glTranslatef((float)var2 + 0.5f, (float)var4 + 1.5f, (float)var6 + 0.5f);
GL11.glScalef(1.0f, 1.0f,1.0f);
GL11.glRotatef(180, 0, 0, 1);
GL11.glRotatef(45 * tile.rotation, 0, 1, 0);
GL11.glColor3f(1, 1, 1);
GL11.glEnable(GL11.GL_CULL_FACE);
setWoodTexture(var1.getBlockMetadata());
barrel.renderWall(0.0625F);
Minecraft.getMinecraft().getTextureManager().bindTexture(trimTexture);
barrel.renderTrim(0.0625F);
setLidTexture(var1.getBlockMetadata());
barrel.renderBase(0.0625F);
}
GL11.glPopMatrix();
}
@@ -58,20 +88,55 @@ public class BlockBarrelRenderer extends BlockRendererInterface{
public void renderInventoryBlock(Block block, int metadata, int modelId,
RenderBlocks renderer) {
GL11.glPushMatrix();
GL11.glTranslatef(0, 1.05f, 0);
GL11.glScalef(1f, 1f, 1f);
GL11.glRotatef(180, 0, 0, 1);
GL11.glRotatef(180, 0, 1, 0);
if(ConfigClient.LegacyBarrel){
GL11.glTranslatef(0, 0.75f, 0);
GL11.glScalef(0.7f, 0.7f, 0.7f);
GL11.glRotatef(180, 0, 0, 1);
GL11.glRotatef(180, 0, 1, 0);
setWoodTexture(metadata);
GL11.glColor3f(1, 1, 1);
legacyModel.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
Minecraft.getMinecraft().getTextureManager().bindTexture(legacy_texture);
legacyLid.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
}
else {
GL11.glTranslatef(0, 0.9f, 0);
GL11.glScalef(0.9f, 0.9f, 0.9f);
GL11.glRotatef(180, 0, 0, 1);
GL11.glRotatef(180, 0, 1, 0);
setWoodTexture(metadata);
GL11.glColor3f(1, 1, 1);
barrel.renderWall(0.0625F);
Minecraft.getMinecraft().getTextureManager().bindTexture(trimTexture);
barrel.renderTrim(0.0625F);
setLidTexture(metadata);
barrel.renderBase(0.0625F);
}
setWoodTexture(metadata);
GL11.glColor3f(1, 1, 1);
core.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
Minecraft.getMinecraft().getTextureManager().bindTexture(trimTexture);
trim.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
GL11.glPopMatrix();
}
@Override
public void setLidTexture(int meta){
TextureManager manager = Minecraft.getMinecraft().getTextureManager();
if(meta == 1)
manager.bindTexture(oak_lid);
else if(meta == 2)
manager.bindTexture(oak_lid);
else if(meta == 3)
manager.bindTexture(oak_lid);
else if(meta == 4)
manager.bindTexture(oak_lid);
else if(meta == 5)
manager.bindTexture(oak_lid);
else
manager.bindTexture(oak_lid);
}
@Override
public int getRenderId() {
return CustomItems.barrel.getRenderType();
}
@@ -5,17 +5,33 @@ import net.minecraft.block.Block;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ResourceLocation;
import net.minecraft.world.IBlockAccess;
import noppes.npcs.CustomItems;
import noppes.npcs.blocks.BlockRotated;
import noppes.npcs.blocks.tiles.TileColorable;
import noppes.npcs.client.model.blocks.ModelCampfire;
import noppes.npcs.client.model.blocks.campfire.ModelCampfireCoals;
import noppes.npcs.client.model.blocks.campfire.ModelCampfireFlame;
import noppes.npcs.client.model.blocks.campfire.ModelCampfireLog;
import noppes.npcs.client.model.blocks.campfire.ModelCampfireStone;
import noppes.npcs.config.ConfigClient;
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL12;
public class BlockCampfireRenderer extends BlockRendererInterface{
private final ModelCampfire model = new ModelCampfire();
// Legacy
private final ModelCampfire legacy_model = new ModelCampfire();
// Modern
private final ModelCampfireFlame flameModel = new ModelCampfireFlame();
private final ModelCampfireLog logsModel = new ModelCampfireLog();
private final ModelCampfireStone stonesModel = new ModelCampfireStone();
private final ModelCampfireCoals coalsModel = new ModelCampfireCoals();
protected static final ResourceLocation coalsTexture = new ResourceLocation("customnpcs","textures/models/CampfireCoals.png");
public BlockCampfireRenderer(){
((BlockRotated)CustomItems.campfire).renderId = RenderingRegistry.getNextAvailableRenderId();
((BlockRotated)CustomItems.campfire_unlit).renderId = ((BlockRotated)CustomItems.campfire).renderId;
@@ -29,15 +45,35 @@ public class BlockCampfireRenderer extends BlockRendererInterface{
GL11.glDisable(GL12.GL_RESCALE_NORMAL);
GL11.glPushMatrix();
GL11.glTranslatef((float)var2 + 0.5f, (float)var4 + 1.5f, (float)var6 + 0.5f);
//GL11.glScalef(0.95f, 0.95f, 0.95f);
GL11.glRotatef(180, 0, 0, 1);
GL11.glRotatef(45 * tile.rotation, 0, 1, 0);
GL11.glColor3f(1, 1, 1);
Minecraft.getMinecraft().getTextureManager().bindTexture(PlanksOak);
model.renderLog(0.0625F);
Minecraft.getMinecraft().getTextureManager().bindTexture(Stone);
model.renderRock(0.0625F);
if(ConfigClient.LegacyCampfire){
Minecraft.getMinecraft().getTextureManager().bindTexture(PlanksOak);
legacy_model.renderLog(0.0625F);
Minecraft.getMinecraft().getTextureManager().bindTexture(Stone);
legacy_model.renderRock(0.0625F);
}
else {
Block block = tile.getBlockType();
Minecraft.getMinecraft().getTextureManager().bindTexture(Logs);
logsModel.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
Minecraft.getMinecraft().getTextureManager().bindTexture(Cobble);
stonesModel.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
if(block == CustomItems.campfire){
GL11.glDisable(GL11.GL_LIGHTING);
GL11.glEnable(GL11.GL_ALPHA_TEST);
Minecraft.getMinecraft().getTextureManager().bindTexture(Flame);
flameModel.render(null, tile.getWorldObj().getWorldTime(), 0, 0, 0, 0.0F, 0.0625F);
GL11.glDisable(GL11.GL_ALPHA_TEST);
GL11.glEnable(GL11.GL_LIGHTING);
}
Minecraft.getMinecraft().getTextureManager().bindTexture(coalsTexture);
coalsModel.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
}
GL11.glPopMatrix();
}
@@ -51,10 +87,19 @@ public class BlockCampfireRenderer extends BlockRendererInterface{
GL11.glRotatef(180, 0, 0, 1);
GL11.glRotatef(180, 0, 1, 0);
GL11.glColor3f(1, 1, 1);
Minecraft.getMinecraft().getTextureManager().bindTexture(PlanksOak);
model.renderLog(0.0625F);
Minecraft.getMinecraft().getTextureManager().bindTexture(Stone);
model.renderRock(0.0625F);
if(ConfigClient.LegacyCampfire){
Minecraft.getMinecraft().getTextureManager().bindTexture(PlanksOak);
legacy_model.renderLog(0.0625F);
Minecraft.getMinecraft().getTextureManager().bindTexture(Stone);
legacy_model.renderRock(0.0625F);
}
else {
Minecraft.getMinecraft().getTextureManager().bindTexture(Logs);
logsModel.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
Minecraft.getMinecraft().getTextureManager().bindTexture(Cobble);
stonesModel.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
}
GL11.glPopMatrix();
}
@@ -12,15 +12,21 @@ import noppes.npcs.CustomItems;
import noppes.npcs.blocks.BlockCarpentryBench;
import noppes.npcs.client.model.blocks.ModelAnvil;
import noppes.npcs.client.model.blocks.ModelCarpentryBench;
import noppes.npcs.client.model.blocks.legacy.ModelLegacyCarpentryBench;
import noppes.npcs.config.ConfigClient;
import org.lwjgl.opengl.GL11;
public class BlockCarpentryBenchRenderer extends TileEntitySpecialRenderer implements ISimpleBlockRenderingHandler{
private final ModelCarpentryBench model = new ModelCarpentryBench();
private final ModelAnvil anvil = new ModelAnvil();
private static final ResourceLocation anvilTexture = new ResourceLocation("customnpcs","textures/models/Steel.png");
private static final ResourceLocation carpentryBench = new ResourceLocation("customnpcs","textures/models/CarpentryBench.png");
private final ModelCarpentryBench modelCarpentryBench = new ModelCarpentryBench();
private static final ResourceLocation carpentryBenchTexture = new ResourceLocation("customnpcs","textures/models/CarpentryBench.png");
private final ModelAnvil anvil = new ModelAnvil();
private static final ResourceLocation anvilTexture = new ResourceLocation("customnpcs","textures/models/Steel.png");
private final ModelLegacyCarpentryBench legacyBench = new ModelLegacyCarpentryBench();
private static final ResourceLocation legacyCarpentryBench = new ResourceLocation("customnpcs","textures/models/legacy/bench.png");
public BlockCarpentryBenchRenderer(){
((BlockCarpentryBench)CustomItems.carpentyBench).renderId = RenderingRegistry.getNextAvailableRenderId();
@@ -40,9 +46,17 @@ public class BlockCarpentryBenchRenderer extends TileEntitySpecialRenderer imple
this.bindTexture(anvilTexture);
anvil.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
}
else{
this.bindTexture(carpentryBench);
model.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
else {
GL11.glEnable(GL11.GL_ALPHA_TEST);
if(ConfigClient.LegacyCarpentryBench){
this.bindTexture(legacyCarpentryBench);
legacyBench.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
} else {
this.bindTexture(carpentryBenchTexture);
modelCarpentryBench.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
}
GL11.glDisable(GL11.GL_ALPHA_TEST);
}
GL11.glPopMatrix();
}
@@ -58,8 +72,13 @@ public class BlockCarpentryBenchRenderer extends TileEntitySpecialRenderer imple
GL11.glColor3f(1, 1, 1);
if(metadata == 0){
this.bindTexture(carpentryBench);
model.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
if(ConfigClient.LegacyCarpentryBench){
this.bindTexture(legacyCarpentryBench);
legacyBench.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
} else {
this.bindTexture(carpentryBenchTexture);
modelCarpentryBench.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
}
}
else{
this.bindTexture(anvilTexture);
@@ -2,18 +2,34 @@ package noppes.npcs.client.renderer.blocks;
import cpw.mods.fml.client.registry.RenderingRegistry;
import net.minecraft.block.Block;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.texture.TextureManager;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ResourceLocation;
import noppes.npcs.CustomItems;
import noppes.npcs.blocks.BlockChair;
import noppes.npcs.blocks.tiles.TileColorable;
import noppes.npcs.client.model.blocks.ModelChair;
import noppes.npcs.client.model.blocks.chair.ModelChair;
import noppes.npcs.client.model.blocks.chair.ModelChairSpoof;
import noppes.npcs.client.model.blocks.legacy.ModelLegacyChair;
import noppes.npcs.config.ConfigClient;
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL12;
public class BlockChairRenderer extends BlockRendererInterface{
private final ModelChair model = new ModelChair();
private final ModelLegacyChair legacyModel = new ModelLegacyChair();
private final ModelChairSpoof chairSpoof = new ModelChairSpoof();
private final ModelChair chair = new ModelChair();
private static final ResourceLocation oak = new ResourceLocation("customnpcs","textures/models/chair/oak.png");
private static final ResourceLocation spruce = new ResourceLocation("customnpcs","textures/models/chair/spruce.png");
private static final ResourceLocation birch = new ResourceLocation("customnpcs","textures/models/chair/birch.png");
private static final ResourceLocation jungle = new ResourceLocation("customnpcs","textures/models/chair/jungle.png");
private static final ResourceLocation dark_oak = new ResourceLocation("customnpcs","textures/models/chair/dark_oak.png");
private static final ResourceLocation acacia = new ResourceLocation("customnpcs","textures/models/chair/acacia.png");
public BlockChairRenderer(){
((BlockChair)CustomItems.chair).renderId = RenderingRegistry.getNextAvailableRenderId();
@@ -25,14 +41,25 @@ public class BlockChairRenderer extends BlockRendererInterface{
TileColorable tile = (TileColorable) var1;
GL11.glDisable(GL12.GL_RESCALE_NORMAL);
GL11.glPushMatrix();
GL11.glTranslatef((float)var2 + 0.5f, (float)var4 + 1.68f, (float)var6 + 0.5f);
GL11.glTranslatef((float)var2 + 0.5f, (float)var4 + 1.65f, (float)var6 + 0.5f);
GL11.glScalef(1.2f, 1.1f, 1.2f);
GL11.glRotatef(180, 0, 0, 1);
GL11.glRotatef(90 * tile.rotation, 0, 1, 0);
GL11.glColor3f(1, 1, 1);
GL11.glEnable(GL11.GL_ALPHA_TEST);
setWoodTexture(var1.getBlockMetadata());
model.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
if(ConfigClient.LegacyChair)
legacyModel.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
else {
if(ConfigClient.WoodTextures)
chairSpoof.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
else {
setChairTexture(var1.getBlockMetadata());
chair.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
}
}
GL11.glDisable(GL11.GL_ALPHA_TEST);
GL11.glPopMatrix();
}
@@ -48,11 +75,34 @@ public class BlockChairRenderer extends BlockRendererInterface{
setWoodTexture(metadata);
GL11.glColor3f(1, 1, 1);
model.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
if(ConfigClient.LegacyChair)
legacyModel.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
else {
if(ConfigClient.WoodTextures)
chairSpoof.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
else {
setChairTexture(metadata);
chair.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
}
}
GL11.glPopMatrix();
}
public void setChairTexture(int meta){
TextureManager manager = Minecraft.getMinecraft().getTextureManager();
if(meta == 1)
manager.bindTexture(spruce);
else if(meta == 2)
manager.bindTexture(birch);
else if(meta == 3)
manager.bindTexture(jungle);
else if(meta == 4)
manager.bindTexture(acacia);
else if(meta == 5)
manager.bindTexture(dark_oak);
else
manager.bindTexture(oak);
}
@Override
@@ -8,10 +8,10 @@ import net.minecraft.tileentity.TileEntity;
import noppes.npcs.CustomItems;
import noppes.npcs.blocks.BlockCouchWood;
import noppes.npcs.blocks.tiles.TileCouchWood;
import noppes.npcs.client.model.blocks.ModelCouchWoodLeft;
import noppes.npcs.client.model.blocks.ModelCouchWoodMiddle;
import noppes.npcs.client.model.blocks.ModelCouchWoodRight;
import noppes.npcs.client.model.blocks.ModelCouchWoodSingle;
import noppes.npcs.client.model.blocks.legacy.couch.ModelCouchWoodLeft;
import noppes.npcs.client.model.blocks.legacy.couch.ModelCouchWoodMiddle;
import noppes.npcs.client.model.blocks.legacy.couch.ModelCouchWoodRight;
import noppes.npcs.client.model.blocks.legacy.couch.ModelCouchWoodSingle;
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL12;
@@ -24,7 +24,7 @@ public class BlockCouchWoodRenderer extends BlockRendererInterface{
private final ModelBase modelRight = new ModelCouchWoodRight();
private final ModelBase modelCorner = new ModelCouchWoodSingle();
public BlockCouchWoodRenderer(){
((BlockCouchWood)CustomItems.couchWood).renderId = RenderingRegistry.getNextAvailableRenderId();
RenderingRegistry.registerBlockHandler(this);
@@ -40,7 +40,7 @@ public class BlockCouchWoodRenderer extends BlockRendererInterface{
GL11.glRotatef(180, 0, 0, 1);
GL11.glRotatef(90 * tile.rotation, 0, 1, 0);
GL11.glColor3f(1, 1, 1);
setWoodTexture(var1.getBlockMetadata());
if(tile.hasLeft && tile.hasRight)
model.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
@@ -66,7 +66,7 @@ public class BlockCouchWoodRenderer extends BlockRendererInterface{
setWoodTexture(metadata);
GL11.glColor3f(1, 1, 1);
modelCorner.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
GL11.glPopMatrix();
}
@@ -8,7 +8,7 @@ import net.minecraft.tileentity.TileEntity;
import noppes.npcs.CustomItems;
import noppes.npcs.blocks.BlockCouchWool;
import noppes.npcs.blocks.tiles.TileCouchWool;
import noppes.npcs.client.model.blocks.*;
import noppes.npcs.client.model.blocks.legacy.couch.*;
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL12;
@@ -25,7 +25,7 @@ public class BlockCouchWoolRenderer extends BlockRendererInterface{
private final ModelBase modelCorner = new ModelCouchCorner();
private final ModelBase modelCorner2 = new ModelCouchCornerWool();
public BlockCouchWoolRenderer(){
((BlockCouchWool)CustomItems.couchWool).renderId = RenderingRegistry.getNextAvailableRenderId();
RenderingRegistry.registerBlockHandler(this);
@@ -41,7 +41,7 @@ public class BlockCouchWoolRenderer extends BlockRendererInterface{
GL11.glRotatef(180, 0, 0, 1);
GL11.glRotatef(90 * tile.rotation, 0, 1, 0);
GL11.glColor3f(1, 1, 1);
setWoodTexture(var1.getBlockMetadata());
if(tile.hasCornerLeft)
modelCorner.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
@@ -24,16 +24,13 @@ public abstract class BlockRendererInterface extends TileEntitySpecialRenderer i
protected static final ResourceLocation PlanksAcacia = new ResourceLocation("customnpcs","textures/cache/planks_acacia.png");
protected static final ResourceLocation PlanksJungle = new ResourceLocation("customnpcs","textures/cache/planks_jungle.png");
protected static final ResourceLocation MCPlanksOak = new ResourceLocation("customnpcs","textures/cache/planks_oak.png");
protected static final ResourceLocation MCPlanksBigOak = new ResourceLocation("customnpcs","textures/cache/planks_big_oak.png");
protected static final ResourceLocation MCPlanksSpruce = new ResourceLocation("customnpcs","textures/cache/planks_spruce.png");
protected static final ResourceLocation MCPlanksBirch = new ResourceLocation("customnpcs","textures/cache/planks_birch.png");
protected static final ResourceLocation MCPlanksAcacia = new ResourceLocation("customnpcs","textures/cache/planks_acacia.png");
protected static final ResourceLocation MCPlanksJungle = new ResourceLocation("customnpcs","textures/cache/planks_jungle.png");
protected static final ResourceLocation Steel = new ResourceLocation("customnpcs","textures/models/Steel.png");
protected static final RenderItem renderer = new RenderItem();
protected static final ResourceLocation Logs = new ResourceLocation("textures/blocks/log_oak.png");
protected static final ResourceLocation Cobble = new ResourceLocation("textures/blocks/cobblestone.png");
protected static final ResourceLocation Flame = new ResourceLocation("customnpcs","textures/models/flame.png");
protected static final RenderItem renderer = new RenderItem();
public static float colorTable[][] = {
{
@@ -111,22 +108,6 @@ public abstract class BlockRendererInterface extends TileEntitySpecialRenderer i
manager.bindTexture(PlanksOak);
}
public void setDefaultWoodTexture(int meta){
TextureManager manager = Minecraft.getMinecraft().getTextureManager();
if(meta == 1)
manager.bindTexture(PlanksSpruce);
else if(meta == 2)
manager.bindTexture(PlanksBirch);
else if(meta == 3)
manager.bindTexture(PlanksJungle);
else if(meta == 4)
manager.bindTexture(PlanksAcacia);
else if(meta == 5)
manager.bindTexture(PlanksBigOak);
else
manager.bindTexture(PlanksOak);
}
public static void setMaterialTexture(int meta){
TextureManager manager = Minecraft.getMinecraft().getTextureManager();
if(meta == 1)
@@ -2,19 +2,32 @@ package noppes.npcs.client.renderer.blocks;
import cpw.mods.fml.client.registry.RenderingRegistry;
import net.minecraft.block.Block;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.texture.TextureManager;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ResourceLocation;
import noppes.npcs.CustomItems;
import noppes.npcs.blocks.BlockStool;
import noppes.npcs.blocks.tiles.TileColorable;
import noppes.npcs.client.model.blocks.ModelStool;
import noppes.npcs.client.model.blocks.legacy.ModelLegacyStool;
import noppes.npcs.config.ConfigClient;
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL12;
public class BlockStoolRenderer extends BlockRendererInterface{
private final ModelStool model = new ModelStool();
private final ModelLegacyStool legacyStool = new ModelLegacyStool();
private final ModelStool stool = new ModelStool();
private static final ResourceLocation oak = new ResourceLocation("customnpcs","textures/models/stool/oak.png");
private static final ResourceLocation spruce = new ResourceLocation("customnpcs","textures/models/stool/spruce.png");
private static final ResourceLocation birch = new ResourceLocation("customnpcs","textures/models/stool/birch.png");
private static final ResourceLocation jungle = new ResourceLocation("customnpcs","textures/models/stool/jungle.png");
private static final ResourceLocation dark_oak = new ResourceLocation("customnpcs","textures/models/stool/dark_oak.png");
private static final ResourceLocation acacia = new ResourceLocation("customnpcs","textures/models/stool/acacia.png");
public BlockStoolRenderer(){
((BlockStool)CustomItems.stool).renderId = RenderingRegistry.getNextAvailableRenderId();
RenderingRegistry.registerBlockHandler(this);
@@ -25,13 +38,27 @@ public class BlockStoolRenderer extends BlockRendererInterface{
TileColorable tile = (TileColorable) var1;
GL11.glDisable(GL12.GL_RESCALE_NORMAL);
GL11.glPushMatrix();
GL11.glTranslatef((float)var2 + 0.5f, (float)var4 + 1.68f, (float)var6 + 0.5f);
GL11.glTranslatef((float)var2 + 0.5f, (float)var4 + 1.65f, (float)var6 + 0.5f);
GL11.glScalef(1.2f, 1.1f, 1.2f);
GL11.glRotatef(180, 0, 0, 1);
GL11.glColor3f(1, 1, 1);
setWoodTexture(var1.getBlockMetadata());
model.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
GL11.glEnable(GL11.GL_ALPHA_TEST);
if(ConfigClient.LegacyStool){
setWoodTexture(var1.getBlockMetadata());
legacyStool.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
}
else {
if(ConfigClient.WoodTextures) {
setWoodTexture(var1.getBlockMetadata());
}
else {
setStoolTexture(var1.getBlockMetadata());
}
stool.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
}
GL11.glDisable(GL11.GL_ALPHA_TEST);
GL11.glPopMatrix();
}
@@ -44,13 +71,36 @@ public class BlockStoolRenderer extends BlockRendererInterface{
GL11.glRotatef(180, 0, 0, 1);
GL11.glRotatef(180, 0, 1, 0);
setWoodTexture(metadata);
GL11.glColor3f(1, 1, 1);
model.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
if(ConfigClient.LegacyStool){
setWoodTexture(metadata);
GL11.glColor3f(1, 1, 1);
legacyStool.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
}
else {
setStoolTexture(metadata);
GL11.glColor3f(1, 1, 1);
stool.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
}
GL11.glPopMatrix();
}
public void setStoolTexture(int meta){
TextureManager manager = Minecraft.getMinecraft().getTextureManager();
if(meta == 1)
manager.bindTexture(spruce);
else if(meta == 2)
manager.bindTexture(birch);
else if(meta == 3)
manager.bindTexture(jungle);
else if(meta == 4)
manager.bindTexture(acacia);
else if(meta == 5)
manager.bindTexture(dark_oak);
else
manager.bindTexture(oak);
}
@Override
public int getRenderId() {
return CustomItems.stool.getRenderType();
@@ -2,8 +2,6 @@ package noppes.npcs.client.renderer.blocks;
import cpw.mods.fml.client.registry.RenderingRegistry;
import net.minecraft.block.Block;
import net.minecraft.block.BlockColored;
import net.minecraft.block.material.MapColor;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.OpenGlHelper;
import net.minecraft.client.renderer.RenderBlocks;
@@ -13,19 +11,26 @@ import net.minecraft.init.Blocks;
import net.minecraft.item.*;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.IIcon;
import net.minecraft.util.MathHelper;
import net.minecraft.util.ResourceLocation;
import noppes.npcs.CustomItems;
import noppes.npcs.blocks.BlockWallBanner;
import noppes.npcs.blocks.tiles.TileWallBanner;
import noppes.npcs.client.model.blocks.ModelWallBanner;
import noppes.npcs.client.model.blocks.ModelWallBannerFlag;
import noppes.npcs.client.model.blocks.banner.ModelBannerWall;
import noppes.npcs.client.model.blocks.banner.ModelBannerWallFlag;
import noppes.npcs.client.model.blocks.legacy.ModelLegacyWallBanner;
import noppes.npcs.client.model.blocks.legacy.ModelLegacyWallBannerFlag;
import noppes.npcs.config.ConfigClient;
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL12;
public class BlockWallBannerRenderer extends BlockRendererInterface{
private final ModelWallBanner model = new ModelWallBanner();
private final ModelWallBannerFlag flag = new ModelWallBannerFlag();
private final ModelLegacyWallBanner modelLegacyWallBanner = new ModelLegacyWallBanner();
private final ModelLegacyWallBannerFlag modelLegacyWallBannerFlag = new ModelLegacyWallBannerFlag();
private final ModelBannerWall model = new ModelBannerWall();
private final ModelBannerWallFlag flag = new ModelBannerWallFlag();
public BlockWallBannerRenderer(){
((BlockWallBanner)CustomItems.wallBanner).renderId = RenderingRegistry.getNextAvailableRenderId();
@@ -44,29 +49,66 @@ public class BlockWallBannerRenderer extends BlockRendererInterface{
GL11.glRotatef(180, 0, 0, 1);
GL11.glRotatef(90 * tile.rotation, 0, 1, 0);
setMaterialTexture(var1.getBlockMetadata());
GL11.glColor3f(1, 1, 1);
model.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
if(ConfigClient.LegacyBanner){
setMaterialTexture(var1.getBlockMetadata());
GL11.glColor3f(1, 1, 1);
modelLegacyWallBanner.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
this.bindTexture(BlockBannerRenderer.resourceFlag);
float[] color = BlockBannerRenderer.colorTable[tile.color];
GL11.glColor3f(color[0], color[1], color[2]);
flag.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
this.bindTexture(BlockBannerRenderer.legacyFlagResource);
float[] color = BlockBannerRenderer.colorTable[tile.color];
GL11.glColor3f(color[0], color[1], color[2]);
modelLegacyWallBannerFlag.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
GL11.glPopMatrix();
GL11.glColor3f(1, 1, 1);
if(tile.icon != null && !this.playerTooFar(tile)){
doRender(var2, var4, var6, tile.rotation, tile.icon);
GL11.glPopMatrix();
GL11.glColor3f(1, 1, 1);
if(tile.icon != null && !this.playerTooFar(tile)){
doRender(var2, var4, var6, tile.rotation, tile.icon, 0);
}
}
else {
long worldTime = tile.getWorldObj() != null ? tile.getWorldObj().getTotalWorldTime() : 0;
// 100 is one full revolution, so we can just mod by 100 without affecting the result
int animationProgress100 = (((tile.xCoord % 100) * 7 + (tile.yCoord % 100) * 9 + (tile.zCoord % 100) * 13) + (int) (worldTime % 100)) % 100;
float f3 = (float) animationProgress100 + var8;
float angle_x = (-0.0125F + 0.01F * MathHelper.cos(f3 * 0.01F * 2F * (float) Math.PI)) * (float) Math.PI;
flag.BannerFlag.rotateAngleX = angle_x;
BlockBannerRenderer.setBannerMaterial(var1.getBlockMetadata());
model.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
BlockBannerRenderer.setFlagType(tile.variant);
float[] color = colorTable[tile.color];
GL11.glPushMatrix();
GL11.glColor3f(color[0], color[1], color[2]);
flag.render(null, 0, 0, 0, f3, 0.0F, 0.0625F);
GL11.glPopMatrix();
GL11.glPopMatrix();
GL11.glColor3f(1, 1, 1);
if(tile.icon != null && !this.playerTooFar(tile)){
doRender(var2, var4, var6, tile.rotation, tile.icon, angle_x);
}
}
}
public void doRender(double par2, double par4, double par6, int meta, ItemStack iicon)
public void doRender(double par2, double par4, double par6, int meta, ItemStack iicon, float rotate)
{
GL11.glPushMatrix();
bindTexture(TextureMap.locationItemsTexture);
GL11.glTranslatef((float)par2 + 0.5f, (float)par4 +0.2f, (float)par6 + 0.5f);
GL11.glTranslatef((float)par2 + 0.5f, (float)par4 + 0.2f, (float)par6 + 0.5f);
GL11.glRotatef(180, 0, 0, 1);
GL11.glRotatef(90 * meta, 0, 1, 0);
GL11.glTranslatef(0, 0, 0.26f);
if(ConfigClient.LegacyBanner){
GL11.glTranslatef(0, 0, 0.26f);
}
else {
GL11.glTranslatef(0, 0, 0.3f);
GL11.glTranslatef(0, -0.6f, 0); // Translate to pivot point
GL11.glRotatef((float) Math.toDegrees(rotate), 1, 0, 0); // Apply sway rotation
GL11.glTranslatef(0, 0.6f, 0); // Translate to pivot point
}
GL11.glDepthMask(false);
float f2 = 0.05f;
Minecraft mc = Minecraft.getMinecraft();
@@ -150,14 +192,25 @@ public class BlockWallBannerRenderer extends BlockRendererInterface{
GL11.glRotatef(180, 0, 0, 1);
GL11.glRotatef(180, 0, 1, 0);
setMaterialTexture(metadata);
GL11.glColor3f(1, 1, 1);
model.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
if(ConfigClient.LegacyBanner){
setMaterialTexture(metadata);
GL11.glColor3f(1, 1, 1);
modelLegacyWallBanner.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
this.bindTexture(BlockBannerRenderer.resourceFlag);
float[] color = BlockBannerRenderer.colorTable[15 - metadata];
GL11.glColor3f(color[0], color[1], color[2]);
flag.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
this.bindTexture(BlockBannerRenderer.legacyFlagResource);
float[] color = BlockBannerRenderer.colorTable[15 - metadata];
GL11.glColor3f(color[0], color[1], color[2]);
modelLegacyWallBannerFlag.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
}
else {
BlockBannerRenderer.setBannerMaterial(metadata);
model.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
this.bindTexture(BlockBannerRenderer.normalFlag);
float[] color = colorTable[15 - metadata];
GL11.glColor3f(color[0], color[1], color[2]);
flag.render(null, 0, 0, 0, 0, 0.0F, 0.0625F);
}
GL11.glPopMatrix();
}
@@ -16,6 +16,8 @@ public class ConfigClient
public final static String GENERAL = "General";
public final static String VISUAL = "Visual";
public final static String QUESTING = "Questing";
public final static String MODEL = "Model";
public final static String TEXTURE = "Texture";
/**
@@ -72,6 +74,21 @@ public class ConfigClient
public static Property BannerAlertsProperty;
public static boolean BannerAlerts = true;
/**
* Texture Properties
**/
public static boolean WoodTextures = false;
/**
* Model Properties
**/
public static boolean LegacyCampfire = false;
public static boolean LegacyBanner = false;
public static boolean LegacyChair = false;
public static boolean LegacyStool = false;
public static boolean LegacyBarrel = false;
public static boolean LegacyCarpentryBench = false;
public static void init(File configFile)
{
config = new Configuration(configFile);
@@ -128,6 +145,15 @@ public class ConfigClient
BannerAlertsProperty = config.get(VISUAL, "All Banner Alerts", true, "Universal enable/disable for Banner Alerts");
BannerAlerts = BannerAlertsProperty.getBoolean(true);
WoodTextures = config.get(TEXTURE, "Wood Textures", false, "Models like Chairs and Stools will use default MC Wood Textures").getBoolean(false);
LegacyCampfire = config.get(MODEL, "Legacy Campfire Model", false).getBoolean(false);
LegacyBanner = config.get(MODEL, "Legacy Banner Model", false).getBoolean(false);
LegacyBarrel = config.get(MODEL, "Legacy Barrel Model", false).getBoolean(false);
LegacyChair = config.get(MODEL, "Legacy Chair Model", false).getBoolean(false);
LegacyStool = config.get(MODEL, "Legacy Stool Model", false).getBoolean(false);
LegacyCarpentryBench = config.get(MODEL, "Legacy Carpentry Bench Model", false).getBoolean(false);
// Convert to Legacy
if(CustomNpcs.legacyExist){
EnableChatBubbles = LegacyConfig.EnableChatBubbles;
@@ -0,0 +1,5 @@
package noppes.npcs.constants;
public enum EnumBannerVariant {
Normal, Curved, Pointy, Triangle, Torn
}
@@ -18,7 +18,7 @@ public class RecipesDefault {
item = new ItemStack((Block)ob);
else
item = (ItemStack) ob;
RecipeCarpentry recipeAnvil = new RecipeCarpentry(name);
recipeAnvil.isGlobal = isGlobal;
recipeAnvil = RecipeCarpentry.saveRecipe(recipeAnvil, item, recipe);
@@ -29,7 +29,7 @@ public class RecipesDefault {
addRecipe("Npc Wand", CustomItems.wand, true, "XX"," Y"," Y",'X', Items.bread,'Y', Items.stick);
addRecipe("Mob Cloner", CustomItems.cloner, true, "XX","XY"," Y",'X', Items.bread,'Y', Items.stick);
addRecipe("Carpentry Bench", CustomItems.carpentyBench, true, "XYX","Z Z","Z Z", 'X', Blocks.planks, 'Z', Items.stick, 'Y', Blocks.crafting_table);
if(!ConfigMain.DisableExtraItems){
addRecipe("Mana", CustomItems.mana, true, "XY",'X',Items.redstone,'Y',Items.glowstone_dust);
addRecipe("Gun Wooden", CustomItems.gunWood, false, "XXXY"," ZM "," M ",'Y', Blocks.lever, 'M', Items.stick, 'Z', Blocks.stone_button,'X', Blocks.planks);
@@ -39,7 +39,7 @@ public class RecipesDefault {
addRecipe("Gun Diamond", CustomItems.gunDiamond, false, "XXXY"," ZM "," M ",'Y', Blocks.lever, 'M', Items.stick, 'Z', Blocks.stone_button,'X', Items.diamond);
addRecipe("Gun Emerald", CustomItems.gunEmerald, false, "XXXY"," ZM "," M ",'Y', Blocks.lever, 'M', Items.stick, 'Z', Blocks.stone_button,'X', Items.emerald);
addRecipe("Gun Bronze", CustomItems.gunBronze, false, "XXXY"," ZM "," M ",'Y', Blocks.lever, 'M', Items.stick, 'Z', Blocks.stone_button,'X', CustomItems.bronze_ingot);
addRecipe("Bullet Wooden", CustomItems.bulletWood, true, "X",'X', Blocks.planks);
addRecipe("Bullet Stone", CustomItems.bulletStone, true, "X",'X', Blocks.cobblestone);
addRecipe("Bullet Iron", CustomItems.bulletIron, true, "X",'X', Items.iron_ingot);
@@ -56,96 +56,96 @@ public class RecipesDefault {
addRecipe("WallBanner Iron", new ItemStack(CustomItems.wallBanner, 1, 2), false, "XXX","ZZZ","ZZZ","Z Z",'Z', Blocks.wool, 'X', Items.iron_ingot);
addRecipe("WallBanner Gold", new ItemStack(CustomItems.wallBanner, 1, 3), false, "XXX","ZZZ","ZZZ","Z Z",'Z', Blocks.wool, 'X', Items.gold_ingot);
addRecipe("WallBanner Diamond", new ItemStack(CustomItems.wallBanner, 1, 4), false, "XXX","ZZZ","ZZZ","Z Z",'Z', Blocks.wool, 'X', Items.diamond);
addRecipe("Banner Wooden", new ItemStack(CustomItems.banner, 1, 0), false, " X "," Z "," Z ","ZZZ", 'X', new ItemStack(CustomItems.wallBanner,1,0), 'Z', Blocks.planks);
addRecipe("Banner Stone", new ItemStack(CustomItems.banner, 1, 1), false, " X "," Z "," Z ","ZZZ", 'X', new ItemStack(CustomItems.wallBanner,1,1), 'Z', Blocks.cobblestone);
addRecipe("Banner Iron", new ItemStack(CustomItems.banner, 1, 2), false, " X "," Z "," Z ","ZZZ", 'X', new ItemStack(CustomItems.wallBanner,1,2), 'Z', Items.iron_ingot);
addRecipe("Banner Gold", new ItemStack(CustomItems.banner, 1, 3), false, " X "," Z "," Z ","ZZZ", 'X', new ItemStack(CustomItems.wallBanner,1,3), 'Z', Items.gold_ingot);
addRecipe("Banner Diamond", new ItemStack(CustomItems.banner, 1, 4), false, " X "," Z "," Z ","ZZZ", 'X', new ItemStack(CustomItems.wallBanner,1,4), 'Z', Items.diamond);
addRecipe("Lamp Wooden", new ItemStack(CustomItems.tallLamp, 1, 0), false, "YXY"," Z "," Z ","ZZZ", 'X', Blocks.torch, 'Y', Blocks.wool, 'Z', Blocks.planks);
addRecipe("Lamp Stone", new ItemStack(CustomItems.tallLamp, 1, 1), false, "YXY"," Z "," Z ","ZZZ", 'X', Blocks.torch, 'Y', Blocks.wool, 'Z', Blocks.cobblestone);
addRecipe("Lamp Iron", new ItemStack(CustomItems.tallLamp, 1, 2), false, "YXY"," Z "," Z ","ZZZ", 'X', Blocks.torch, 'Y', Blocks.wool, 'Z', Items.iron_ingot);
addRecipe("Lamp Gold", new ItemStack(CustomItems.tallLamp, 1, 3), false, "YXY"," Z "," Z ","ZZZ", 'X', Blocks.torch, 'Y', Blocks.wool, 'Z', Items.gold_ingot);
addRecipe("Lamp Diamond", new ItemStack(CustomItems.tallLamp, 1, 4), false, "YXY"," Z "," Z ","ZZZ", 'X', Blocks.torch, 'Y', Blocks.wool, 'Z', Items.diamond);
addRecipe("Chair Wooden1", new ItemStack(CustomItems.chair, 1, 0), false, " X", " X","XXX","X X", 'X', new ItemStack(Blocks.planks,1,0));
addRecipe("Chair Wooden2", new ItemStack(CustomItems.chair, 1, 1), false, " X", " X","XXX","X X", 'X', new ItemStack(Blocks.planks,1,1));
addRecipe("Chair Wooden3", new ItemStack(CustomItems.chair, 1, 2), false, " X", " X","XXX","X X", 'X', new ItemStack(Blocks.planks,1,2));
addRecipe("Chair Wooden4", new ItemStack(CustomItems.chair, 1, 3), false, " X", " X","XXX","X X", 'X', new ItemStack(Blocks.planks,1,3));
addRecipe("Chair Wooden5", new ItemStack(CustomItems.chair, 1, 4), false, " X", " X","XXX","X X", 'X', new ItemStack(Blocks.planks,1,4));
addRecipe("Chair Wooden6", new ItemStack(CustomItems.chair, 1, 5), false, " X", " X","XXX","X X", 'X', new ItemStack(Blocks.planks,1,5));
addRecipe("Crate Wooden1", new ItemStack(CustomItems.crate, 1, 0), false, "XXXX","X X","X X","XXXX", 'X', new ItemStack(Blocks.planks,1,0));
addRecipe("Crate Wooden2", new ItemStack(CustomItems.crate, 1, 1), false, "XXXX","X X","X X","XXXX", 'X', new ItemStack(Blocks.planks,1,1));
addRecipe("Crate Wooden3", new ItemStack(CustomItems.crate, 1, 2), false, "XXXX","X X","X X","XXXX", 'X', new ItemStack(Blocks.planks,1,2));
addRecipe("Crate Wooden4", new ItemStack(CustomItems.crate, 1, 3), false, "XXXX","X X","X X","XXXX", 'X', new ItemStack(Blocks.planks,1,3));
addRecipe("Crate Wooden5", new ItemStack(CustomItems.crate, 1, 4), false, "XXXX","X X","X X","XXXX", 'X', new ItemStack(Blocks.planks,1,4));
addRecipe("Crate Wooden6", new ItemStack(CustomItems.crate, 1, 5), false, "XXXX","X X","X X","XXXX", 'X', new ItemStack(Blocks.planks,1,5));
addRecipe("WeaponRack Wooden1", new ItemStack(CustomItems.weaponsRack, 1, 0), false, "XXX","XYX","XYX","XXX", 'X', new ItemStack(Blocks.planks,1,0),'Y', Items.stick);
addRecipe("WeaponRack Wooden2", new ItemStack(CustomItems.weaponsRack, 1, 1), false, "XXX","XYX","XYX","XXX", 'X', new ItemStack(Blocks.planks,1,1),'Y', Items.stick);
addRecipe("WeaponRack Wooden3", new ItemStack(CustomItems.weaponsRack, 1, 2), false, "XXX","XYX","XYX","XXX", 'X', new ItemStack(Blocks.planks,1,2),'Y', Items.stick);
addRecipe("WeaponRack Wooden4", new ItemStack(CustomItems.weaponsRack, 1, 3), false, "XXX","XYX","XYX","XXX", 'X', new ItemStack(Blocks.planks,1,3),'Y', Items.stick);
addRecipe("WeaponRack Wooden5", new ItemStack(CustomItems.weaponsRack, 1, 4), false, "XXX","XYX","XYX","XXX", 'X', new ItemStack(Blocks.planks,1,4),'Y', Items.stick);
addRecipe("WeaponRack Wooden6", new ItemStack(CustomItems.weaponsRack, 1, 5), false, "XXX","XYX","XYX","XXX", 'X', new ItemStack(Blocks.planks,1,5),'Y', Items.stick);
addRecipe("Couch Wooden1", new ItemStack(CustomItems.couchWood, 1, 0), false, " X"," X","XXXX","X X", 'X', new ItemStack(Blocks.planks,1,0));
addRecipe("Couch Wooden2", new ItemStack(CustomItems.couchWood, 1, 1), false, " X"," X","XXXX","X X", 'X', new ItemStack(Blocks.planks,1,1));
addRecipe("Couch Wooden3", new ItemStack(CustomItems.couchWood, 1, 2), false, " X"," X","XXXX","X X", 'X', new ItemStack(Blocks.planks,1,2));
addRecipe("Couch Wooden4", new ItemStack(CustomItems.couchWood, 1, 3), false, " X"," X","XXXX","X X", 'X', new ItemStack(Blocks.planks,1,3));
addRecipe("Couch Wooden5", new ItemStack(CustomItems.couchWood, 1, 4), false, " X"," X","XXXX","X X", 'X', new ItemStack(Blocks.planks,1,4));
addRecipe("Couch Wooden6", new ItemStack(CustomItems.couchWood, 1, 5), false, " X"," X","XXXX","X X", 'X', new ItemStack(Blocks.planks,1,5));
addRecipe("Couch Wool1", new ItemStack(CustomItems.couchWool, 1, 0), false, " Z", " Z","ZZZZ","X X", 'X', new ItemStack(Blocks.planks,1,0), 'Z', Blocks.wool);
addRecipe("Couch Wool2", new ItemStack(CustomItems.couchWool, 1, 1), false, " Z", " Z","ZZZZ","X X", 'X', new ItemStack(Blocks.planks,1,1), 'Z', Blocks.wool);
addRecipe("Couch Wool3", new ItemStack(CustomItems.couchWool, 1, 2), false, " Z", " Z","ZZZZ","X X", 'X', new ItemStack(Blocks.planks,1,2), 'Z', Blocks.wool);
addRecipe("Couch Wool4", new ItemStack(CustomItems.couchWool, 1, 3), false, " Z", " Z","ZZZZ","X X", 'X', new ItemStack(Blocks.planks,1,3), 'Z', Blocks.wool);
addRecipe("Couch Wool5", new ItemStack(CustomItems.couchWool, 1, 4), false, " Z", " Z","ZZZZ","X X", 'X', new ItemStack(Blocks.planks,1,4), 'Z', Blocks.wool);
addRecipe("Couch Wool6", new ItemStack(CustomItems.couchWool, 1, 5), false, " Z", " Z","ZZZZ","X X", 'X', new ItemStack(Blocks.planks,1,5), 'Z', Blocks.wool);
addRecipe("Table Wood1", new ItemStack(CustomItems.table, 1, 0), false, "XXXX","X X","X X", 'X', new ItemStack(Blocks.planks,1,0), 'Z', Blocks.wool);
addRecipe("Table Wood2", new ItemStack(CustomItems.table, 1, 1), false, "XXXX","X X","X X", 'X', new ItemStack(Blocks.planks,1,1), 'Z', Blocks.wool);
addRecipe("Table Wood3", new ItemStack(CustomItems.table, 1, 2), false, "XXXX","X X","X X", 'X', new ItemStack(Blocks.planks,1,2), 'Z', Blocks.wool);
addRecipe("Table Wood4", new ItemStack(CustomItems.table, 1, 3), false, "XXXX","X X","X X", 'X', new ItemStack(Blocks.planks,1,3), 'Z', Blocks.wool);
addRecipe("Table Wood5", new ItemStack(CustomItems.table, 1, 4), false, "XXXX","X X","X X", 'X', new ItemStack(Blocks.planks,1,4), 'Z', Blocks.wool);
addRecipe("Table Wood6", new ItemStack(CustomItems.table, 1, 5), false, "XXXX","X X","X X", 'X', new ItemStack(Blocks.planks,1,5), 'Z', Blocks.wool);
addRecipe("Stool Wood1", new ItemStack(CustomItems.stool, 1, 0), false, "XXX"," X ","X X", 'X', new ItemStack(Blocks.planks,1,0));
addRecipe("Stool Wood2", new ItemStack(CustomItems.stool, 1, 1), false, "XXX"," X ","X X", 'X', new ItemStack(Blocks.planks,1,1));
addRecipe("Stool Wood3", new ItemStack(CustomItems.stool, 1, 2), false, "XXX"," X ","X X", 'X', new ItemStack(Blocks.planks,1,2));
addRecipe("Stool Wood4", new ItemStack(CustomItems.stool, 1, 3), false, "XXX"," X ","X X", 'X', new ItemStack(Blocks.planks,1,3));
addRecipe("Stool Wood5", new ItemStack(CustomItems.stool, 1, 4), false, "XXX"," X ","X X", 'X', new ItemStack(Blocks.planks,1,4));
addRecipe("Stool Wood6", new ItemStack(CustomItems.stool, 1, 5), false, "XXX"," X ","X X", 'X', new ItemStack(Blocks.planks,1,5));
addRecipe("noppes.npcs.client.model.blocks.Stool Wood1", new ItemStack(CustomItems.stool, 1, 0), false, "XXX"," X ","X X", 'X', new ItemStack(Blocks.planks,1,0));
addRecipe("noppes.npcs.client.model.blocks.Stool Wood2", new ItemStack(CustomItems.stool, 1, 1), false, "XXX"," X ","X X", 'X', new ItemStack(Blocks.planks,1,1));
addRecipe("noppes.npcs.client.model.blocks.Stool Wood3", new ItemStack(CustomItems.stool, 1, 2), false, "XXX"," X ","X X", 'X', new ItemStack(Blocks.planks,1,2));
addRecipe("noppes.npcs.client.model.blocks.Stool Wood4", new ItemStack(CustomItems.stool, 1, 3), false, "XXX"," X ","X X", 'X', new ItemStack(Blocks.planks,1,3));
addRecipe("noppes.npcs.client.model.blocks.Stool Wood5", new ItemStack(CustomItems.stool, 1, 4), false, "XXX"," X ","X X", 'X', new ItemStack(Blocks.planks,1,4));
addRecipe("noppes.npcs.client.model.blocks.Stool Wood6", new ItemStack(CustomItems.stool, 1, 5), false, "XXX"," X ","X X", 'X', new ItemStack(Blocks.planks,1,5));
addRecipe("Barrel Wood1", new ItemStack(CustomItems.barrel, 1, 0), false, "XXX","X X","X X", "XXX", 'X', new ItemStack(Blocks.planks,1,0));
addRecipe("Barrel Wood2", new ItemStack(CustomItems.barrel, 1, 1), false, "XXX","X X","X X", "XXX", 'X', new ItemStack(Blocks.planks,1,1));
addRecipe("Barrel Wood3", new ItemStack(CustomItems.barrel, 1, 2), false, "XXX","X X","X X", "XXX", 'X', new ItemStack(Blocks.planks,1,2));
addRecipe("Barrel Wood4", new ItemStack(CustomItems.barrel, 1, 3), false, "XXX","X X","X X", "XXX", 'X', new ItemStack(Blocks.planks,1,3));
addRecipe("Barrel Wood5", new ItemStack(CustomItems.barrel, 1, 4), false, "XXX","X X","X X", "XXX", 'X', new ItemStack(Blocks.planks,1,4));
addRecipe("Barrel Wood6", new ItemStack(CustomItems.barrel, 1, 5), false, "XXX","X X","X X", "XXX", 'X', new ItemStack(Blocks.planks,1,5));
addRecipe("Shelf Wood1", new ItemStack(CustomItems.shelf, 2, 0), false, "XXX","XY ","X ", 'Y', Items.stick, 'X', new ItemStack(Blocks.planks,1,0));
addRecipe("Shelf Wood2", new ItemStack(CustomItems.shelf, 2, 1), false, "XXX","XY ","X ", 'Y', Items.stick, 'X', new ItemStack(Blocks.planks,1,1));
addRecipe("Shelf Wood3", new ItemStack(CustomItems.shelf, 2, 2), false, "XXX","XY ","X ", 'Y', Items.stick, 'X', new ItemStack(Blocks.planks,1,2));
addRecipe("Shelf Wood4", new ItemStack(CustomItems.shelf, 2, 3), false, "XXX","XY ","X ", 'Y', Items.stick, 'X', new ItemStack(Blocks.planks,1,3));
addRecipe("Shelf Wood5", new ItemStack(CustomItems.shelf, 2, 4), false, "XXX","XY ","X ", 'Y', Items.stick, 'X', new ItemStack(Blocks.planks,1,4));
addRecipe("Shelf Wood6", new ItemStack(CustomItems.shelf, 2, 5), false, "XXX","XY ","X ", 'Y', Items.stick, 'X', new ItemStack(Blocks.planks,1,5));
addRecipe("Beam Wood1", new ItemStack(CustomItems.beam, 2, 0), false, "XXX", "XXX", 'X', new ItemStack(Blocks.planks,1,0));
addRecipe("Beam Wood2", new ItemStack(CustomItems.beam, 2, 1), false, "XXX", "XXX", 'X', new ItemStack(Blocks.planks,1,1));
addRecipe("Beam Wood3", new ItemStack(CustomItems.beam, 2, 2), false, "XXX", "XXX", 'X', new ItemStack(Blocks.planks,1,2));
addRecipe("Beam Wood4", new ItemStack(CustomItems.beam, 2, 3), false, "XXX", "XXX", 'X', new ItemStack(Blocks.planks,1,3));
addRecipe("Beam Wood5", new ItemStack(CustomItems.beam, 2, 4), false, "XXX", "XXX", 'X', new ItemStack(Blocks.planks,1,4));
addRecipe("Beam Wood6", new ItemStack(CustomItems.beam, 2, 5), false, "XXX", "XXX", 'X', new ItemStack(Blocks.planks,1,5));
addRecipe("Sign Wood1", new ItemStack(CustomItems.sign, 1, 0), false, "YYY", "XXX", "XXX", 'X', new ItemStack(Blocks.planks,1,0), 'Y', Items.iron_ingot);
addRecipe("Sign Wood2", new ItemStack(CustomItems.sign, 1, 1), false, "YYY", "XXX", "XXX", 'X', new ItemStack(Blocks.planks,1,1), 'Y', Items.iron_ingot);
addRecipe("Sign Wood3", new ItemStack(CustomItems.sign, 1, 2), false, "YYY", "XXX", "XXX", 'X', new ItemStack(Blocks.planks,1,2), 'Y', Items.iron_ingot);
addRecipe("Sign Wood4", new ItemStack(CustomItems.sign, 1, 3), false, "YYY", "XXX", "XXX", 'X', new ItemStack(Blocks.planks,1,3), 'Y', Items.iron_ingot);
addRecipe("Sign Wood5", new ItemStack(CustomItems.sign, 1, 4), false, "YYY", "XXX", "XXX", 'X', new ItemStack(Blocks.planks,1,4), 'Y', Items.iron_ingot);
addRecipe("Sign Wood6", new ItemStack(CustomItems.sign, 1, 5), false, "YYY", "XXX", "XXX", 'X', new ItemStack(Blocks.planks,1,5), 'Y', Items.iron_ingot);
addRecipe("Lamp", new ItemStack(CustomItems.lamp), false, "XXX","YZY","XXX", 'X', Items.iron_ingot, 'Y', Blocks.glass, 'Z', Blocks.torch);
addRecipe("Candle", new ItemStack(CustomItems.candle), false, "XZX"," X ", 'X', Items.iron_ingot, 'Z', Blocks.torch);
addRecipe("BigSign", new ItemStack(CustomItems.bigsign, 2), false, "XXX","XXX","XXX", 'X', Blocks.planks);
@@ -159,7 +159,7 @@ public class RecipesDefault {
addRecipe("Battle Axe5", CustomItems.battleAxeDiamond, false, "XX","XY"," Y", " Y", 'Y', Items.stick, 'X', Items.diamond);
addRecipe("Battle Axe6", CustomItems.battleAxeBronze, false, "XX","XY"," Y", " Y", 'Y', Items.stick, 'X', CustomItems.bronze_ingot);
addRecipe("Battle Axe7", CustomItems.battleAxeEmerald, false, "XX","XY"," Y", " Y", 'Y', Items.stick, 'X', Items.emerald);
addRecipe("Halberd1", CustomItems.halberdWood, false, " X ","XYX"," Y ", " Y ", 'Y', Items.stick, 'X', Blocks.planks);
addRecipe("Halberd2", CustomItems.halberdStone, false, " X ","XYX"," Y ", " Y ", 'Y', Items.stick, 'X', Blocks.cobblestone);
addRecipe("Halberd3", CustomItems.halberdIron, false, " X ","XYX"," Y ", " Y ", 'Y', Items.stick, 'X', Items.iron_ingot);
@@ -167,7 +167,7 @@ public class RecipesDefault {
addRecipe("Halberd5", CustomItems.halberdDiamond, false, " X ","XYX"," Y ", " Y ", 'Y', Items.stick, 'X', Items.diamond);
addRecipe("Halberd6", CustomItems.halberdBronze, false, " X ","XYX"," Y ", " Y ", 'Y', Items.stick, 'X', CustomItems.bronze_ingot);
addRecipe("Halberd7", CustomItems.halberdEmerald, false, " X ","XYX"," Y ", " Y ", 'Y', Items.stick, 'X', Items.emerald);
addRecipe("Glaive1", CustomItems.glaiveWood, false, "X "," Y "," Y ", " X", 'Y', Items.stick, 'X', Blocks.planks);
addRecipe("Glaive2", CustomItems.glaiveStone, false, "X "," Y "," Y ", " X", 'Y', Items.stick, 'X', Blocks.cobblestone);
addRecipe("Glaive3", CustomItems.glaiveIron, false, "X "," Y "," Y ", " X", 'Y', Items.stick, 'X', Items.iron_ingot);
@@ -175,7 +175,7 @@ public class RecipesDefault {
addRecipe("Glaive5", CustomItems.glaiveDiamond, false, "X "," Y "," Y ", " X", 'Y', Items.stick, 'X', Items.diamond);
addRecipe("Glaive6", CustomItems.glaiveBronze, false, "X "," Y "," Y ", " X", 'Y', Items.stick, 'X', CustomItems.bronze_ingot);
addRecipe("Glaive7", CustomItems.glaiveEmerald, false, "X "," Y "," Y ", " X", 'Y', Items.stick, 'X', Items.emerald);
addRecipe("Trident1", CustomItems.tridentWood, false, "X X"," X "," Y ", " Y ", 'Y', Items.stick, 'X', Blocks.planks);
addRecipe("Trident2", CustomItems.tridentStone, false, "X X"," X "," Y ", " Y ", 'Y', Items.stick, 'X', Blocks.cobblestone);
addRecipe("Trident3", CustomItems.tridentIron, false, "X X"," X "," Y ", " Y ", 'Y', Items.stick, 'X', Items.iron_ingot);
@@ -183,7 +183,7 @@ public class RecipesDefault {
addRecipe("Trident5", CustomItems.tridentDiamond, false, "X X"," X "," Y ", " Y ", 'Y', Items.stick, 'X', Items.diamond);
addRecipe("Trident6", CustomItems.tridentBronze, false, "X X"," X "," Y ", " Y ", 'Y', Items.stick, 'X', CustomItems.bronze_ingot);
addRecipe("Trident7", CustomItems.tridentEmerald, false, "X X"," X "," Y ", " Y ", 'Y', Items.stick, 'X', Items.emerald);
}
}
}