diff --git a/StevenDimDoors/mod_pocketDim/dimHelper.java b/StevenDimDoors/mod_pocketDim/dimHelper.java index 28ce172..8c92be9 100644 --- a/StevenDimDoors/mod_pocketDim/dimHelper.java +++ b/StevenDimDoors/mod_pocketDim/dimHelper.java @@ -233,7 +233,6 @@ public class dimHelper extends DimensionManager { oldWorld.getChunkFromChunkCoords(entX, entZ).removeEntity(entity); oldWorld.getChunkFromChunkCoords(entX, entZ).isModified = true; - } diff --git a/StevenDimDoors/mod_pocketDim/ticking/MobObelisk.java b/StevenDimDoors/mod_pocketDim/ticking/MobObelisk.java index 2c0537f..c7f4bec 100644 --- a/StevenDimDoors/mod_pocketDim/ticking/MobObelisk.java +++ b/StevenDimDoors/mod_pocketDim/ticking/MobObelisk.java @@ -31,22 +31,30 @@ public class MobObelisk extends EntityFlying implements IMob int aggro = 0; byte textureState = 0; boolean hasJumped= false; + float scaleFactor = 0; int destX=0; int destY=0; int destZ=0; public MobObelisk(World par1World) { + super(par1World); this.texture="/mods/DimensionalDoors/textures/mobs/Monolith0.png"; this.setSize(2F, 8.0F); this.noClip=true; + this.scaleFactor= (float) (rand.nextDouble()+1); // TODO Auto-generated constructor stub } + @Override + public boolean canDespawn() + { + return false; + } @Override public int getMaxHealth() @@ -60,6 +68,11 @@ public class MobObelisk extends EntityFlying implements IMob return false; } + public float getRenderSizeModifier() + { + return this.scaleFactor; + } + public void setEntityPosition(Entity entity, double x, double y, double z) { entity.lastTickPosX = entity.prevPosX = entity.posX = x; @@ -394,6 +407,7 @@ public class MobObelisk extends EntityFlying implements IMob par1NBTTagCompound.setInteger("aggro", this.aggro); par1NBTTagCompound.setByte("textureState", this.textureState); par1NBTTagCompound.setBoolean("hasJumped", this.hasJumped); + par1NBTTagCompound.setFloat("scaleFactor", this.scaleFactor); } @@ -407,6 +421,8 @@ public class MobObelisk extends EntityFlying implements IMob this.aggro=par1NBTTagCompound.getInteger("aggro"); this.textureState=par1NBTTagCompound.getByte("textureState"); this.hasJumped=par1NBTTagCompound.getBoolean("hasJumped"); + this.scaleFactor=par1NBTTagCompound.getFloat("scaleFactor"); + } diff --git a/StevenDimDoors/mod_pocketDimClient/ModelMobObelisk.java b/StevenDimDoors/mod_pocketDimClient/ModelMobObelisk.java index b6080ef..172008f 100644 --- a/StevenDimDoors/mod_pocketDimClient/ModelMobObelisk.java +++ b/StevenDimDoors/mod_pocketDimClient/ModelMobObelisk.java @@ -13,6 +13,12 @@ package StevenDimDoors.mod_pocketDimClient; +import java.util.Random; + +import org.lwjgl.opengl.GL11; + +import StevenDimDoors.mod_pocketDim.ticking.MobObelisk; + import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; @@ -21,12 +27,15 @@ public class ModelMobObelisk extends ModelBase { //fields ModelRenderer wholemonolith; + Random rand = new Random(); + public ModelMobObelisk() { textureWidth = 256; textureHeight = 256; + wholemonolith = new ModelRenderer(this, 0, 0); wholemonolith.addBox(-48/2F,-108F/1.3F, -12/2F, 48, 108, 12); @@ -44,6 +53,9 @@ public class ModelMobObelisk extends ModelBase { super.render(par1Entity, 0, 0, 0, 0, 0, 0); this.setRotationAngles(0, 0, 0, 0, 0,0, par1Entity); + + + GL11.glScalef(((MobObelisk) par1Entity).getRenderSizeModifier(), ((MobObelisk) par1Entity).getRenderSizeModifier(), ((MobObelisk) par1Entity).getRenderSizeModifier()); wholemonolith.render(par7); } diff --git a/resources/mods/DimensionalDoors/textures/mobs/Monolith.psd b/resources/mods/DimensionalDoors/textures/mobs/Monolith.psd index 9f423c5..72510aa 100644 Binary files a/resources/mods/DimensionalDoors/textures/mobs/Monolith.psd and b/resources/mods/DimensionalDoors/textures/mobs/Monolith.psd differ diff --git a/resources/mods/DimensionalDoors/textures/mobs/Monolith0.png b/resources/mods/DimensionalDoors/textures/mobs/Monolith0.png index 767a47d..afcb31d 100644 Binary files a/resources/mods/DimensionalDoors/textures/mobs/Monolith0.png and b/resources/mods/DimensionalDoors/textures/mobs/Monolith0.png differ diff --git a/resources/mods/DimensionalDoors/textures/mobs/Monolith1.png b/resources/mods/DimensionalDoors/textures/mobs/Monolith1.png index 5b28b67..e22b321 100644 Binary files a/resources/mods/DimensionalDoors/textures/mobs/Monolith1.png and b/resources/mods/DimensionalDoors/textures/mobs/Monolith1.png differ diff --git a/resources/mods/DimensionalDoors/textures/mobs/Monolith10.png b/resources/mods/DimensionalDoors/textures/mobs/Monolith10.png index 9d7a04a..d5d398a 100644 Binary files a/resources/mods/DimensionalDoors/textures/mobs/Monolith10.png and b/resources/mods/DimensionalDoors/textures/mobs/Monolith10.png differ diff --git a/resources/mods/DimensionalDoors/textures/mobs/Monolith11.png b/resources/mods/DimensionalDoors/textures/mobs/Monolith11.png index 8d4ba6c..89df625 100644 Binary files a/resources/mods/DimensionalDoors/textures/mobs/Monolith11.png and b/resources/mods/DimensionalDoors/textures/mobs/Monolith11.png differ diff --git a/resources/mods/DimensionalDoors/textures/mobs/Monolith12.png b/resources/mods/DimensionalDoors/textures/mobs/Monolith12.png index 315ad55..85eb0b0 100644 Binary files a/resources/mods/DimensionalDoors/textures/mobs/Monolith12.png and b/resources/mods/DimensionalDoors/textures/mobs/Monolith12.png differ diff --git a/resources/mods/DimensionalDoors/textures/mobs/Monolith13.png b/resources/mods/DimensionalDoors/textures/mobs/Monolith13.png index 7eeb2f2..5724818 100644 Binary files a/resources/mods/DimensionalDoors/textures/mobs/Monolith13.png and b/resources/mods/DimensionalDoors/textures/mobs/Monolith13.png differ diff --git a/resources/mods/DimensionalDoors/textures/mobs/Monolith14.png b/resources/mods/DimensionalDoors/textures/mobs/Monolith14.png index ff2f492..93938fa 100644 Binary files a/resources/mods/DimensionalDoors/textures/mobs/Monolith14.png and b/resources/mods/DimensionalDoors/textures/mobs/Monolith14.png differ diff --git a/resources/mods/DimensionalDoors/textures/mobs/Monolith15.png b/resources/mods/DimensionalDoors/textures/mobs/Monolith15.png index ec1b0f0..1ccc663 100644 Binary files a/resources/mods/DimensionalDoors/textures/mobs/Monolith15.png and b/resources/mods/DimensionalDoors/textures/mobs/Monolith15.png differ diff --git a/resources/mods/DimensionalDoors/textures/mobs/Monolith16.png b/resources/mods/DimensionalDoors/textures/mobs/Monolith16.png index 7bdeb25..56be9da 100644 Binary files a/resources/mods/DimensionalDoors/textures/mobs/Monolith16.png and b/resources/mods/DimensionalDoors/textures/mobs/Monolith16.png differ diff --git a/resources/mods/DimensionalDoors/textures/mobs/Monolith17.png b/resources/mods/DimensionalDoors/textures/mobs/Monolith17.png index 03809d4..223a645 100644 Binary files a/resources/mods/DimensionalDoors/textures/mobs/Monolith17.png and b/resources/mods/DimensionalDoors/textures/mobs/Monolith17.png differ diff --git a/resources/mods/DimensionalDoors/textures/mobs/Monolith18.png b/resources/mods/DimensionalDoors/textures/mobs/Monolith18.png index 908820a..00ba1d0 100644 Binary files a/resources/mods/DimensionalDoors/textures/mobs/Monolith18.png and b/resources/mods/DimensionalDoors/textures/mobs/Monolith18.png differ diff --git a/resources/mods/DimensionalDoors/textures/mobs/Monolith2.png b/resources/mods/DimensionalDoors/textures/mobs/Monolith2.png index 658cd30..7496197 100644 Binary files a/resources/mods/DimensionalDoors/textures/mobs/Monolith2.png and b/resources/mods/DimensionalDoors/textures/mobs/Monolith2.png differ diff --git a/resources/mods/DimensionalDoors/textures/mobs/Monolith3.png b/resources/mods/DimensionalDoors/textures/mobs/Monolith3.png index 7e25d8f..e40fe2a 100644 Binary files a/resources/mods/DimensionalDoors/textures/mobs/Monolith3.png and b/resources/mods/DimensionalDoors/textures/mobs/Monolith3.png differ diff --git a/resources/mods/DimensionalDoors/textures/mobs/Monolith4.png b/resources/mods/DimensionalDoors/textures/mobs/Monolith4.png index bec4a7f..1296d62 100644 Binary files a/resources/mods/DimensionalDoors/textures/mobs/Monolith4.png and b/resources/mods/DimensionalDoors/textures/mobs/Monolith4.png differ diff --git a/resources/mods/DimensionalDoors/textures/mobs/Monolith5.png b/resources/mods/DimensionalDoors/textures/mobs/Monolith5.png index d770a91..b38fcad 100644 Binary files a/resources/mods/DimensionalDoors/textures/mobs/Monolith5.png and b/resources/mods/DimensionalDoors/textures/mobs/Monolith5.png differ diff --git a/resources/mods/DimensionalDoors/textures/mobs/Monolith6.png b/resources/mods/DimensionalDoors/textures/mobs/Monolith6.png index 607c61d..3fdd3e5 100644 Binary files a/resources/mods/DimensionalDoors/textures/mobs/Monolith6.png and b/resources/mods/DimensionalDoors/textures/mobs/Monolith6.png differ diff --git a/resources/mods/DimensionalDoors/textures/mobs/Monolith7.png b/resources/mods/DimensionalDoors/textures/mobs/Monolith7.png index 4330774..1505ead 100644 Binary files a/resources/mods/DimensionalDoors/textures/mobs/Monolith7.png and b/resources/mods/DimensionalDoors/textures/mobs/Monolith7.png differ diff --git a/resources/mods/DimensionalDoors/textures/mobs/Monolith8.png b/resources/mods/DimensionalDoors/textures/mobs/Monolith8.png index cbea45b..1505ead 100644 Binary files a/resources/mods/DimensionalDoors/textures/mobs/Monolith8.png and b/resources/mods/DimensionalDoors/textures/mobs/Monolith8.png differ diff --git a/resources/mods/DimensionalDoors/textures/mobs/Monolith9.png b/resources/mods/DimensionalDoors/textures/mobs/Monolith9.png index 8a7c3a5..08b63b8 100644 Binary files a/resources/mods/DimensionalDoors/textures/mobs/Monolith9.png and b/resources/mods/DimensionalDoors/textures/mobs/Monolith9.png differ diff --git a/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith0.png b/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith0.png new file mode 100644 index 0000000..767a47d Binary files /dev/null and b/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith0.png differ diff --git a/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith1.png b/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith1.png new file mode 100644 index 0000000..5b28b67 Binary files /dev/null and b/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith1.png differ diff --git a/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith10.png b/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith10.png new file mode 100644 index 0000000..9d7a04a Binary files /dev/null and b/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith10.png differ diff --git a/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith11.png b/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith11.png new file mode 100644 index 0000000..8d4ba6c Binary files /dev/null and b/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith11.png differ diff --git a/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith12.png b/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith12.png new file mode 100644 index 0000000..315ad55 Binary files /dev/null and b/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith12.png differ diff --git a/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith13.png b/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith13.png new file mode 100644 index 0000000..7eeb2f2 Binary files /dev/null and b/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith13.png differ diff --git a/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith14.png b/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith14.png new file mode 100644 index 0000000..ff2f492 Binary files /dev/null and b/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith14.png differ diff --git a/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith15.png b/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith15.png new file mode 100644 index 0000000..ec1b0f0 Binary files /dev/null and b/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith15.png differ diff --git a/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith16.png b/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith16.png new file mode 100644 index 0000000..7bdeb25 Binary files /dev/null and b/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith16.png differ diff --git a/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith17.png b/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith17.png new file mode 100644 index 0000000..03809d4 Binary files /dev/null and b/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith17.png differ diff --git a/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith18.png b/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith18.png new file mode 100644 index 0000000..908820a Binary files /dev/null and b/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith18.png differ diff --git a/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith2.png b/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith2.png new file mode 100644 index 0000000..658cd30 Binary files /dev/null and b/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith2.png differ diff --git a/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith3.png b/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith3.png new file mode 100644 index 0000000..7e25d8f Binary files /dev/null and b/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith3.png differ diff --git a/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith4.png b/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith4.png new file mode 100644 index 0000000..bec4a7f Binary files /dev/null and b/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith4.png differ diff --git a/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith5.png b/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith5.png new file mode 100644 index 0000000..d770a91 Binary files /dev/null and b/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith5.png differ diff --git a/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith6.png b/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith6.png new file mode 100644 index 0000000..607c61d Binary files /dev/null and b/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith6.png differ diff --git a/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith7.png b/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith7.png new file mode 100644 index 0000000..4330774 Binary files /dev/null and b/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith7.png differ diff --git a/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith8.png b/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith8.png new file mode 100644 index 0000000..cbea45b Binary files /dev/null and b/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith8.png differ diff --git a/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith9.png b/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith9.png new file mode 100644 index 0000000..8a7c3a5 Binary files /dev/null and b/resources/mods/DimensionalDoors/textures/mobs/sparklymob/Monolith9.png differ