fixed the candelabra

removed z-fighting from candelabra fixed the UVs on candelabra fixed the fire particles on candelabra changed the candelabra texture to iron, as well as the crafting recipe fixed the glass table in Dutch lang file
rawkit1 · Sep 12, 2018 · 01bfc26 · 01bfc26
1 parent ccd8353
commit 01bfc26
Show file tree

Hide file tree

Showing 4 changed files with 192 additions and 166 deletions.
diff --git a/src/main/java/com/enwash/deco/blocks/Candelabra.java b/src/main/java/com/enwash/deco/blocks/Candelabra.java
@@ -115,33 +115,34 @@ public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, Bloc
     @SideOnly(Side.CLIENT)
     public void randomDisplayTick(IBlockState stateIn, World worldIn, BlockPos pos, Random rand)
     {
-
-    	/*
-    	   double[][] posList = {
-    		{(double)pos.getX() + .625D, (double)pos.getY() + 6D, (double)pos.getZ() + .5D},
-    		{(double)pos.getX() + .9375D, (double)pos.getY() + 6D, (double)pos.getZ() + 0.5D},
-    		{(double)pos.getX() + .5D, (double)pos.getY() + 6D, (double)pos.getZ() + .0625D},
-    		{(double)pos.getX() + .5D, (double)pos.getY() + 6D, (double)pos.getZ() + .9375D}
-    		};
-    	 */
 
-        double a0 = (double)pos.getX() + .75D;
-        double a1 = (double)pos.getY() + .8125D;
-        double a2 = (double)pos.getZ() + .5D;
-        double b0 = (double)pos.getX() + .25D;
-        double b1 = (double)pos.getY() + .8125D;
-        double b2 = (double)pos.getZ() + .5D;
-        double c0 = (double)pos.getX() + .5D;
-        double c1 = (double)pos.getY() + .75D;
-        double c2 = (double)pos.getZ() + .5D;
-
-
-        worldIn.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, a0, a1, a2, 0.0D, 0.0D, 0.0D);
-        worldIn.spawnParticle(EnumParticleTypes.FLAME, a0, a1, a2, 0.0D, 0.0D, 0.0D);
-        worldIn.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, b0, b1, b2, 0.0D, 0.0D, 0.0D);
-        worldIn.spawnParticle(EnumParticleTypes.FLAME, b0, b1, b2, 0.0D, 0.0D, 0.0D);
-        worldIn.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, c0, c1, c2, 0.0D, 0.0D, 0.0D);
-        worldIn.spawnParticle(EnumParticleTypes.FLAME, c0, c1, c2, 0.0D, 0.0D, 0.0D);
+        double s1 = (double)pos.getY() + .8125D;
+        double m0 = (double)pos.getX() + .5D;
+        double m1 = (double)pos.getY() + .75D;
+        double m2 = (double)pos.getZ() + .5D;
+        double a0;
+        double b0;
+        double a2;
+        double b2;
+        if (stateIn.getValue(FACING) == EnumFacing.NORTH || stateIn.getValue(FACING) == EnumFacing.SOUTH){
+        	a0 = (double)pos.getX() + .75D;
+        	b0 = (double)pos.getX() + .25D;
+        	a2 = (double)pos.getZ() + .5D;
+        	b2 = a2;
+        }
+        else{
+        	a2 = (double)pos.getZ() + .75D;
+        	b2 = (double)pos.getZ() + .25D;
+        	a0 = (double)pos.getX() + .5D;
+        	b0 = a0;
+        }
+        worldIn.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, a0, s1, a2, 0.0D, 0.0D, 0.0D);
+        worldIn.spawnParticle(EnumParticleTypes.FLAME, a0, s1, a2, 0.0D, 0.0D, 0.0D);
+        worldIn.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, b0, s1, b2, 0.0D, 0.0D, 0.0D);
+        worldIn.spawnParticle(EnumParticleTypes.FLAME, b0, s1, b2, 0.0D, 0.0D, 0.0D);
+
+        worldIn.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, m0, m1, m2, 0.0D, 0.0D, 0.0D);
+        worldIn.spawnParticle(EnumParticleTypes.FLAME, m0, m1, m2, 0.0D, 0.0D, 0.0D);
     }
 
 }
diff --git a/src/main/resources/assets/btdc/lang/nl_nl.lang b/src/main/resources/assets/btdc/lang/nl_nl.lang
@@ -15,7 +15,7 @@ tile.logdeer.name=Boomstamhert
 tile.luckycat_white.name=Gelukskat (Wit)
 tile.luckycat_black.name=Gelukskat (Zwart)
 tile.log_tinted.name=Getinte Boomstam
-tile.coffee_table.name=Glazen Salontafel
+tile.coffee_table_glass.name=Glazen Salontafel
 
 // BUSTS