Permalink
Browse files

Combined the base of ground ferns into the main model.

  • Loading branch information...
Ri5ux committed Oct 28, 2018
1 parent 9d1e9ad commit 9aafcd04dcc106a47f7d1f0c331a68560037b42f
Showing with 4 additions and 3 deletions.
  1. +4 −3 src/main/java/org/avp/client/Resources.java
@@ -82,6 +82,7 @@
import org.avp.client.model.tile.ModelTurret;
import org.avp.client.model.tile.ModelWorkstation;
import org.avp.client.model.tile.plants.ModelGroundFern;
import org.avp.client.model.tile.plants.ModelTreeFern;
import org.avp.client.model.tile.rackmodules.ModelNetworkModuleRack;
import org.avp.client.model.tile.rackmodules.ModelRackModule1;
import org.avp.client.model.tile.rackmodules.ModelRackModule2;
@@ -231,14 +232,14 @@ public Models models()
public final MapModelTexture<ModelUrsuidae> URSUIDAE = new MapModelTexture(new ModelUrsuidae(), new Texture(AliensVsPredator.Properties.ID, "textures/mob/vardaboar.png"));
public final MapModelTexture<ModelVardaMonkey> VARDA_MONKEY = new MapModelTexture(new ModelVardaMonkey(), new Texture(AliensVsPredator.Properties.ID, "textures/mob/vardamonkey.png"));
public final MapModelTexture<ModelGroundFern> GROUND_FERN_OVERLAY = new MapModelTexture(new ModelGroundFern(), new Texture(AliensVsPredator.Properties.ID, "textures/tile/plants/paradisiangroundfern_overlay.png"));
public final MapModelTexture<ModelGroundFern> GROUND_FERN_COLORMAP = new MapModelTexture(new ModelGroundFern(), new Texture(AliensVsPredator.Properties.ID, "textures/tile/plants/paradisiangroundfern.png"));
public final MapModelTexture<ModelGroundFern> GROUND_FERN = new MapModelTexture(new ModelGroundFern(), new Texture(AliensVsPredator.Properties.ID, "textures/tile/plants/paradisiangroundfern.png"));
public final MapModelTexture<ModelTreeFern> TREE_FERN = new MapModelTexture(new ModelTreeFern(), new Texture(AliensVsPredator.Properties.ID, "textures/tile/plants/paradisiantreefern.png"));
/** New xenomorph model format **/
public final MapModelTexture<ModelUltramorph> ULTRAMORPH = new MapModelTexture(new ModelUltramorph(), new Texture(AliensVsPredator.Properties.ID, "textures/mob/ultramorph.png"));
/** Wavefront models **/
public final TriangulatedWavefrontModel M577_APC = WavefrontModelLoader.load(AliensVsPredator.class, AliensVsPredator.Properties.ID, "m577apc", "/assets/avp/models/m577apc");
public final TriangulatedWavefrontModel M577_APC = WavefrontModelLoader.load(AliensVsPredator.class, AliensVsPredator.Properties.ID, "m577apc", "/assets/avp/models/m577apc");
public final MapModelTexture<ModelNetworkModuleRack> NETWORKMODULERACK = new MapModelTexture(new ModelNetworkModuleRack(), new Texture(AliensVsPredator.Properties.ID, "textures/tile/networkmodulerack.png"));
public final MapModelTexture<ModelNetworkModuleRack> NETWORKMODULERACK_ON = new MapModelTexture(new ModelNetworkModuleRack(), new Texture(AliensVsPredator.Properties.ID, "textures/tile/networkmodulerack_on.png"));

0 comments on commit 9aafcd0

Please sign in to comment.