diff --git a/MODSRC/vazkii/botania/client/lib/LibResources.java b/MODSRC/vazkii/botania/client/lib/LibResources.java index 2db674dc7..3875b2f15 100644 --- a/MODSRC/vazkii/botania/client/lib/LibResources.java +++ b/MODSRC/vazkii/botania/client/lib/LibResources.java @@ -21,7 +21,8 @@ public final class LibResources { public static final String PREFIX_ENTRIES = PREFIX_GUI + "entries/"; public static final String PREFIX_MODEL = PREFIX_MOD + "textures/model/"; public static final String PREFIX_MISC = PREFIX_MOD + "textures/misc/"; - + public static final String PREFIX_OBJ_MODEL = PREFIX_MOD + "model/"; + public static final String EMTPY_TEXTURE = "emptyTexture"; public static final String GUI_MANA_HUD = PREFIX_GUI + "manaHud.png"; @@ -44,6 +45,7 @@ public final class LibResources { public static final String MODEL_ALTAR = PREFIX_MODEL + "altar.png"; public static final String MODEL_SPREADER = PREFIX_MODEL + "spreader.png"; public static final String MODEL_POOL = PREFIX_MODEL + "pool.png"; + public static final String MODEL_PYLON_OLD = PREFIX_MODEL + "pylonOld.png"; public static final String MODEL_PYLON = PREFIX_MODEL + "pylon.png"; public static final String MODEL_LEXICA = PREFIX_MODEL + "lexica.png"; public static final String MODEL_CAPE = "/assets/botania/textures/model/cape.png"; @@ -52,6 +54,8 @@ public final class LibResources { public static final String MISC_WISP_LARGE = PREFIX_MISC + "wispLarge.png"; public static final String MISC_WISP_SMALL = PREFIX_MISC + "wispSmall.png"; + public static final String OBJ_MODEL_PYLON = PREFIX_OBJ_MODEL + "pylon.obj"; + public static final String[] LANGS = new String[] { "en_US" }; diff --git a/MODSRC/vazkii/botania/client/model/IPylonModel.java b/MODSRC/vazkii/botania/client/model/IPylonModel.java new file mode 100644 index 000000000..a80b92838 --- /dev/null +++ b/MODSRC/vazkii/botania/client/model/IPylonModel.java @@ -0,0 +1,19 @@ +/** + * This class was created by . 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 a + * Creative Commons Attribution-NonCommercial-ShareAlike 3.0 License + * (http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_GB) + * + * File Created @ [Apr 1, 2014, 6:23:24 PM (GMT)] + */ +package vazkii.botania.client.model; + +public interface IPylonModel { + + public void renderCrystal(); + public void renderRing(); + +} diff --git a/MODSRC/vazkii/botania/client/model/ModelPylon.java b/MODSRC/vazkii/botania/client/model/ModelPylon.java index 401878b0f..0d7c3ac78 100644 --- a/MODSRC/vazkii/botania/client/model/ModelPylon.java +++ b/MODSRC/vazkii/botania/client/model/ModelPylon.java @@ -7,146 +7,32 @@ * Creative Commons Attribution-NonCommercial-ShareAlike 3.0 License * (http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_GB) * - * File Created @ [Feb 18, 2014, 10:05:39 PM (GMT)] + * File Created @ [Apr 1, 2014, 6:21:48 PM (GMT)] */ package vazkii.botania.client.model; -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.client.model.AdvancedModelLoader; +import net.minecraftforge.client.model.IModelCustom; +import net.minecraftforge.client.model.obj.GroupObject; +import net.minecraftforge.client.model.obj.WavefrontObject; +import vazkii.botania.client.lib.LibResources; -public class ModelPylon extends ModelBase { - - ModelRenderer crystal1; - ModelRenderer crystal2; - ModelRenderer crystal3; - ModelRenderer crystal4; - ModelRenderer crystal5; - ModelRenderer crystal6; - ModelRenderer crystal7; - ModelRenderer crystal8; - ModelRenderer outside1; - ModelRenderer outside2; - ModelRenderer outside3; - ModelRenderer outside4; - ModelRenderer outside5; - ModelRenderer outside6; - ModelRenderer outside7; - ModelRenderer outside8; +public class ModelPylon implements IPylonModel { + private IModelCustom model; + public ModelPylon() { - textureWidth = 64; - textureHeight = 32; - - crystal1 = new ModelRenderer(this, 0, 0); - crystal1.addBox(-1.5F, -7F, -1F, 3, 7, 2); - crystal1.setRotationPoint(0F, 23F, 0F); - crystal1.setTextureSize(256, 128); - setRotation(crystal1, 0.1396263F, -0.418879F, 0F); - crystal2 = new ModelRenderer(this, 0, 0); - crystal2.addBox(-1.5F, -7F, -1F, 3, 7, 2); - crystal2.setRotationPoint(0F, 23F, 0F); - crystal2.setTextureSize(256, 128); - setRotation(crystal2, -0.1396263F, 0.418879F, 0F); - crystal3 = new ModelRenderer(this, 0, 0); - crystal3.addBox(-1.5F, -7F, -1F, 3, 7, 2); - crystal3.setRotationPoint(0F, 23F, 0F); - crystal3.setTextureSize(256, 128); - setRotation(crystal3, 0.1396263F, 0.418879F, 0F); - crystal4 = new ModelRenderer(this, 0, 0); - crystal4.addBox(-1.5F, -7F, -1F, 3, 7, 2); - crystal4.setRotationPoint(0F, 23F, 0F); - crystal4.setTextureSize(256, 128); - setRotation(crystal4, -0.1396263F, -0.418879F, 0F); - crystal5 = new ModelRenderer(this, 0, 0); - crystal5.addBox(-1.5F, 0F, -1F, 3, 7, 2); - crystal5.setRotationPoint(0F, 10F, 0F); - crystal5.setTextureSize(256, 128); - setRotation(crystal5, 0.1396263F, 0.418879F, 0F); - crystal6 = new ModelRenderer(this, 0, 0); - crystal6.addBox(-1.5F, 0F, -1F, 3, 7, 2); - crystal6.setRotationPoint(0F, 10F, 0F); - crystal6.setTextureSize(256, 128); - setRotation(crystal6, 0.1396263F, -0.418879F, 0F); - crystal7 = new ModelRenderer(this, 0, 0); - crystal7.addBox(-1.5F, 0F, -1F, 3, 7, 2); - crystal7.setRotationPoint(0F, 10F, 0F); - crystal7.setTextureSize(256, 128); - setRotation(crystal7, -0.1396263F, -0.418879F, 0F); - crystal8 = new ModelRenderer(this, 0, 0); - crystal8.addBox(-1.5F, 0F, -1F, 3, 7, 2); - crystal8.setRotationPoint(0F, 10F, 0F); - crystal8.setTextureSize(256, 128); - setRotation(crystal8, -0.1396263F, 0.418879F, 0F); - outside1 = new ModelRenderer(this, 17, 0); - outside1.addBox(0F, -4F, -1.5F, 1, 8, 3); - outside1.setRotationPoint(4F, 18F, 0F); - outside1.setTextureSize(256, 128); - setRotation(outside1, 0F, 0F, 0.1396263F); - outside2 = new ModelRenderer(this, 17, 0); - outside2.addBox(-1F, -4F, -1.5F, 1, 8, 3); - outside2.setRotationPoint(-4F, 18F, 0F); - outside2.setTextureSize(256, 128); - setRotation(outside2, 0F, 0F, -0.1396263F); - outside3 = new ModelRenderer(this, 26, 0); - outside3.addBox(-1.5F, -3F, -1F, 3, 6, 1); - outside3.setRotationPoint(0F, 18F, -4F); - outside3.setTextureSize(256, 128); - setRotation(outside3, 0.0698132F, 0F, 0F); - outside4 = new ModelRenderer(this, 26, 0); - outside4.addBox(-1.5F, -3F, 0F, 3, 6, 1); - outside4.setRotationPoint(0F, 18F, 4F); - outside4.setTextureSize(256, 128); - setRotation(outside4, -0.0698132F, 0F, 0F); - outside5 = new ModelRenderer(this, 27, 0); - outside5.addBox(0F, 0F, -4F, 1, 2, 8); - outside5.setRotationPoint(3F, 18F, 0F); - outside5.setTextureSize(256, 128); - setRotation(outside5, 0F, 0F, 0F); - outside6 = new ModelRenderer(this, 27, 0); - outside6.addBox(-1F, -1F, -4F, 1, 2, 8); - outside6.setRotationPoint(-3F, 19F, 0F); - outside6.setTextureSize(256, 128); - setRotation(outside6, 0F, 0F, 0F); - outside7 = new ModelRenderer(this, 17, 12); - outside7.addBox(-3F, -1F, 0F, 6, 2, 1); - outside7.setRotationPoint(0F, 19F, 3F); - outside7.setTextureSize(256, 128); - setRotation(outside7, 0F, 0F, 0F); - outside8 = new ModelRenderer(this, 17, 12); - outside8.addBox(-3F, -1F, -1F, 6, 2, 1); - outside8.setRotationPoint(0F, 19F, -3F); - outside8.setTextureSize(256, 128); - setRotation(outside8, 0F, 0F, 0F); + model = AdvancedModelLoader.loadModel(new ResourceLocation(LibResources.OBJ_MODEL_PYLON)); } - + + @Override public void renderCrystal() { - float f = 1F / 16F; - crystal1.render(f); - crystal2.render(f); - crystal3.render(f); - crystal4.render(f); - crystal5.render(f); - crystal6.render(f); - crystal7.render(f); - crystal8.render(f); + model.renderPart("Crystal"); } + @Override public void renderRing() { - float f = 1F / 16F; - outside1.render(f); - outside2.render(f); - outside3.render(f); - outside4.render(f); - outside5.render(f); - outside6.render(f); - outside7.render(f); - outside8.render(f); + model.renderAllExcept("Crystal"); } - - private void setRotation(ModelRenderer model, float x, float y, float z) { - model.rotateAngleX = x; - model.rotateAngleY = y; - model.rotateAngleZ = z; - } - -} \ No newline at end of file +} diff --git a/MODSRC/vazkii/botania/client/model/ModelPylonOld.java b/MODSRC/vazkii/botania/client/model/ModelPylonOld.java new file mode 100644 index 000000000..e048df3b0 --- /dev/null +++ b/MODSRC/vazkii/botania/client/model/ModelPylonOld.java @@ -0,0 +1,154 @@ +/** + * This class was created by . 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 a + * Creative Commons Attribution-NonCommercial-ShareAlike 3.0 License + * (http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_GB) + * + * File Created @ [Feb 18, 2014, 10:05:39 PM (GMT)] + */ +package vazkii.botania.client.model; + +import net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelRenderer; + +public class ModelPylonOld extends ModelBase implements IPylonModel { + + ModelRenderer crystal1; + ModelRenderer crystal2; + ModelRenderer crystal3; + ModelRenderer crystal4; + ModelRenderer crystal5; + ModelRenderer crystal6; + ModelRenderer crystal7; + ModelRenderer crystal8; + ModelRenderer outside1; + ModelRenderer outside2; + ModelRenderer outside3; + ModelRenderer outside4; + ModelRenderer outside5; + ModelRenderer outside6; + ModelRenderer outside7; + ModelRenderer outside8; + + public ModelPylonOld() { + textureWidth = 64; + textureHeight = 32; + + crystal1 = new ModelRenderer(this, 0, 0); + crystal1.addBox(-1.5F, -7F, -1F, 3, 7, 2); + crystal1.setRotationPoint(0F, 23F, 0F); + crystal1.setTextureSize(256, 128); + setRotation(crystal1, 0.1396263F, -0.418879F, 0F); + crystal2 = new ModelRenderer(this, 0, 0); + crystal2.addBox(-1.5F, -7F, -1F, 3, 7, 2); + crystal2.setRotationPoint(0F, 23F, 0F); + crystal2.setTextureSize(256, 128); + setRotation(crystal2, -0.1396263F, 0.418879F, 0F); + crystal3 = new ModelRenderer(this, 0, 0); + crystal3.addBox(-1.5F, -7F, -1F, 3, 7, 2); + crystal3.setRotationPoint(0F, 23F, 0F); + crystal3.setTextureSize(256, 128); + setRotation(crystal3, 0.1396263F, 0.418879F, 0F); + crystal4 = new ModelRenderer(this, 0, 0); + crystal4.addBox(-1.5F, -7F, -1F, 3, 7, 2); + crystal4.setRotationPoint(0F, 23F, 0F); + crystal4.setTextureSize(256, 128); + setRotation(crystal4, -0.1396263F, -0.418879F, 0F); + crystal5 = new ModelRenderer(this, 0, 0); + crystal5.addBox(-1.5F, 0F, -1F, 3, 7, 2); + crystal5.setRotationPoint(0F, 10F, 0F); + crystal5.setTextureSize(256, 128); + setRotation(crystal5, 0.1396263F, 0.418879F, 0F); + crystal6 = new ModelRenderer(this, 0, 0); + crystal6.addBox(-1.5F, 0F, -1F, 3, 7, 2); + crystal6.setRotationPoint(0F, 10F, 0F); + crystal6.setTextureSize(256, 128); + setRotation(crystal6, 0.1396263F, -0.418879F, 0F); + crystal7 = new ModelRenderer(this, 0, 0); + crystal7.addBox(-1.5F, 0F, -1F, 3, 7, 2); + crystal7.setRotationPoint(0F, 10F, 0F); + crystal7.setTextureSize(256, 128); + setRotation(crystal7, -0.1396263F, -0.418879F, 0F); + crystal8 = new ModelRenderer(this, 0, 0); + crystal8.addBox(-1.5F, 0F, -1F, 3, 7, 2); + crystal8.setRotationPoint(0F, 10F, 0F); + crystal8.setTextureSize(256, 128); + setRotation(crystal8, -0.1396263F, 0.418879F, 0F); + outside1 = new ModelRenderer(this, 17, 0); + outside1.addBox(0F, -4F, -1.5F, 1, 8, 3); + outside1.setRotationPoint(4F, 18F, 0F); + outside1.setTextureSize(256, 128); + setRotation(outside1, 0F, 0F, 0.1396263F); + outside2 = new ModelRenderer(this, 17, 0); + outside2.addBox(-1F, -4F, -1.5F, 1, 8, 3); + outside2.setRotationPoint(-4F, 18F, 0F); + outside2.setTextureSize(256, 128); + setRotation(outside2, 0F, 0F, -0.1396263F); + outside3 = new ModelRenderer(this, 26, 0); + outside3.addBox(-1.5F, -3F, -1F, 3, 6, 1); + outside3.setRotationPoint(0F, 18F, -4F); + outside3.setTextureSize(256, 128); + setRotation(outside3, 0.0698132F, 0F, 0F); + outside4 = new ModelRenderer(this, 26, 0); + outside4.addBox(-1.5F, -3F, 0F, 3, 6, 1); + outside4.setRotationPoint(0F, 18F, 4F); + outside4.setTextureSize(256, 128); + setRotation(outside4, -0.0698132F, 0F, 0F); + outside5 = new ModelRenderer(this, 27, 0); + outside5.addBox(0F, 0F, -4F, 1, 2, 8); + outside5.setRotationPoint(3F, 18F, 0F); + outside5.setTextureSize(256, 128); + setRotation(outside5, 0F, 0F, 0F); + outside6 = new ModelRenderer(this, 27, 0); + outside6.addBox(-1F, -1F, -4F, 1, 2, 8); + outside6.setRotationPoint(-3F, 19F, 0F); + outside6.setTextureSize(256, 128); + setRotation(outside6, 0F, 0F, 0F); + outside7 = new ModelRenderer(this, 17, 12); + outside7.addBox(-3F, -1F, 0F, 6, 2, 1); + outside7.setRotationPoint(0F, 19F, 3F); + outside7.setTextureSize(256, 128); + setRotation(outside7, 0F, 0F, 0F); + outside8 = new ModelRenderer(this, 17, 12); + outside8.addBox(-3F, -1F, -1F, 6, 2, 1); + outside8.setRotationPoint(0F, 19F, -3F); + outside8.setTextureSize(256, 128); + setRotation(outside8, 0F, 0F, 0F); + } + + @Override + public void renderCrystal() { + float f = 1F / 16F; + crystal1.render(f); + crystal2.render(f); + crystal3.render(f); + crystal4.render(f); + crystal5.render(f); + crystal6.render(f); + crystal7.render(f); + crystal8.render(f); + } + + @Override + public void renderRing() { + float f = 1F / 16F; + outside1.render(f); + outside2.render(f); + outside3.render(f); + outside4.render(f); + outside5.render(f); + outside6.render(f); + outside7.render(f); + outside8.render(f); + } + + private void setRotation(ModelRenderer model, float x, float y, float z) { + model.rotateAngleX = x; + model.rotateAngleY = y; + model.rotateAngleZ = z; + } + +} \ No newline at end of file diff --git a/MODSRC/vazkii/botania/client/render/tile/RenderTilePylon.java b/MODSRC/vazkii/botania/client/render/tile/RenderTilePylon.java index 6003bb7d8..170105721 100644 --- a/MODSRC/vazkii/botania/client/render/tile/RenderTilePylon.java +++ b/MODSRC/vazkii/botania/client/render/tile/RenderTilePylon.java @@ -23,41 +23,58 @@ import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; import vazkii.botania.client.lib.LibResources; +import vazkii.botania.client.model.IPylonModel; import vazkii.botania.client.model.ModelPylon; +import vazkii.botania.client.model.ModelPylonOld; +import vazkii.botania.common.core.handler.ConfigHandler; public class RenderTilePylon extends TileEntitySpecialRenderer { + private static final ResourceLocation textureOld = new ResourceLocation(LibResources.MODEL_PYLON_OLD); private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_PYLON); - ModelPylon model = new ModelPylon(); + + IPylonModel model; @Override public void renderTileEntityAt(TileEntity tileentity, double d0, double d1, double d2, float pticks) { + if(model == null) + model = ConfigHandler.oldPylonModel ? new ModelPylonOld() : new ModelPylon(); + GL11.glPushMatrix(); GL11.glEnable(GL12.GL_RESCALE_NORMAL); GL11.glEnable(GL11.GL_BLEND); GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); GL11.glColor4f(1F, 1F, 1F, 1F); - Minecraft.getMinecraft().renderEngine.bindTexture(texture); + Minecraft.getMinecraft().renderEngine.bindTexture(ConfigHandler.oldPylonModel ? textureOld : texture); int worldTime = (int) (tileentity.getWorldObj() == null ? 0 : tileentity.getWorldObj().getTotalWorldTime()); if(tileentity != null) worldTime += new Random(tileentity.xCoord ^ tileentity.yCoord ^ tileentity.zCoord).nextInt(360); - GL11.glTranslated(d0 + 0.5, d1 + 2.2, d2 + 0.5); - GL11.glScalef(1F, -1.5F, -1F); + GL11.glTranslated(d0 + 0.2, d1 + 0.05, d2 + 0.8); + GL11.glScalef(0.6F, 0.6F, 0.6F); int light = 15728880; int lightmapX = light % 65536; int lightmapY = light / 65536; GL11.glPushMatrix(); + if(!ConfigHandler.oldPylonModel) + GL11.glTranslatef(0.5F, 0F, -0.5F); GL11.glRotatef(worldTime * 1.5F, 0F, 1F, 0F); + if(!ConfigHandler.oldPylonModel) + GL11.glTranslatef(-0.5F, 0F, 0.5F); + model.renderRing(); GL11.glPopMatrix(); GL11.glPushMatrix(); GL11.glTranslated(0D, Math.sin(worldTime / 20D) / 17.5, 0D); + if(!ConfigHandler.oldPylonModel) + GL11.glTranslatef(0.5F, 0F, -0.5F); GL11.glRotatef(-worldTime, 0F, 1F, 0F); + if(!ConfigHandler.oldPylonModel) + GL11.glTranslatef(-0.5F, 0F, 0.5F); GL11.glDisable(GL11.GL_CULL_FACE); model.renderCrystal(); @@ -66,13 +83,12 @@ public class RenderTilePylon extends TileEntitySpecialRenderer { double alpha = Math.sin(worldTime / 20D) / 2D + 0.5; GL11.glColor4d(1D, 1D, 1D, alpha + 0.183F); GL11.glScalef(1.1F, 1.1F, 1.1F); - GL11.glTranslatef(0F, -0.09F, 0F); + GL11.glTranslatef(-0.05F, -0.1F, 0.05F); model.renderCrystal(); GL11.glEnable(GL11.GL_CULL_FACE); GL11.glPopMatrix(); - GL11.glScalef(1F, -1.5F, -1F); GL11.glDisable(GL11.GL_BLEND); GL11.glEnable(GL12.GL_RESCALE_NORMAL); GL11.glPopMatrix(); diff --git a/MODSRC/vazkii/botania/common/core/handler/ConfigHandler.java b/MODSRC/vazkii/botania/common/core/handler/ConfigHandler.java index dd1961193..f5345a3e0 100644 --- a/MODSRC/vazkii/botania/common/core/handler/ConfigHandler.java +++ b/MODSRC/vazkii/botania/common/core/handler/ConfigHandler.java @@ -25,6 +25,7 @@ public final class ConfigHandler { public static boolean staticWandBeam = false; public static boolean boundBlockWireframe = true; public static boolean lexicon3dModel = true; + public static boolean oldPylonModel = false; public static int flowerQuantity = 3; public static int flowerDensity = 32; @@ -34,33 +35,39 @@ public final class ConfigHandler { config.load(); - Property lexiconRotatingItemsProp = config.get(Configuration.CATEGORY_GENERAL, "lexicon.enable.rotatingItems", true); - lexiconRotatingItemsProp.comment = "Set to false to disable the rotating items in the petal and rune entries in the Lexica Botania."; - lexiconRotatingItems = lexiconRotatingItemsProp.getBoolean(true); + String desc = "Set to false to disable the rotating items in the petal and rune entries in the Lexica Botania."; + lexiconRotatingItems = loadPropBool("lexicon.enable.rotatingItems", desc, true); + + desc = "Set to true to set the power system's particles to be a lot more subtle. Good for low-end systems, if the particles are causing lag."; + subtlePowerSystem = loadPropBool("powerSystem.subtle", desc, false); - Property subtlePowerSystemProp = config.get(Configuration.CATEGORY_GENERAL, "powerSystem.subtle", false); - subtlePowerSystemProp.comment = "Set to true to set the power system's particles to be a lot more subtle. Good for low-end systems, if the particles are causing lag."; - subtlePowerSystem = subtlePowerSystemProp.getBoolean(false); + desc = "Set to true to use a static wand beam that shows every single position of the burst, similar to the way it used to work on old botania versions. Warning: Disabled by default because it may be laggy."; + staticWandBeam = loadPropBool("wandBeam.static", desc, false); - Property staticWandBeamProp = config.get(Configuration.CATEGORY_GENERAL, "wandBeam.static", false); - staticWandBeamProp.comment = "Set to true to use a static wand beam that shows every single position of the burst, similar to the way it used to work on old botania versions. Warning: Disabled by default because it may be laggy."; - staticWandBeam = staticWandBeamProp.getBoolean(false); + desc = "Set to false to disable the wireframe when looking a block bound to something (spreaders, flowers, etc)."; + boundBlockWireframe = loadPropBool("boundBlock.wireframe.enabled", desc, true); - Property boundBlockWireframeProp = config.get(Configuration.CATEGORY_GENERAL, "boundBlock.wireframe.enabled", true); - boundBlockWireframeProp.comment = "Set to false to disable the wireframe when looking a block bound to something (spreaders, flowers, etc)."; - boundBlockWireframe = boundBlockWireframeProp.getBoolean(true); - - Property lexicon3dModelProp = config.get(Configuration.CATEGORY_GENERAL, "lexicon.render.3D", true); - lexicon3dModelProp.comment = "Set to false to disabled the animated 3D render for the lexica botania"; - lexicon3dModel = lexicon3dModelProp.getBoolean(true); - - Property propFlowerQuantity = config.get(Configuration.CATEGORY_GENERAL, "worldgen.flower.quantity", 3); - flowerQuantity = propFlowerQuantity.getInt(3); - Property propFlowerDensity = config.get(Configuration.CATEGORY_GENERAL, "worldgen.flower.density", 32); - flowerDensity = propFlowerDensity.getInt(32); + desc = "Set to false to disabled the animated 3D render for the lexica botania"; + lexicon3dModel = loadPropBool("lexicon.render.3D", desc, true); + desc = "Set to true to use the old (non-.obj, pre beta18) pylon model"; + oldPylonModel = loadPropBool("pylonModel.old", desc, false); + + flowerQuantity = loadPropInt("worldgen.flower.quantity", null, 3); + flowerDensity = loadPropInt("worldgen.flower.density", null, 32); config.save(); } + public static int loadPropInt(String propName, String desc, int default_) { + Property prop = config.get(Configuration.CATEGORY_GENERAL, propName, default_); + prop.comment = desc; + return prop.getInt(default_); + } + + public static boolean loadPropBool(String propName, String desc, boolean default_) { + Property prop = config.get(Configuration.CATEGORY_GENERAL, propName, default_); + prop.comment = desc; + return prop.getBoolean(default_); + } } diff --git a/resources/assets/botania/model/pylon.obj b/resources/assets/botania/model/pylon.obj new file mode 100644 index 000000000..dcf1bbe84 --- /dev/null +++ b/resources/assets/botania/model/pylon.obj @@ -0,0 +1,796 @@ +# 3ds Max Wavefront OBJ Exporter v0.97b - (c)2007 guruware +# File Created: 01.04.2014 21:53:07 + +# +# object Crystal +# + +v 0.5000 2.0000 -0.5000 +v 0.9174 1.3116 -0.5000 +v 0.5000 1.3116 -0.9174 +v 0.0826 1.3116 -0.5000 +v 0.5000 1.3116 -0.0826 +v 0.5000 0.0000 -0.5000 +# 6 vertices + +vn 0.6499 0.3941 -0.6499 +vn -0.6499 0.3941 -0.6499 +vn -0.6499 0.3941 0.6499 +vn 0.6499 0.3941 0.6499 +vn 0.6899 -0.2196 -0.6899 +vn -0.6899 -0.2196 -0.6899 +vn -0.6899 -0.2196 0.6899 +vn 0.6899 -0.2196 0.6899 +# 8 vertex normals + +vt 0.4766 0.1563 0.5000 +vt 0.3828 -0.0000 0.7639 +vt 0.5703 -0.0000 0.5000 +vt 0.4766 0.3125 0.5000 +vt 0.3828 0.1563 0.7639 +vt 0.5703 0.1563 0.5000 +vt 0.3828 -0.0000 0.2361 +vt 0.3828 0.1563 0.2361 +vt 0.1875 0.3594 0.7639 +vt 0.2813 -0.0000 0.5000 +vt 0.3750 0.3594 0.5000 +vt 0.0000 0.3594 0.2361 +vt 0.0938 -0.0000 0.5000 +vt 0.1875 0.3594 0.5000 +# 14 texture coords + +g Crystal +s off +f 1/1/1 2/2/1 3/3/1 +f 1/4/2 3/5/2 4/6/2 +f 1/1/3 4/7/3 5/3/3 +f 1/4/4 5/8/4 2/6/4 +f 2/9/5 6/10/5 3/11/5 +f 3/9/6 6/10/6 4/11/6 +f 4/12/7 6/13/7 5/14/7 +f 5/12/8 6/13/8 2/14/8 +# 8 faces + +# +# object Ring_Panel03 +# + +v 0.4323 0.6361 -0.9729 +v 0.4323 1.4274 -0.9729 +v 0.2129 1.4274 -0.8816 +v 0.2129 0.6361 -0.8816 +v 0.3998 0.6361 -1.0510 +v 0.1804 0.6361 -0.9597 +v 0.1804 1.4274 -0.9597 +v 0.3998 1.4274 -1.0510 +# 8 vertices + +vn 0.3840 0.0000 0.9233 +vn -0.3840 -0.0000 -0.9233 +vn 0.0000 -1.0000 0.0000 +vn -0.9233 -0.0000 0.3840 +vn -0.0000 1.0000 -0.0000 +vn 0.9233 0.0000 -0.3840 +# 6 vertex normals + +vt 0.1172 0.5703 0.1259 +vt 0.1172 0.7813 0.1259 +vt 0.0234 0.7813 0.1993 +vt 0.0234 0.5703 0.1993 +vt 0.0234 0.5703 0.0631 +vt 0.1172 0.5703 0.1365 +vt 0.1172 0.7813 0.1365 +vt 0.0234 0.7813 0.0631 +vt 0.0234 0.5703 0.0005 +vt 0.1172 0.5703 0.0005 +vt 0.1172 0.5313 0.0005 +vt 0.0234 0.5313 0.0005 +vt 0.0234 0.5703 0.7339 +vt 0.0234 0.7813 0.7339 +vt 0.0000 0.7813 0.7604 +vt 0.0000 0.5703 0.7604 +vt 0.1172 0.5703 0.9995 +vt 0.0234 0.5703 0.9995 +vt 0.0234 0.5313 0.9995 +vt 0.1172 0.5313 0.9995 +vt 0.0000 0.7813 0.5552 +vt 0.0000 0.5703 0.5552 +vt 0.0234 0.5703 0.5817 +vt 0.0234 0.7813 0.5817 +# 24 texture coords + +g Ring_Panel03 +s 2 +f 7/15/9 8/16/9 9/17/9 +f 9/17/9 10/18/9 7/15/9 +s 4 +f 11/19/10 12/20/10 13/21/10 +f 13/21/10 14/22/10 11/19/10 +s 8 +f 7/23/11 10/24/11 12/25/11 +f 12/25/11 11/26/11 7/23/11 +s 16 +f 10/27/12 9/28/12 13/29/12 +f 13/29/12 12/30/12 10/27/12 +s 32 +f 9/31/13 8/32/13 14/33/13 +f 14/33/13 13/34/13 9/31/13 +s 64 +f 8/35/14 7/36/14 11/37/14 +f 11/37/14 14/38/14 8/35/14 +# 12 faces + +# +# object Ring_Gem03 +# + +v 0.4670 0.9827 -0.9895 +v 0.4670 1.3321 -0.9895 +v 0.1766 1.3321 -0.8687 +v 0.1766 0.9827 -0.8687 +v 0.4091 0.9827 -1.1288 +v 0.1187 0.9827 -1.0080 +v 0.1187 1.3321 -1.0080 +v 0.4091 1.3321 -1.1288 +# 8 vertices + +vn 0.3840 0.0000 0.9233 +vn -0.3840 -0.0000 -0.9233 +vn 0.0000 -1.0000 0.0000 +vn -0.9233 -0.0000 0.3840 +vn -0.0000 1.0000 -0.0000 +vn 0.9233 0.0000 -0.3840 +# 6 vertex normals + +vt 0.2813 0.4141 0.1126 +vt 0.2813 0.5234 0.1126 +vt 0.1719 0.5234 0.2097 +vt 0.1719 0.4141 0.2097 +vt 0.0625 0.4141 0.0005 +vt 0.1719 0.4141 0.0977 +vt 0.1719 0.5234 0.0977 +vt 0.0625 0.5234 0.0005 +vt 0.0625 0.4141 0.4381 +vt 0.1719 0.4141 0.4381 +vt 0.1719 0.3672 0.4381 +vt 0.0625 0.3672 0.4381 +vt 0.0000 0.4141 0.7635 +vt 0.0000 0.5234 0.7635 +vt 0.0625 0.5234 0.8107 +vt 0.0625 0.4141 0.8107 +vt 0.1719 0.4141 0.8792 +vt 0.0625 0.4141 0.8792 +vt 0.0625 0.3672 0.8792 +vt 0.1719 0.3672 0.8792 +vt 0.0000 0.5234 0.5269 +vt 0.0000 0.4141 0.5269 +vt 0.0625 0.4141 0.5741 +vt 0.0625 0.5234 0.5741 +# 24 texture coords + +g Ring_Gem03 +s 2 +f 15/39/15 16/40/15 17/41/15 +f 17/41/15 18/42/15 15/39/15 +s 4 +f 19/43/16 20/44/16 21/45/16 +f 21/45/16 22/46/16 19/43/16 +s 8 +f 15/47/17 18/48/17 20/49/17 +f 20/49/17 19/50/17 15/47/17 +s 16 +f 18/51/18 17/52/18 21/53/18 +f 21/53/18 20/54/18 18/51/18 +s 32 +f 17/55/19 16/56/19 22/57/19 +f 22/57/19 21/58/19 17/55/19 +s 64 +f 16/59/20 15/60/20 19/61/20 +f 19/61/20 22/62/20 16/59/20 +# 12 faces + +# +# object Ring_Gem01 +# + +v 0.5330 0.9827 -0.0105 +v 0.5330 1.3321 -0.0105 +v 0.8234 1.3321 -0.1313 +v 0.8234 0.9827 -0.1313 +v 0.5909 0.9827 0.1288 +v 0.8813 0.9827 0.0080 +v 0.8813 1.3321 0.0080 +v 0.5909 1.3321 0.1288 +# 8 vertices + +vn -0.3840 0.0000 -0.9233 +vn 0.3840 -0.0000 0.9233 +vn -0.0000 -1.0000 -0.0000 +vn 0.9233 -0.0000 -0.3840 +vn 0.0000 1.0000 0.0000 +vn -0.9233 0.0000 0.3840 +# 6 vertex normals + +vt 0.2813 0.4141 0.1126 +vt 0.2813 0.5234 0.1126 +vt 0.1719 0.5234 0.2097 +vt 0.1719 0.4141 0.2097 +vt 0.0625 0.4141 0.0005 +vt 0.1719 0.4141 0.0977 +vt 0.1719 0.5234 0.0977 +vt 0.0625 0.5234 0.0005 +vt 0.0625 0.4141 0.4381 +vt 0.1719 0.4141 0.4381 +vt 0.1719 0.3672 0.4381 +vt 0.0625 0.3672 0.4381 +vt 0.0000 0.4141 0.7635 +vt 0.0000 0.5234 0.7635 +vt 0.0625 0.5234 0.8107 +vt 0.0625 0.4141 0.8107 +vt 0.1719 0.4141 0.8792 +vt 0.0625 0.4141 0.8792 +vt 0.0625 0.3672 0.8792 +vt 0.1719 0.3672 0.8792 +vt 0.0000 0.5234 0.5269 +vt 0.0000 0.4141 0.5269 +vt 0.0625 0.4141 0.5741 +vt 0.0625 0.5234 0.5741 +# 24 texture coords + +g Ring_Gem01 +s 2 +f 23/63/21 24/64/21 25/65/21 +f 25/65/21 26/66/21 23/63/21 +s 4 +f 27/67/22 28/68/22 29/69/22 +f 29/69/22 30/70/22 27/67/22 +s 8 +f 23/71/23 26/72/23 28/73/23 +f 28/73/23 27/74/23 23/71/23 +s 16 +f 26/75/24 25/76/24 29/77/24 +f 29/77/24 28/78/24 26/75/24 +s 32 +f 25/79/25 24/80/25 30/81/25 +f 30/81/25 29/82/25 25/79/25 +s 64 +f 24/83/26 23/84/26 27/85/26 +f 27/85/26 30/86/26 24/83/26 +# 12 faces + +# +# object Ring_Gem02 +# + +v 0.9895 0.9827 -0.5330 +v 0.9895 1.3321 -0.5330 +v 0.8687 1.3321 -0.8234 +v 0.8687 0.9827 -0.8234 +v 1.1288 0.9827 -0.5909 +v 1.0080 0.9827 -0.8813 +v 1.0080 1.3321 -0.8813 +v 1.1288 1.3321 -0.5909 +# 8 vertices + +vn -0.9233 0.0000 0.3840 +vn 0.9233 -0.0000 -0.3840 +vn -0.0000 -1.0000 0.0000 +vn -0.3840 -0.0000 -0.9233 +vn 0.0000 1.0000 -0.0000 +vn 0.3840 0.0000 0.9233 +# 6 vertex normals + +vt 0.2813 0.4141 0.1126 +vt 0.2813 0.5234 0.1126 +vt 0.1719 0.5234 0.2097 +vt 0.1719 0.4141 0.2097 +vt 0.0625 0.4141 0.0005 +vt 0.1719 0.4141 0.0977 +vt 0.1719 0.5234 0.0977 +vt 0.0625 0.5234 0.0005 +vt 0.0625 0.4141 0.4381 +vt 0.1719 0.4141 0.4381 +vt 0.1719 0.3672 0.4381 +vt 0.0625 0.3672 0.4381 +vt 0.0000 0.4141 0.7635 +vt 0.0000 0.5234 0.7635 +vt 0.0625 0.5234 0.8107 +vt 0.0625 0.4141 0.8107 +vt 0.1719 0.4141 0.8792 +vt 0.0625 0.4141 0.8792 +vt 0.0625 0.3672 0.8792 +vt 0.1719 0.3672 0.8792 +vt 0.0000 0.5234 0.5269 +vt 0.0000 0.4141 0.5269 +vt 0.0625 0.4141 0.5741 +vt 0.0625 0.5234 0.5741 +# 24 texture coords + +g Ring_Gem02 +s 2 +f 31/87/27 32/88/27 33/89/27 +f 33/89/27 34/90/27 31/87/27 +s 4 +f 35/91/28 36/92/28 37/93/28 +f 37/93/28 38/94/28 35/91/28 +s 8 +f 31/95/29 34/96/29 36/97/29 +f 36/97/29 35/98/29 31/95/29 +s 16 +f 34/99/30 33/100/30 37/101/30 +f 37/101/30 36/102/30 34/99/30 +s 32 +f 33/103/31 32/104/31 38/105/31 +f 38/105/31 37/106/31 33/103/31 +s 64 +f 32/107/32 31/108/32 35/109/32 +f 35/109/32 38/110/32 32/107/32 +# 12 faces + +# +# object Ring_Panel02 +# + +v 0.9729 0.6361 -0.5677 +v 0.9729 1.4274 -0.5677 +v 0.8816 1.4274 -0.7871 +v 0.8816 0.6361 -0.7871 +v 1.0510 0.6361 -0.6002 +v 0.9597 0.6361 -0.8196 +v 0.9597 1.4274 -0.8196 +v 1.0510 1.4274 -0.6002 +# 8 vertices + +vn -0.9233 0.0000 0.3840 +vn 0.9233 -0.0000 -0.3840 +vn -0.0000 -1.0000 0.0000 +vn -0.3840 -0.0000 -0.9233 +vn 0.0000 1.0000 -0.0000 +vn 0.3840 0.0000 0.9233 +# 6 vertex normals + +vt 0.1172 0.5703 0.1259 +vt 0.1172 0.7813 0.1259 +vt 0.0234 0.7813 0.1993 +vt 0.0234 0.5703 0.1993 +vt 0.0234 0.5703 0.0631 +vt 0.1172 0.5703 0.1365 +vt 0.1172 0.7813 0.1365 +vt 0.0234 0.7813 0.0631 +vt 0.0234 0.5703 0.0005 +vt 0.1172 0.5703 0.0005 +vt 0.1172 0.5313 0.0005 +vt 0.0234 0.5313 0.0005 +vt 0.0234 0.5703 0.7339 +vt 0.0234 0.7813 0.7339 +vt 0.0000 0.7813 0.7604 +vt 0.0000 0.5703 0.7604 +vt 0.1172 0.5703 0.9995 +vt 0.0234 0.5703 0.9995 +vt 0.0234 0.5313 0.9995 +vt 0.1172 0.5313 0.9995 +vt 0.0000 0.7813 0.5552 +vt 0.0000 0.5703 0.5552 +vt 0.0234 0.5703 0.5817 +vt 0.0234 0.7813 0.5817 +# 24 texture coords + +g Ring_Panel02 +s 2 +f 39/111/33 40/112/33 41/113/33 +f 41/113/33 42/114/33 39/111/33 +s 4 +f 43/115/34 44/116/34 45/117/34 +f 45/117/34 46/118/34 43/115/34 +s 8 +f 39/119/35 42/120/35 44/121/35 +f 44/121/35 43/122/35 39/119/35 +s 16 +f 42/123/36 41/124/36 45/125/36 +f 45/125/36 44/126/36 42/123/36 +s 32 +f 41/127/37 40/128/37 46/129/37 +f 46/129/37 45/130/37 41/127/37 +s 64 +f 40/131/38 39/132/38 43/133/38 +f 43/133/38 46/134/38 40/131/38 +# 12 faces + +# +# object Ring_Panel01 +# + +v 0.5677 0.6361 -0.0271 +v 0.5677 1.4274 -0.0271 +v 0.7871 1.4274 -0.1184 +v 0.7871 0.6361 -0.1184 +v 0.6002 0.6361 0.0510 +v 0.8196 0.6361 -0.0403 +v 0.8196 1.4274 -0.0403 +v 0.6002 1.4274 0.0510 +# 8 vertices + +vn -0.3840 0.0000 -0.9233 +vn 0.3840 -0.0000 0.9233 +vn -0.0000 -1.0000 -0.0000 +vn 0.9233 -0.0000 -0.3840 +vn 0.0000 1.0000 0.0000 +vn -0.9233 0.0000 0.3840 +# 6 vertex normals + +vt 0.1172 0.5703 0.1259 +vt 0.1172 0.7813 0.1259 +vt 0.0234 0.7813 0.1993 +vt 0.0234 0.5703 0.1993 +vt 0.0234 0.5703 0.0631 +vt 0.1172 0.5703 0.1365 +vt 0.1172 0.7813 0.1365 +vt 0.0234 0.7813 0.0631 +vt 0.0234 0.5703 0.0005 +vt 0.1172 0.5703 0.0005 +vt 0.1172 0.5313 0.0005 +vt 0.0234 0.5313 0.0005 +vt 0.0234 0.5703 0.7339 +vt 0.0234 0.7813 0.7339 +vt 0.0000 0.7813 0.7604 +vt 0.0000 0.5703 0.7604 +vt 0.1172 0.5703 0.9995 +vt 0.0234 0.5703 0.9995 +vt 0.0234 0.5313 0.9995 +vt 0.1172 0.5313 0.9995 +vt 0.0000 0.7813 0.5552 +vt 0.0000 0.5703 0.5552 +vt 0.0234 0.5703 0.5817 +vt 0.0234 0.7813 0.5817 +# 24 texture coords + +g Ring_Panel01 +s 2 +f 47/135/39 48/136/39 49/137/39 +f 49/137/39 50/138/39 47/135/39 +s 4 +f 51/139/40 52/140/40 53/141/40 +f 53/141/40 54/142/40 51/139/40 +s 8 +f 47/143/41 50/144/41 52/145/41 +f 52/145/41 51/146/41 47/143/41 +s 16 +f 50/147/42 49/148/42 53/149/42 +f 53/149/42 52/150/42 50/147/42 +s 32 +f 49/151/43 48/152/43 54/153/43 +f 54/153/43 53/154/43 49/151/43 +s 64 +f 48/155/44 47/156/44 51/157/44 +f 51/157/44 54/158/44 48/155/44 +# 12 faces + +# +# object Crystal_Ring +# + +v 0.5000 1.2101 -1.1130 +v 0.5000 1.2101 -0.9631 +v 0.8274 1.2101 -0.8274 +v 0.9335 1.2101 -0.9335 +v 0.5000 1.0601 -0.9631 +v 0.8274 1.0601 -0.8274 +v 0.5000 1.0601 -1.1130 +v 0.9335 1.0601 -0.9335 +v 0.9631 1.2101 -0.5000 +v 1.1130 1.2101 -0.5000 +v 0.9631 1.0601 -0.5000 +v 1.1130 1.0601 -0.5000 +v 0.8274 1.2101 -0.1726 +v 0.9335 1.2101 -0.0665 +v 0.8274 1.0601 -0.1726 +v 0.9335 1.0601 -0.0665 +v 0.5000 1.2101 -0.0369 +v 0.5000 1.2101 0.1130 +v 0.5000 1.0601 -0.0369 +v 0.5000 1.0601 0.1130 +v 0.1726 1.2101 -0.1726 +v 0.0665 1.2101 -0.0665 +v 0.1726 1.0601 -0.1726 +v 0.0665 1.0601 -0.0665 +v 0.0369 1.2101 -0.5000 +v -0.1130 1.2101 -0.5000 +v 0.0369 1.0601 -0.5000 +v -0.1130 1.0601 -0.5000 +v 0.1726 1.2101 -0.8274 +v 0.0665 1.2101 -0.9335 +v 0.1726 1.0601 -0.8274 +v 0.0665 1.0601 -0.9335 +# 32 vertices + +vn 0.0000 1.0000 -0.0000 +vn -0.3827 0.0000 0.9239 +vn 0.0000 -1.0000 -0.0000 +vn 0.3827 0.0000 -0.9239 +vn -0.9239 0.0000 0.3827 +vn 0.9239 0.0000 -0.3827 +vn -0.9239 0.0000 -0.3827 +vn 0.0000 -1.0000 0.0000 +vn 0.9239 0.0000 0.3827 +vn -0.3827 0.0000 -0.9239 +vn 0.3827 0.0000 0.9239 +vn -0.0000 -1.0000 0.0000 +vn -0.0000 -1.0000 -0.0000 +# 13 vertex normals + +vt 0.2578 0.5313 0.7252 +vt 0.2422 0.5781 0.7252 +vt 0.1406 0.5781 0.7252 +vt 0.1250 0.5313 0.7252 +vt 0.1250 0.6250 0.8789 +vt 0.1250 0.5859 0.8789 +vt 0.2578 0.5859 0.7697 +vt 0.2578 0.6250 0.7697 +vt 0.1406 0.5781 0.5358 +vt 0.1250 0.5313 0.5358 +vt 0.2578 0.5313 0.5358 +vt 0.2422 0.5781 0.5358 +vt 0.2578 0.5859 0.9995 +vt 0.2578 0.6250 0.9995 +vt 0.1250 0.6250 0.8551 +vt 0.1250 0.5859 0.8551 +vt 0.1250 0.6250 0.7668 +vt 0.1250 0.5859 0.7668 +vt 0.2578 0.5859 0.8773 +vt 0.2578 0.6250 0.8773 +vt 0.2578 0.5859 0.8532 +vt 0.2578 0.6250 0.8532 +vt 0.1250 0.6250 0.9995 +vt 0.1250 0.5859 0.9995 +vt 0.1250 0.6250 0.8773 +vt 0.1250 0.5859 0.8773 +vt 0.2578 0.5859 0.7668 +vt 0.2578 0.6250 0.7668 +vt 0.1250 0.6250 0.8532 +vt 0.1250 0.5859 0.8532 +vt 0.1250 0.6250 0.2429 +vt 0.1250 0.5859 0.2429 +vt 0.2578 0.5859 0.1338 +vt 0.2578 0.6250 0.1338 +vt 0.2578 0.5859 0.1576 +vt 0.2578 0.6250 0.1576 +vt 0.1250 0.6250 0.0132 +vt 0.1250 0.5859 0.0132 +vt 0.1250 0.6250 0.1338 +vt 0.1250 0.5859 0.1338 +vt 0.2578 0.5859 0.2429 +vt 0.2578 0.6250 0.2429 +vt 0.2578 0.5859 0.0132 +vt 0.2578 0.6250 0.0132 +vt 0.1250 0.6250 0.1576 +vt 0.1250 0.5859 0.1576 +vt 0.1250 0.6250 0.2332 +vt 0.1250 0.5859 0.2332 +vt 0.2578 0.5859 0.1227 +vt 0.2578 0.6250 0.1227 +vt 0.2578 0.5859 0.1468 +vt 0.2578 0.6250 0.1468 +vt 0.1250 0.6250 0.0005 +vt 0.1250 0.5859 0.0005 +vt 0.1250 0.6250 0.1227 +vt 0.1250 0.5859 0.1227 +vt 0.2578 0.5859 0.2332 +vt 0.2578 0.6250 0.2332 +vt 0.2578 0.5859 0.0005 +vt 0.2578 0.6250 0.0005 +vt 0.1250 0.6250 0.1468 +vt 0.1250 0.5859 0.1468 +vt 0.1250 0.6250 0.7697 +vt 0.1250 0.5859 0.7697 +vt 0.2578 0.5859 0.8789 +vt 0.2578 0.6250 0.8789 +vt 0.2578 0.5859 0.8551 +vt 0.2578 0.6250 0.8551 +# 68 texture coords + +g Crystal_Ring +s off +f 55/159/45 56/160/45 57/161/45 +f 57/161/45 58/162/45 55/159/45 +f 56/163/46 59/164/46 60/165/46 +f 60/165/46 57/166/46 56/163/46 +f 59/167/47 61/168/47 62/169/47 +f 62/169/47 60/170/47 59/167/47 +f 61/171/48 55/172/48 58/173/48 +f 58/173/48 62/174/48 61/171/48 +f 58/159/45 57/160/45 63/161/45 +f 63/161/45 64/162/45 58/159/45 +f 57/175/49 60/176/49 65/177/49 +f 65/177/49 63/178/49 57/175/49 +f 60/167/47 62/168/47 66/169/47 +f 66/169/47 65/170/47 60/167/47 +f 62/179/50 58/180/50 64/181/50 +f 64/181/50 66/182/50 62/179/50 +f 64/159/45 63/160/45 67/161/45 +f 67/161/45 68/162/45 64/159/45 +f 63/183/51 65/184/51 69/185/51 +f 69/185/51 67/186/51 63/183/51 +f 65/167/52 66/168/52 70/169/52 +f 70/169/52 69/170/52 65/167/52 +f 66/171/53 64/172/53 68/187/53 +f 68/187/53 70/188/53 66/171/53 +f 68/159/45 67/160/45 71/161/45 +f 71/161/45 72/162/45 68/159/45 +f 67/189/54 69/190/54 73/191/54 +f 73/191/54 71/192/54 67/189/54 +f 69/167/52 70/168/52 74/169/52 +f 74/169/52 73/170/52 69/167/52 +f 70/193/55 68/194/55 72/195/55 +f 72/195/55 74/196/55 70/193/55 +f 72/159/45 71/160/45 75/161/45 +f 75/161/45 76/162/45 72/159/45 +f 71/197/48 73/198/48 77/199/48 +f 77/199/48 75/200/48 71/197/48 +f 73/167/56 74/168/56 78/169/56 +f 78/169/56 77/170/56 73/167/56 +f 74/201/46 72/202/46 76/203/46 +f 76/203/46 78/204/46 74/201/46 +f 76/159/45 75/160/45 79/161/45 +f 79/161/45 80/162/45 76/159/45 +f 75/205/50 77/206/50 81/207/50 +f 81/207/50 79/208/50 75/205/50 +f 77/167/56 78/168/56 82/169/56 +f 82/169/56 81/170/56 77/167/56 +f 78/209/49 76/210/49 80/211/49 +f 80/211/49 82/212/49 78/209/49 +f 80/159/45 79/160/45 83/161/45 +f 83/161/45 84/162/45 80/159/45 +f 79/213/53 81/214/53 85/215/53 +f 85/215/53 83/216/53 79/213/53 +f 81/167/57 82/168/57 86/169/57 +f 86/169/57 85/170/57 81/167/57 +f 82/217/51 80/218/51 84/219/51 +f 84/219/51 86/220/51 82/217/51 +f 84/159/45 83/160/45 56/161/45 +f 56/161/45 55/162/45 84/159/45 +f 83/221/55 85/222/55 59/223/55 +f 59/223/55 56/224/55 83/221/55 +f 85/167/57 86/168/57 61/169/57 +f 61/169/57 59/170/57 85/167/57 +f 86/225/54 84/226/54 55/181/54 +f 55/181/54 61/182/54 86/225/54 +# 64 faces + +# +# object Ring_Gem04 +# + +v 0.0105 0.9827 -0.4670 +v 0.0105 1.3321 -0.4670 +v 0.1313 1.3321 -0.1766 +v 0.1313 0.9827 -0.1766 +v -0.1288 0.9827 -0.4091 +v -0.0080 0.9827 -0.1187 +v -0.0080 1.3321 -0.1187 +v -0.1288 1.3321 -0.4091 +# 8 vertices + +vn 0.9233 0.0000 -0.3840 +vn -0.9233 -0.0000 0.3840 +vn 0.0000 -1.0000 -0.0000 +vn 0.3840 -0.0000 0.9233 +vn -0.0000 1.0000 0.0000 +vn -0.3840 0.0000 -0.9233 +# 6 vertex normals + +vt 0.2813 0.4141 0.1126 +vt 0.2813 0.5234 0.1126 +vt 0.1719 0.5234 0.2097 +vt 0.1719 0.4141 0.2097 +vt 0.0625 0.4141 0.0005 +vt 0.1719 0.4141 0.0977 +vt 0.1719 0.5234 0.0977 +vt 0.0625 0.5234 0.0005 +vt 0.0625 0.4141 0.4381 +vt 0.1719 0.4141 0.4381 +vt 0.1719 0.3672 0.4381 +vt 0.0625 0.3672 0.4381 +vt 0.0000 0.4141 0.7635 +vt 0.0000 0.5234 0.7635 +vt 0.0625 0.5234 0.8107 +vt 0.0625 0.4141 0.8107 +vt 0.1719 0.4141 0.8792 +vt 0.0625 0.4141 0.8792 +vt 0.0625 0.3672 0.8792 +vt 0.1719 0.3672 0.8792 +vt 0.0000 0.5234 0.5269 +vt 0.0000 0.4141 0.5269 +vt 0.0625 0.4141 0.5741 +vt 0.0625 0.5234 0.5741 +# 24 texture coords + +g Ring_Gem04 +s 2 +f 87/227/58 88/228/58 89/229/58 +f 89/229/58 90/230/58 87/227/58 +s 4 +f 91/231/59 92/232/59 93/233/59 +f 93/233/59 94/234/59 91/231/59 +s 8 +f 87/235/60 90/236/60 92/237/60 +f 92/237/60 91/238/60 87/235/60 +s 16 +f 90/239/61 89/240/61 93/241/61 +f 93/241/61 92/242/61 90/239/61 +s 32 +f 89/243/62 88/244/62 94/245/62 +f 94/245/62 93/246/62 89/243/62 +s 64 +f 88/247/63 87/248/63 91/249/63 +f 91/249/63 94/250/63 88/247/63 +# 12 faces + +# +# object Ring_Panel04 +# + +v 0.0271 0.6361 -0.4323 +v 0.0271 1.4274 -0.4323 +v 0.1184 1.4274 -0.2129 +v 0.1184 0.6361 -0.2129 +v -0.0510 0.6361 -0.3998 +v 0.0403 0.6361 -0.1804 +v 0.0403 1.4274 -0.1804 +v -0.0510 1.4274 -0.3998 +# 8 vertices + +vn 0.9233 0.0000 -0.3840 +vn -0.9233 -0.0000 0.3840 +vn 0.0000 -1.0000 -0.0000 +vn 0.3840 -0.0000 0.9233 +vn -0.0000 1.0000 0.0000 +vn -0.3840 0.0000 -0.9233 +# 6 vertex normals + +vt 0.1172 0.5703 0.1259 +vt 0.1172 0.7813 0.1259 +vt 0.0234 0.7813 0.1993 +vt 0.0234 0.5703 0.1993 +vt 0.0234 0.5703 0.0631 +vt 0.1172 0.5703 0.1365 +vt 0.1172 0.7813 0.1365 +vt 0.0234 0.7813 0.0631 +vt 0.0234 0.5703 0.0005 +vt 0.1172 0.5703 0.0005 +vt 0.1172 0.5313 0.0005 +vt 0.0234 0.5313 0.0005 +vt 0.0234 0.5703 0.7339 +vt 0.0234 0.7813 0.7339 +vt 0.0000 0.7813 0.7604 +vt 0.0000 0.5703 0.7604 +vt 0.1172 0.5703 0.9995 +vt 0.0234 0.5703 0.9995 +vt 0.0234 0.5313 0.9995 +vt 0.1172 0.5313 0.9995 +vt 0.0000 0.7813 0.5552 +vt 0.0000 0.5703 0.5552 +vt 0.0234 0.5703 0.5817 +vt 0.0234 0.7813 0.5817 +# 24 texture coords + +g Ring_Panel04 +s 2 +f 95/251/64 96/252/64 97/253/64 +f 97/253/64 98/254/64 95/251/64 +s 4 +f 99/255/65 100/256/65 101/257/65 +f 101/257/65 102/258/65 99/255/65 +s 8 +f 95/259/66 98/260/66 100/261/66 +f 100/261/66 99/262/66 95/259/66 +s 16 +f 98/263/67 97/264/67 101/265/67 +f 101/265/67 100/266/67 98/263/67 +s 32 +f 97/267/68 96/268/68 102/269/68 +f 102/269/68 101/270/68 97/267/68 +s 64 +f 96/271/69 95/272/69 99/273/69 +f 99/273/69 102/274/69 96/271/69 +# 12 faces + diff --git a/resources/assets/botania/textures/model/pylon.png b/resources/assets/botania/textures/model/pylon.png index 01a378b63..360856a14 100644 Binary files a/resources/assets/botania/textures/model/pylon.png and b/resources/assets/botania/textures/model/pylon.png differ diff --git a/resources/assets/botania/textures/model/pylonOld.png b/resources/assets/botania/textures/model/pylonOld.png new file mode 100644 index 000000000..01a378b63 Binary files /dev/null and b/resources/assets/botania/textures/model/pylonOld.png differ diff --git a/resources/mcmod.info b/resources/mcmod.info index 9ea583da1..a590487ad 100644 --- a/resources/mcmod.info +++ b/resources/mcmod.info @@ -9,7 +9,7 @@ "url": "http://www.vazkii.us", "updateUrl": "", "authorList": ["Vazkii"], - "credits": "Azanor, dylan4ever, wiiv, MegaManki, mDiyo, Mikeemoo, ChickenBones, cpw", + "credits": "Azanor, dylan4ever, wiiv, Rorax, MegaManki, mDiyo, Mikeemoo, ChickenBones, cpw", "parent": "", "screenshots": [], "dependencies": []