Fixed some basic crashes

This commit is contained in:
Anuken
2020-03-06 15:30:51 -05:00
parent 77f406e9b8
commit f8b554aff8
4 changed files with 4 additions and 8 deletions

View File

@@ -9,10 +9,7 @@ uniform vec3 u_ambientColor;
varying vec4 v_col;
const vec3 ambientColor = vec3(1.0);
const vec3 diffuse = vec3(0.2);
const vec3 v1 = vec3(1.0, 0.0, 1.0);
const vec3 v2 = vec3(1.0, 0.5, 0.0);
void main(){
vec3 norc = u_ambientColor * (diffuse + vec3(clamp((dot(a_normal, u_lightdir) + 1.0) / 2.0, 0.0, 1.0)));

View File

@@ -92,7 +92,7 @@ public class Blocks implements ContentList{
hasShadow = false;
}
public void draw(){}
public void drawBase(Tile tile){}
public void load(){}
public void init(){}
public boolean isHidden(){

View File

@@ -100,7 +100,6 @@ public class ContentLoader{
/** Calls Content#load() on everything. Use only after all modules have been created on the client.*/
public void load(){
Log.info("CALLING LOAD()");
initialize(Content::load);
}

View File

@@ -63,7 +63,7 @@ abstract class TileComp implements Posc, Teamc, Healthc, Tilec, Timerc{
/** Sets this tile entity data to this and adds it if necessary. */
public Tilec init(Tile tile, boolean shouldAdd){
this.tile = tile;
this.block = block();
this.block = tile.block();
set(tile.drawx(), tile.drawy());
if(block.activeSound != Sounds.none){
@@ -186,11 +186,11 @@ abstract class TileComp implements Posc, Teamc, Healthc, Tilec, Timerc{
}
public int rotation(){
return rotation();
return tile.rotation();
}
public void rotation(int rotation){
rotation(rotation);
tile.rotation(rotation);
}
public Floor floor(){