mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-18 03:15:07 +00:00
More asset changes for the art update.
This commit is contained in:
1 parent
7ff0fd2d18
commit
03a96edb44
100 files changed
+143
-178
No files matched your search
@@ -76,46 +76,44 @@ public final class LibResources {
|
||||
public static final String MODEL_PYLON_MANA = PREFIX_MODEL + "pylon_mana.png";
|
||||
public static final String MODEL_PYLON_NATURA = PREFIX_MODEL + "pylon_natura.png";
|
||||
public static final String MODEL_PYLON_GAIA = PREFIX_MODEL + "pylon_gaia.png";
|
||||
public static final String MODEL_LEXICA_DEFAULT = PREFIX_MODEL + "lexica_default.png";
|
||||
public static final String MODEL_LEXICA_ELVEN = PREFIX_MODEL + "lexica_elven.png";
|
||||
public static final String MODEL_LEXICA_DEFAULT = PREFIX_MODEL + "lexicon_default.png";
|
||||
public static final String MODEL_LEXICA_ELVEN = PREFIX_MODEL + "lexicon_elven.png";
|
||||
public static final String MODEL_MANASTEEL_0 = PREFIX_MODEL + "manasteel_0.png";
|
||||
public static final String MODEL_MANASTEEL_1 = PREFIX_MODEL + "manasteel_1.png";
|
||||
public static final String MODEL_MANASTEEL_2 = PREFIX_MODEL + "manasteel_2.png";
|
||||
public static final String MODEL_MANASTEEL_NEW = PREFIX_MODEL + "manasteel_new.png";
|
||||
public static final String MODEL_MANASTEEL_NEW = PREFIX_MODEL + "armor_manasteel.png";
|
||||
public static final String MODEL_TERRASTEEL_0 = PREFIX_MODEL + "terrasteel_0.png";
|
||||
public static final String MODEL_TERRASTEEL_1 = PREFIX_MODEL + "terrasteel_1.png";
|
||||
public static final String MODEL_TERRASTEEL_2 = PREFIX_MODEL + "terrasteel_2.png";
|
||||
public static final String MODEL_TERRASTEEL_NEW = PREFIX_MODEL + "terrasteel_new.png";
|
||||
public static final String MODEL_TERRASTEEL_NEW = PREFIX_MODEL + "armor_terrasteel.png";
|
||||
public static final String MODEL_ELEMENTIUM_0 = PREFIX_MODEL + "elementium_0.png";
|
||||
public static final String MODEL_ELEMENTIUM_1 = PREFIX_MODEL + "elementium_1.png";
|
||||
public static final String MODEL_ELEMENTIUM_2 = PREFIX_MODEL + "elementium_2.png";
|
||||
public static final String MODEL_ELEMENTIUM_NEW = PREFIX_MODEL + "elementium_new.png";
|
||||
public static final String MODEL_ELEMENTIUM_NEW = PREFIX_MODEL + "armor_elementium.png";
|
||||
public static final String MODEL_MANAWEAVE_0 = PREFIX_MODEL + "manaweave_0.png";
|
||||
public static final String MODEL_MANAWEAVE_1 = PREFIX_MODEL + "manaweave_1.png";
|
||||
public static final String MODEL_MANAWEAVE_NEW = PREFIX_MODEL + "manaweave_new.png";
|
||||
public static final String MODEL_MANAWEAVE_NEW_HOLIDAY = PREFIX_MODEL + "manaweave_new_holiday.png";
|
||||
public static final String MODEL_MANAWEAVE_NEW = PREFIX_MODEL + "armor_manaweave.png";
|
||||
public static final String MODEL_MANAWEAVE_NEW_HOLIDAY = PREFIX_MODEL + "armor_manaweave_holiday.png";
|
||||
public static final String MODEL_PIXIE = PREFIX_MODEL + "pixie.png";
|
||||
public static final String MODEL_PIXIE_HALLOWEEN = PREFIX_MODEL + "pixie_halloween.png";
|
||||
public static final String MODEL_TINY_POTATO = PREFIX_MODEL + "tiny_potato.png";
|
||||
public static final String MODEL_TINY_POTATO_GS = PREFIX_MODEL + "tiny_potato_gray.png";
|
||||
public static final String MODEL_TINY_POTATO_HALLOWEEN = PREFIX_MODEL + "tiny_potato_halloween.png";
|
||||
public static final String MODEL_BREWERY = PREFIX_MODEL + "brewery.png";
|
||||
public static final String MODEL_TRAVEL_BELT = PREFIX_MODEL + "travelBelt.png";
|
||||
public static final String MODEL_SUPER_TRAVEL_BELT = PREFIX_MODEL + "superTravelBelt.png";
|
||||
public static final String MODEL_SPEED_UP_BELT = PREFIX_MODEL + "speedUpBelt.png";
|
||||
public static final String MODEL_KNOCKBACK_BELT = PREFIX_MODEL + "knockbackBelt.png";
|
||||
public static final String MODEL_TRAVEL_BELT = PREFIX_MODEL + "belt_travel.png";
|
||||
public static final String MODEL_SUPER_TRAVEL_BELT = PREFIX_MODEL + "belt_travel_super.png";
|
||||
public static final String MODEL_SPEED_UP_BELT = PREFIX_MODEL + "belt_speed.png";
|
||||
public static final String MODEL_KNOCKBACK_BELT = PREFIX_MODEL + "belt_knockback.png";
|
||||
public static final String MODEL_HOLY_CLOAK = PREFIX_MODEL + "cloak_holy.png";
|
||||
public static final String MODEL_UNHOLY_CLOAK = PREFIX_MODEL + "cloak_unholy.png";
|
||||
public static final String MODEL_BALANCE_CLOAK = PREFIX_MODEL + "cloak_balance.png";
|
||||
public static final String MODEL_HOLY_CLOAK_GLOW = PREFIX_MODEL + "cloak_holy_glow.png";
|
||||
public static final String MODEL_UNHOLY_CLOAK_GLOW = PREFIX_MODEL + "cloak_unholy_glow.png";
|
||||
public static final String MODEL_BALANCE_CLOAK_GLOW = PREFIX_MODEL + "cloak_balance_glow.png";
|
||||
public static final String MODEL_CORPOREA_INDEX = PREFIX_MODEL + "corporeaIndex.png";
|
||||
public static final String MODEL_INVISIBLE_ARMOR = PREFIX_MODEL + "invisibleArmor.png";
|
||||
public static final String MODEL_PINK_WITHER = PREFIX_MODEL + "pinkWither.png";
|
||||
public static final String MODEL_CRYSTAL_CUBE = PREFIX_MODEL + "crystalCube.png";
|
||||
public static final String MODEL_CORPOREA_INDEX = PREFIX_MODEL + "corporea_index.png";
|
||||
public static final String MODEL_INVISIBLE_ARMOR = PREFIX_MODEL + "armor_invisible.png";
|
||||
public static final String MODEL_PINK_WITHER = PREFIX_MODEL + "wither_pink.png";
|
||||
public static final String MODEL_BREWERY = PREFIX_MODEL + "brewery.png";
|
||||
public static final String MODEL_HOURGLASS = PREFIX_MODEL + "hourglass.png";
|
||||
public static final String MODEL_COCOON = PREFIX_MODEL + "cocoon.png";
|
||||
public static final String MODEL_BELLOWS = PREFIX_MODEL + "bellows.png";
|
||||
public static final String MODEL_TERU_TERU_BOZU = PREFIX_MODEL + "teruTeruBozu.png";
|
||||
public static final String MODEL_TERU_TERU_BOZU_HALLOWEEN = PREFIX_MODEL + "teruTeruBozu_halloween.png";
|
||||
|
||||
@@ -1,51 +0,0 @@
|
||||
/**
|
||||
* This class was created by <wiiv>. It's distributed as
|
||||
* part of the Botania Mod. Get the Source Code in github:
|
||||
* https://github.com/Vazkii/Botania
|
||||
*
|
||||
* Botania is Open Source and distributed under the
|
||||
* Botania License: http://botaniamod.net/license.php
|
||||
*
|
||||
* File Created @ [? (GMT)]
|
||||
*/
|
||||
package vazkii.botania.client.model;
|
||||
|
||||
import net.minecraft.client.model.ModelBase;
|
||||
import net.minecraft.client.model.ModelRenderer;
|
||||
|
||||
public class ModelCrystalCube extends ModelBase {
|
||||
public final ModelRenderer cube;
|
||||
public final ModelRenderer base1;
|
||||
public final ModelRenderer base2;
|
||||
|
||||
public ModelCrystalCube() {
|
||||
textureWidth = 48;
|
||||
textureHeight = 32;
|
||||
cube = new ModelRenderer(this, 0, 0);
|
||||
cube.setRotationPoint(0.0F, 12.0F, 0.0F);
|
||||
cube.addBox(-4.0F, -4.0F, -4.0F, 8, 8, 8, 0.0F);
|
||||
base1 = new ModelRenderer(this, 22, 0);
|
||||
base1.setRotationPoint(0.0F, 16.0F, 0.0F);
|
||||
base1.addBox(-3.0F, 7.0F, -3.0F, 6, 1, 6, 0.0F);
|
||||
base2 = new ModelRenderer(this, 0, 16);
|
||||
base2.setRotationPoint(0.0F, 0.0F, 0.0F);
|
||||
base2.addBox(-5.0F, 3.0F, -5.0F, 10, 4, 10, 0.0F);
|
||||
base1.addChild(base2);
|
||||
}
|
||||
|
||||
public void renderBase() {
|
||||
float f5 = 1F / 16F;
|
||||
base1.render(f5);
|
||||
}
|
||||
|
||||
public void renderCube() {
|
||||
float f5 = 1F / 16F;
|
||||
cube.render(f5);
|
||||
}
|
||||
|
||||
public void setRotateAngle(ModelRenderer modelRenderer, float x, float y, float z) {
|
||||
modelRenderer.rotateAngleX = x;
|
||||
modelRenderer.rotateAngleY = y;
|
||||
modelRenderer.rotateAngleZ = z;
|
||||
}
|
||||
}
|
||||
@@ -19,38 +19,42 @@ import java.awt.Color;
|
||||
|
||||
public class ModelHourglass extends ModelBase {
|
||||
|
||||
public final ModelRenderer ring;
|
||||
public final ModelRenderer base1;
|
||||
public final ModelRenderer base2;
|
||||
public final ModelRenderer glass1;
|
||||
public final ModelRenderer sand1;
|
||||
public final ModelRenderer glass2;
|
||||
public final ModelRenderer sand2;
|
||||
public ModelRenderer top;
|
||||
public ModelRenderer glassT;
|
||||
public ModelRenderer ring;
|
||||
public ModelRenderer glassB;
|
||||
public ModelRenderer bottom;
|
||||
|
||||
public ModelRenderer sandT;
|
||||
public ModelRenderer sandB;
|
||||
|
||||
public ModelHourglass() {
|
||||
textureWidth = 48;
|
||||
textureHeight = 24;
|
||||
sand2 = new ModelRenderer(this, 24, 0);
|
||||
sand2.setRotationPoint(0.0F, 0.0F, 0.0F);
|
||||
sand2.addBox(0F, 0F, 0F, 5, 5, 5, 0.0F); // -2.5F, 1.0F, -2.5F
|
||||
sand1 = new ModelRenderer(this, 24, 0);
|
||||
sand1.setRotationPoint(0.0F, 0.0F, 0.0F);
|
||||
sand1.addBox(0F, 0F, 0F, 5, 5, 5, 0.0F); // -2.5F, -6.0F, -2.5F
|
||||
glass1 = new ModelRenderer(this, 0, 0);
|
||||
glass1.setRotationPoint(0.0F, 0.0F, 0.0F);
|
||||
glass1.addBox(-3.0F, -6.501F, -3.0F, 6, 6, 6, 0.0F);
|
||||
base2 = new ModelRenderer(this, 0, 12);
|
||||
base2.setRotationPoint(0.0F, 0.0F, 0.0F);
|
||||
base2.addBox(-3.5F, 6.502F, -3.5F, 7, 1, 7, 0.0F);
|
||||
base1 = new ModelRenderer(this, 0, 12);
|
||||
base1.setRotationPoint(0.0F, 0.0F, 0.0F);
|
||||
base1.addBox(-3.5F, -7.502F, -3.5F, 7, 1, 7, 0.0F);
|
||||
ring = new ModelRenderer(this, 28, 12);
|
||||
ring.setRotationPoint(0.0F, 15.5F, 0.0F);
|
||||
ring.addBox(-2.0F, -16F, -2.0F, 4, 1, 4, 0.0F);
|
||||
glass2 = new ModelRenderer(this, 0, 0);
|
||||
glass2.setRotationPoint(0.0F, 0.0F, 0.0F);
|
||||
glass2.addBox(-3.0F, 0.501F, -3.0F, 6, 6, 6, 0.0F);
|
||||
|
||||
textureWidth = 64;
|
||||
textureHeight = 32;
|
||||
|
||||
top = new ModelRenderer(this, 20, 0);
|
||||
top.setRotationPoint(0.0F, 0.0F, 0.0F);
|
||||
top.addBox(-3.0F, -6.5F, -3.0F, 6, 1, 6, 0.0F);
|
||||
glassT = new ModelRenderer(this, 0, 0);
|
||||
glassT.setRotationPoint(0.0F, 0.0F, 0.0F);
|
||||
glassT.addBox(-2.5F, -5.5F, -2.5F, 5, 5, 5, 0.0F);
|
||||
ring = new ModelRenderer(this, 0, 20);
|
||||
ring.setRotationPoint(0.0F, 0.0F, 0.0F);
|
||||
ring.addBox(-1.5F, -0.5F, -1.5F, 3, 1, 3, 0.0F);
|
||||
glassB = new ModelRenderer(this, 0, 10);
|
||||
glassB.setRotationPoint(0.0F, 0.0F, 0.0F);
|
||||
glassB.addBox(-2.5F, 0.5F, -2.5F, 5, 5, 5, 0.0F);
|
||||
bottom = new ModelRenderer(this, 20, 7);
|
||||
bottom.setRotationPoint(0.0F, 0.0F, 0.0F);
|
||||
bottom.addBox(-3.0F, 5.5F, -3.0F, 6, 1, 6, 0.0F);
|
||||
|
||||
sandT = new ModelRenderer(this, 20, 14);
|
||||
sandT.setRotationPoint(0.0F, 0.0F, 0.0F);
|
||||
sandT.addBox(0.0F, 0.0F, 0.0F, 4, 4, 4, 0.0F); // -2.0F, -5.0F, -2.0F
|
||||
sandB = new ModelRenderer(this, 20, 14);
|
||||
sandB.setRotationPoint(0.0F, 0.0F, 0.0F);
|
||||
sandB.addBox(0.0F, 0.0F, 0.0F, 4, 4, 4, 0.0F); // -2.0F, 1.0F, -2.05F
|
||||
}
|
||||
|
||||
public void render(float fract1, float fract2, boolean flip, int color) {
|
||||
@@ -62,8 +66,8 @@ public class ModelHourglass extends ModelBase {
|
||||
|
||||
float f = 1F / 16F;
|
||||
ring.render(f);
|
||||
base1.render(f);
|
||||
base2.render(f);
|
||||
top.render(f);
|
||||
bottom.render(f);
|
||||
Color c = new Color(color);
|
||||
GL11.glColor3ub((byte) c.getRed(), (byte) c.getGreen(), (byte) c.getBlue());
|
||||
|
||||
@@ -74,38 +78,34 @@ public class ModelHourglass extends ModelBase {
|
||||
if(fract1 > 0) {
|
||||
GlStateManager.pushMatrix();
|
||||
if(flip)
|
||||
GlStateManager.translate(-2.5F * f, 1.0F * f, -2.5F * f);
|
||||
GlStateManager.translate(-2.0F * f, 1.0F * f, -2.0F * f);
|
||||
else {
|
||||
GlStateManager.rotate(180F, 0F, 0F, 1F);
|
||||
GlStateManager.translate(-2.5F * f, -6.0F * f, -2.5F * f);
|
||||
GlStateManager.translate(-2.0F * f, -5.0F * f, -2.0F * f);
|
||||
}
|
||||
|
||||
GlStateManager.scale(1F, fract1, 1F);
|
||||
sand1.render(f);
|
||||
sandT.render(f);
|
||||
GlStateManager.popMatrix();
|
||||
}
|
||||
|
||||
if(fract2 > 0) {
|
||||
GlStateManager.pushMatrix();
|
||||
if(flip)
|
||||
GlStateManager.translate(-2.5F * f, -6.0F * f, -2.5F * f);
|
||||
GlStateManager.translate(-2.0F * f, -5.0F * f, -2.0F * f);
|
||||
else {
|
||||
GlStateManager.rotate(180F, 0F, 0F, 1F);
|
||||
GlStateManager.translate(-2.5F * f, 1.0F * f, -2.5F * f);
|
||||
GlStateManager.translate(-2.0F * f, 1.0F * f, -2.0F * f);
|
||||
}
|
||||
|
||||
|
||||
GlStateManager.scale(1F, fract2, 1F);
|
||||
|
||||
sand2.render(f);
|
||||
sandB.render(f);
|
||||
GlStateManager.popMatrix();
|
||||
}
|
||||
|
||||
GL11.glPopAttrib();
|
||||
|
||||
GL11.glColor3ub((byte) 255, (byte) 255, (byte) 255);
|
||||
glass1.render(f);
|
||||
glass2.render(f);
|
||||
glassT.render(f);
|
||||
glassB.render(f);
|
||||
}
|
||||
|
||||
}
|
||||
+1
-1
@@ -46,7 +46,7 @@ public class TileCorporeaCrystalCube extends TileCorporeaBase implements ICorpor
|
||||
|
||||
public TileCorporeaCrystalCube() {
|
||||
if (FMLCommonHandler.instance().getSide() == Side.CLIENT) {
|
||||
asm = ModelLoaderRegistry.loadASM(new ResourceLocation("botania", "asms/block/crystalcube_cube.json"), ImmutableMap.of());
|
||||
asm = ModelLoaderRegistry.loadASM(new ResourceLocation("botania", "asms/block/corporeacrystalcube.json"), ImmutableMap.of());
|
||||
} else {
|
||||
asm = null;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user